Checkmk git commits November 2018

checkmk-commits@lists.checkmk.com

15 participants
465 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 9c17a58f376919edb94cec391d1aec0ecad7a14c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9c17a58f376919… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 13 14:45:51 2018 +0100 YAPFed helper scripts Change-Id: I9f13b6dec9569f38c087a1b19764e8f5e720e761 --- scripts/autodetect.py | 164 +++++++++++++++++++++++----------------------- scripts/make_package_info | 23 ++++--- 2 files changed, 94 insertions(+), 93 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9c17a58f37…

5 years, 10 months

YAPFed notification scripts

by Lars Michelsen

Module: check_mk Branch: master Commit: 577fe86b8e88e3cf99fe06fef093c7f38123a4b7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=577fe86b8e88e3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 13 14:46:23 2018 +0100 YAPFed notification scripts Change-Id: Ib0e6e594314b7b6c196043a2db1394c4f21278ee --- notifications/sms | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/notifications/sms b/notifications/sms index 10ec05f..deb6ab2 100755 --- a/notifications/sms +++ b/notifications/sms @@ -25,7 +25,6 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. - # Notification via sms using the sms tools # Note: You have to add the side user to the sendsms group # and restart the site @@ -36,7 +35,7 @@ import shutil import tempfile send_path = None -for binary in [ 'sendsms', 'smssend' ]: +for binary in ['sendsms', 'smssend']: if os.system('which %s >/dev/null 2>/dev/null' % binary) == 0: send_path = binary @@ -46,8 +45,9 @@ if not os.path.exists(spool_dir): spool_dir = None if not send_path and not spool_dir: - sys.stderr.write('Error: SMS Tools binaries (sendsms or smssend) not found and spool dir does not exists.\n') - sys.exit(2) # Fatal error, no retry + sys.stderr.write( + 'Error: SMS Tools binaries (sendsms or smssend) not found and spool dir does not exists.\n') + sys.exit(2) # Fatal error, no retry max_len = 160 message = os.environ['NOTIFY_HOSTNAME'] + " " @@ -56,7 +56,7 @@ notification_type = os.environ["NOTIFY_NOTIFICATIONTYPE"] # Prepare Default information and Type PROBLEM, RECOVERY if os.environ['NOTIFY_WHAT'] == 'SERVICE': - if notification_type in [ "PROBLEM", "RECOVERY" ]: + if notification_type in ["PROBLEM", "RECOVERY"]: message += os.environ['NOTIFY_SERVICESTATE'][:2] + " " avail_len = max_len - len(message) message += os.environ['NOTIFY_SERVICEDESC'][:avail_len] + " " @@ -66,7 +66,7 @@ if os.environ['NOTIFY_WHAT'] == 'SERVICE': message += os.environ['NOTIFY_SERVICEDESC'] else: - if notification_type in [ "PROBLEM", "RECOVERY" ]: + if notification_type in ["PROBLEM", "RECOVERY"]: message += "is " + os.environ['NOTIFY_HOSTSTATE'] # Ouput the other State @@ -90,18 +90,21 @@ elif notification_type == "CUSTOM": message += " " + os.environ['NOTIFY_NOTIFICATIONCOMMENT'] recipient = os.environ['NOTIFY_CONTACTPAGER'].replace(" ", "") + + def quote_message(msg, max_length=None): if max_length: - return "'" + msg.replace("'", "'\"'\"'")[:max_length-2] + "'" + return "'" + msg.replace("'", "'\"'\"'")[:max_length - 2] + "'" return "'" + msg.replace("'", "'\"'\"'") + "'" + if send_path: if os.system("%s %s %s" % (send_path, recipient, quote_message(message, 160))) >> 8 != 0: sys.exit(1) elif spool_dir: # On some distros, like debian, smstools does not ship with the sendsms/smssend helper # script. On this distro, simply drop the SMS in the outgoing spool directory. - fd, path = tempfile.mkstemp(prefix = 'cmk_sms_') + fd, path = tempfile.mkstemp(prefix='cmk_sms_') os.write(fd, 'To: %s\n\n%s' % (recipient, quote_message(message))) os.close(fd) os.chmod(path, 0660)

5 years, 10 months

YAPFed HW/SW inventory plugins

by Lars Michelsen

5 years, 10 months

YAPFed special agents

by Lars Michelsen

