innov
/
nightingale1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

display children node events

This commit is contained in:
Ulric Qin 2020-05-06 22:09:32 +08:00
parent afb80933d0
commit f609a84c18
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/model/event.go
View File

@ -98,7 +98,7 @@ func (e *Event) GetEventDetail() ([]EventDetail, error) {
}
func EventTotal(stime, etime int64, nodePath, query, eventType string, priorities, sendTypes []string) (int64, error) {
session := DB["mon"].Where("etime > ? and etime < ? and node_path = ?", stime, etime, nodePath)
session := DB["mon"].Where("etime > ? and etime < ? and (node_path = ? or node_path like ?)", stime, etime, nodePath, nodePath+".%")
if len(priorities) > 0 && priorities[0] != "" {
session = session.In("priority", priorities)
}
@ -119,7 +119,7 @@ func EventTotal(stime, etime int64, nodePath, query, eventType string, prioritie
}
q := "%" + fields[i] + "%"
session = session.Where("sname like ? or endpoint like ? or node_path like ?", q, q, q)
session = session.Where("sname like ? or endpoint like ?", q, q)
}
}
@ -130,7 +130,7 @@ func EventTotal(stime, etime int64, nodePath, query, eventType string, prioritie
func EventGets(stime, etime int64, nodePath, query, eventType string, priorities, sendTypes []string, limit, offset int) ([]Event, error) {
var objs []Event
session := DB["mon"].Where("etime > ? and etime < ? and node_path = ?", stime, etime, nodePath)
session := DB["mon"].Where("etime > ? and etime < ? and (node_path = ? or node_path like ?)", stime, etime, nodePath, nodePath+".%")
if len(priorities) > 0 && priorities[0] != "" {
session = session.In("priority", priorities)
}
@ -151,7 +151,7 @@ func EventGets(stime, etime int64, nodePath, query, eventType string, priorities
}
q := "%" + fields[i] + "%"
session = session.Where("sname like ? or endpoint like ? or node_path like ?", q, q, q)
session = session.Where("sname like ? or endpoint like ?", q, q)
}
}

8
src/model/event_cur.go
View File

@ -163,7 +163,7 @@ func SaveEventCurStatus(hashid uint64, status string) error {
}
func EventCurTotal(stime, etime int64, nodePath, query string, priorities, sendTypes []string) (int64, error) {
session := DB["mon"].Where("etime > ? and etime < ? and node_path = ? and ignore_alert=0", stime, etime, nodePath)
session := DB["mon"].Where("etime > ? and etime < ? and (node_path = ? or node_path like ?) and ignore_alert=0", stime, etime, nodePath, nodePath+".%")
if len(priorities) > 0 && priorities[0] != "" {
session = session.In("priority", priorities)
}
@ -180,7 +180,7 @@ func EventCurTotal(stime, etime int64, nodePath, query string, priorities, sendT
}
q := "%" + fields[i] + "%"
session = session.Where("sname like ? or endpoint like ? or node_path like ?", q, q, q)
session = session.Where("sname like ? or endpoint like ?", q, q)
}
}
@ -191,7 +191,7 @@ func EventCurTotal(stime, etime int64, nodePath, query string, priorities, sendT
func EventCurGets(stime, etime int64, nodePath, query string, priorities, sendTypes []string, limit, offset int) ([]EventCur, error) {
var obj []EventCur
session := DB["mon"].Where("etime > ? and etime < ? and node_path = ? and ignore_alert=0", stime, etime, nodePath)
session := DB["mon"].Where("etime > ? and etime < ? and (node_path = ? or node_path like ?) and ignore_alert=0", stime, etime, nodePath, nodePath+".%")
if len(priorities) > 0 && priorities[0] != "" {
session = session.In("priority", priorities)
}
@ -208,7 +208,7 @@ func EventCurGets(stime, etime int64, nodePath, query string, priorities, sendTy
}
q := "%" + fields[i] + "%"
session = session.Where("sname like ? or endpoint like ? or node_path like ? ", q, q, q)
session = session.Where("sname like ? or endpoint like ?", q, q)
}
}