Module: check_mk Branch: master Commit: 9c0e32cd167a215701d237602e4afa9143fe501d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9c0e32cd167a21… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Dec 27 14:52:11 2016 +0100 4209 FIX mk_jolokia: Setting a default product now works Previously, setting a product (such as tomcat) for all instances in jolokia.cfg would have no effect. This has been fixed. Change-Id: I438b61bc080701f2fbcd05d5d4bf89c4a44eea0f --- .werks/4209 | 12 ++++++++++++ ChangeLog | 1 + agents/plugins/mk_jolokia | 6 ++++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.werks/4209 b/.werks/4209 new file mode 100644 index 0000000..204ea5e --- /dev/null +++ b/.werks/4209 @@ -0,0 +1,12 @@ +Title: mk_jolokia: Setting a default product now works +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i4 +Date: 1482845861 + +Previously, setting a product (such as tomcat) for all +instances in jolokia.cfg would have no effect. This has +been fixed. diff --git a/ChangeLog b/ChangeLog index 94d3c6e..cd258ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,7 @@ * 4119 FIX: check_mk_agent.solaris: fixed run_cached function... * 4006 FIX: Windows Agent: Fixed possible memory leak when using logwatch with vista api setting * 4008 FIX: Windows Agent, dotnet_clrmemory section: prevent indefinite freeze of windows agent... + * 4209 FIX: mk_jolokia: Setting a default product now works... 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 index 841cb6b..ae314ea 100755 --- a/agents/plugins/mk_jolokia +++ b/agents/plugins/mk_jolokia @@ -304,7 +304,7 @@ def query_instance(inst): d = dict(server_info) version = d.get(('info', 'version'), "unknown") product = d.get(('info', 'product'), "unknown") - if inst.has_key("product"): + if inst.get("product"): product = inst["product"] agentversion = d.get(('agent',), "unknown") sys.stdout.write("%s %s %s %s\n" % (inst["instance"], product, version, agentversion)) @@ -361,6 +361,7 @@ client_key = None service_url = None service_user = None service_password = None +product = None global_vars = [ ( "java.lang:type=Memory", "NonHeapMemoryUsage/used", "NonHeapMemoryUsage", [], False), @@ -469,7 +470,8 @@ for inst in instances: ("client_key", client_key), ("service_url", service_url), ("service_user", service_user), - ("service_password", service_password) + ("service_password", service_password), + ( "product", product ), ]: if varname not in inst: inst[varname] = value