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

feat(alerting): adds ok as no data option

Browse Source 
closes #6866
This commit is contained in:
bergquist
2016-12-15 11:13:19 +01:00
parent 6a161216de
commit ca7baca21d
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/models/alert.go
View File

@@ -20,9 +20,10 @@ const (
)
const (
NoDataSetOK NoDataOption = "ok"
NoDataSetNoData NoDataOption = "no_data"
NoDataSetAlerting NoDataOption = "alerting"
NoDataKeepState NoDataOption = "keep_state"
NoDataSetAlerting NoDataOption = "alerting"
)
const (
@@ -35,7 +36,7 @@ func (s AlertStateType) IsValid() bool {
}
func (s NoDataOption) IsValid() bool {
return s == NoDataSetNoData || s == NoDataSetAlerting || s == NoDataKeepState
return s == NoDataSetNoData || s == NoDataSetAlerting || s == NoDataKeepState || s == NoDataSetOK
}
func (s NoDataOption) ToAlertState() AlertStateType {

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

@@ -47,6 +47,7 @@ var noDataModes = [
{text: 'Alerting', value: 'alerting'},
{text: 'No Data', value: 'no_data'},
{text: 'Keep Last State', value: 'keep_state'},
{text: 'Ok', value: 'ok'},
];
var executionErrorModes = [