fix(backend): 修复监控策略初始化报错的问题 #3786

TencentBlueKing · Apr 1, 2024 · 6e6f1a9 · 6e6f1a9
1 parent 3e58113
commit 6e6f1a9
Show file tree

Hide file tree

Showing 177 changed files with 329 additions and 331 deletions.
diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/cloud/云区域组件 - DNS(named和pull-crond)存活性检查.json b/dbm-ui/backend/db_monitor/tpls/alarm/cloud/云区域组件 - DNS(named和pull-crond)存活性检查.json
@@ -161,7 +161,7 @@
           "timedelta": 60,
           "is_enabled": true,
           "converge_func": "collect",
-          "need_biz_converge": true,
+          "need_biz_converge": false,
           "sub_converge_config": {
             "timedelta": 60,
             "count": 2,
@@ -256,7 +256,7 @@
   },
   "is_enabled": true,
   "monitor_indicator": "COUNT(dns_check_warning-dbm_report_channel)",
-  "version": 16,
+  "version": 17,
   "alert_source": "event",
   "custom_conditions": []
 }
diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/es/ES 主机 CPU 使用率.json b/dbm-ui/backend/db_monitor/tpls/alarm/es/ES 主机 CPU 使用率.json
@@ -166,7 +166,7 @@
           "timedelta": 60,
           "is_enabled": true,
           "converge_func": "collect",
-          "need_biz_converge": true,
+          "need_biz_converge": false,
           "sub_converge_config": {
             "timedelta": 60,
             "count": 2,
@@ -259,7 +259,7 @@
   },
   "is_enabled": true,
   "monitor_indicator": "AVG(CPU使用率)",
-  "version": 19,
+  "version": 20,
   "alert_source": "time_series",
   "custom_conditions": [],
   "export_at": "2024-03-28T21:19:53+08:00"

diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/es/ES 主机磁盘IO利用率.json b/dbm-ui/backend/db_monitor/tpls/alarm/es/ES 主机磁盘IO利用率.json
@@ -167,7 +167,7 @@
           "timedelta": 60,
           "is_enabled": true,
           "converge_func": "collect",
