make default values for alerting configurable

2018-09-06 11:26:14 +02:00
parent 72ab24f300
commit 3ce89cad71
7 changed files with 46 additions and 18 deletions
@@ -1009,3 +1009,11 @@ 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
+
+Default setting for new alert rules. Defaults to categories error and timeouts as alerting. (alerting, keep_state)
+
+### nodata_or_nullvalues
+
+Default setting for how Grafana handles nodata or null values in alerting. (alerting, no_data, keep_state, ok)