Module: check_mk Branch: master Commit: 59f4996adaca6ea2731a9c3102a16f4893c315fa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=59f4996adaca6e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 13 13:54:40 2018 +0100 YAPFed special agents Change-Id: If013440ad21b7057dbf6c9b4f7c6e062e36c9677 --- agents/special/agent_3par | 81 ++-- agents/special/agent_activemq | 39 +- agents/special/agent_allnet_ip_sensoric | 26 +- agents/special/agent_appdynamics | 48 ++- agents/special/agent_azure | 11 +- agents/special/agent_bi | 8 +- agents/special/agent_ddn_s2a | 4 +- agents/special/agent_emcvnx | 95 +++-- agents/special/agent_fritzbox | 48 ++- agents/special/agent_hivemanager | 23 +- agents/special/agent_hivemanager_ng | 35 +- agents/special/agent_hp_msa | 89 ++-- agents/special/agent_ibmsvc | 150 ++++--- agents/special/agent_innovaphone | 36 +- agents/special/agent_ipmi_sensors | 107 ++--- agents/special/agent_jolokia | 176 ++++---- agents/special/agent_netapp | 634 ++++++++++++++++------------ agents/special/agent_prism | 36 +- agents/special/agent_random | 34 +- agents/special/agent_ruckus_spot | 28 +- agents/special/agent_salesforce | 2 - agents/special/agent_siemens_plc | 63 ++- agents/special/agent_storeonce | 38 +- agents/special/agent_tinkerforge | 134 +++--- agents/special/agent_ucs_bladecenter | 106 ++--- agents/special/agent_vsphere | 505 +++++++++++++--------- agents/special/agent_vsphere.pysphere | 252 ++++++----- agents/special/lib/cmk_special_agent_api.py | 17 +- 28 files changed, 1584 insertions(+), 1241 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=59f4996ada…

5 years, 10 months

Some YAPFing...

by Sven Panne

Module: check_mk Branch: master Commit: 979c34a91bea311caadfece3234be92cdae05c98 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=979c34a91bea31… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 13 14:03:23 2018 +0100 Some YAPFing... Change-Id: I7f753295e7823eeec5d763738f9998b6d5ab7047 --- cmk/__init__.py | 5 +- cmk/daemon.py | 2 +- cmk/defines.py | 78 +++++++++++----------- cmk/ec/actions.py | 123 ++++++++++++----------------------- cmk/ec/main.py | 19 ++---- cmk/man_pages.py | 28 ++++---- cmk/notification_plugins/slack.py | 14 ++-- cmk/notification_plugins/spectrum.py | 44 +++++-------- cmk/paths.py | 45 +++++-------- cmk/plugin_registry.py | 12 +--- cmk/render.py | 1 + cmk/site.py | 1 + cmk/store.py | 9 ++- cmk/structured_data.py | 7 ++ cmk/werks.py | 66 +++++++++---------- 15 files changed, 187 insertions(+), 267 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=979c34a91b…

5 years, 10 months

Cosmectic cleanup only.

by Sven Panne

