flashduty-knowledge-base 1.2.8 → 1.2.9

package/dist/iife/zh.js

@@ -5358,7 +5358,8 @@ url: "https://docs.flashcat.cloud/zh/flashduty/dingtalk-integration-guide"
     - 回到分派策略配置页面，刷新后重新选择群聊列表
     - 如果仍然拿不到群聊列表，请尝试群内卸载酷应用后，重试以上步骤。如果还不可以，请联系客户或专属技术支持
 
-<img src="https://download.flashcat.cloud/dingtalk-self-app-install.png" alt="drawing" width="800"/>
+<img src="https://download.flashcat.cloud/flashduty/doc/zh/fd/dingtalk-install-1.png" alt="drawing" width="800"/>
+<img src="https://download.flashcat.cloud/flashduty/doc/zh/fd/dingtalk-install-2.png" alt="drawing" width="800"/>
 
 <img src="https://download.flashcat.cloud/dingtalk-self-app-notify-rule.png" alt="drawing" width="800"/>
 
@@ -6782,7 +6783,7 @@ msg_type 必填，值为 interactive
       "fields": [{
           "text": {
             "tag": "lark_md",
-            "content": "**🏢 协作空间:**{{if .ChannelName}}{{.ChannelName}}{{else}}无{{end}}"
+            "content": "**🏢 协作空间:**{{.ChannelName}}"
           }
         },
         {
@@ -6794,34 +6795,46 @@ msg_type 必填，值为 interactive
         {
           "text": {
             "tag": "lark_md",
-            "content": "**⏰ 触发时间:**{{date "2006-01-02 15:04:05" .StartTime}}{{if gt .AlertCnt 1}}"
+            "content": "**⏰ 触发时间:**{{date "2006-01-02 15:04:05" .StartTime}}"
           }
         },
+        {{if gt .AlertCnt 1}}
         {
           "text": {
             "tag": "lark_md",
-            "content": "**🔔 聚合告警:**{{.AlertCnt}}条 {{end}}{{if .Labels.resource}}"
+            "content": "**🔔 聚合告警:**{{.AlertCnt}}条"
           }
         },
+        {{end}}{{if .Labels.resource}}
         {
           "tag": "div",
           "text": {
             "tag": "lark_md",
-            "content": "**📌 告警对象:**{{toHtml (joinAlertLabels . "resource" ",")}} {{end}}{{if .Description}}"
+            "content": {{printf "%q" (print "**📌 告警对象:**" (joinAlertLabels . "resource" ","))}}
           }
         },
+        {{end}}{{if .Description}}
         {
           "tag": "div",
           "text": {
             "tag": "lark_md",
-            "content": "**🔍 故障描述:**{{.Description}}{{end}}{{if gt (len .Responders) 0}}"
+            "content": {{printf "%q" (print "**🔍 故障描述:**" .Description)}}
           }
         },
+        {{end}}{{if gt (len .Responders) 0}}
         {
           "tag": "div",
           "text": {
             "tag": "lark_md",
-            "content": "**👨‍💻 处理人员:**{{range .Responders}}@{{.PersonName}} {{end}}{{end}}"
+            "content": "**👨‍💻 处理人员:**{{range .Responders}}@{{.PersonName}} {{end}}"
+          }
+        },
+        {{end}}
+        {
+          "tag": "div",
+          "text": {
+            "tag": "lark_md",
+            "content": ""
           }
         }
       ]
@@ -6850,7 +6863,28 @@ msg_type 必填，值为 interactive
           "url": "{{.DetailUrl}}?ack=1"
         }
       ]
