From ec38af9a2f4ab06b202d88c0ab29235645551df8 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期二, 28 七月 2020 19:04:02 +0800
Subject: [PATCH] fix alarmLevel
---
esutil/EsClient.go | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/esutil/EsClient.go b/esutil/EsClient.go
index 7d392c8..8257e1f 100644
--- a/esutil/EsClient.go
+++ b/esutil/EsClient.go
@@ -98,11 +98,16 @@
if !exist {
continue
}
- alarmLevel, exist := source["alarmLevel"]
+ alarmRules, exist := source["alarmRules"]
if exist {
- d["alarmLevel"] = alarmLevel
+ if alarmB,ae := json.Marshal(alarmRules);ae ==nil {
+ var alarmRArr []AlarmRule
+ if ae = json.Unmarshal(alarmB, &alarmRArr);ae ==nil && len(alarmRArr) >0 {
+ d["alarmLevel"] = alarmRArr[0].AlarmLevel
+ }
+ }
} else {
- d["alarmLevel"] = "涓�绾�"
+ d["alarmLevel"] = ""
}
pmArr := pmax.([]interface{})
if len(pmArr) > 0 {
@@ -168,6 +173,11 @@
}
}
+type AlarmRule struct {
+ GroupId string `json:"groupId"`
+ AlarmLevel string `json:"alarmLevel"`
+}
+
type TargetInfo struct {
TargetId string `json:"targetId"`
TargetType string `json:"targetType"`
--
Gitblit v1.8.0