From 3d419cd48ba55bb582cda8f60c77f7c4481666b7 Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Fri, 4 Apr 2014 19:04:13 +0200 Subject: [PATCH] Rename 'hostcheck' to 'hostalive' check command. Refs #5939 --- doc/3.01-hosts-and-services.md | 4 ++-- doc/4.3-object-types.md | 6 +++--- doc/5-icinga-template-library.md | 2 +- etc/icinga2/conf.d/generic-host.conf | 2 +- itl/command-common.conf | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/3.01-hosts-and-services.md b/doc/3.01-hosts-and-services.md index 97abc5e1d..9d308ea45 100644 --- a/doc/3.01-hosts-and-services.md +++ b/doc/3.01-hosts-and-services.md @@ -16,7 +16,7 @@ Here is an example of a host object which defines two child services: object Host "my-server1" { vars.address = "10.0.0.1" - check_command = "hostcheck" + check_command = "hostalive" } apply Service "ping4" { @@ -32,7 +32,7 @@ Here is an example of a host object which defines two child services: The example host `my-server1` creates two services which belong to this host: `ping4` and `http`. -It also specifies that the host should perform its own check using the `hostcheck` +It also specifies that the host should perform its own check using the `hostalive` check command. The `address` custom attribute is used by check commands to determine which network diff --git a/doc/4.3-object-types.md b/doc/4.3-object-types.md index 8fe9bef8d..8056a5c7c 100644 --- a/doc/4.3-object-types.md +++ b/doc/4.3-object-types.md @@ -11,7 +11,7 @@ Example: groups = [ "all-hosts" ] - check_command = "hostcheck" + check_command = "hostalive" } Attributes: @@ -618,7 +618,7 @@ Cleanup Items: eventhandlers_age |**Optional.** Max age for eventhandlers table rows (start_time). Defaults to 0 (never). externalcommands_age |**Optional.** Max age for externalcommands table rows (entry_time). Defaults to 0 (never). flappinghistory_age |**Optional.** Max age for flappinghistory table rows (event_time). Defaults to 0 (never). - hostchecks_age |**Optional.** Max age for hostchecks table rows (start_time). Defaults to 0 (never). + hostchecks_age |**Optional.** Max age for hostalives table rows (start_time). Defaults to 0 (never). logentries_age |**Optional.** Max age for logentries table rows (logentry_time). Defaults to 0 (never). notifications_age |**Optional.** Max age for notifications table rows (start_time). Defaults to 0 (never). processevents_age |**Optional.** Max age for processevents table rows (event_time). Defaults to 0 (never). @@ -702,7 +702,7 @@ Cleanup Items: eventhandlers_age |**Optional.** Max age for eventhandlers table rows (start_time). Defaults to 0 (never). externalcommands_age |**Optional.** Max age for externalcommands table rows (entry_time). Defaults to 0 (never). flappinghistory_age |**Optional.** Max age for flappinghistory table rows (event_time). Defaults to 0 (never). - hostchecks_age |**Optional.** Max age for hostchecks table rows (start_time). Defaults to 0 (never). + hostchecks_age |**Optional.** Max age for hostalives table rows (start_time). Defaults to 0 (never). logentries_age |**Optional.** Max age for logentries table rows (logentry_time). Defaults to 0 (never). notifications_age |**Optional.** Max age for notifications table rows (start_time). Defaults to 0 (never). processevents_age |**Optional.** Max age for processevents table rows (event_time). Defaults to 0 (never). diff --git a/doc/5-icinga-template-library.md b/doc/5-icinga-template-library.md index de5bef68a..4b5b4d7b0 100644 --- a/doc/5-icinga-template-library.md +++ b/doc/5-icinga-template-library.md @@ -47,7 +47,7 @@ cpl | **Optional.** The packet loss critical threshold in %. Default packets | **Optional.** The number of packets to send. Defaults to 5. timeout | **Optional.** The plugin timeout in seconds. Defaults to 0 (no timeout). -### hostcheck +### hostalive Check command object for the `check_ping` plugin with host check default values. diff --git a/etc/icinga2/conf.d/generic-host.conf b/etc/icinga2/conf.d/generic-host.conf index 916044c7a..87ab00916 100644 --- a/etc/icinga2/conf.d/generic-host.conf +++ b/etc/icinga2/conf.d/generic-host.conf @@ -3,7 +3,7 @@ * all hosts should import this template. */ template Host "generic-host" { - check_command = "hostcheck" + check_command = "hostalive" } template Host "linux-server" { diff --git a/itl/command-common.conf b/itl/command-common.conf index 4a2138c0c..510664a01 100644 --- a/itl/command-common.conf +++ b/itl/command-common.conf @@ -61,7 +61,7 @@ object CheckCommand "ping6" { vars.timeout = 0 } -object CheckCommand "hostcheck" { +object CheckCommand "hostalive" { import "ping4" vars.wrta = 3000.0,