Merge branch 'main' of github.com:ccfos/nightingale

Author: 710leo

docker/migratesql/migrate.sql

@@ -133,7 +133,7 @@ ALTER TABLE `builtin_components` MODIFY COLUMN `logo` mediumtext COMMENT '''logo
 /* v8.0.0-beta.2 2024-12-26 */
 ALTER TABLE `es_index_pattern` ADD COLUMN `cross_cluster_enabled` int not null default 0;
 
-/* v8.0.0-beta.3 2024-01-03 */
+/* v8.0.0-beta.3 2025-01-03 */
 ALTER TABLE `builtin_components` ADD COLUMN `disabled` INT NOT NULL DEFAULT 0 COMMENT 'is disabled or not';
 
 CREATE TABLE `dash_annotation` (
@@ -208,4 +208,4 @@ CREATE TABLE `message_template` (
     `update_at` bigint not null default 0,
     `update_by` varchar(64) not null default '',
     PRIMARY KEY (`id`)
-) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4;
+) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4;

models/message_tpl.go

@@ -474,8 +474,8 @@ var NewTplMap = map[string]string{
 发送时间: {{timestamp}}{{$domain := "http://127.0.0.1:17000" }}   
 事件详情: {{$domain}}/alert-his-events/{{$event.Id}}{{$muteUrl := print $domain "/alert-mutes/add?busiGroup=" $event.GroupId "&cate=" $event.Cate "&datasource_ids=" $event.DatasourceId "&prod=" $event.RuleProd}}{{range $key, $value := $event.TagsMap}}{{$muteUrl = print $muteUrl "&tags=" $key "%3D" $value}}{{end}}   
 屏蔽1小时: {{ unescaped $muteUrl }}`,
-	FeishuCard: `{{ if $event.IsRecovered }}
-{{- if ne $event.Cate "host"}}
+	FeishuCard: `{{- if $event.IsRecovered -}}
+{{- if ne $event.Cate "host" -}}
 **告警集群:** {{$event.Cluster}}{{end}}   
 **级别状态:** S{{$event.Severity}} Recovered   
 **告警名称:** {{$event.RuleName}}