Module: check_mk
Branch: master
Commit: d3873ab96e781f66a6bb27851f1cbaa810499eeb
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d3873ab96e781f…
Author: Konstantin Büttner <kb(a)mathias-kettner.de>
Date: Wed Aug 9 17:54:40 2017 +0200
mk_jolokia: Fix for changed data type of sentinel value
Change-Id: I4fd3bf56b8baf1cabc8656530f04c5e333810845
---
agents/plugins/mk_jolokia | 4 ++--
agents/windows/plugins/mk_jolokia.exe | Bin 10088482 -> 10088473 bytes
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/agents/plugins/mk_jolokia b/agents/plugins/mk_jolokia
index e372ade..6a2e23a 100755
--- a/agents/plugins/mk_jolokia
+++ b/agents/plugins/mk_jolokia
@@ -478,7 +478,7 @@ conffile = os.getenv("MK_CONFDIR",
"/etc/check_mk") + "/jolokia.cfg"
if os.path.exists(conffile):
execfile(conffile)
-if server == ("use fqdn",):
+if server == "use fqdn":
server = socket.getfqdn()
if instance == None:
@@ -517,7 +517,7 @@ for inst in instances:
inst["instance"] = str(inst["port"])
inst["instance"] = inst["instance"].replace(" ",
"_")
- if inst.get("server") == ("use fqdn",):
+ if inst.get("server") == "use fqdn":
inst["server"] = socket.getfqdn()
query_instance(inst)
diff --git a/agents/windows/plugins/mk_jolokia.exe
b/agents/windows/plugins/mk_jolokia.exe
index fbb54d9..1eeac35 100755
Binary files a/agents/windows/plugins/mk_jolokia.exe and
b/agents/windows/plugins/mk_jolokia.exe differ