Merge pull request #13170 from bergquist/alerting_default_setting

make default values for alerting configurable
2018-09-06 13:26:42 +02:00
parent e364119774 1e33a3780f
commit 3c0b1ef581
7 changed files with 48 additions and 18 deletions
@@ -556,3 +556,13 @@ Defaults to true. Set to false to disable alerting engine and hide Alerting from
 ### execute_alerts

 Makes it possible to turn off alert rule execution.
+
+### error_or_timeout
+> Available in 5.3 and above
+
+Default setting for new alert rules. Defaults to categorize error and timeouts as alerting. (alerting, keep_state)
+
+### nodata_or_nullvalues
+> Available in 5.3  and above
+
+Default setting for how Grafana handles nodata or null values in alerting. (alerting, no_data, keep_state, ok)