Merge branch 'feat/new_monitor_apigw' into feat/monitor_apigateway_compatibility/#1010158081123701143

Author: zzz833708

bklog/apps/api/modules/monitor.py

@@ -28,7 +28,7 @@
 
 from apps.api.base import DataAPI  # noqa
 from apps.api.modules.utils import add_esb_info_before_request  # noqa
-from config.domains import MONITOR_APIGATEWAY_ROOT, MONITOR_APIGATEWAY_ROOT_NEW  # noqa
+from config.domains import MONITOR_APIGATEWAY_ROOT  # noqa
 
 
 class _MonitorApi(object):

bklog/apps/api/modules/transfer.py

@@ -27,7 +27,7 @@
 
 from apps.api.base import DataAPI
 from apps.api.modules.utils import add_esb_info_before_request
-from config.domains import MONITOR_APIGATEWAY_ROOT, MONITOR_APIGATEWAY_ROOT_NEW
+from config.domains import MONITOR_APIGATEWAY_ROOT
 
 
 def get_cluster_info_after(response_result):

bklog/apps/log_clustering/handlers/clustering_monitor.py

@@ -38,7 +38,6 @@
     DEFAULT_LABEL,
     DEFAULT_METRIC_CLUSTERING,
     DEFAULT_NO_DATA_CONFIG,
-    DEFAULT_NOTICE_WAY,
     DEFAULT_PATTERN_MONITOR_MSG,
     DEFAULT_SCENARIO,
     ITEM_NAME_CLUSTERING,
@@ -447,9 +446,7 @@ def save_pattern_strategy(self, table_id, params):
             group = MonitorUtils.save_notice_group(
                 bk_biz_id=self.bk_biz_id,
                 name=group_name,
-                message="",
                 notice_receiver=[{"type": "user", "id": name} for name in remark_obj.owners],
-                notice_way=DEFAULT_NOTICE_WAY,
             )
             user_groups = [group["id"]]
             remark_obj.notice_group_id = group["id"]

bklog/apps/log_clustering/utils/monitor.py

@@ -51,9 +51,10 @@ def save_notice_group(cls, bk_biz_id: int, name: str, notice_way: dict, notice_r
             params = {
                 "bk_biz_id": bk_biz_id,
                 "name": name,
-                "message": message,
-                "notice_way": notice_way,
-                "notice_receiver": notice_receiver,
+                "duty_arranges": [{"users": notice_receiver}],
+                "mention_list": DEFAULT_MENTION_LIST,
+                "alert_notice": DEFAULT_ALERT_NOTICE,
+                "action_notice": DEFAULT_ACTION_NOTICE,
             }
         return MonitorApi.save_notice_group(params=params)
 
@@ -72,9 +73,7 @@ def get_or_create_notice_group(cls, log_index_set_id, bk_biz_id):
         group = cls.save_notice_group(
             bk_biz_id=bk_biz_id,
             name=_("{}_{}聚类告警组").format(log_index_set_id, log_index_set.index_set_name),
-            message="",
             notice_receiver=notice_receiver,
-            notice_way=DEFAULT_NOTICE_WAY,
         )
         NoticeGroup.objects.get_or_create(
             index_set_id=log_index_set_id, notice_group_id=group["id"], bk_biz_id=bk_biz_id

bklog/config/domains.py

@@ -34,7 +34,6 @@
     "GSE_APIGATEWAY_ROOT_V2",
     "GSE_APIGATEWAY_ROOT_V3",
     "MONITOR_APIGATEWAY_ROOT",
-    "MONITOR_APIGATEWAY_ROOT_NEW",
     "BCS_CC_APIGATEWAY_ROOT",
     "USER_MANAGE_APIGATEWAY_ROOT",
     # 数据平台模块域名
@@ -71,7 +70,7 @@
     # Wework api
     "WEWORK_APIGATEWAY_ROOT",
     # UNIFY QUERY
-    "UNIFYQUERY_APIGATEWAY_ROOT"
+    "UNIFYQUERY_APIGATEWAY_ROOT",
 ]
 
 env_domains = load_domains(settings)