-          "need_biz_converge": true,
+          "need_biz_converge": false,
           "sub_converge_config": {
             "timedelta": 60,
             "count": 2,

diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/es/ES 主机磁盘空间使用率.json b/dbm-ui/backend/db_monitor/tpls/alarm/es/ES 主机磁盘空间使用率.json
@@ -202,7 +202,7 @@
           "timedelta": 60,
           "is_enabled": true,
           "converge_func": "collect",
-          "need_biz_converge": true,
+          "need_biz_converge": false,
           "sub_converge_config": {
             "timedelta": 60,
             "count": 2,
@@ -295,7 +295,7 @@
   },
   "is_enabled": true,
   "monitor_indicator": "AVG(磁盘空间使用率)",
-  "version": 19,
+  "version": 20,
   "alert_source": "time_series",
   "custom_conditions": [],
   "export_at": "2024-03-28T21:19:53+08:00"

diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/es/ES 主机网络入流量.json b/dbm-ui/backend/db_monitor/tpls/alarm/es/ES 主机网络入流量.json
@@ -176,7 +176,7 @@
           "timedelta": 60,
           "is_enabled": true,
           "converge_func": "collect",
-          "need_biz_converge": true,
+          "need_biz_converge": false,
           "sub_converge_config": {
             "timedelta": 60,
             "count": 2,

diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/es/ES 写拒绝.json b/dbm-ui/backend/db_monitor/tpls/alarm/es/ES 写拒绝.json
@@ -175,7 +175,7 @@
           "timedelta": 60,
           "is_enabled": true,
           "converge_func": "collect",
-          "need_biz_converge": true,
+          "need_biz_converge": false,
           "sub_converge_config": {
             "timedelta": 60,
             "count": 2,

diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/es/ES 写排队.json b/dbm-ui/backend/db_monitor/tpls/alarm/es/ES 写排队.json
@@ -165,7 +165,7 @@
           "timedelta": 60,
           "is_enabled": true,
           "converge_func": "collect",
-          "need_biz_converge": true,
+          "need_biz_converge": false,
           "sub_converge_config": {
             "timedelta": 60,
             "count": 2,
@@ -258,7 +258,7 @@
   },
   "is_enabled": true,
   "monitor_indicator": "MAX(elasticsearch_thread_pool_queue_count)",
-  "version": 19,
+  "version": 20,
   "alert_source": "time_series",
   "custom_conditions": [],
   "export_at": "2024-03-28T21:19:53+08:00"

diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/es/ES 搜索拒绝.json b/dbm-ui/backend/db_monitor/tpls/alarm/es/ES 搜索拒绝.json
@@ -175,7 +175,7 @@
           "timedelta": 60,
           "is_enabled": true,
           "converge_func": "collect",
-          "need_biz_converge": true,
+          "need_biz_converge": false,
           "sub_converge_config": {
             "timedelta": 60,
             "count": 2,

diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/es/ES 集群状态.json b/dbm-ui/backend/db_monitor/tpls/alarm/es/ES 集群状态.json
@@ -166,7 +166,7 @@
           "timedelta": 60,
           "is_enabled": true,
           "converge_func": "collect",
-          "need_biz_converge": true,
+          "need_biz_converge": false,
           "sub_converge_config": {
             "timedelta": 60,
             "count": 2,
@@ -262,7 +262,7 @@
   },
   "is_enabled": true,
   "monitor_indicator": "MAX(elasticsearch_cluster_health_status)",
-  "version": 19,
+  "version": 20,
   "alert_source": "time_series",
   "custom_conditions": [],
   "export_at": "2024-03-28T21:19:53+08:00"

diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/hdfs/HDFS CorruptBlocks.json b/dbm-ui/backend/db_monitor/tpls/alarm/hdfs/HDFS CorruptBlocks.json
@@ -212,7 +212,7 @@
           "timedelta": 60,
           "is_enabled": true,
           "converge_func": "collect",
-          "need_biz_converge": true,
+          "need_biz_converge": false,
           "sub_converge_config": {
             "timedelta": 60,
             "count": 2,
@@ -308,7 +308,7 @@
   },
   "is_enabled": true,
   "monitor_indicator": "AVG(hadoop_namenode_corrupt_blocks)/MIN(hadoop_namenode_State)",
-  "version": 16,
+  "version": 17,
   "alert_source": "time_series",
   "custom_conditions": []
 }
diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/hdfs/HDFS DataNode Last Contact.json b/dbm-ui/backend/db_monitor/tpls/alarm/hdfs/HDFS DataNode Last Contact.json
@@ -143,7 +143,7 @@
           "timedelta": 60,
           "is_enabled": true,
           "converge_func": "collect",
-          "need_biz_converge": true,
+          "need_biz_converge": false,
           "sub_converge_config": {
             "timedelta": 60,
             "count": 2,
@@ -235,7 +235,7 @@
   },
   "is_enabled": true,
   "monitor_indicator": "[HDFS]-DataNode Last Contact",
-  "version": 16,
+  "version": 17,
   "alert_source": "time_series",
   "custom_conditions": []
 }
diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/hdfs/HDFS EditLogRoll.json b/dbm-ui/backend/db_monitor/tpls/alarm/hdfs/HDFS EditLogRoll.json
@@ -212,7 +212,7 @@
           "timedelta": 60,
           "is_enabled": true,
           "converge_func": "collect",
-          "need_biz_converge": true,
+          "need_biz_converge": false,
           "sub_converge_config": {
             "timedelta": 60,
             "count": 2,
@@ -309,7 +309,7 @@
   },
   "is_enabled": true,
   "monitor_indicator": "AVG(hadoop_namenode_transactions_since_last_checkpoint)/MIN(hadoop_namenode_State)",
-  "version": 16,
+  "version": 17,
   "alert_source": "time_series",
   "custom_conditions": []
 }
diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/hdfs/HDFS MissingBlocks.json b/dbm-ui/backend/db_monitor/tpls/alarm/hdfs/HDFS MissingBlocks.json
@@ -212,7 +212,7 @@
           "timedelta": 60,
           "is_enabled": true,
           "converge_func": "collect",
-          "need_biz_converge": true,
+          "need_biz_converge": false,
           "sub_converge_config": {
             "timedelta": 60,
             "count": 2,
@@ -308,7 +308,7 @@
   },
   "is_enabled": true,
   "monitor_indicator": "AVG(hadoop_namenode_missing_blocks)/MIN(hadoop_namenode_State)",
-  "version": 16,
+  "version": 17,
   "alert_source": "time_series",
   "custom_conditions": []
 }
diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/hdfs/HDFS NameNode Failover.json b/dbm-ui/backend/db_monitor/tpls/alarm/hdfs/HDFS NameNode Failover.json
@@ -208,7 +208,7 @@
           "timedelta": 60,
           "is_enabled": true,
           "converge_func": "collect",
-          "need_biz_converge": true,
+          "need_biz_converge": false,
           "sub_converge_config": {
             "timedelta": 60,
             "count": 2,
@@ -300,7 +300,7 @@
   },
   "is_enabled": true,
   "monitor_indicator": "MIN(hadoop_namenode_State)",
-  "version": 16,
+  "version": 17,
   "alert_source": "time_series",
   "custom_conditions": []
 }
diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/hdfs/HDFS 容量使用率.json b/dbm-ui/backend/db_monitor/tpls/alarm/hdfs/HDFS 容量使用率.json
@@ -229,7 +229,7 @@
           "timedelta": 60,
           "is_enabled": true,
           "converge_func": "collect",
-          "need_biz_converge": true,
+          "need_biz_converge": false,
           "sub_converge_config": {
             "timedelta": 60,
             "count": 2,
@@ -325,7 +325,7 @@
   },
   "is_enabled": true,
   "monitor_indicator": "AVG(hadoop_namenode_capacity_used)/AVG(hadoop_namenode_capacity_total)*MIN(hadoop_namenode_State)*100",
-  "version": 16,
+  "version": 17,
   "alert_source": "time_series",
   "custom_conditions": []
 }
diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/influxdb/InfluxDB CPU 使用率告警.json b/dbm-ui/backend/db_monitor/tpls/alarm/influxdb/InfluxDB CPU 使用率告警.json
@@ -200,7 +200,7 @@
           "timedelta": 60,
           "is_enabled": true,
           "converge_func": "collect",
-          "need_biz_converge": true,
+          "need_biz_converge": false,
           "sub_converge_config": {
             "timedelta": 60,
             "count": 2,
@@ -292,7 +292,7 @@
   },
   "is_enabled": true,
   "monitor_indicator": "AVG(CPU使用率)",
-  "version": 16,
+  "version": 17,
   "alert_source": "time_series",
   "custom_conditions": []
 }
diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/influxdb/InfluxDB Series 增长量.json b/dbm-ui/backend/db_monitor/tpls/alarm/influxdb/InfluxDB Series 增长量.json
@@ -164,7 +164,7 @@
           "timedelta": 60,
           "is_enabled": true,
           "converge_func": "collect",
-          "need_biz_converge": true,
+          "need_biz_converge": false,
           "sub_converge_config": {
             "timedelta": 60,
             "count": 2,
@@ -256,7 +256,7 @@
   },
   "is_enabled": true,
   "monitor_indicator": "AVG(influxdb_database_numSeries)",
-  "version": 16,
+  "version": 17,
   "alert_source": "time_series",
   "custom_conditions": []
 }
diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/influxdb/InfluxDB 内存使用告警.json b/dbm-ui/backend/db_monitor/tpls/alarm/influxdb/InfluxDB 内存使用告警.json
@@ -200,7 +200,7 @@
           "timedelta": 60,
           "is_enabled": true,
           "converge_func": "collect",