-    }]
+    }
+    {{if or .IsFlapping .IsInStorm}},{{end}}
+    {{if .IsFlapping}}
+    {
+        "tag": "div",
+        "text": {
+        "tag": "lark_md",
+        "content": "🔴 当前故障频繁发生与恢复，{{if .Flapping.MuteMinutes}}未来{{.Flapping.MuteMinutes}}分钟内此告警重复触发将不再通知。{{end}}建议您优化告警策略。"
+        }
+    }
+    {{end}}
+    {{if and .IsFlapping .IsInStorm}},{{end}}
+    {{if .IsInStorm}}
+    {
+        "tag": "div",
+        "text": {
+        "tag": "lark_md",
+        "content": "🔴 当前故障已聚合{{.AlertCnt}}条告警，触发告警风暴，请加急处理！"
+        }
+    }
+    {{end}} 
+    ]
   }
 }
 \`\`\`
@@ -6870,10 +6904,10 @@ msg_type 必填，值为 post
                 }, {
                     "tag": "text",
                     "text": "协作空间：",
-                    "text_type": "bold"
+                    "style": ["bold"]
                 }, {
                     "tag": "text",
-                    "text": "{{if .ChannelName}}{{.ChannelName}}{{else}}无{{end}}\\n"
+                    "text": "{{if .ChannelName}}{{.ChannelName}}{{else}}无{{end}}"
                 }],
                 [{
                     "tag": "text",
@@ -6881,11 +6915,10 @@ msg_type 必填，值为 post
                 }, {
                     "tag": "text",
                     "text": "严重程度：",
-                    "text_type": "bold"
+                    "style": ["bold"]
                 }, {
                     "tag": "text",
-                    "text": "{{.IncidentSeverity}}\\n",
-                    "text_type": "{{if eq .IncidentSeverity "Critical"}}bold{{end}}"
+                    "text": "{{.IncidentSeverity}}"
                 }],
                 [{
                     "tag": "text",
@@ -6893,10 +6926,10 @@ msg_type 必填，值为 post
                 }, {
                     "tag": "text",
                     "text": "触发时间：",
-                    "text_type": "bold"
+                    "style": ["bold"]
                 }, {
                     "tag": "text",
-                    "text": "{{date "2006-01-02 15:04:05" .StartTime}}\\n"
+                    "text": "{{date "2006-01-02 15:04:05" .StartTime}}"
                 }],
                 {{if gt .AlertCnt 1}}[{
                     "tag": "text",
@@ -6904,10 +6937,10 @@ msg_type 必填，值为 post
                 }, {
                     "tag": "text",
                     "text": "聚合告警：",
-                    "text_type": "bold"
+                    "style": ["bold"]
                 }, {
                     "tag": "text",
-                    "text": "{{.AlertCnt}}条\\n"
+                    "text": "{{.AlertCnt}}条"
                 }],{{end}}
                 {{if .Labels.resource}}[{
                     "tag": "text",
@@ -6915,10 +6948,10 @@ msg_type 必填，值为 post
                 }, {
                     "tag": "text",
                     "text": "告警对象：",
-                    "text_type": "bold"
+                    "style": ["bold"]
                 }, {
                     "tag": "text",
-                    "text": "{{toHtml (joinAlertLabels . "resource" ", ")}}\\n"
+                    "text": {{printf "%q" (print (joinAlertLabels . "resource" ","))}}
                 }],{{end}}
                 {{if .Description}}[{
                     "tag": "text",
@@ -6926,10 +6959,10 @@ msg_type 必填，值为 post
                 }, {
                     "tag": "text",
                     "text": "描述：",
-                    "text_type": "bold"
+                    "style": ["bold"]
                 }, {
                     "tag": "text",
-                    "text": "{{toHtml .Description}}\\n"
+                    "text": {{printf "%q" (print .Description)}}
                 }],{{end}}
                 {{if gt (len .Responders) 0}}[{
                     "tag": "text",
@@ -6937,10 +6970,10 @@ msg_type 必填，值为 post
                 }, {
                     "tag": "text",
                     "text": "处理人员：",
-                    "text_type": "bold"
+                    "style": ["bold"]
                 }, {
                     "tag": "text",
-                    "text": "{{range .Responders}}@{{.PersonName}} {{end}}\\n"
+                    "text": "{{range .Responders}}@{{.PersonName}} {{end}}"
                 }],{{end}}
                 [{
                     "tag": "a",
@@ -6954,6 +6987,20 @@ msg_type 必填，值为 post
                     "href": "{{.DetailUrl}}?ack=1",
                     "text": "认领"
                 }]
+                {{if or .IsFlapping .IsInStorm}},{{end}}
+                {{if .IsFlapping}}
+                [{
+                    "tag": "text",
+                    "text": "\\n 🔴 当前故障频繁发生与恢复，{{if .Flapping.MuteMinutes}}未来{{.Flapping.MuteMinutes}}分钟内此告警重复触发将不再通知。{{end}}建议您优化告警策略。"
+                }]
+                {{end}}
+                {{if and .IsFlapping .IsInStorm}},{{end}}
+                {{if .IsInStorm}}
+                ,[{
+                    "tag": "text",
+                    "text": "\\n 🔴 当前故障已聚合{{.AlertCnt}}条告警，触发告警风暴，请加急处理！"
+                }]
+                {{end}}
             ]
         }
     }
@@ -7088,94 +7135,100 @@ msg_type 必填，值为 post
 - 如果不设置自定义内容，将采用系统默认模板，仅展示关键信息：
 
 \`\`\`json
-{"head": {
-    "text": "{{fireReason .}}INC [#{{.Num}}] {{toHtml .Title}}",
+{
+"head": {
+  "text": "{{fireReason .}}INC [#{{.Num}}] {{.Title}}",
+  "style": {
+    "bold": true,
+    "italic": false,
+    "color": "{{$s := serverityToColor .IncidentSeverity}}{{$s}}"
+  }
+},
+"body": [
+  {
+    "type": "message",
+    "text": {{printf "%q" (print "协作空间：" .ChannelName)}},
     "style": {
-      "bold": true,
+      "bold": false,
+      "italic": false
+    }
+  },
+  {
+    "type": "message",
+    "text": "严重程度：{{.IncidentSeverity}}",
+    "style": {
+      "bold": false,
       "italic": false,
-      "color": "{{$s := serverityToColor .IncidentSeverity}}{{toHtml $s}}"
+      "color": "{{$s := serverityToColor .IncidentSeverity}}{{$s}}"
     }
   },
-  "body": [
-    {
-      "type": "message",
-      "text": "协作空间：{{if .ChannelName}}{{.ChannelName}}{{else}}无{{end}}",
-      "style": {
-        "bold": false,
-        "italic": false
-      }
-    },
-    {
-      "type": "message",
-      "text": "严重程度：{{.IncidentSeverity}}",
-      "style": {
-        "bold": false,
-        "italic": false,
-        "color": "{{$s := serverityToColor .IncidentSeverity}}{{toHtml $s}}"
-      }
-    },
-    {
-      "type": "message",
-      "text": "持续时长：{{ago .StartTime}}{{if gt .AlertCnt 1}}",
-      "style": {
-        "bold": false,
-        "italic": false
-      }
-    },
-    {
-      "type": "message",
-      "text": "聚合告警：{{.AlertCnt}}条{{end}}{{if .Labels.resource}}",
-      "style": {
-        "bold": false,
-        "italic": false
-      }
-    },
-    {
-        "type": "message",
-        "text": "告警对象：{{.Labels.resource}}{{end}}{{if .Description}}",
-        "style": {
-          "bold": false,
-          "italic": false
-        }
-      },
-    {
+  {
+    "type": "message",
+    "text": "{{if .AlertCnt}}聚合告警：{{.AlertCnt}}条{{end}}",
+    "style": {
+      "bold": false,
+      "italic": false
+    }
+  },
+  {{if .Labels.resource}}
+  {
       "type": "message",
-      "text": "故障描述：{{toHtml .Description}}{{end}}{{if gt (len .Responders) 0}}",
+      "text": {{printf "%q" (print "告警对象：" (joinAlertLabels . "resource" ", "))}},
       "style": {
         "bold": false,
         "italic": false
       }
-    },
-    {
+  },
+  {{end}}{{if .Labels.body_text}}
+  {
       "type": "message",
-      "text": "分派人员：{{range .Responders}}@{{.PersonName}}{{end}}{{end}}",
+      "text": {{printf "%q" (print "故障描述：" .Labels.body_text)}},
       "style": {
         "bold": false,
         "italic": false
       }
-    },
-    {
-        "type": "message",
-        "text": "查看详情",
-        "link": "{{.DetailUrl}}{{if .IsFlapping}}"
-    },
-    {
-      "type": "message",
-      "text": "注意：当前故障状态变化频繁，将收敛通知{{.Flapping.MuteMinutes}}分钟，建议您优化告警策略。{{end}}{{if .IsInStorm}}",
-      "style": {
-        "bold": true,
-        "italic": false
-      }
-    },
-    {
+  },
+  {{else if .Description}}
+  {
+    "type": "message",
+    "text": {{printf "%q" (print "故障描述：" .Description)}},
+    "style": {
+      "bold": false,
+      "italic": false
+    }
+  },
+  {{end}}{{if gt (len .Responders) 0}}
+  {
+    "type": "message",
+    "text": "处理人员：{{range .Responders}}@{{.PersonName}}{{end}}",
+    "style": {
+      "bold": false,
+      "italic": false
+    }
+  },
+  {{end}}
+  {
       "type": "message",
-      "text": "注意：当前故障已聚合{{.AlertCnt}}条告警，触发告警风暴，请加急处理！{{end}}",
-      "style": {
-        "bold": true,
-        "italic": false
-      }
+      "text": "查看详情",
+      "link": {{printf "%q" .DetailUrl}}
+  },
+  {
+    "type": "message",
+    "text": "{{if .IsFlapping}}🔴 当前故障频繁发生与恢复，{{if .Flapping.MuteMinutes}}未来{{.Flapping.MuteMinutes}}分钟内此告警重复触发将不再通知。{{end}}建议您优化告警策略。{{end}}",
+    "style": {
+      "bold": true,
+      "italic": false
     }
-  ]
+  },
+  {
+    "type": "message",
+    "text": "{{if .IsInStorm}}🔴 当前故障已聚合{{.AlertCnt}}条告警，触发告警风暴，请加急处理！{{end}}",
+    "style": {
+      "bold": true,
+      "italic": false
+    }
+  }
+]
 }
 \`\`\`
 </div>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flashduty-knowledge-base",
-  "version": "1.2.8",
+  "version": "1.2.9",
   "description": "flashduty knowledge base",
   "type": "module",
   "engines": {