Skip to content

Commit a7ffe88

Browse files
committedNov 2, 2021
Update alarm query
1 parent 48c82a8 commit a7ffe88

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed
 

‎monitor-server/api/v1/alarm/alarm.go

+4
Original file line numberDiff line numberDiff line change
@@ -545,6 +545,8 @@ func QueryEntityAlarm(c *gin.Context) {
545545
value := param.Criteria.Condition
546546
if strings.Contains(value, "monitor-check") {
547547
alarmObj := db.GetCheckProgressContent(value)
548+
alarmObj.Id = value
549+
alarmObj.DisplayName = alarmObj.Subject
548550
result.Data = append(result.Data, &alarmObj)
549551
}else {
550552
if strings.Contains(value, "-") {
@@ -571,6 +573,8 @@ func QueryEntityAlarm(c *gin.Context) {
571573
mid.ReturnData(c, result)
572574
return
573575
}
576+
alarmObj.Id = value
577+
alarmObj.DisplayName = alarmObj.Subject
574578
result.Data = append(result.Data, &alarmObj)
575579
}
576580
result.Status = "OK"

‎monitor-server/models/entity.go

+1
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ type AlarmEntity struct {
7676

7777
type AlarmEntityObj struct {
7878
Id string `json:"id"`
79+
DisplayName string `json:"displayName"`
7980
Status string `json:"status"`
8081
Subject string `json:"subject"`
8182
Content string `json:"content"`

0 commit comments

Comments
 (0)
Failed to load comments.