-          "need_biz_converge": true,
+          "need_biz_converge": false,
           "sub_converge_config": {
             "timedelta": 60,
             "count": 2,
@@ -292,7 +292,7 @@
   },
   "is_enabled": true,
   "monitor_indicator": "AVG(应用程序内存使用占比)",
-  "version": 16,
+  "version": 17,
   "alert_source": "time_series",
   "custom_conditions": []
 }
diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/influxdb/InfluxDB 写入异常告警.json b/dbm-ui/backend/db_monitor/tpls/alarm/influxdb/InfluxDB 写入异常告警.json
@@ -164,7 +164,7 @@
           "timedelta": 60,
           "is_enabled": true,
           "converge_func": "collect",
-          "need_biz_converge": true,
+          "need_biz_converge": false,
           "sub_converge_config": {
             "timedelta": 60,
             "count": 2,
@@ -256,7 +256,7 @@
   },
   "is_enabled": true,
   "monitor_indicator": "AVG(influxdb_httpd_pointsWrittenFail)",
-  "version": 16,
+  "version": 17,
   "alert_source": "time_series",
   "custom_conditions": []
 }
diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/influxdb/InfluxDB 实例端口异常.json b/dbm-ui/backend/db_monitor/tpls/alarm/influxdb/InfluxDB 实例端口异常.json
@@ -154,7 +154,7 @@
           "timedelta": 60,
           "is_enabled": true,
           "converge_func": "collect",
-          "need_biz_converge": true,
+          "need_biz_converge": false,
           "sub_converge_config": {
             "timedelta": 60,
             "count": 2,
@@ -246,7 +246,7 @@
   },
   "is_enabled": true,
   "monitor_indicator": "MAX(http_response_result_code)",
-  "version": 16,
+  "version": 17,
   "alert_source": "time_series",
   "custom_conditions": []
 }
diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/influxdb/InfluxDB 磁盘 IO 利用率.json b/dbm-ui/backend/db_monitor/tpls/alarm/influxdb/InfluxDB 磁盘 IO 利用率.json
@@ -201,7 +201,7 @@
           "timedelta": 60,
           "is_enabled": true,
           "converge_func": "collect",
-          "need_biz_converge": true,
+          "need_biz_converge": false,
           "sub_converge_config": {
             "timedelta": 60,
             "count": 2,
@@ -293,7 +293,7 @@
   },
   "is_enabled": true,
   "monitor_indicator": "AVG(I/O使用率)",
-  "version": 16,
+  "version": 17,
   "alert_source": "time_series",
   "custom_conditions": []
 }
diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/influxdb/InfluxDB 磁盘空间告警.json b/dbm-ui/backend/db_monitor/tpls/alarm/influxdb/InfluxDB 磁盘空间告警.json
@@ -201,7 +201,7 @@
           "timedelta": 60,
           "is_enabled": true,
           "converge_func": "collect",
-          "need_biz_converge": true,
+          "need_biz_converge": false,
           "sub_converge_config": {
             "timedelta": 60,
             "count": 2,
@@ -293,7 +293,7 @@
   },
   "is_enabled": true,
   "monitor_indicator": "MAX(磁盘空间使用率)",
-  "version": 16,
+  "version": 17,
   "alert_source": "time_series",
   "custom_conditions": []
 }
diff --git a/dbm-ui/backend/db_monitor/tpls/alarm/kafka/Kafka 主机 CPU 使用率.json b/dbm-ui/backend/db_monitor/tpls/alarm/kafka/Kafka 主机 CPU 使用率.json
@@ -162,7 +162,7 @@
           "timedelta": 60,
           "is_enabled": true,
           "converge_func": "collect",
-          "need_biz_converge": true,
+          "need_biz_converge": false,
           "sub_converge_config": {
             "timedelta": 60,
             "count": 2,
@@ -254,7 +254,7 @@
   },
   "is_enabled": false,
   "monitor_indicator": "AVG(CPU使用率)",
-  "version": 16,
+  "version": 17,
   "alert_source": "time_series",
   "custom_conditions": []
 }