diff --git a/conf/defaults.ini b/conf/defaults.ini index cf924be3f9f8..85d0953c6af8 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -467,7 +467,7 @@ enabled = true # Makes it possible to turn off alert rule execution but alerting UI is visible execute_alerts = true -# Default setting for new alert rules. Defaults to categories error and timeouts as alerting. (alerting, keep_state) +# Default setting for new alert rules. Defaults to categorize error and timeouts as alerting. (alerting, keep_state) error_or_timeout = alerting # Default setting for how Grafana handles nodata or null values in alerting. (alerting, no_data, keep_state, ok) diff --git a/conf/sample.ini b/conf/sample.ini index 670728143476..2ef254f79b9a 100644 --- a/conf/sample.ini +++ b/conf/sample.ini @@ -387,7 +387,7 @@ log_queries = # Makes it possible to turn off alert rule execution but alerting UI is visible ;execute_alerts = true -# Default setting for new alert rules. Defaults to categories error and timeouts as alerting. (alerting, keep_state) +# Default setting for new alert rules. Defaults to categorize error and timeouts as alerting. (alerting, keep_state) ;error_or_timeout = alerting # Default setting for how Grafana handles nodata or null values in alerting. (alerting, no_data, keep_state, ok) diff --git a/docs/sources/installation/configuration.md b/docs/sources/installation/configuration.md index 1cd4d5d38936..6e3d36cc6d3d 100644 --- a/docs/sources/installation/configuration.md +++ b/docs/sources/installation/configuration.md @@ -1011,9 +1011,11 @@ Defaults to true. Set to false to disable alerting engine and hide Alerting from 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 categories error and timeouts as alerting. (alerting, keep_state) +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)