IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-16 18:34:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

not ok option to alert list, fixes: #9754

Browse Source
This commit is contained in:
Patrick O'Carroll 2017-11-13 10:30:11 +01:00
parent c44f6e2ec2
commit 9ad186bcc9
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/services/sqlstore/alert.go
View File

@ -94,7 +94,12 @@ func HandleAlertsQuery(query *m.GetAlertsQuery) error {
if i > 0 { if i > 0 {
sql.WriteString(" OR ") sql.WriteString(" OR ")
} }
sql.WriteString("state = ? ") if strings.HasPrefix(v, "not") {
sql.WriteString("state <> ? ")
v = v[4:]
} else {
sql.WriteString("state = ? ")
}
params = append(params, v) params = append(params, v)
} }
sql.WriteString(")") sql.WriteString(")")

1
public/app/features/alerting/alert_list_ctrl.ts
View File

@ -11,6 +11,7 @@ export class AlertListCtrl {
stateFilters = [ stateFilters = [
{text: 'All', value: null}, {text: 'All', value: null},
{text: 'OK', value: 'ok'}, {text: 'OK', value: 'ok'},
{text: 'Not OK', value: 'not_ok'},
{text: 'Alerting', value: 'alerting'}, {text: 'Alerting', value: 'alerting'},
{text: 'No Data', value: 'no_data'}, {text: 'No Data', value: 'no_data'},
{text: 'Paused', value: 'paused'}, {text: 'Paused', value: 'paused'},