From 5799d86ed7c86bcfeda96a308fa6459282fbd3e2 Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Thu, 7 Aug 2014 11:18:17 +0200 Subject: [PATCH] Documentation: s/enable_flap_detection/enable_flapping/g fixes #6870 --- doc/6-configuring-icinga-2.md | 4 ++-- tools/syntax/nano/icinga2.nanorc | 2 +- tools/syntax/vim/syntax/icinga2.vim | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/6-configuring-icinga-2.md b/doc/6-configuring-icinga-2.md index f07a2773d..922de5e5a 100644 --- a/doc/6-configuring-icinga-2.md +++ b/doc/6-configuring-icinga-2.md @@ -574,7 +574,7 @@ Attributes: enable\_active\_checks|**Optional.** Whether active checks are enabled. Defaults to true. enable\_passive\_checks|**Optional.** Whether passive checks are enabled. Defaults to true. enable\_event\_handler|**Optional.** Enables event handlers for this host. Defaults to true. - enable\_flap\_detection|**Optional.** Whether flap detection is enabled. Defaults to true. + enable\_flapping|**Optional.** Whether flap detection is enabled. Defaults to true. enable\_perfdata|**Optional.** Whether performance data processing is enabled. Defaults to true. event\_command |**Optional.** The name of an event command that should be executed every time the host's state changes or the host is in a `SOFT` state. flapping\_threshold|**Optional.** The flapping threshold in percent when a host is considered to be flapping. @@ -660,7 +660,7 @@ Attributes: enable\_active\_checks|**Optional.** Whether active checks are enabled. Defaults to true. enable\_passive\_checks|**Optional.** Whether passive checks are enabled. Defaults to true. enable\_event\_handler|**Optional.** Enables event handlers for this host. Defaults to true. - enable\_flap\_detection|**Optional.** Whether flap detection is enabled. Defaults to true. + enable\_flapping|**Optional.** Whether flap detection is enabled. Defaults to true. enable\_perfdata|**Optional.** Whether performance data processing is enabled. Defaults to true. event\_command |**Optional.** The name of an event command that should be executed every time the service's state changes or the service is in a `SOFT` state. flapping\_threshold|**Optional.** The flapping threshold in percent when a service is considered to be flapping. diff --git a/tools/syntax/nano/icinga2.nanorc b/tools/syntax/nano/icinga2.nanorc index 165d674c7..095f1d8e8 100644 --- a/tools/syntax/nano/icinga2.nanorc +++ b/tools/syntax/nano/icinga2.nanorc @@ -24,7 +24,7 @@ icolor red "(^|^\s+)(bind_port|ca_path|categories|cert_path|check_command|chec icolor red "(^|^\s+)(check_period|child_host_name|child_service_name|cleanup|command|command_path)" icolor red "(^|^\s+)(comment|compat_log_path|crl_path|database|disable_checks|disable_notifications)" icolor red "(^|^\s+)(display_name|duration|email|enable_active_checks|enable_event_handler)" -icolor red "(^|^\s+)(enable_flap_detection|enable_notifications|enable_passive_checks|enable_perfdata)" +icolor red "(^|^\s+)(enable_flapping|enable_notifications|enable_passive_checks|enable_perfdata)" icolor red "(^|^\s+)(endpoints|env|event_command|fixed|flapping_threshold|groups|host)" icolor red "(^|^\s+)(host_format_template|host_name|host_perfdata_path|host_temp_path|icon_image)" icolor red "(^|^\s+)(icon_image_alt|instance_description|instance_name|interval|key_path|log_dir)" diff --git a/tools/syntax/vim/syntax/icinga2.vim b/tools/syntax/vim/syntax/icinga2.vim index 208e9680c..dba3ffa0c 100644 --- a/tools/syntax/vim/syntax/icinga2.vim +++ b/tools/syntax/vim/syntax/icinga2.vim @@ -67,7 +67,7 @@ syn keyword icinga2ObjAttr contained bind_port ca_path categories cert_path ch syn keyword icinga2ObjAttr contained check_period child_host_name child_service_name cleanup command command_path syn keyword icinga2ObjAttr contained comment compat_log_path crl_path database disable_checks disable_notifications syn keyword icinga2ObjAttr contained display_name duration email enable_active_checks enable_event_handler -syn keyword icinga2ObjAttr contained enable_flap_detection enable_notifications enable_passive_checks enable_perfdata +syn keyword icinga2ObjAttr contained enable_flapping enable_notifications enable_passive_checks enable_perfdata syn keyword icinga2ObjAttr contained endpoints env event_command fixed flapping_threshold groups host syn keyword icinga2ObjAttr contained host_format_template host_name host_perfdata_path host_temp_path icon_image syn keyword icinga2ObjAttr contained icon_image_alt instance_description instance_name interval key_path log_dir