[checkmk-commits] remove compatibility code

Module: check_mk Branch: master Commit: 632a56ffc2078b528233ab0971d2d47f66d327ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=632a56ffc2078b… Author: Moritz Kiemer &lt;mo(a)mathias-kettner.de&gt; Date: Mon Nov 12 10:44:56 2018 +0100 remove compatibility code Change-Id: I306268723c64582597b38724f42095ed0a035ee9 --- agents/plugins/mk_jolokia | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/agents/plugins/mk_jolokia b/agents/plugins/mk_jolokia index 0cb05dd..82b7a76 100755 --- a/agents/plugins/mk_jolokia +++ b/agents/plugins/mk_jolokia @@ -328,14 +328,7 @@ def query_instance(inst): sys.stdout.write('<<<jolokia_metrics>>>\n') # Fetch the general information first for var in global_vars + specific_vars.get(inst["product"], []): - # support old and new configuration format so we stay compatible with older - # configuration files - if len(var) == 3: - path, title, itemspec = var - mbean, path = path.split("/", 1) - do_search = False - else: - mbean, path, title, itemspec, do_search = var + mbean, path, title, itemspec, do_search = var queries = _get_queries(do_search, inst, itemspec, title, path, mbean, mbean_search_results) @@ -412,6 +405,7 @@ def output_custom_vars(inst, mbean_search_results): sys.stdout.write('<<<jolokia_generic>>>\n') for var in custom_vars: mbean, path, title, itemspec, do_search, value_type = var + queries = _get_queries(do_search, inst, itemspec, title, path, mbean, mbean_search_results) for mbean_path, title, itemspec in queries: