[checkmk-commits] 4208 FIX mk_jolokia: Plugin now works with jolokia versions requiring the base url to finish with a slash

Module: check_mk Branch: master Commit: ee3a35c3174deb9d309321bb3ac07f5ff9332c19 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ee3a35c3174deb… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Dec 20 10:28:08 2016 +0100 4208 FIX mk_jolokia: Plugin now works with jolokia versions requiring the base url to finish with a slash Previously, the plugin would not output any meaningful data for certain jolokia versions. This has been fixed. Change-Id: I4634b0936919c33d13b8ab0dc011f5923737c4a3 --- .werks/4208 | 11 +++++++++++ ChangeLog | 1 + agents/plugins/mk_jolokia | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/4208 b/.werks/4208 new file mode 100644 index 0000000..8f0380b --- /dev/null +++ b/.werks/4208 @@ -0,0 +1,11 @@ +Title: mk_jolokia: Plugin now works with jolokia versions requiring the base url to finish with a slash +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i4 +Date: 1482226014 + +Previously, the plugin would not output any meaningful data for certain jolokia versions. This has +been fixed. diff --git a/ChangeLog b/ChangeLog index a72dbea..951b023 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ * 4173 FIX: if.include: ignore some more keys in 'Network interfaces and switch ports' rule which are only used for interface grouping * 4207 FIX: mk_jolokia: Use configured port as default instance name... NOTE: Please refer to the migration notes! + * 4208 FIX: mk_jolokia: Plugin now works with jolokia versions requiring the base url to finish with a slash... Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... diff --git a/agents/plugins/mk_jolokia b/agents/plugins/mk_jolokia old mode 100755 new mode 100644 index 4359a1b..841cb6b --- a/agents/plugins/mk_jolokia +++ b/agents/plugins/mk_jolokia @@ -95,7 +95,7 @@ def fetch_url_get(base_url, path, function): if path: url = "%s/%s/%s" % (base_url, function, path) else: - url = base_url + url = base_url + "/" if opt_verbose: sys.stderr.write("DEBUG: Fetching: %s\n" % url)