Module: check_mk
Branch: master
Commit: 846a34fdd4ea8f885cb04c10c2b76f2044e6ba4d
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=846a34fdd4ea8f…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Oct 26 11:00:16 2015 +0100
Conflicts:
ChangeLog
modules/check_mk.py
---
.werks/2692 | 10 ++++++++++
ChangeLog | 1 +
checks/check_http | 4 ++--
modules/check_mk.py | 2 ++
4 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/.werks/2692 b/.werks/2692
new file mode 100644
index 0000000..6e6e020
--- /dev/null
+++ b/.werks/2692
@@ -0,0 +1,10 @@
+Title: check_http: Fixed broken check when using Nagios (introduced with 1.2.7i3)
+Level: 1
+Component: checks
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.7i4
+Date: 1445849972
+
+
diff --git a/ChangeLog b/ChangeLog
index 30766f5..bdb8d92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,7 @@
* 2236 FIX: cups_queues: Correct not working discovery after werk #2504...
* 2668 FIX: jar_signature: Handle case correctly where certificate is already
expired
* 2669 FIX: mcdata_fcport: fix computation of in and out traffic...
+ * 2692 FIX: check_http: Fixed broken check when using Nagios (introduced with
1.2.7i3)
Multisite:
* 2684 Added icons for downloading agent data / walks of hosts...
diff --git a/checks/check_http b/checks/check_http
index cf370d9..85b3153 100644
--- a/checks/check_http
+++ b/checks/check_http
@@ -50,9 +50,9 @@ def check_http_arguments(params):
if address_family == "ipv6":
args += " -6"
- address = "$HOST_ADDRESS_6$"
+ address = "$_HOSTADDRESS_6$"
else:
- address = "$HOST_ADDRESS_4$"
+ address = "$_HOSTADDRESS_4$"
if settings.get("ssl"):
args += ' --ssl'
diff --git a/modules/check_mk.py b/modules/check_mk.py
index 5e3d0f8..386aa7b 100755
--- a/modules/check_mk.py
+++ b/modules/check_mk.py
@@ -1381,6 +1381,8 @@ def get_basic_host_macros_from_attributes(hostname, attrs):
for macro_name, value in attrs.items():
if macro_name[0] == '_':
macros["$HOST" + macro_name + "$"] = value
+ # Be compatible to nagios making $_HOST<VARNAME>$ out of the config
_<VARNAME> configs
+ macros["$_HOST" + macro_name[1:] + "$"] = value
return macros