[Mysql] modify issu and delete process stop

server/controller/db/mysql/migration/rawsql/init.sql

@@ -1369,12 +1369,6 @@ INSERT INTO alarm_policy(user_id, sub_view_type, tag_conditions, query_condition
     values(1, 1, "过滤项: N/A | 分组项: host", "", "/v1/stats/querier/UniversalPromHistory", "{\"DATABASE\":\"\",\"PROM_SQL\":\"delta(min(deepflow_tenant__deepflow_agent_monitor__create_time)by(host)[1m:10s])\",\"interval\":60,\"metric\":\"process_start_time_delta\",\"time_tag\":\"toi\"}",
     "[{\"METRIC_LABEL\":\"process_start\",\"return_field_description\":\"最近 1 分钟进程启动时间变化\",\"unit\":\" 毫秒\"}]", "采集器重启",  0, 1, 1, 20, 1, "", "", "{\"displayName\":\"process_start_time_delta\", \"unit\": \"毫秒\"}", 1, "{\"OP\":\">=\",\"VALUE\":1}", @lcuuid);
 
-set @lcuuid = (select uuid());
-INSERT INTO alarm_policy(user_id, sub_view_type, tag_conditions, query_conditions, query_url, query_params, sub_view_metrics, name, level, state,
-    app_type, sub_type, contrast_type, target_line_uid, target_line_name, target_field, agg,
-    threshold_warning, lcuuid)
-    values(1, 1, "过滤项: N/A | 分组项: 主机名, 进程", "", "/v1/alarm/process-end/", "{}", "[{\"OPERATOR\": {\"return_field\": \"sysalarm_value\", \"return_field_description\": \"最近 1 分钟进程停止次数\", \"return_field_unit\": \"次\"}}]", "进程停止",  0, 1, 1, 20, 1, "", "", "{\"displayName\":\"sysalarm_value\", \"unit\": \"次\"}", 1, "{\"OP\":\">=\",\"VALUE\":1}", @lcuuid);
-
 set @lcuuid = (select uuid());
 INSERT INTO alarm_policy(user_id, sub_view_type, tag_conditions, query_conditions, query_url, query_params, sub_view_metrics, name, level, state,
     app_type, sub_type, contrast_type, target_line_uid, target_line_name, target_field, agg,
@@ -1412,7 +1406,7 @@ set @lcuuid = (select uuid());
 INSERT INTO alarm_policy(user_id, sub_view_type, tag_conditions, query_conditions, query_url, query_params, sub_view_metrics, name, level, state,
     app_type, sub_type, contrast_type, target_line_uid, target_line_name, target_field,
     threshold_error, lcuuid)
-    values(1, 1, "过滤项: N/A | 分组项: tag.cluster_id", "", "/v1/stats/querier/UniversalHistory", "{\"DATABASE\":\"deepflow_tenant\",\"TABLE\":\"deepflow_server_controller_genesis_k8sinfo_delay\",\"interval\":60,\"fill\": \"none\",\"window_size\":1,\"QUERIES\":[{\"QUERY_ID\":\"R1\",\"SELECT\":\"Last(`metrics.avg`) AS `delay`\",\"WHERE\":\"1=1\",\"GROUP_BY\":\"`tag.cluster_id`\",\"METRICS\":[\"Last(`metrics.avg`) AS `delay`\"]}]}",
+    values(1, 1, "过滤项: N/A | 分组项: tag.cluster_id", "", "/v1/stats/querier/UniversalHistory", "{\"DATABASE\":\"deepflow_tenant\",\"TABLE\":\"controller_genesis_k8sinfo_delay\",\"interval\":60,\"fill\": \"none\",\"window_size\":1,\"QUERIES\":[{\"QUERY_ID\":\"R1\",\"SELECT\":\"Last(`metrics.avg`) AS `delay`\",\"WHERE\":\"1=1\",\"GROUP_BY\":\"`tag.cluster_id`\",\"METRICS\":[\"Last(`metrics.avg`) AS `delay`\"]}]}",
     "[{\"METRIC_LABEL\":\"delay\",\"return_field_description\":\"资源同步滞后时间\",\"unit\":\" 秒\"}]", "K8s 资源同步滞后",  1, 1, 1, 23, 1, "", "", "{\"displayName\":\"delay\", \"unit\": \"秒\"}", "{\"OP\":\">=\",\"VALUE\":600}", @lcuuid);
 
 set @lcuuid = (select uuid());

server/controller/db/mysql/migration/rawsql/issu/6.5.1.42.sql

@@ -9,6 +9,10 @@ BEGIN
 
     UPDATE data_source SET display_name='日志-日志数据',retention_time=720 WHERE data_table_collection='application_log.log';
     UPDATE data_source SET display_name='租户侧监控数据', data_table_collection='deepflow_tenant.*' WHERE data_table_collection='deepflow_system.*';
+    UPDATE alarm_policy SET query_params = REPLACE(query_params, 'deepflow_system', 'deepflow_tenant') WHERE app_type=1 AND name like ('%采集器%');
+    DELETE FROM alarm_policy WHERE name='进程停止';
+    UPDATE alarm_policy SET query_params="{\"DATABASE\":\"deepflow_tenant\",\"TABLE\":\"controller_genesis_k8sinfo_delay\",\"interval\":60,\"fill\": \"none\",\"window_size\":1,\"QUERIES\":[{\"QUERY_ID\":\"R1\",\"SELECT\":\"Last(`metrics.avg`) AS `delay`\",\"WHERE\":\"1=1\",\"GROUP_BY\":\"`tag.cluster_id`\",\"METRICS\":[\"Last(`metrics.avg`) AS `delay`\"]}]}" WHERE name="K8s 资源同步滞后";
+
 
     -- do migration in default db
 
@@ -19,11 +23,8 @@ BEGIN
             INSERT INTO data_source (display_name, data_table_collection, `interval`, retention_time, lcuuid) 
             VALUES ('管理侧监控数据', 'deepflow_admin.*', 0, 7*24, @lcuuid);
         END IF;
-        UPDATE alarm_policy SET query_params = REPLACE(query_params, 'deepflow_system', 'deepflow_admin') WHERE
-        name in ("控制器磁盘空间不足", "控制器系统负载高", "数据节点系统负载高", "数据节点磁盘空间不足", "数据节点数据强制删除", "数据节点数据丢失 (ingester.recviver.metrics.invalid)", "数据节点数据丢失 (ingester.queue.metrics.overwritten)","数据节点数据丢失 (ingester.decoder.metrics.drop_count)", "数据节点数据丢失 (ingester.ckwriter.metrics.write_failed_count)");
+        UPDATE alarm_policy SET query_params = REPLACE(query_params, 'deepflow_system', 'deepflow_admin') WHERE app_type=1 AND (name like ('%控制器%') OR name like ('%数据节点%'));
     END IF;
-    UPDATE alarm_policy SET query_params = REPLACE(query_params, 'deepflow_system', 'deepflow_tenant') WHERE
-    name in ("采集器 CPU 超限", "采集器内存超限", "采集器重启", "采集器所在系统空闲内存低", "采集器 WARN 日志过多", "采集器 ERR 日志过多", "K8s 资源同步滞后", "采集器数据丢失 (dispatcher.metrics.kernel_drops)", "采集器数据丢失 (queue.metrics.overwritten)", "采集器数据丢失 (l7_session_aggr.metrics.throttle-drop)", "采集器数据丢失 (flow_aggr.metrics.drop-in-throttle)", "采集器数据丢失 (ebpf_collector.metrics.kern_lost)", "采集器数据丢失 (ebpf_collector.metrics.user_enqueue_lost)", "采集器数据丢失 (dispatcher.metrics.invalid_packets)", "采集器数据丢失 (dispatcher.metrics.err)", "采集器数据丢失 (flow_map.metrics.drop_by_window)", "采集器数据丢失 (flow_map.metrics.drop_by_capacity)", "采集器数据丢失 (flow_aggr.metrics.drop-before-window)", "采集器数据丢失 (quadruple_generator.metrics.drop-before-window)", "采集器数据丢失 (collector.metrics.drop-before-window)", "采集器数据丢失 (collector.metrics.drop-inactive)", "采集器数据丢失 (collect_sender.metrics.dropped)");
     COMMIT; 
 
 END;

server/server.yaml

@@ -55,6 +55,8 @@ controller:
   reporting-disabled: false
   # Deepflow billing mode  license/voucher
   billing-method: license
+  ## If no-teamid-refused is set to true, agent must report team_id to server
+  #no-teamid-refused: false
 
   # ingester plaform data, default: 0
   # 0 (All K8s Cluster)