Merge branch 'alertList-notOK'

pkg/services/sqlstore/alert.go

@@ -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 = strings.TrimPrefix(v, "not_")
+			} else {
+				sql.WriteString("state = ? ")
+			}
 			params = append(params, v)
 			params = append(params, v)
 		}
 		}
 		sql.WriteString(")")
 		sql.WriteString(")")

public/app/features/alerting/alert_list_ctrl.ts

@@ -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'},