Module: check_mk Branch: master Commit: 4fa2e642264c4e8b9e4cf622a6397f8b4fd27f3c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4fa2e642264c4e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 13 13:40:25 2018 +0100 Cosmectic cleanup only. Change-Id: I7cd9db3b430a276aeacd02d4fcef1f5a3975c915 --- tests/Makefile | 91 ++++++++++++++++++++++++++++++---------------------------- 1 file changed, 47 insertions(+), 44 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index 96cf581..13c6e6f 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,77 +1,74 @@ SHELL := /bin/bash -e +VENV := ../.venv PIPENV := PIPENV_VENV_IN_PROJECT=true pipenv -PYTEST := $(PIPENV) run py.test -s -vv -COVERAGE := $(PIPENV) run coverage BANDIT := $(PIPENV) run bandit +COVERAGE := $(PIPENV) run coverage +PYTEST := $(PIPENV) run py.test -s -vv +YAPF := $(PIPENV) run yapf -.PHONY: help pipenv-check test-unit test-unit-coverage-html test-integration \ - test-gui-crawl test-pylint test-packaging test-docker test-bandit \ - test-shellcheck +.PHONY: help pipenv-check test-bandit test-docker test-format-python \ + test-gui-crawl test-integration test-packaging test-pylint \ + test-shellcheck test-unit test-unit-coverage-html help: - @echo "setup - Install dependencies" - @echo "test-unit - Run unit tests" - @echo "test-unit-coverage-html - Create HTML coverage report for unit tests" - @echo "test-integration - Run integration tests" - @echo "test-gui-crawl - Run GUI crawl test" - @echo "test-pylint - Run pylint based tests" - @echo "test-packaging - Run packaging tests" + echo $(MAKE) -C $(dir $(VENV)) $(notdir $(VENV)) + @echo "pipenv-check - Checks for security vulnerabilities/PEP 508 markers" @echo "test-bandit - Run bandit (security) tests" - @echo "test-shellcheck - Run shellcheck tests" @echo "test-docker - Run docker tests" @echo "test-format-python - Test the python formatting" + @echo "test-gui-crawl - Run GUI crawl test" + @echo "test-integration - Run integration tests" + @echo "test-packaging - Run packaging tests" + @echo "test-pylint - Run pylint based tests" + @echo "test-shellcheck - Run shellcheck tests" + @echo "test-unit - Run unit tests" + @echo "test-unit-coverage-html - Create HTML coverage report for unit tests" -# This target needs to be phony so it is run every time because only the other +# These target need to be phony so it is run every time because only the other # makefile can determine that there's nothing to be done. # TODO: Move everything to top level makefile? -.PHONY: ../.venv bandit.ini test-format-python +.PHONY: $(VENV) bandit.ini + +$(VENV): + $(MAKE) -C $(dir $(VENV)) $(notdir $(VENV)) -../.venv: - $(MAKE) -C .. .venv +bandit.ini: + echo -e "[bandit]\ntargets: $$(./find-python-files | tr '\n' ',' | sed 's/,$$//')" > bandit.ini -pipenv-check: ../.venv +pipenv-check: $(VENV) $(PIPENV) check -test-format-python: ../.venv +test-bandit: $(VENV) bandit.ini +# Currently only care about high severity reported issues. Once this is reached, +# go and enable the medium/low checks. + $(BANDIT) -c ../bandit.yaml -r -lll --ini bandit.ini $(BANDIT_OUTPUT_ARGS) + +test-docker: $(VENV) + $(MAKE) -C ../docker test-lint-dockerfile test-lint-entrypoint + $(PYTEST) -T docker + +test-format-python: $(VENV) ../.style.yapf # Explicitly specify --style [FILE] to prevent costly searching in parent directories # for each file specified via command line # # Saw some mixed up lines on stdout after adding the --parallel option. Leaving it on # for the moment to get the performance boost this option brings. PYTHON_FILES=$${PYTHON_FILES-$$(./find-python-files)} ; \ - $(PIPENV) run yapf --parallel --style ../.style.yapf --verbose --diff $$PYTHON_FILES \ + $(YAPF) --parallel --style ../.style.yapf --verbose --diff $$PYTHON_FILES \ | grep -e "^Reformatting " -e "(reformatted)$$" \ | awk '{if ($$1 == "+++") { print "Unformatted: "$$2 } else {print "Checking "$$2"..."}}' ; exit $${PIPESTATUS[0]} -test-unit: ../.venv - $(PYTEST) -T unit - -test-unit-coverage-html: ../.venv - $(COVERAGE) run --rcfile=.coveragerc_unit -m pytest -T unit ; $(COVERAGE) html - -test-integration: ../.venv - $(PYTEST) -T integration - -test-gui-crawl: ../.venv +test-gui-crawl: $(VENV) $(PYTEST) -T gui_crawl -test-pylint: ../.venv - $(PYTEST) -T pylint +test-integration: $(VENV) + $(PYTEST) -T integration -test-packaging: ../.venv +test-packaging: $(VENV) $(PYTEST) -T packaging -test-docker: ../.venv - $(MAKE) -C ../docker test-lint-dockerfile test-lint-entrypoint - $(PYTEST) -T docker - -bandit.ini: - echo -e "[bandit]\ntargets: $$(./find-python-files | tr '\n' ',' | sed 's/,$$//')" > bandit.ini - -test-bandit: ../.venv bandit.ini -# Currently only care about high severity reported issues. Once this is reached, -# go and enable the medium/low checks. - $(BANDIT) -c ../bandit.yaml -r -lll --ini bandit.ini $(BANDIT_OUTPUT_ARGS) +test-pylint: $(VENV) + $(PYTEST) -T pylint test-shellcheck: @CMK_DIR="$(realpath ..)" ; \ @@ -80,3 +77,9 @@ test-shellcheck: $(SHELLCHECK_OUTPUT_ARGS) \ $$(grep -l '^#!/.*sh' $$CMK_DIR/agents/* $$CMK_DIR/agents/plugins/* $$CMK_DIR/agents/special/* 2>/dev/null) \ "$$ENTERPRISE_DIR/agents/mk-remote-alert-handler" + +test-unit: $(VENV) + $(PYTEST) -T unit + +test-unit-coverage-html: $(VENV) + $(COVERAGE) run --rcfile=.coveragerc_unit -m pytest -T unit ; $(COVERAGE) html

