修复监控插件失败无异常输出的问题 (#6910)

* bugfix: 修复监控插件失败无异常输出的问题 * test: 修复单元测试的问题 * test: 修复单元测试的问题
TencentBlueKing · Aug 10, 2023 · d98c91b · d98c91b
1 parent 8b6f1bd
commit d98c91b
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 25 deletions.
diff --git a/pipeline_plugins/components/collections/sites/open/monitor/base.py b/pipeline_plugins/components/collections/sites/open/monitor/base.py
@@ -3,13 +3,12 @@
 
 from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
-
 from pipeline.core.flow.activity import Service
 from pipeline.core.flow.io import StringItemSchema
 
-from gcloud.utils.handlers import handle_api_error
-from gcloud.utils import cmdb
 from gcloud.core.models import Business
+from gcloud.utils import cmdb
+from gcloud.utils.handlers import handle_api_error
 
 __group_name__ = _("监控平台(Monitor)")
 monitor_handle_api_error = partial(handle_api_error, __group_name__)
@@ -75,6 +74,7 @@ def send_request(self, request_body, data, client):
         if not response["result"]:
             message = monitor_handle_api_error("monitor.create_shield", request_body, response)
             self.logger.error(message)
+            data.outputs.ex_data = message
             shield_id = ""
             ret_flag = False
         else:

diff --git a/...ne_plugins/tests/components/collections/sites/open/monitor_test/alarm_shield/test_v1_1.py b/...ne_plugins/tests/components/collections/sites/open/monitor_test/alarm_shield/test_v1_1.py
@@ -13,16 +13,18 @@
 
 from django.test import TestCase
 from mock import MagicMock
-
 from pipeline.component_framework.test import (
-    ComponentTestMixin,
-    ComponentTestCase,
+    Call,
     CallAssertion,
+    ComponentTestCase,
+    ComponentTestMixin,
     ExecuteAssertion,
-    Call,
     Patcher,
 )
-from pipeline_plugins.components.collections.sites.open.monitor.alarm_shield.v1_1 import MonitorAlarmShieldComponent
+
+from pipeline_plugins.components.collections.sites.open.monitor.alarm_shield.v1_1 import (
+    MonitorAlarmShieldComponent,
+)
 
 
 class MonitorAlarmShieldComponentTest(TestCase, ComponentTestMixin):
@@ -140,6 +142,15 @@ def get_module_id_list_by_name(bk_biz_id, username, set_list, service_template_l
     execute_assertion=ExecuteAssertion(
         success=False,
         outputs={
+            "ex_data": "调用监控平台(Monitor)接口monitor.create_shield返回失败, error=create shield fail, "
+            'params={"begin_time":"2020-09-28 11:18:58",'
+            '"bk_biz_id":2,"category":"scope","cycle_config":{"begin_time":"","end_time":"","day_list":[],'
+            '"week_list":[],"type":1},"description":"shield by bk_sops","dimension_config":'
+            '{"scope_type":"node","target":[{"bk_obj_id":"module","bk_inst_id":1},{"bk_obj_id":"module",'
+            '"bk_inst_id":2},{"bk_obj_id":"module","bk_inst_id":3},{"bk_obj_id":"module","bk_inst_id":4},'
+            '{"bk_obj_id":"module","bk_inst_id":5}],"metric_id":["bk_monitor.system.load.load5",'
+            '"bk_monitor.system.cpu_summary.usage"]},"end_time":"2020-09-28 11:18:58","notice_config":{},'
+            '"shield_notice":false}',
             "shield_id": "",
             "message": "调用监控平台(Monitor)接口monitor.create_shield返回失败, error=create shield fail, "
             'params={"begin_time":"2020-09-28 11:18:58",'

diff --git a/...s/tests/components/collections/sites/open/monitor_test/alarm_shield_strategy/test_v1_1.py b/...s/tests/components/collections/sites/open/monitor_test/alarm_shield_strategy/test_v1_1.py
@@ -13,15 +13,15 @@
 
 from django.test import TestCase
 from mock import MagicMock
-
 from pipeline.component_framework.test import (
-    ComponentTestMixin,
-    ComponentTestCase,
+    Call,
     CallAssertion,
+    ComponentTestCase,
+    ComponentTestMixin,
     ExecuteAssertion,
-    Call,
     Patcher,
 )
+
 from pipeline_plugins.components.collections.sites.open.monitor.alarm_shield_strategy.v1_1 import (
     MonitorAlarmShieldStrategyComponent,
 )
@@ -113,6 +113,12 @@ def __init__(self):
     execute_assertion=ExecuteAssertion(
         success=False,
         outputs={
+            "ex_data": "调用监控平台(Monitor)接口monitor.create_shield返回失败, error=create shield fail, "
+            'params={"begin_time":"2019-11-04 00:00:00",'
+            '"bk_biz_id":2,"category":"strategy","cycle_config":{"begin_time":"","end_time":"","day_list":'
+            '[],"week_list":[],"type":1},"description":"shield by bk_sops","dimension_config":{"id":"123",'
+            '"scope_type":"ip","target":[{"ip":"127.0.0.1","bk_cloud_id":0},{"ip":"127.0.0.2",'
+            '"bk_cloud_id":1}]},"end_time":"2019-11-05 00:00:00","notice_config":{},"shield_notice":false}',
             "shield_id": "",
             "message": "调用监控平台(Monitor)接口monitor.create_shield返回失败, error=create shield fail, "
             'params={"begin_time":"2019-11-04 00:00:00",'

diff --git a/...s/tests/components/collections/sites/open/monitor_test/alarm_shield_strategy/test_v1_2.py b/...s/tests/components/collections/sites/open/monitor_test/alarm_shield_strategy/test_v1_2.py
@@ -11,15 +11,15 @@
 specific language governing permissions and limitations under the License.
 """
 from django.test import TestCase
+from mock import MagicMock
 from pipeline.component_framework.test import (
-    ComponentTestMixin,
+    Call,
+    CallAssertion,
     ComponentTestCase,
+    ComponentTestMixin,
     ExecuteAssertion,
-    CallAssertion,
-    Call,
     Patcher,
 )
-from mock import MagicMock
 
 from pipeline_plugins.components.collections.sites.open.monitor.alarm_shield_strategy.v1_2 import (
     MonitorAlarmShieldStrategyComponent,
@@ -112,6 +112,14 @@ def __init__(self):
     execute_assertion=ExecuteAssertion(
         success=False,
         outputs={
+            "ex_data": "调用监控平台(Monitor)接口monitor.create_shield返回失败, error=create shield fail, "
+            'params={"begin_time":"2019-11-04 00:00:00",'
+            '"bk_biz_id":2,"category":"strategy","cycle_config":{"begin_time":"","end_time":"","day_list":'
+            '[],"week_list":[],"type":1},"description":"shield by bk_sops","dimension_config":{"id":"123",'
+            '"dimension_conditions":[{"condition":"and","key":"bk_biz_id","method":"eq","value":["1","2"],'
+            '"name":"bk_biz_id"}],'  # noqa
+            '"scope_type":"ip","target":[{"ip":"127.0.0.1","bk_cloud_id":0},{"ip":"127.0.0.2",'
+            '"bk_cloud_id":1}]},"end_time":"2019-11-05 00:00:00","notice_config":{},"shield_notice":false}',
             "shield_id": "",
             "message": "调用监控平台(Monitor)接口monitor.create_shield返回失败, error=create shield fail, "
             'params={"begin_time":"2019-11-04 00:00:00",'

diff --git a/pipeline_plugins/tests/components/collections/sites/open/monitor_test/test_alarm_shield.py b/pipeline_plugins/tests/components/collections/sites/open/monitor_test/test_alarm_shield.py
@@ -13,16 +13,18 @@
 
 from django.test import TestCase
 from mock import MagicMock
-
 from pipeline.component_framework.test import (
-    ComponentTestMixin,
-    ComponentTestCase,
+    Call,
     CallAssertion,
+    ComponentTestCase,
+    ComponentTestMixin,
     ExecuteAssertion,
-    Call,
     Patcher,
 )
-from pipeline_plugins.components.collections.sites.open.monitor.alarm_shield.v1_0 import MonitorAlarmShieldComponent
+
+from pipeline_plugins.components.collections.sites.open.monitor.alarm_shield.v1_0 import (
+    MonitorAlarmShieldComponent,
+)
 
 
 class MonitorAlarmShieldComponentTest(TestCase, ComponentTestMixin):
@@ -138,6 +140,15 @@ def get_module_id_list_by_name(bk_biz_id, username, set_list, service_template_l
     execute_assertion=ExecuteAssertion(
         success=False,
         outputs={
+            "ex_data": "调用监控平台(Monitor)接口monitor.create_shield返回失败, error=create shield fail, "
+            'params={"begin_time":"2020-09-28 11:18:58",'
+            '"bk_biz_id":2,"category":"scope","cycle_config":{"begin_time":"","end_time":"","day_list":[],'
+            '"week_list":[],"type":1},"description":"shield by bk_sops","dimension_config":'
+            '{"scope_type":"node","target":[{"bk_obj_id":"module","bk_inst_id":1},{"bk_obj_id":"module",'
+            '"bk_inst_id":2},{"bk_obj_id":"module","bk_inst_id":3},{"bk_obj_id":"module","bk_inst_id":4},'
+            '{"bk_obj_id":"module","bk_inst_id":5}],"metric_id":["bk_monitor.system.load.load5",'
+            '"bk_monitor.system.cpu_summary.usage"]},"end_time":"2020-09-28 11:18:58","notice_config":{},'
+            '"shield_notice":false}',
             "shield_id": "",
             "message": "调用监控平台(Monitor)接口monitor.create_shield返回失败, error=create shield fail, "
             'params={"begin_time":"2020-09-28 11:18:58",'

diff --git a/...lugins/tests/components/collections/sites/open/monitor_test/test_alarm_shield_strategy.py b/...lugins/tests/components/collections/sites/open/monitor_test/test_alarm_shield_strategy.py
@@ -13,15 +13,15 @@
 
 from django.test import TestCase
 from mock import MagicMock
-
 from pipeline.component_framework.test import (
-    ComponentTestMixin,
-    ComponentTestCase,
+    Call,
     CallAssertion,
+    ComponentTestCase,
+    ComponentTestMixin,
     ExecuteAssertion,
-    Call,
     Patcher,
 )
+
 from pipeline_plugins.components.collections.sites.open.monitor.alarm_shield_strategy.v1_0 import (
     MonitorAlarmShieldStrategyComponent,
 )
@@ -117,6 +117,12 @@ def __init__(self):
     execute_assertion=ExecuteAssertion(
         success=False,
         outputs={
+            "ex_data": "调用监控平台(Monitor)接口monitor.create_shield返回失败, error=create shield fail, "
+            'params={"begin_time":"2019-11-04 00:00:00",'
+            '"bk_biz_id":2,"category":"strategy","cycle_config":{"begin_time":"","end_time":"","day_list":'
+            '[],"week_list":[],"type":1},"description":"shield by bk_sops","dimension_config":{"id":"123",'
+            '"scope_type":"ip","target":[{"ip":"127.0.0.1","bk_cloud_id":0},{"ip":"127.0.0.2",'
+            '"bk_cloud_id":1}]},"end_time":"2019-11-05 00:00:00","notice_config":{},"shield_notice":false}',
             "shield_id": "",
             "message": "调用监控平台(Monitor)接口monitor.create_shield返回失败, error=create shield fail, "
             'params={"begin_time":"2019-11-04 00:00:00",'