Browse Source

spelling errors

bergquist 7 years ago
parent
commit
1e33a3780f
3 changed files with 5 additions and 3 deletions
  1. 1 1
      conf/defaults.ini
  2. 1 1
      conf/sample.ini
  3. 3 1
      docs/sources/installation/configuration.md

+ 1 - 1
conf/defaults.ini

@@ -467,7 +467,7 @@ enabled = true
 # Makes it possible to turn off alert rule execution but alerting UI is visible
 # Makes it possible to turn off alert rule execution but alerting UI is visible
 execute_alerts = true
 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
 error_or_timeout = alerting
 
 
 # Default setting for how Grafana handles nodata or null values in alerting. (alerting, no_data, keep_state, ok)
 # Default setting for how Grafana handles nodata or null values in alerting. (alerting, no_data, keep_state, ok)

+ 1 - 1
conf/sample.ini

@@ -387,7 +387,7 @@ log_queries =
 # Makes it possible to turn off alert rule execution but alerting UI is visible
 # Makes it possible to turn off alert rule execution but alerting UI is visible
 ;execute_alerts = true
 ;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
 ;error_or_timeout = alerting
 
 
 # Default setting for how Grafana handles nodata or null values in alerting. (alerting, no_data, keep_state, ok)
 # Default setting for how Grafana handles nodata or null values in alerting. (alerting, no_data, keep_state, ok)

+ 3 - 1
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.
 Makes it possible to turn off alert rule execution.
 
 
 ### error_or_timeout
 ### 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
 ### 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)
 Default setting for how Grafana handles nodata or null values in alerting. (alerting, no_data, keep_state, ok)