5 years, 10 months

Bumped expected archive sizes again, caused by new Python packages.

by Sven Panne

Module: check_mk Branch: master Commit: 3f9825ae96b4588a41283922a633d8e8154acc1d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3f9825ae96b458… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 13 11:35:58 2018 +0100 Bumped expected archive sizes again, caused by new Python packages. Change-Id: I7c6d2ae017cb13c66e6b8d945d3c3f6b2cadefef --- tests/packaging/test_files.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/packaging/test_files.py b/tests/packaging/test_files.py index 0a6cbe8..2217b20 100644 --- a/tests/packaging/test_files.py +++ b/tests/packaging/test_files.py @@ -22,9 +22,9 @@ def _get_package_paths(version_path, what): # In case packages grow/shrink this check has to be changed. @pytest.mark.parametrize("what,min_size,max_size", [ - ("rpm", 119*1024*1024, 230*1024*1024), + ("rpm", 119*1024*1024, 250*1024*1024), ("deb", 94*1024*1024, 210*1024*1024), - ("cma", 169*1024*1024, 235*1024*1024), + ("cma", 169*1024*1024, 255*1024*1024), ("tar.gz", 320*1024*1024, 415*1024*1024), ]) def test_package_sizes(version_path, what, min_size, max_size):

5 years, 10 months

added WK6680: The 'Parameters for this service' page now correctly displays the computed results for timespecific parameters

by Andreas Boesl

Module: check_mk Branch: master Commit: cf33724e7db36c3335777f7558189cc0e45f46ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf33724e7db36c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Nov 13 11:15:56 2018 +0100 added WK6680: The 'Parameters for this service' page now correctly displays the computed results for timespecific parameters Change-Id: Ifece84cfe6e0d5e680df9c2ff673b2f62cd3c934 --- .werks/6680 | 11 +++++++++++ cmk/gui/wato/pages/object_parameters.py | 11 +++++++++++ cmk_base/automations/check_mk.py | 8 +++++++- 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/.werks/6680 b/.werks/6680 new file mode 100644 index 0000000..232d513 --- /dev/null +++ b/.werks/6680 @@ -0,0 +1,11 @@ +Title: The "Parameters for this service" page now correctly displays the computed results for timespecific parameters +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1542039239 + +This fixes a display error for the mentioned page, the computation itself was always correct. diff --git a/cmk/gui/wato/pages/object_parameters.py b/cmk/gui/wato/pages/object_parameters.py index 451240c..ef19ea8 100644 --- a/cmk/gui/wato/pages/object_parameters.py +++ b/cmk/gui/wato/pages/object_parameters.py @@ -27,6 +27,9 @@ parameters. This is a host/service overview page over all things that can be modified via rules.""" + +import cmk + import cmk.gui.config as config import cmk.gui.watolib as watolib import cmk.gui.forms as forms @@ -307,6 +310,14 @@ class ModeObjectParameters(WatoMode): # Show the resulting value or factory setting html.open_td(class_=["settingvalue", "used" if len(rules) > 0 else "unused"]) + + if isinstance(known_settings, dict) and "tp_computed_params" in known_settings: + computed_at = known_settings["tp_computed_params"]["computed_at"] + html.write_text(_("Timespecific parameters computed at %s") % cmk.render.date_and_time(computed_at)) + html.br() + known_settings = known_settings["tp_computed_params"]["params"] + + # In some cases we now the settings from a check_mk automation if known_settings is self._PARAMETERS_OMIT: return diff --git a/cmk_base/automations/check_mk.py b/cmk_base/automations/check_mk.py index c1840e0..2af17ed 100644 --- a/cmk_base/automations/check_mk.py +++ b/cmk_base/automations/check_mk.py @@ -613,6 +613,12 @@ class AutomationAnalyseServices(Automation): else: fs = None + check_parameters = config.compute_check_parameters(hostname, ct, item, params) + if isinstance(check_parameters, cmk_base.config.TimespecificParamList): + check_parameters = cmk_base.checking.determine_check_params(check_parameters) + check_parameters = {"tp_computed_params": {"params": check_parameters, "computed_at": time.time()}} + + return { "origin": "auto", "checktype": ct, @@ -620,7 +626,7 @@ class AutomationAnalyseServices(Automation): "item": item, "inv_parameters": params, "factory_settings": fs, - "parameters": config.compute_check_parameters(hostname, ct, item, params), + "parameters": check_parameters, } # 3. Classical checks

5 years, 10 months

Add make targets for YAPF formatting and CI integration

by Lars Michelsen

Module: check_mk Branch: master Commit: d5c06b1d6c9a3104186b35abe2824de12d8f857a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d5c06b1d6c9a31… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 12 16:31:20 2018 +0100 Add make targets for YAPF formatting and CI integration All use YAPF from our standard virtual environment to format the source files. * Add make target "format-python" to top level file This target uses the YAPF from our virtual environment to format all our python source files. * Add make target "test-format-python" to tests/ This target can be used to tests formatting of all python files. It is used by our CI to warn about unformatted code. In case we have a specific set of files to check, the environment variable PYTHON_FILES can be set to check the listed files instead of all known python files. * Excluded tests directory from "find-python-files" output because the data structures in some tests dramatically increase the execution time of YAPF (8 minutes -> 60 minutes) CMK-1179 Change-Id: I9cf82c3e5360c5bcf81e717431750d26f0d304c1 --- Makefile | 15 +++++++++++++-- tests/Makefile | 14 +++++++++++++- tests/find-python-files | 6 ++++-- 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index bebb292..c0f61e1 100644 --- a/Makefile +++ b/Makefile @@ -94,7 +94,7 @@ PNG_FILES := $(wildcard $(addsuffix /*.png,web/htdocs/images web/htdocs .PHONY: all analyze build check check-binaries check-permissions \ - check-version clean compile-neb-cmc cppcheck dist documentation format \ + check-version clean compile-neb-cmc cppcheck dist documentation format format-c format-python \ GTAGS headers help install iwyu mrproper \ optimize-images packages setup setversion tidy version \ am--refresh skel @@ -477,12 +477,23 @@ ifeq ($(ENTERPRISE),yes) $(MAKE) -C enterprise/core/src cppcheck-xml endif +format: format-python format-c + # TODO: We should probably handle this rule via AM_EXTRA_RECURSIVE_TARGETS in # src/configure.ac, but this needs at least automake-1.13, which in turn is only # available from e.g. Ubuntu Saucy (13) onwards, so some magic is needed. -format: +format-c: $(CLANG_FORMAT) -style=file -i $(FILES_TO_FORMAT) +format-python: .venv +# Explicitly specify --style [FILE] to prevent costly searching in parent directories +# for each file specified via command line +# +# Saw some mixed up lines on stdout after adding the --parallel option. Leaving it on +# for the moment to get the performance boost this option brings. + PYTHON_FILES=$${PYTHON_FILES-$$(tests/find-python-files)} ; \ + $(PIPENV) run yapf --parallel --style .style.yapf --verbose -i $$PYTHON_FILES + # Note: You need the doxygen and graphviz packages. documentation: config.h $(MAKE) -C livestatus/src documentation diff --git a/tests/Makefile b/tests/Makefile index 0ba7f03..96cf581 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -19,11 +19,12 @@ help: @echo "test-bandit - Run bandit (security) tests" @echo "test-shellcheck - Run shellcheck tests" @echo "test-docker - Run docker tests" + @echo "test-format-python - Test the python formatting" # This target needs to be phony so it is run every time because only the other # makefile can determine that there's nothing to be done. # TODO: Move everything to top level makefile? -.PHONY: ../.venv bandit.ini +.PHONY: ../.venv bandit.ini test-format-python ../.venv: $(MAKE) -C .. .venv @@ -31,6 +32,17 @@ help: pipenv-check: ../.venv $(PIPENV) check +test-format-python: ../.venv +# Explicitly specify --style [FILE] to prevent costly searching in parent directories +# for each file specified via command line +# +# Saw some mixed up lines on stdout after adding the --parallel option. Leaving it on +# for the moment to get the performance boost this option brings. + PYTHON_FILES=$${PYTHON_FILES-$$(./find-python-files)} ; \ + $(PIPENV) run yapf --parallel --style ../.style.yapf --verbose --diff $$PYTHON_FILES \ + | grep -e "^Reformatting " -e "(reformatted)$$" \ + | awk '{if ($$1 == "+++") { print "Unformatted: "$$2 } else {print "Checking "$$2"..."}}' ; exit $${PIPESTATUS[0]} + test-unit: ../.venv $(PYTEST) -T unit diff --git a/tests/find-python-files b/tests/find-python-files index 19d0056..d846fb8 100755 --- a/tests/find-python-files +++ b/tests/find-python-files @@ -22,9 +22,11 @@ SEARCH+=" notifications" SEARCH+=" omd/packages/cma" SEARCH+=" omd/packages/maintenance" SEARCH+=" omd/packages/omd" - SEARCH+=" scripts" -SEARCH+=" tests" +# Tests contain some very large data structures (e.g. +# tests/unit/checks/test_docker_parse_node_images.py). Skip them for the +# moment because they make YAPF run more than 60 minutes instead of 8 minutes +#SEARCH+=" tests" SEARCH+=" web/app" SEARCH+=" werk"

5 years, 10 months

mk_jolokia: reorganize caching for more clarity

by Moritz Kiemer

Module: check_mk Branch: master Commit: 4da1fc035e9c3f1555bbfb462265c8a9875758f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4da1fc035e9c3f… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Nov 13 07:48:55 2018 +0100 mk_jolokia: reorganize caching for more clarity Change-Id: If74240912881d6e0dcca475060ef5f3c19b652b4 --- agents/plugins/mk_jolokia | 41 ++++++++++++++++++----------------------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/agents/plugins/mk_jolokia b/agents/plugins/mk_jolokia index 3a7ef7d..afc26ec 100755 --- a/agents/plugins/mk_jolokia +++ b/agents/plugins/mk_jolokia @@ -117,6 +117,16 @@ def write_section(name, iterable): sys.stdout.write(' '.join(map(str, line)) + '\n') +def cached(function): + cache = {} + def cached_function(*args): + try: + return cache[args] + except KeyError: + return cache.setdefault(args, function(*args)) + return cached_function + + def fetch_url_get(base_url, path, function): if path: url = "%s/%s/%s" % (base_url, function, path) @@ -288,25 +298,13 @@ def fetch_metric(inst, path, title, itemspec, inst_add=None): yield (item.replace(" ", "_"), tit, value) -def _get_queries(do_search, inst, itemspec, title, path, mbean, mbean_search_results): +@cached +def _get_queries(do_search, inst, itemspec, title, path, mbean): if not do_search: return [(mbean + "/" + path, title, itemspec)] - if mbean in mbean_search_results: - paths = mbean_search_results[mbean] - else: - paths = fetch_var( - inst["protocol"], - inst["server"], - inst["port"], - mbean, - inst["suburi"], - "", - None, - None, - None, - function="search")[0][1] - mbean_search_results[mbean] = paths + paths = fetch_var(inst["protocol"], inst["server"], inst["port"], mbean, + inst["suburi"], "", None, None, None, function="search")[0][1] return [("%s/%s" % (urllib2.quote(mbean_exp), path), path, itemspec, mbean_exp) for mbean_exp in paths] @@ -330,15 +328,12 @@ def query_instance(inst): sys.stderr.write("ERROR: %s\n" % exc) raise SkipInstance() - # TODO: Untie mbean_search_results / query calculation and jolokia_metrics processing - mbean_search_results = {} - shipped_vars = QUERY_SPECS_GENERIC + QUERY_SPECS_SPECIFIC.get(inst["product"], []) custom_vars = inst.get("custom_vars") write_section('jolokia_info', generate_jolokia_info(inst)) - write_section('jolokia_metrics', generate_values(inst, shipped_vars, mbean_search_results)) - write_section('jolokia_generic', generate_values(inst, custom_vars, mbean_search_results)) + write_section('jolokia_metrics', generate_values(inst, shipped_vars)) + write_section('jolokia_generic', generate_values(inst, custom_vars)) def prepare_http_opener(inst): @@ -385,12 +380,12 @@ def generate_jolokia_info(inst): yield inst["instance"], product, version, agentversion -def generate_values(inst, var_list, mbean_search_results): +def generate_values(inst, var_list): for var in var_list: mbean, path, title, itemspec, do_search = var[:5] value_type = var[5] if len(var) >= 6 else None - queries = _get_queries(do_search, inst, itemspec, title, path, mbean, mbean_search_results) + queries = _get_queries(do_search, inst, itemspec, title, path, mbean) for item, title, value in _process_queries(inst, queries): if value_type:

5 years, 10 months

← Newer
1
...
29
30
31
32
33
34
35
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2018