[icinga-checkins] icinga.org: icinga2/master: Fix incorrect custom variable name for the -q option for ntp_time.

git at icinga.org git at icinga.org
Tue Aug 9 10:44:03 CEST 2016


Module: icinga2
Branch: master
Commit: 39890c00c0d1e39d9b3d81ee707c8f7071b70bb4
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=39890c00c0d1e39d9b3d81ee707c8f7071b70bb4

Author: Bård Dahlmo-Lerbæk <bard.dahlmo-lerbaek at skatteetaten.no>
Date:   Wed Aug  3 10:41:51 2016 +0200

Fix incorrect custom variable name for the -q option for ntp_time.

fixes #12274

Signed-off-by: Gunnar Beutner <gunnar.beutner at netways.de>

---

 doc/7-icinga-template-library.md |    2 +-
 itl/command-plugins.conf         |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/doc/7-icinga-template-library.md b/doc/7-icinga-template-library.md
index 5d3f8e3..739ec39 100644
--- a/doc/7-icinga-template-library.md
+++ b/doc/7-icinga-template-library.md
@@ -772,7 +772,7 @@ Name            | Description
 ----------------|--------------
 ntp_address     | **Optional.** The host's address. Defaults to "$address$" if the host's `address` attribute is set, "$address6$" otherwise.
 ntp_port        | **Optional.** Port number (default: 123).
-ntp_quit        | **Optional.** Returns UNKNOWN instead of CRITICAL if offset cannot be found.
+ntp_quiet       | **Optional.** Returns UNKNOWN instead of CRITICAL if offset cannot be found.
 ntp_warning     | **Optional.** Offset to result in warning status (seconds).
 ntp_critical    | **Optional.** Offset to result in critical status (seconds).
 ntp_timeoffset  | **Optional.** Expected offset of the ntp server relative to local server (seconds).
diff --git a/itl/command-plugins.conf b/itl/command-plugins.conf
index a1426d7..0c04133 100644
--- a/itl/command-plugins.conf
+++ b/itl/command-plugins.conf
@@ -870,7 +870,10 @@ object CheckCommand "ntp_time" {
 	arguments = {
 		"-H" = "$ntp_address$"
 		"-p" = "$ntp_port$"
-		"-q" = "$ntp_quit$"
+		"-q" = {
+			set_if = "$ntp_quiet$"
+			description = "Returns UNKNOWN instead of CRITICAL if offset cannot be found"
+		}
 		"-w" = "$ntp_warning$"
 		"-c" = "$ntp_critical$"
 		"-o" = "$ntp_timeoffset$"



More information about the icinga-checkins mailing list