From fbe346a3322090aa5a4ad1a1d39ec1baa6f7013e Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 14 May 2021 12:32:47 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=A4=84=E7=90=86=20alertMessage?=
 =?UTF-8?q?=20=E6=9F=A5=E8=AF=A2=E5=9B=BE=E8=A1=A8=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/page/alert/alertMessage.vue      | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/nezha-fronted/src/components/page/alert/alertMessage.vue b/nezha-fronted/src/components/page/alert/alertMessage.vue
index d1f09a08e..0c66f2e32 100644
--- a/nezha-fronted/src/components/page/alert/alertMessage.vue
+++ b/nezha-fronted/src/components/page/alert/alertMessage.vue
@@ -227,10 +227,12 @@ export default {
       })
     },
     messageDetail (row) {
-      this.currentMsg = { ...row }
-      this.graphShow = true
-      this.$nextTick(() => {
-        this.queryChartDate()
+      this.$get('/alert/rule/' + row.alertRule.id).then(res => {
+        this.currentMsg = { ...row, alertRule: { ...res.data } }
+        this.graphShow = true
+        this.$nextTick(() => {
+          this.queryChartDate()
+        })
       })
     },
     queryMessage (alertMessage) {
@@ -410,13 +412,14 @@ export default {
     promQueryParamConvert (obj) {
       let r = '(' + obj.alertRule.expr + ')'
       let intoLabels = false
+      obj.labels = JSON.parse(obj.labels)
       if (Object.keys(obj.labels).length > 0) {
         r += (function () {
           let group = ' and ' + '(group({'
           let by = ' by ('
 
           for (const k in obj.labels) {
-            if (k != 'alertname' && k != 'severity') {
+            if (k != 'alertname' && k != 'severity' && k != 'severity_id') {
               intoLabels = true
               group += k
               group += '='