[checkmk-commits] mk_jolokia: make search keyword an argument

Module: check_mk Branch: master Commit: f7f1b4a0599fa66d6aa8f4cd8b08920d1e795081 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f7f1b4a0599fa6… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Jan 24 21:29:00 2019 +0100 mk_jolokia: make search keyword an argument Change-Id: I1e6a7757546a830e5b7968649fc67855585a4cdc --- agents/plugins/mk_jolokia.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/agents/plugins/mk_jolokia.py b/agents/plugins/mk_jolokia.py index ac1e57d..738fceb 100755 --- a/agents/plugins/mk_jolokia.py +++ b/agents/plugins/mk_jolokia.py @@ -270,7 +270,7 @@ def _get_post_data(path, service_url, service_user, service_password, function): return json.dumps(data) -def fetch_var(inst, path, service_url, service_user, service_password, function="read"): +def fetch_var(inst, function, path, service_url, service_user, service_password): if service_url is not None: post_data = _get_post_data(path, service_url, service_user, service_password, function) @@ -353,7 +353,7 @@ def extract_item(key, itemspec): def fetch_metric(inst, path, title, itemspec, inst_add=None): - values = fetch_var(inst, path, inst.config["service_url"], inst.config["service_user"], + values = fetch_var(inst, "read", path, inst.config["service_url"], inst.config["service_user"], inst.config["service_password"]) item_list = make_item_list((), values, itemspec) @@ -387,7 +387,7 @@ def _get_queries(do_search, inst, itemspec, title, path, mbean): if not do_search: return [(mbean + "/" + path, title, itemspec)] - value = fetch_var(inst, mbean, None, None, None, function="search") + value = fetch_var(inst, "search", mbean, None, None, None) try: paths = make_item_list((), value, "")[0][1] except IndexError: @@ -511,7 +511,7 @@ def prepare_http_opener(inst): def generate_jolokia_info(inst): # Determine type of server - value = fetch_var(inst, "", None, None, None) + value = fetch_var(inst, "read", "", None, None, None) server_info = make_item_list((), value, "") if not server_info: