Checkmk git commits January 2019

checkmk-commits@lists.checkmk.com

15 participants
490 discussions

Fixed a TODO: ClassRegistry.register() checks parameter now.

by Sven Panne

Module: check_mk Branch: master Commit: ed6658cd7ca67d72c02260f0ed13d36e3d7d3aa9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed6658cd7ca67d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jan 11 12:04:35 2019 +0100 Fixed a TODO: ClassRegistry.register() checks parameter now. Change-Id: Ibe8bb3d51c2ee1e52bccf2be6c37f1ad7e870f9f --- cmk/gui/plugins/userdb/utils.py | 4 ++-- cmk/utils/plugin_registry.py | 7 ++++--- tests/unit/cmk/utils/test_plugin_registry.py | 6 +++--- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/cmk/gui/plugins/userdb/utils.py b/cmk/gui/plugins/userdb/utils.py index 7ebf758..0571107 100644 --- a/cmk/gui/plugins/userdb/utils.py +++ b/cmk/gui/plugins/userdb/utils.py @@ -195,7 +195,7 @@ class UserConnectorRegistry(cmk.utils.plugin_registry.ClassRegistry): Have a look at the base class for details.""" def plugin_base_class(self): - return cmk.gui.plugins.userdb.UserConnector + return UserConnector def _register(self, plugin_class): plugin_class.migrate_config() @@ -210,7 +210,7 @@ class UserAttributeRegistry(cmk.utils.plugin_registry.ClassRegistry): Have a look at the base class for details.""" def plugin_base_class(self): - return cmk.gui.plugins.userdb.UserAttribute + return UserAttribute def _register(self, plugin_class): self._entries[plugin_class.name()] = plugin_class diff --git a/cmk/utils/plugin_registry.py b/cmk/utils/plugin_registry.py index d739530..a409d32 100644 --- a/cmk/utils/plugin_registry.py +++ b/cmk/utils/plugin_registry.py @@ -30,8 +30,6 @@ import abc # for example let all use a static/class method .name(). # We could standardize this by making all plugin classes inherit # from a plugin base class instead of "object". -# TODO: _register should always validate that the given plugin class is -# based on plugin_base_class # TODO: Decide which base class to implement # (https://docs.python.org/2/library/collections.html) and cleanup @@ -59,6 +57,9 @@ class ClassRegistry(object): def register(self, plugin_class): """Decorator to register a class with the registry""" + if not issubclass(plugin_class, self.plugin_base_class()): + raise TypeError('%s is not a subclass of %s' % (plugin_class.__name__, + self.plugin_base_class().__name__)) self._register(plugin_class) return plugin_class @@ -66,7 +67,7 @@ class ClassRegistry(object): """Method for registering a plugin with the registry. Result is equal to use the register() decorator""" - self._register(plugin_class) + self.register(plugin_class) @abc.abstractmethod def _register(self, plugin_class): diff --git a/tests/unit/cmk/utils/test_plugin_registry.py b/tests/unit/cmk/utils/test_plugin_registry.py index 267603d..049510f 100644 --- a/tests/unit/cmk/utils/test_plugin_registry.py +++ b/tests/unit/cmk/utils/test_plugin_registry.py @@ -32,7 +32,7 @@ def test_decorator_registration(): assert registry.items() == [] @registry.register - class DecoratedPlugin(object): + class DecoratedPlugin(Plugin): pass assert registry.get("DecoratedPlugin") == DecoratedPlugin @@ -42,7 +42,7 @@ def test_method_registration(): registry = PluginRegistry() assert registry.items() == [] - class MethodRegisteredPlugin(object): + class MethodRegisteredPlugin(Plugin): pass registry.register_plugin(MethodRegisteredPlugin) @@ -59,7 +59,7 @@ def test_delitem(basic_registry): del basic_registry["bla"] @basic_registry.register - class DelPlugin(object): + class DelPlugin(Plugin): pass del basic_registry["DelPlugin"]

5 years, 8 months

Sync agents directory in integration tests

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 97a6498fae36c46ca610bd00a00001b302b57835 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=97a6498fae36c4… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Jan 11 11:35:42 2019 +0100 Sync agents directory in integration tests Change-Id: Iaeeca7c89cf4db42999e3859479e2ce59f4d5a85 --- tests/testlib/__init__.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 314b9b3..6763a83 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -592,6 +592,7 @@ class Site(object): cmk_path() + "/livestatus", cmk_path() + "/livestatus/api/python", cmk_path() + "/bin", + cmk_path() + "/agents", cmk_path() + "/modules", cmk_path() + "/cmk_base", cmk_path() + "/cmk", @@ -1823,8 +1824,9 @@ class CheckManager(object): config.load_all_checks(check_api.get_check_api_context) # loads all checks else: config._initialize_data_structures() - config.load_checks(check_api.get_check_api_context, - map(lambda f: os.path.join(cmk.utils.paths.checks_dir, f), file_names)) + config.load_checks( + check_api.get_check_api_context, + map(lambda f: os.path.join(cmk.utils.paths.checks_dir, f), file_names)) return self

5 years, 8 months

Inline var_utf8() into single call site.

by Sven Panne

Module: check_mk Branch: master Commit: 436b43edcf888885fd2a12a23cac9c875e5f02df URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=436b43edcf8888… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jan 11 11:05:28 2019 +0100 Inline var_utf8() into single call site. Change-Id: I1c20fbbe76e196cb446ead632bc52a5086bee359 --- cmk/gui/htmllib.py | 3 ++- cmk/gui/http.py | 6 ------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/cmk/gui/htmllib.py b/cmk/gui/htmllib.py index 6a89fab..f6f2cf7 100644 --- a/cmk/gui/htmllib.py +++ b/cmk/gui/htmllib.py @@ -1133,7 +1133,8 @@ class html(HTMLGenerator): def get_unicode_input(self, varname, deflt=None): try: - return self.request.var_utf8(varname, deflt) + val = self.request.var(varname, deflt) + return val.decode("utf-8") if isinstance(val, str) else val except UnicodeDecodeError: raise MKUserError( varname, diff --git a/cmk/gui/http.py b/cmk/gui/http.py index 96dab22..f89a17f 100644 --- a/cmk/gui/http.py +++ b/cmk/gui/http.py @@ -152,12 +152,6 @@ class Request(object): def has_var(self, varname): return varname in self._vars - def var_utf8(self, varname, deflt=None): - val = self._vars.get(varname, deflt) - if isinstance(val, str): - return val.decode("utf-8") - return val - def itervars(self, prefix=""): return (item \ for item in self._vars.iteritems() \

5 years, 8 months

Update persisted sections with existing (filtered) persisted sections before saving

by Simon Betz

Module: check_mk Branch: master Commit: 62673227ec2bdbd5d61eecb5a5e9d431f62b9daf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=62673227ec2bdb… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Jan 11 09:39:35 2019 +0100 Update persisted sections with existing (filtered) persisted sections before saving Change-Id: Ifc93a6f18cdc2b352b15cb9bd102c1923ea677cf --- cmk_base/data_sources/abstract.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/cmk_base/data_sources/abstract.py b/cmk_base/data_sources/abstract.py index 56e562d..4b8d1e3 100644 --- a/cmk_base/data_sources/abstract.py +++ b/cmk_base/data_sources/abstract.py @@ -128,13 +128,8 @@ class DataSource(object): if get_raw_data: return raw_data - if host_sections.persisted_sections and not is_cached_data: - self._store_persisted_sections(host_sections.persisted_sections) - # Add information from previous persisted infos - host_sections = self._update_info_with_persisted_sections(host_sections) - - return host_sections + return self._update_info_with_persisted_sections(host_sections, is_cached_data) except MKTerminate: raise @@ -413,7 +408,6 @@ class DataSource(object): return file_path = self._persisted_sections_file_path() - try: os.makedirs(os.path.dirname(file_path)) except OSError as e: @@ -425,8 +419,14 @@ class DataSource(object): store.save_data_to_file(file_path, persisted_sections, pretty=False) self._logger.debug("Stored persisted sections: %s" % (", ".join(persisted_sections.keys()))) - def _update_info_with_persisted_sections(self, host_sections): + def _update_info_with_persisted_sections(self, host_sections, is_cached_data): + persisted_sections_from_raw = host_sections.persisted_sections persisted_sections = self._load_persisted_sections() + + if persisted_sections_from_raw and not is_cached_data: + persisted_sections.update(persisted_sections_from_raw) + self._store_persisted_sections(persisted_sections) + if not persisted_sections: return host_sections @@ -437,13 +437,13 @@ class DataSource(object): persisted_from, persisted_until, section_info = entry # Don't overwrite sections that have been received from the source with this call - if section_name not in host_sections.sections: + if section_name in host_sections.sections: + self._logger.debug( + "Skipping persisted section %r, live data available" % (section_name)) + else: self._logger.debug("Using persisted section %r" % (section_name)) host_sections.add_cached_section(section_name, section_info, persisted_from, persisted_until) - else: - self._logger.debug("Skipping persisted section %r" % (section_name)) - return host_sections def _load_persisted_sections(self):

5 years, 8 months

Use get_unicode_input() instead of var_utf8().

by Sven Panne

Module: check_mk Branch: master Commit: dce585b23ef84771419a48d9f6078216fc6190d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dce585b23ef847… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jan 11 10:52:17 2019 +0100 Use get_unicode_input() instead of var_utf8(). Change-Id: I8be50e7472ccbefdbed631f3346d64b23d4e74e4 --- cmk/gui/metrics.py | 2 +- cmk/gui/pagetypes.py | 2 +- cmk/gui/plugins/sidebar/quicksearch.py | 2 +- doc/treasures/open_ticket.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmk/gui/metrics.py b/cmk/gui/metrics.py index ab2cb76..c123c5d 100644 --- a/cmk/gui/metrics.py +++ b/cmk/gui/metrics.py @@ -885,7 +885,7 @@ def get_graph_template_by_source(graph_templates, source): def page_host_service_graph_popup(): site_id = html.request.var('site') host_name = html.request.var('host_name') - service_description = html.request.var_utf8('service') + service_description = html.get_unicode_input('service') # TODO: Refactor this to some OO based approach if cmk_graphs_possible(site_id): diff --git a/cmk/gui/pagetypes.py b/cmk/gui/pagetypes.py index 575d575..47b11da 100644 --- a/cmk/gui/pagetypes.py +++ b/cmk/gui/pagetypes.py @@ -1058,7 +1058,7 @@ class Overridable(Base): cls.remove_instance((owner_user_id, page_name)) # will be added later again else: # clone title = cls.phrase("clone") - load_user = html.request.var_utf8("load_user") # FIXME: Change varname to "owner" + load_user = html.get_unicode_input("load_user") # FIXME: Change varname to "owner" try: page = cls.instance((load_user, page_name)) diff --git a/cmk/gui/plugins/sidebar/quicksearch.py b/cmk/gui/plugins/sidebar/quicksearch.py index 18d666e..e10767a 100644 --- a/cmk/gui/plugins/sidebar/quicksearch.py +++ b/cmk/gui/plugins/sidebar/quicksearch.py @@ -166,7 +166,7 @@ class QuicksearchSnapin(SidebarSnapin): } def _ajax_search(self): - q = html.request.var_utf8('q').strip() + q = html.get_unicode_input('q').strip() if not q: return diff --git a/doc/treasures/open_ticket.py b/doc/treasures/open_ticket.py index 79e25fc..5364467 100644 --- a/doc/treasures/open_ticket.py +++ b/doc/treasures/open_ticket.py @@ -8,7 +8,7 @@ config.declare_permission("action.sap_openticket", _("Open Support Ticket"), def command_open_ticket(cmdtag, spec, row): if html.request.var("_sap_openticket"): - comment = u"OPENTICKET:" + html.request.var_utf8("_sap_ticket_comment") + comment = u"OPENTICKET:" + html.get_unicode_input("_sap_ticket_comment") broadcast = 0 forced = 2 command = "SEND_CUSTOM_%s_NOTIFICATION;%s;%s;%s;%s" % \

5 years, 8 months

Move logic of agent_kubernetes to cmk/special_agents/agent_kubernetes.py

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 73331c5933bbc02072a4a5fcfe911285131551e1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=73331c5933bbc0… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Jan 10 16:03:22 2019 +0100 Move logic of agent_kubernetes to cmk/special_agents/agent_kubernetes.py Additionally, mypy checks now all python files under cmk/special_agents instead of only agent_kubernetes. Change-Id: Ibfb467be7def019f56a35e0b8baed163c06cd54f --- agents/special/agent_kubernetes | 687 +------------------------------- cmk/special_agents/agent_kubernetes.py | 690 +++++++++++++++++++++++++++++++++ tests/static/Makefile | 4 +- 3 files changed, 693 insertions(+), 688 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=73331c5933…

5 years, 8 months

7027 FIX Docker container: Added ssh client and ping command to container

by Lars Michelsen

Module: check_mk Branch: master Commit: 6af66b6e5f408105c27b984525745a77023a9868 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6af66b6e5f4081… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 11 10:24:55 2019 +0100 7027 FIX Docker container: Added ssh client and ping command to container Change-Id: I1fa072de330b1439752c5e7e7919f0c89fdbd3a8 --- .werks/7027 | 10 ++++++++++ docker/Dockerfile | 2 ++ 2 files changed, 12 insertions(+) diff --git a/.werks/7027 b/.werks/7027 new file mode 100644 index 0000000..b37dc5b --- /dev/null +++ b/.werks/7027 @@ -0,0 +1,10 @@ +Title: Docker container: Added ssh client and ping command to container +Level: 1 +Component: omd +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1547198631 +Class: fix + + diff --git a/docker/Dockerfile b/docker/Dockerfile index 9125b8b..bc01d31 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -42,6 +42,8 @@ RUN set -e \ inetutils-syslogd \ bsd-mailx \ gnupg2 \ + openssh-client \ + iputils-ping \ dpkg-sig \ $(cat needed-packages) \ && apt-get clean \

5 years, 8 months

Fixed docker update test

by Lars Michelsen

Module: check_mk Branch: master Commit: cf2d30bc80f92a1ae58183ac20d67e2a558c2dcb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf2d30bc80f92a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 11 10:04:45 2019 +0100 Fixed docker update test The docker update test was broken since the required packages between 1.5.0 branch and master branch changed. During the update test a 1.5.0 package is installed into a container which has only the master dependencies installed. Improved build error handling on the way. Change-Id: I400c4531b18e9ac2001533af5b3d4e07671e67ab --- docker/.gitignore | 3 ++- docker/Dockerfile | 2 +- docker/Makefile | 15 +++++++------ tests/docker/test_docker.py | 52 +++++++++++++++++++++++++++++++++------------ 4 files changed, 50 insertions(+), 22 deletions(-) diff --git a/docker/.gitignore b/docker/.gitignore index bb57edf..4ca7689 100644 --- a/docker/.gitignore +++ b/docker/.gitignore @@ -1,2 +1,3 @@ -needed-packages +needed-packages* +distro-*.mk check-mk*.tar.gz diff --git a/docker/Dockerfile b/docker/Dockerfile index 74d228e..9125b8b 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -25,7 +25,7 @@ ARG MAIL_RELAY_HOST ENV MAIL_RELAY_HOST="" # Make the list of required packages available to the following command -COPY needed-packages /needed-packages +COPY needed-packages-${CMK_VERSION} /needed-packages # First install the tools we need for fetching the package and installation # Then fetch the package and install it. This will make sure all Check_MK diff --git a/docker/Makefile b/docker/Makefile index a450c08..dd52782 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -49,14 +49,17 @@ setup: setversion: sed -i 's/^ARG CMK_VERSION=.*$$/ARG CMK_VERSION="$(NEW_VERSION)"/g' Dockerfile -needed-packages: ../omd/distros/DEBIAN_9.mk - echo -e 'needed-packages:\n\t@echo \$$(OS_PACKAGES) > needed-packages\n' | \ - make -f - -f ../omd/distros/DEBIAN_9.mk --no-print-directory needed-packages +distro-%.mk: + git show $(GIT_REF):../omd/distros/DEBIAN_9.mk > $@ + +needed-packages-%: distro-%.mk + echo -e '$@:\n\t@echo \$$(OS_PACKAGES) > $@\n' | \ + make -f - -f $< --no-print-directory $@ check-mk-$(EDITION)-docker-$(VERSION).tar.gz: image docker save $(DOCKER_REPO_NAME)/check-mk-$(EDITION):$(VERSION) | gzip > check-mk-$(EDITION)-docker-$(VERSION).tar.gz -image: needed-packages +image: needed-packages-$(VERSION) docker build \ --build-arg CMK_VERSION="$(VERSION)" \ --build-arg CMK_EDITION="$(EDITION)" \ @@ -64,7 +67,7 @@ image: needed-packages -t $(DOCKER_REPO_NAME)/check-mk-$(EDITION):$(VERSION) \ . -image-daily: needed-packages +image-daily: needed-packages-$(VERSION) BRANCH_PREFIX="$$(git rev-parse --abbrev-ref HEAD)" ; \ if [[ "$$BRANCH_PREFIX" == "master" || "$$BRANCH_PREFIX" =~ "/" ]]; then \ BRANCH_PREFIX="" ; \ @@ -91,5 +94,5 @@ test-lint-entrypoint: clean: -docker rmi $(DOCKER_REPO_NAME)/check-mk-$(EDITION):latest || true -docker rmi $(DOCKER_REPO_NAME)/check-mk-$(EDITION):$(VERSION) || true - [ -e needed-packages ] && rm needed-packages || true + ls needed-packages-* >/dev/null 2>&1 && rm needed-packages-* || true ls check-mk-*-docker-*.tar.gz >/dev/null 2>&1 && rm check-mk-*-docker-*.tar.gz || true diff --git a/tests/docker/test_docker.py b/tests/docker/test_docker.py index c7aac51..d90c90a 100644 --- a/tests/docker/test_docker.py +++ b/tests/docker/test_docker.py @@ -24,6 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +import sys import pytest import docker import os @@ -55,23 +56,46 @@ def _image_name(edition, version): return "docker-tests/check-mk-%s-%s-%s" % (edition, branch_name, version.version) -def _prepare_build(): - assert subprocess.Popen(["make", "needed-packages"], - stdout=open(os.devnull, "w"), - cwd=build_path).wait() == 0 +def _prepare_build(version): + if version.branch() != branch_name: + git_ref = ["GIT_REF=v%s" % version.version] + else: + git_ref = [] + + assert subprocess.Popen( + ["make"] + git_ref + ["needed-packages-%s" % version.version], + stdout=open(os.devnull, "w"), + cwd=build_path).wait() == 0 def _build(request, client, edition, version, add_args=None): - _prepare_build() - - image, build_logs = client.images.build( - path=build_path, - tag=_image_name(edition, version), - buildargs={ - "CMK_VERSION": version.version, - "CMK_EDITION": edition, - "CMK_DL_CREDENTIALS": ":".join(testlib.get_cmk_download_credentials()), - }) + _prepare_build(version) + + build_args = { + "CMK_VERSION": version.version, + "CMK_EDITION": edition, + "CMK_DL_CREDENTIALS": ":".join(testlib.get_cmk_download_credentials()), + } + + print "Building image Path: %s, Tag: %s Args: %r" % (build_path, _image_name(edition, version), + build_args) + try: + image, build_logs = client.images.build( + path=build_path, + tag=_image_name(edition, version), + buildargs=build_args, + ) + except docker.errors.BuildError as e: + sys.stdout.write("= Build log ==================\n") + for entry in e.build_log: + if "stream" in entry: + sys.stdout.write(entry["stream"]) + elif "errorDetail" in entry: + continue # Is already part of the exception message + else: + sys.stdout.write("UNEXPECTED FORMAT: %r\n" % entry) + sys.stdout.write("= Build log ==================\n") + raise # TODO: Enable this on CI system. Removing during development slows down testing #request.addfinalizer(lambda: client.images.remove(image.id, force=True))

5 years, 8 months

Icons in inventory.py refactored to new plugin registry structure

by Florian Kromer

Module: check_mk Branch: master Commit: 4ec78538d0d039f506b2aae02a17b9b95444c0e8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ec78538d0d039… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Thu Jan 10 16:57:32 2019 +0100 Icons in inventory.py refactored to new plugin registry structure CMK-1514 Change-Id: I95c1618e0159db0a74644520f4e7d127802f8414 --- cmk/gui/plugins/views/icons/inventory.py | 33 +++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/cmk/gui/plugins/views/icons/inventory.py b/cmk/gui/plugins/views/icons/inventory.py index 3adcd55..eb6736b 100644 --- a/cmk/gui/plugins/views/icons/inventory.py +++ b/cmk/gui/plugins/views/icons/inventory.py @@ -24,26 +24,29 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import cmk.gui.inventory as inventory import cmk.gui.config as config +import cmk.gui.inventory as inventory from cmk.gui.i18n import _ -from . import multisite_icons_and_actions +from cmk.gui.plugins.views.icons import Icon, icon_and_action_registry -def paint_icon_inventory(what, row, tags, customer_vars): - # TODO: Clean this up somehow - from cmk.gui.plugins.views import url_to_view - if (what == "host" or row.get("service_check_command","").startswith("check_mk_active-cmk_inv!")) \ - and inventory.has_inventory(row["host_name"]): +(a)icon_and_action_registry.register +class InventoryIcon(Icon): + @classmethod + def ident(cls): + return "inventory" - if not config.user.may("view.inv_host"): - return + def host_columns(self): + return ["name"] - return 'inv', _("Show Hardware/Software Inventory of this host"), url_to_view( - row, 'inv_host') + def render(self, what, row, tags, custom_vars): + # TODO: Clean this up somehow + from cmk.gui.plugins.views import url_to_view + if (what == "host" or row.get("service_check_command","").startswith("check_mk_active-cmk_inv!")) \ + and inventory.has_inventory(row["host_name"]): + if not config.user.may("view.inv_host"): + return -multisite_icons_and_actions['inventory'] = { - 'host_columns': ["name"], - 'paint': paint_icon_inventory, -} + return 'inv', _("Show Hardware/Software Inventory of this host"), url_to_view( + row, 'inv_host')

5 years, 8 months

Icons in wato.py refactored to new plugin registry structure

by Florian Kromer

Module: check_mk Branch: master Commit: bd5d613f1c69f2297f63b867e0b27fa3d2a33374 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd5d613f1c69f2… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Wed Jan 9 18:14:52 2019 +0100 Icons in wato.py refactored to new plugin registry structure CMK-1514 Change-Id: I15e7a5648cc2c2ae9d3a6d72572095f486b3e365 --- cmk/gui/plugins/views/icons/wato.py | 139 ++++++++++++++++++------------------ 1 file changed, 70 insertions(+), 69 deletions(-) diff --git a/cmk/gui/plugins/views/icons/wato.py b/cmk/gui/plugins/views/icons/wato.py index 3fc58fd..9841c0b 100644 --- a/cmk/gui/plugins/views/icons/wato.py +++ b/cmk/gui/plugins/views/icons/wato.py @@ -25,82 +25,93 @@ # Boston, MA 02110-1301 USA. import cmk.gui.config as config -from cmk.gui.i18n import _ from cmk.gui.globals import html +from cmk.gui.i18n import _ +from cmk.gui.plugins.views import display_options +from cmk.gui.plugins.views.icons import Icon, icon_and_action_registry -from cmk.gui.plugins.views import (display_options) -from . import multisite_icons_and_actions +(a)icon_and_action_registry.register +class WatoIcon(Icon): + @classmethod + def ident(cls): + return "wato" + def host_columns(self): + return ['filename'] -def wato_link(folder, site, hostname, where): - if not config.wato_enabled: - return + def render(self, what, row, tags, custom_vars): + def may_see_hosts(): + return config.user.may("wato.use") and \ + (config.user.may("wato.seeall") or config.user.may("wato.hosts")) - if display_options.enabled(display_options.X): - url = "wato.py?folder=%s&host=%s" % \ - (html.urlencode(folder), html.urlencode(hostname)) - if where == "inventory": - url += "&mode=inventory" - help_txt = _("Edit services") - icon = "services" - else: - url += "&mode=edit_host" - help_txt = _("Edit this host") - icon = "wato" - return icon, help_txt, url - else: - return + if not may_see_hosts() or html.mobile: + return + wato_folder = _wato_folder_from_filename(row["host_filename"]) + if wato_folder is not None: + if what == "host": + return self._wato_link(wato_folder, row["site"], row["host_name"], "edithost") + elif row["service_description"] in ["Check_MK inventory", "Check_MK Discovery"]: + return self._wato_link(wato_folder, row["site"], row["host_name"], "inventory") -def wato_folder_from_filename(filename): - if filename.startswith("/wato/") and filename.endswith("hosts.mk"): - return filename[6:-8].rstrip("/") + def _wato_link(self, folder, site, hostname, where): + if not config.wato_enabled: + return + if display_options.enabled(display_options.X): + url = "wato.py?folder=%s&host=%s" % \ + (html.urlencode(folder), html.urlencode(hostname)) + if where == "inventory": + url += "&mode=inventory" + help_txt = _("Edit services") + icon = "services" + else: + url += "&mode=edit_host" + help_txt = _("Edit this host") + icon = "wato" + return icon, help_txt, url + else: + return + + +(a)icon_and_action_registry.register +class DownloadAgentOutputIcon(Icon): + """Action for downloading the current agent output.""" -def paint_wato(what, row, tags, custom_vars): - def may_see_hosts(): - return config.user.may("wato.use") and \ - (config.user.may("wato.seeall") or config.user.may("wato.hosts")) + @classmethod + def ident(cls): + return "download_agent_output" - if not may_see_hosts() or html.mobile: - return + def default_sort_index(self): + return 50 - wato_folder = wato_folder_from_filename(row["host_filename"]) - if wato_folder is not None: - if what == "host": - return wato_link(wato_folder, row["site"], row["host_name"], "edithost") - elif row["service_description"] in ["Check_MK inventory", "Check_MK Discovery"]: - return wato_link(wato_folder, row["site"], row["host_name"], "inventory") + def host_columns(self): + return ["filename", "check_type"] + def render(self, what, row, tags, custom_vars): + return _paint_download_host_info(what, row, tags, custom_vars, ty="agent") # pylint: disable=no-value-for-parameter -multisite_icons_and_actions['wato'] = { - 'host_columns': ["filename"], - 'paint': paint_wato, -} -#. -# .--Agent-Output--------------------------------------------------------. -# | _ _ ___ _ _ | -# | / \ __ _ ___ _ __ | |_ / _ \ _ _| |_ _ __ _ _| |_ | -# | / _ \ / _` |/ _ \ '_ \| __|____| | | | | | | __| '_ \| | | | __| | -# | / ___ \ (_| | __/ | | | ||_____| |_| | |_| | |_| |_) | |_| | |_ | -# | /_/ \_\__, |\___|_| |_|\__| \___/ \__,_|\__| .__/ \__,_|\__| | -# | |___/ |_| | -# +----------------------------------------------------------------------+ -# | Action for downloading the current agent output | -# '----------------------------------------------------------------------' +(a)icon_and_action_registry.register +class DownloadSnmpWalkIcon(Icon): + """Action for downloading the current snmp output.""" + @classmethod + def ident(cls): + return "download_snmp_walk" -def paint_download_agent_output(*args): - return paint_download_host_info(*args, ty="agent") # pylint: disable=no-value-for-parameter + def host_columns(self): + return ["filename"] + def default_sort_index(self): + return 50 -def paint_download_snmp_walk(*args): - return paint_download_host_info(*args, ty="walk") # pylint: disable=no-value-for-parameter + def render(self, what, row, tags, custom_vars): + return _paint_download_host_info(what, row, tags, custom_vars, ty="walk") # pylint: disable=no-value-for-parameter -def paint_download_host_info(what, row, tags, host_custom_vars, ty): +def _paint_download_host_info(what, row, tags, host_custom_vars, ty): if (what == "host" or (what == "service" and row["service_description"] == "Check_MK")) \ and config.user.may("wato.download_agent_output") \ and not row["host_check_type"] == 2: # Not for shadow hosts @@ -116,7 +127,7 @@ def paint_download_host_info(what, row, tags, host_custom_vars, ty): params = [ ("host", row["host_name"]), - ("folder", wato_folder_from_filename(row["host_filename"])), + ("folder", _wato_folder_from_filename(row["host_filename"])), ("type", ty), ("_start", "1"), ] @@ -137,16 +148,6 @@ def paint_download_host_info(what, row, tags, host_custom_vars, ty): return "agent_output", title, url -multisite_icons_and_actions['download_agent_output'] = { - 'host_columns': ["filename", "check_type"], - 'paint': paint_download_agent_output, - 'toplevel': False, - 'sort_index': 50, -} - -multisite_icons_and_actions['download_snmp_walk'] = { - 'host_columns': ["filename"], - 'paint': paint_download_snmp_walk, - 'toplevel': False, - 'sort_index': 50, -} +def _wato_folder_from_filename(filename): + if filename.startswith("/wato/") and filename.endswith("hosts.mk"): + return filename[6:-8].rstrip("/")

5 years, 8 months

← Newer
1
...
30
31
32
33
34
35
36
...
49
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2019