Checkmk git commits November 2018

checkmk-commits@lists.checkmk.com

15 participants
465 discussions

6909 FIX emcvnx_storage_pools: Don't crash upon disabled deduplication

by Moritz Kiemer

Module: check_mk Branch: master Commit: 39066b21ba403b98fa1403f05091c322500f377d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=39066b21ba403b… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Nov 20 09:54:12 2018 +0100 6909 FIX emcvnx_storage_pools: Don't crash upon disabled deduplication Change-Id: If984d2fd79c2b2981cb3f68236c7222553ba53d7 --- .werks/6909 | 10 ++ checks/emcvnx_storage_pools | 60 ++++---- .../datasets/emcvnx_storage_pools_regression.py | 159 +++++++++++++++++++++ 3 files changed, 205 insertions(+), 24 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=39066b21ba…

5 years, 12 months

Dynamic configuration: Implement basic WATO modes

by Lars Michelsen

Module: check_mk Branch: master Commit: 371f080b977b6f1b6ba46934ad815bb5c8392646 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=371f080b977b6f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 21 14:28:49 2018 +0100 Dynamic configuration: Implement basic WATO modes * Introduce the WATO simple modes base classes which assist managing a collection of objects using WATO. A lot of WATO pages, which are currently individually implemented, can be replaced with this generic implementation in the future. * Analog to the simple modes we have a simple abstract store class which can be used for all cases where a collection of objects is stored in a single config variable using our standard config path scheme. * The DCD connections are now managed using these simple base classes * The Password store is now managed using these simple base classes CMK-1140 Change-Id: I4e4f79e2160bc1bc61a30a741957ad756a165f7c --- cmk/gui/plugins/wato/__init__.py | 3 + cmk/gui/plugins/wato/utils/__init__.py | 47 +--- cmk/gui/plugins/wato/utils/simple_modes.py | 397 +++++++++++++++++++++++++++++ cmk/gui/wato/pages/password_store.py | 218 ++++------------ cmk/gui/watolib.py | 104 ++++++-- tests/unit/cmk/gui/conftest.py | 13 +- 6 files changed, 547 insertions(+), 235 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=371f080b97…

5 years, 12 months

Moved nagios from shipped.py to dedicated module

by Kenneth Okoh

Module: check_mk Branch: master Commit: b14e7c5e9a46ccae166a0344cdee936bd863e2ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b14e7c5e9a46cc… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Thu Nov 22 10:19:21 2018 +0100 Moved nagios from shipped.py to dedicated module Change-Id: I968e86b62e4d955af5c547aef901753f72346141 --- cmk/gui/plugins/sidebar/nagios.py | 105 +++++++++++++++++++++++++++++++++++++ cmk/gui/plugins/sidebar/shipped.py | 80 ---------------------------- 2 files changed, 105 insertions(+), 80 deletions(-) diff --git a/cmk/gui/plugins/sidebar/nagios.py b/cmk/gui/plugins/sidebar/nagios.py new file mode 100644 index 0000000..01148ab --- /dev/null +++ b/cmk/gui/plugins/sidebar/nagios.py @@ -0,0 +1,105 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# tails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# 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.plugins.sidebar import ( + sidebar_snapins, + bulletlink, + nagioscgilink, + heading, +) + + +def render_nagios(): + html.open_ul() + bulletlink("Home", "http://www.nagios.org") + bulletlink("Documentation", "%snagios/docs/toc.html" % config.url_prefix()) + html.close_ul() + for entry in [ + "General", + ("tac.cgi", "Tactical Overview"), + ("statusmap.cgi?host=all", "Map"), + "Current Status", + ("status.cgi?hostgroup=all&style=hostdetail", "Hosts"), + ("status.cgi?host=all", "Services"), + ("status.cgi?hostgroup=all&style=overview", "Host Groups"), + ("status.cgi?hostgroup=all&style=summary", "*Summary"), + ("status.cgi?hostgroup=all&style=grid", "*Grid"), + ("status.cgi?servicegroup=all&style=overview", "Service Groups"), + ("status.cgi?servicegroup=all&style=summary", "*Summary"), + ("status.cgi?servicegroup=all&style=grid", "*Grid"), + ("status.cgi?host=all&servicestatustypes=28", "Problems"), + ("status.cgi?host=all&type=detail&hoststatustypes=3&serviceprops=42&servicestatustypes=28", + "*Service (Unhandled)"), + ("status.cgi?hostgroup=all&style=hostdetail&hoststatustypes=12&hostprops=42", + "*Hosts (Unhandled)"), + ("outages.cgi", "Network Outages"), + "Reports", + ("avail.cgi", "Availability"), + ("trends.cgi", "Trends"), + ("history.cgi?host=all", "Alerts"), + ("history.cgi?host=all", "*History"), + ("summary.cgi", "*Summary"), + ("histogram.cgi", "*Histogram"), + ("notifications.cgi?contact=all", "Notifications"), + ("showlog.cgi", "Event Log"), + "System", + ("extinfo.cgi?type=3", "Comments"), + ("extinfo.cgi?type=6", "Downtime"), + ("extinfo.cgi?type=0", "Process Info"), + ("extinfo.cgi?type=4", "Performance Info"), + ("extinfo.cgi?type=7", "Scheduling Queue"), + ("config.cgi", "Configuration"), + ]: + if isinstance(entry, str): + html.close_ul() + heading(entry) + html.open_ul() + else: + ref, text = entry + if text[0] == "*": + html.open_ul(class_="link") + nagioscgilink(text[1:], ref) + html.close_ul() + heading(entry) + html.open_ul() + else: + nagioscgilink(text, ref) + + +sidebar_snapins["nagios_legacy"] = { + "title": _("Old Nagios GUI"), + "description": _("The classical sidebar of Nagios 3.2.0 with links to " + "your local Nagios instance (no multi site support)"), + "render": render_nagios, + "allowed": [ + "user", + "admin", + "guest", + ], +} diff --git a/cmk/gui/plugins/sidebar/shipped.py b/cmk/gui/plugins/sidebar/shipped.py index d7deed0..799a2e1 100644 --- a/cmk/gui/plugins/sidebar/shipped.py +++ b/cmk/gui/plugins/sidebar/shipped.py @@ -47,8 +47,6 @@ from cmk.gui.plugins.sidebar import ( footnotelinks, snapin_width, snapin_site_choice, - nagioscgilink, - heading, simplelink, ) @@ -199,84 +197,6 @@ table.performance td.right { } #. -# .--Nagios--------------------------------------------------------------. -# | _ _ _ | -# | | \ | | __ _ __ _(_) ___ ___ | -# | | \| |/ _` |/ _` | |/ _ \/ __| | -# | | |\ | (_| | (_| | | (_) \__ \ | -# | |_| \_|\__,_|\__, |_|\___/|___/ | -# | |___/ | -# '----------------------------------------------------------------------' - - -def render_nagios(): - html.open_ul() - bulletlink("Home", "http://www.nagios.org") - bulletlink("Documentation", "%snagios/docs/toc.html" % config.url_prefix()) - html.close_ul() - for entry in [ - "General", - ("tac.cgi", "Tactical Overview"), - ("statusmap.cgi?host=all", "Map"), - "Current Status", - ("status.cgi?hostgroup=all&style=hostdetail", "Hosts"), - ("status.cgi?host=all", "Services"), - ("status.cgi?hostgroup=all&style=overview", "Host Groups"), - ("status.cgi?hostgroup=all&style=summary", "*Summary"), - ("status.cgi?hostgroup=all&style=grid", "*Grid"), - ("status.cgi?servicegroup=all&style=overview", "Service Groups"), - ("status.cgi?servicegroup=all&style=summary", "*Summary"), - ("status.cgi?servicegroup=all&style=grid", "*Grid"), - ("status.cgi?host=all&servicestatustypes=28", "Problems"), - ("status.cgi?host=all&type=detail&hoststatustypes=3&serviceprops=42&servicestatustypes=28", - "*Service (Unhandled)"), - ("status.cgi?hostgroup=all&style=hostdetail&hoststatustypes=12&hostprops=42", - "*Hosts (Unhandled)"), - ("outages.cgi", "Network Outages"), - "Reports", - ("avail.cgi", "Availability"), - ("trends.cgi", "Trends"), - ("history.cgi?host=all", "Alerts"), - ("history.cgi?host=all", "*History"), - ("summary.cgi", "*Summary"), - ("histogram.cgi", "*Histogram"), - ("notifications.cgi?contact=all", "Notifications"), - ("showlog.cgi", "Event Log"), - "System", - ("extinfo.cgi?type=3", "Comments"), - ("extinfo.cgi?type=6", "Downtime"), - ("extinfo.cgi?type=0", "Process Info"), - ("extinfo.cgi?type=4", "Performance Info"), - ("extinfo.cgi?type=7", "Scheduling Queue"), - ("config.cgi", "Configuration"), - ]: - if isinstance(entry, str): - html.close_ul() - heading(entry) - html.open_ul() - else: - ref, text = entry - if text[0] == "*": - html.open_ul(class_="link") - nagioscgilink(text[1:], ref) - html.close_ul() - else: - nagioscgilink(text, ref) - - -sidebar_snapins["nagios_legacy"] = { - "title": _("Old Nagios GUI"), - "description": _("The classical sidebar of Nagios 3.2.0 with links to " - "your local Nagios instance (no multi site support)"), - "render": render_nagios, - "allowed": [ - "user", - "admin", - "guest", - ], -} - -#. # .--Custom Links--------------------------------------------------------. # | ____ _ _ _ _ | # | / ___| _ ___| |_ ___ _ __ ___ | | (_)_ __ | | _____ |

5 years, 12 months

Moved dashboards snapin to dedicated module

by Kenneth Okoh

Module: check_mk Branch: master Commit: 787d78542e0c447453a9549e3bafd347a72f5330 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=787d78542e0c44… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Thu Nov 22 14:58:19 2018 +0100 Moved dashboards snapin to dedicated module Change-Id: I721551c5ed6ed8fd1ea1e65e40ce3c6bd489a4ca --- cmk/gui/plugins/sidebar/dashboards.py | 86 +++++++++++++++++++++++++++++++++++ cmk/gui/plugins/sidebar/shipped.py | 63 ------------------------- 2 files changed, 86 insertions(+), 63 deletions(-) diff --git a/cmk/gui/plugins/sidebar/dashboards.py b/cmk/gui/plugins/sidebar/dashboards.py new file mode 100644 index 0000000..b403cbf --- /dev/null +++ b/cmk/gui/plugins/sidebar/dashboards.py @@ -0,0 +1,86 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# tails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +import cmk.gui.config as config +import cmk.gui.dashboard as dashboard +from cmk.gui.globals import html +from cmk.gui.i18n import _ +from cmk.gui.plugins.sidebar import ( + sidebar_snapins, + visuals_by_topic, + bulletlink, + footnotelinks, +) + + +def render_dashboards(): + dashboard.load_dashboards() + + def render_topic(topic, s, foldable=True): + first = True + for t, title, name, _is_view in s: + if t == topic: + if first: + if foldable: + html.begin_foldable_container( + "dashboards", topic, False, topic, indent=True) + else: + html.open_ul() + first = False + bulletlink( + title, 'dashboard.py?name=%s' % name, onclick="return wato_views_clicked(this)") + + if not first: # at least one item rendered + if foldable: + html.end_foldable_container() + else: + html.open_ul() + + by_topic = visuals_by_topic( + dashboard.permitted_dashboards().items(), default_order=[_('Overview')]) + topics = [topic for topic, _entry in by_topic] + + if len(topics) < 2: + render_topic(by_topic[0][0], by_topic[0][1], foldable=False) + + else: + for topic, s in by_topic: + render_topic(topic, s) + + links = [] + if config.user.may("general.edit_dashboards"): + if config.debug: + links.append((_("Export"), "export_dashboards.py")) + links.append((_("Edit"), "edit_dashboards.py")) + footnotelinks(links) + + +sidebar_snapins["dashboards"] = { + "title": _("Dashboards"), + "description": _("Links to all dashboards"), + "render": render_dashboards, + "allowed": ["user", "admin", "guest"], +} diff --git a/cmk/gui/plugins/sidebar/shipped.py b/cmk/gui/plugins/sidebar/shipped.py index 799a2e1..9ca4b02 100644 --- a/cmk/gui/plugins/sidebar/shipped.py +++ b/cmk/gui/plugins/sidebar/shipped.py @@ -34,7 +34,6 @@ import re import cmk.paths import cmk.gui.config as config -import cmk.gui.dashboard as dashboard import cmk.gui.sites as sites from cmk.gui.htmllib import HTML from cmk.gui.i18n import _ @@ -42,75 +41,13 @@ from cmk.gui.globals import html from cmk.gui.plugins.sidebar import ( sidebar_snapins, - visuals_by_topic, bulletlink, - footnotelinks, snapin_width, snapin_site_choice, simplelink, ) #. -# .--Dashboards----------------------------------------------------------. -# | ____ _ _ _ | -# | | _ \ __ _ ___| |__ | |__ ___ __ _ _ __ __| |___ | -# | | | | |/ _` / __| '_ \| '_ \ / _ \ / _` | '__/ _` / __| | -# | | |_| | (_| \__ \ | | | |_) | (_) | (_| | | | (_| \__ \ | -# | |____/ \__,_|___/_| |_|_.__/ \___/ \__,_|_| \__,_|___/ | -# | | -# '----------------------------------------------------------------------' - - -def render_dashboards(): - dashboard.load_dashboards() - - def render_topic(topic, s, foldable=True): - first = True - for t, title, name, _is_view in s: - if t == topic: - if first: - if foldable: - html.begin_foldable_container( - "dashboards", topic, False, topic, indent=True) - else: - html.open_ul() - first = False - bulletlink( - title, 'dashboard.py?name=%s' % name, onclick="return wato_views_clicked(this)") - - if not first: # at least one item rendered - if foldable: - html.end_foldable_container() - else: - html.open_ul() - - by_topic = visuals_by_topic( - dashboard.permitted_dashboards().items(), default_order=[_('Overview')]) - topics = [topic for topic, _entry in by_topic] - - if len(topics) < 2: - render_topic(by_topic[0][0], by_topic[0][1], foldable=False) - - else: - for topic, s in by_topic: - render_topic(topic, s) - - links = [] - if config.user.may("general.edit_dashboards"): - if config.debug: - links.append((_("Export"), "export_dashboards.py")) - links.append((_("Edit"), "edit_dashboards.py")) - footnotelinks(links) - - -sidebar_snapins["dashboards"] = { - "title": _("Dashboards"), - "description": _("Links to all dashboards"), - "render": render_dashboards, - "allowed": ["user", "admin", "guest"], -} - -#. # .--Performance---------------------------------------------------------. # | ____ __ | # | | _ \ ___ _ __ / _| ___ _ __ _ __ ___ __ _ _ __ ___ ___ |

5 years, 12 months

Removed rendering of nagios legacy sidebar snapin

by Kenneth Okoh

Module: check_mk Branch: master Commit: 32f6b7cfca78ed4ac6ffdd42d40b5102d656ad28 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=32f6b7cfca78ed… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Thu Nov 22 14:51:13 2018 +0100 Removed rendering of nagios legacy sidebar snapin Change-Id: I716c96da8c84b3f2d06274cf624d4fa8f39e6a9c --- cmk/gui/plugins/sidebar/nagios.py | 87 +++++++-------------------------------- 1 file changed, 16 insertions(+), 71 deletions(-) diff --git a/cmk/gui/plugins/sidebar/nagios.py b/cmk/gui/plugins/sidebar/nagios.py index 01148ab..5b74f46 100644 --- a/cmk/gui/plugins/sidebar/nagios.py +++ b/cmk/gui/plugins/sidebar/nagios.py @@ -24,82 +24,27 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # 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.plugins.sidebar import ( - sidebar_snapins, - bulletlink, - nagioscgilink, - heading, + SidebarSnapin, + snapin_registry, ) -def render_nagios(): - html.open_ul() - bulletlink("Home", "http://www.nagios.org") - bulletlink("Documentation", "%snagios/docs/toc.html" % config.url_prefix()) - html.close_ul() - for entry in [ - "General", - ("tac.cgi", "Tactical Overview"), - ("statusmap.cgi?host=all", "Map"), - "Current Status", - ("status.cgi?hostgroup=all&style=hostdetail", "Hosts"), - ("status.cgi?host=all", "Services"), - ("status.cgi?hostgroup=all&style=overview", "Host Groups"), - ("status.cgi?hostgroup=all&style=summary", "*Summary"), - ("status.cgi?hostgroup=all&style=grid", "*Grid"), - ("status.cgi?servicegroup=all&style=overview", "Service Groups"), - ("status.cgi?servicegroup=all&style=summary", "*Summary"), - ("status.cgi?servicegroup=all&style=grid", "*Grid"), - ("status.cgi?host=all&servicestatustypes=28", "Problems"), - ("status.cgi?host=all&type=detail&hoststatustypes=3&serviceprops=42&servicestatustypes=28", - "*Service (Unhandled)"), - ("status.cgi?hostgroup=all&style=hostdetail&hoststatustypes=12&hostprops=42", - "*Hosts (Unhandled)"), - ("outages.cgi", "Network Outages"), - "Reports", - ("avail.cgi", "Availability"), - ("trends.cgi", "Trends"), - ("history.cgi?host=all", "Alerts"), - ("history.cgi?host=all", "*History"), - ("summary.cgi", "*Summary"), - ("histogram.cgi", "*Histogram"), - ("notifications.cgi?contact=all", "Notifications"), - ("showlog.cgi", "Event Log"), - "System", - ("extinfo.cgi?type=3", "Comments"), - ("extinfo.cgi?type=6", "Downtime"), - ("extinfo.cgi?type=0", "Process Info"), - ("extinfo.cgi?type=4", "Performance Info"), - ("extinfo.cgi?type=7", "Scheduling Queue"), - ("config.cgi", "Configuration"), - ]: - if isinstance(entry, str): - html.close_ul() - heading(entry) - html.open_ul() - else: - ref, text = entry - if text[0] == "*": - html.open_ul(class_="link") - nagioscgilink(text[1:], ref) - html.close_ul() - heading(entry) - html.open_ul() - else: - nagioscgilink(text, ref) +(a)snapin_registry.register +class Nagios(SidebarSnapin): + @staticmethod + def type_name(): + return "nagios_legacy" + @classmethod + def title(cls): + return _("Old Nagios GUI") -sidebar_snapins["nagios_legacy"] = { - "title": _("Old Nagios GUI"), - "description": _("The classical sidebar of Nagios 3.2.0 with links to " - "your local Nagios instance (no multi site support)"), - "render": render_nagios, - "allowed": [ - "user", - "admin", - "guest", - ], -} + @classmethod + def description(cls): + return _("The legacy Nagios GUI has been removed.") + + def show(self): + html.write_text(_("The legacy Nagios GUI has been removed."))

5 years, 12 months

Refactored hosts to new snapin API

by Kenneth Okoh

Module: check_mk Branch: master Commit: 2b6bb3eb1f4d7a6110c81185bc52282f9315fd24 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b6bb3eb1f4d7a… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Thu Nov 22 09:15:39 2018 +0100 Refactored hosts to new snapin API Change-Id: Id753b61c57a9dc0af829e9745af444d3eb264949 --- cmk/gui/plugins/sidebar/hosts.py | 203 +++++++++++++++++++++++---------------- 1 file changed, 118 insertions(+), 85 deletions(-) diff --git a/cmk/gui/plugins/sidebar/hosts.py b/cmk/gui/plugins/sidebar/hosts.py index c40c586..e5c9cc8 100644 --- a/cmk/gui/plugins/sidebar/hosts.py +++ b/cmk/gui/plugins/sidebar/hosts.py @@ -24,99 +24,132 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +import abc import cmk.gui.config as config import cmk.gui.views as views import cmk.gui.sites as sites from cmk.gui.i18n import _ from cmk.gui.globals import html -from cmk.gui.plugins.sidebar import sidebar_snapins, link - - -def render_hosts(mode): - sites.live().set_prepend_site(True) - query = "GET hosts\nColumns: name state worst_service_state\nLimit: 100\n" - view = "host" - - if mode == "problems": - view = "problemsofhost" - # Exclude hosts and services in downtime - svc_query = "GET services\nColumns: host_name\n"\ - "Filter: state > 0\nFilter: scheduled_downtime_depth = 0\n"\ - "Filter: host_scheduled_downtime_depth = 0\nAnd: 3" - problem_hosts = {x[1] for x in sites.live().query(svc_query)} - - query += "Filter: state > 0\nFilter: scheduled_downtime_depth = 0\nAnd: 2\n" - for host in problem_hosts: - query += "Filter: name = %s\n" % host - query += "Or: %d\n" % (len(problem_hosts) + 1) - - hosts = sites.live().query(query) - sites.live().set_prepend_site(False) - hosts.sort() - - longestname = 0 - for site, host, state, worstsvc in hosts: - longestname = max(longestname, len(host)) - if longestname > 15: - num_columns = 1 - else: - num_columns = 2 - - views.load_views() - target = views.get_context_link(config.user.id, view) - html.open_table(class_="allhosts") - col = 1 - for site, host, state, worstsvc in hosts: - if col == 1: - html.open_tr() - html.open_td() - html.open_td() - - if state > 0 or worstsvc == 2: - statecolor = 2 - elif worstsvc == 1: - statecolor = 1 - elif worstsvc == 3: - statecolor = 3 - else: - statecolor = 0 - html.open_div(class_=["statebullet", "state%d" % statecolor]) - html.nbsp() - html.close_div() - link(host, target + "&host=%s&site=%s" % (html.urlencode(host), html.urlencode(site))) - html.close_td() - if col == num_columns: - html.close_tr() - col = 1 +from cmk.gui.plugins.sidebar import ( + link, + SidebarSnapin, + snapin_registry, +) + + +class HostSnapin(SidebarSnapin): + __metaclass__ = abc.ABCMeta + + @abc.abstractmethod + def _host_mode_ident(self): + raise NotImplementedError() + + def show(self): + mode = self._host_mode_ident() + sites.live().set_prepend_site(True) + query = "GET hosts\nColumns: name state worst_service_state\nLimit: 100\n" + view = "host" + + if mode == "problems": + view = "problemsofhost" + # Exclude hosts and services in downtime + svc_query = "GET services\nColumns: host_name\n"\ + "Filter: state > 0\nFilter: scheduled_downtime_depth = 0\n"\ + "Filter: host_scheduled_downtime_depth = 0\nAnd: 3" + problem_hosts = {x[1] for x in sites.live().query(svc_query)} + + query += "Filter: state > 0\nFilter: scheduled_downtime_depth = 0\nAnd: 2\n" + for host in problem_hosts: + query += "Filter: name = %s\n" % host + query += "Or: %d\n" % (len(problem_hosts) + 1) + + hosts = sites.live().query(query) + sites.live().set_prepend_site(False) + hosts.sort() + + longestname = 0 + for site, host, state, worstsvc in hosts: + longestname = max(longestname, len(host)) + if longestname > 15: + num_columns = 1 else: - col += 1 + num_columns = 2 + + views.load_views() + target = views.get_context_link(config.user.id, view) + html.open_table(class_="allhosts") + col = 1 + for site, host, state, worstsvc in hosts: + if col == 1: + html.open_tr() + html.open_td() - if col < num_columns: - html.close_tr() - html.close_table() + if state > 0 or worstsvc == 2: + statecolor = 2 + elif worstsvc == 1: + statecolor = 1 + elif worstsvc == 3: + statecolor = 3 + else: + statecolor = 0 + html.open_div(class_=["statebullet", "state%d" % statecolor]) + html.nbsp() + html.close_div() + link(host, target + "&host=%s&site=%s" % (html.urlencode(host), html.urlencode(site))) + html.close_td() + if col == num_columns: + html.close_tr() + col = 1 + else: + col += 1 + if col < num_columns: + html.close_tr() + html.close_table() + + @classmethod + def refresh_on_restart(cls): + return True -snapin_allhosts_styles = """ - .snapin table.allhosts { width: 100%; } - .snapin table.allhosts td { width: 50%; padding: 0px 0px; } + def styles(self): + return """ +.snapin table.allhosts { width: 100%; } +.snapin table.allhosts td { width: 50%; padding: 0px 0px; } """ -sidebar_snapins["hosts"] = { - "title": _("All Hosts"), - "description": _("A summary state of each host with a link to the view " - "showing its services"), - "render": lambda: render_hosts("hosts"), - "allowed": ["user", "admin", "guest"], - "refresh": True, - "styles": snapin_allhosts_styles, -} - -sidebar_snapins["problem_hosts"] = { - "title": _("Problem Hosts"), - "description": _("A summary state of all hosts that have a problem, with " - "links to problems of those hosts"), - "render": lambda: render_hosts("problems"), - "allowed": ["user", "admin", "guest"], - "refresh": True, - "styles": snapin_allhosts_styles, -} + +(a)snapin_registry.register +class Hosts(HostSnapin): + def _host_mode_ident(self): + return "hosts" + + @staticmethod + def type_name(): + return "hosts" + + @classmethod + def title(cls): + return _("All Hosts") + + @classmethod + def description(cls): + return _("A summary state of each host with a link to the view showing its services") + + +(a)snapin_registry.register +class ProblemHosts(HostSnapin): + def _host_mode_ident(self): + return "problems" + + @staticmethod + def type_name(): + return "problem_hosts" + + @classmethod + def title(cls): + return _("Problem Hosts") + + @classmethod + def description(cls): + return _("A summary state of all hosts that have a problem, with " + "links to problems of those hosts")

5 years, 12 months

add --single-version-externally-managed to net-snmp python module build in order to create egg-info instead of egg

by Alex Zurhake

Module: check_mk Branch: master Commit: 034e1be4fcaef79a50cf94ae7fbc19cc29e13604 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=034e1be4fcaef7… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Fri Nov 23 10:05:30 2018 +0100 add --single-version-externally-managed to net-snmp python module build in order to create egg-info instead of egg Change-Id: I908d2b59c1f99f0364e2ebc392348f8511c13330 --- omd/packages/net-snmp/net-snmp.make | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/omd/packages/net-snmp/net-snmp.make b/omd/packages/net-snmp/net-snmp.make index c53ec93..29327a1 100644 --- a/omd/packages/net-snmp/net-snmp.make +++ b/omd/packages/net-snmp/net-snmp.make @@ -42,9 +42,11 @@ $(NET_SNMP)-install-python: export LDFLAGS="$(PACKAGE_PYTHON_LDFLAGS)" ; \ export LD_LIBRARY_PATH="$(PACKAGE_PYTHON_LD_LIBRARY_PATH)" ; \ $(PACKAGE_PYTHON_EXECUTABLE) setup.py install --basedir=.. --home=$(DESTDIR)$(OMD_ROOT) \ - --prefix='' \ - --install-platlib=$(DESTDIR)$(OMD_ROOT)/lib/python \ - --install-purelib=$(DESTDIR)$(OMD_ROOT)/lib/python + --prefix='' \ + --install-platlib=$(DESTDIR)$(OMD_ROOT)/lib/python \ + --install-purelib=$(DESTDIR)$(OMD_ROOT)/lib/python \ + --root=/ \ + --single-version-externally-managed # For some obscure reason beyond the mental capacities of mere humans, the # easy_install mechanism triggered by the setup call above results in the # creation of a lib/python/site.py, a copy of site-patch.py from setuptools.

5 years, 12 months

Fix cmk.gui.hooks registration after modularization of GUI

by Lars Michelsen

Module: check_mk Branch: master Commit: e20978c05111f4f128ff5d4d7a6e9c38084aaec8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e20978c05111f4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 23 09:09:46 2018 +0100 Fix cmk.gui.hooks registration after modularization of GUI Loading of the legacy plugins dropped all registered GUI hooks while it should only drop hooks registered by other plugins. This has now been cleaned up to make the builtin hooks work again as intended. Change-Id: I0541d64d941dba900dc82fa13aa78eda64e8bab4 --- cmk/gui/hooks.py | 36 ++++++++++++---- cmk/gui/plugins/userdb/hook_auth.py | 8 ++-- cmk/gui/plugins/wato/builtin_attributes.py | 2 +- cmk/gui/wato/mkeventd.py | 2 +- cmk/gui/watolib.py | 11 ++--- tests/unit/cmk/gui/test_gui_hooks.py | 66 ++++++++++++++++++++++++++++++ 6 files changed, 105 insertions(+), 20 deletions(-) diff --git a/cmk/gui/hooks.py b/cmk/gui/hooks.py index bbb5855..bea6bc8 100644 --- a/cmk/gui/hooks.py +++ b/cmk/gui/hooks.py @@ -27,6 +27,7 @@ import sys import StringIO import traceback +from typing import NamedTuple import cmk.gui.config as config import cmk.gui.i18n @@ -45,9 +46,9 @@ def load_plugins(force): if loaded_with_language == cmk.gui.i18n.get_current_language() and not force: return - # Cleanup all registered hooks. They need to be renewed by load_plugins() + # Cleanup all plugin hooks. They need to be renewed by load_plugins() # of the other modules - unregister() + unregister_plugin_hooks() # This must be set after plugin loading to make broken plugins raise # exceptions all the time and not only the first time (when the plugins @@ -55,13 +56,30 @@ def load_plugins(force): loaded_with_language = cmk.gui.i18n.get_current_language() -def unregister(): - global hooks - hooks = {} +def unregister_plugin_hooks(): + old_hooks = hooks.copy() + for name, registered_hooks in old_hooks.items(): + hooks_left = [h for h in registered_hooks if h.is_builtin] + if hooks_left: + hooks[name] = hooks_left + else: + del hooks[name] -def register(name, func): - hooks.setdefault(name, []).append(func) +def register_builtin(name, func): + register(name, func, is_builtin=True) + + +def register_from_plugin(name, func): + register(name, func, is_builtin=False) + + +Hook = NamedTuple("Hook", [("handler", type(lambda: None)), ("is_builtin", bool)]) + + +# Kept public for compatibility with pre 1.6 plugins (is_builtin needs to be optional for pre 1.6) +def register(name, func, is_builtin=False): + hooks.setdefault(name, []).append(Hook(handler=func, is_builtin=is_builtin)) def get(name): @@ -75,10 +93,10 @@ def registered(name): def call(name, *args): n = 0 - for hk in hooks.get(name, []): + for hook in hooks.get(name, []): n += 1 try: - hk(*args) + hook.handler(*args) except Exception as e: if config.debug: txt = StringIO.StringIO() diff --git a/cmk/gui/plugins/userdb/hook_auth.py b/cmk/gui/plugins/userdb/hook_auth.py index 76daffb..172df2c 100644 --- a/cmk/gui/plugins/userdb/hook_auth.py +++ b/cmk/gui/plugins/userdb/hook_auth.py @@ -240,7 +240,7 @@ def create_auth_file(callee, users=None): # TODO: Should we not execute this hook also when folders are modified? -hooks.register('users-saved', lambda users: create_auth_file("users-saved", users)) -hooks.register('roles-saved', lambda x: create_auth_file("roles-saved")) -hooks.register('contactgroups-saved', lambda x: create_auth_file("contactgroups-saved")) -hooks.register('activate-changes', lambda x: create_auth_file("activate-changes")) +hooks.register_builtin('users-saved', lambda users: create_auth_file("users-saved", users)) +hooks.register_builtin('roles-saved', lambda x: create_auth_file("roles-saved")) +hooks.register_builtin('contactgroups-saved', lambda x: create_auth_file("contactgroups-saved")) +hooks.register_builtin('activate-changes', lambda x: create_auth_file("activate-changes")) diff --git a/cmk/gui/plugins/wato/builtin_attributes.py b/cmk/gui/plugins/wato/builtin_attributes.py index 82067e2..ec2f31b 100644 --- a/cmk/gui/plugins/wato/builtin_attributes.py +++ b/cmk/gui/plugins/wato/builtin_attributes.py @@ -249,7 +249,7 @@ def validate_host_parents(host): ) % (parent_name, parent.site_id(), host.site_id())) -hooks.register('validate-host', validate_host_parents) +hooks.register_builtin('validate-host', validate_host_parents) class NetworkScanAttribute(ValueSpecAttribute): diff --git a/cmk/gui/wato/mkeventd.py b/cmk/gui/wato/mkeventd.py index ce28923..12545f7 100644 --- a/cmk/gui/wato/mkeventd.py +++ b/cmk/gui/wato/mkeventd.py @@ -3895,4 +3895,4 @@ define command { }) -hooks.register("pre-activate-changes", mkeventd_update_notifiation_configuration) +hooks.register_builtin("pre-activate-changes", mkeventd_update_notifiation_configuration) diff --git a/cmk/gui/watolib.py b/cmk/gui/watolib.py index fe83244..0136883 100644 --- a/cmk/gui/watolib.py +++ b/cmk/gui/watolib.py @@ -2910,9 +2910,9 @@ class CREHost(WithPermissionsAndAttributes): def validation_errors(self): if hooks.registered('validate-host'): errors = [] - for hook_function in hooks.get('validate-host'): + for hook in hooks.get('validate-host'): try: - hook_function(self) + hook.handler(self) except MKUserError as e: errors.append("%s" % e) return errors @@ -7018,8 +7018,9 @@ class BuiltinHosttagsConfiguration(HosttagsConfiguration): # '----------------------------------------------------------------------' +# TODO: Kept for compatibility with pre-1.6 WATO plugins def register_hook(name, func): - hooks.register(name, func) + hooks.register_from_plugin(name, func) def call_hook_hosts_changed(folder): @@ -10251,9 +10252,9 @@ def validate_all_hosts(hostnames, force_all=False): for name in hostnames: eff = all_hosts[name] errors = [] - for hk in hooks.get('validate-all-hosts'): + for hook in hooks.get('validate-all-hosts'): try: - hk(eff, all_hosts) + hook.handler(eff, all_hosts) except MKUserError as e: errors.append("%s" % e) hosts_errors[name] = errors diff --git a/tests/unit/cmk/gui/test_gui_hooks.py b/tests/unit/cmk/gui/test_gui_hooks.py new file mode 100644 index 0000000..8ab5134 --- /dev/null +++ b/tests/unit/cmk/gui/test_gui_hooks.py @@ -0,0 +1,66 @@ +import pytest + +import cmk.gui.hooks as hooks + + +(a)pytest.fixture(autouse=True) +def reset_hooks(): + hooks.hooks.clear() + + +def test_hook_registration(): + assert hooks.hooks == {} + + # pre 1.6 API + hooks.register("bla", lambda: True) + assert hooks.get("bla")[0].is_builtin == False + + hooks.register_builtin("blub", lambda: True) + hooks.register_from_plugin("blub", lambda: False) + assert hooks.get("blub")[0].is_builtin == True + assert hooks.get("blub")[1].is_builtin == False + + assert hooks.registered("bla") == True + assert hooks.registered("blub") == True + assert hooks.registered("bli") == False + + assert len(hooks.get("bla")) == 1 + assert len(hooks.get("blub")) == 2 + assert len(hooks.get("bli")) == 0 + + +def test_call(mocker): + hook1_mock = mocker.Mock() + hook2_mock = mocker.Mock() + hooks.register("bla", hook1_mock) + hooks.register("blub", hook2_mock) + + hooks.call("bla") + hook1_mock.assert_called_once() + hook2_mock.assert_not_called() + + hooks.call("blub") + hook1_mock.assert_called_once() + hook2_mock.assert_called_once() + + +def test_call_exception_handling(mocker): + hooks.register_builtin("bli", lambda: 1 / 0) + hook3_mock = mocker.Mock() + hooks.register("bli", hook3_mock) + with pytest.raises(ZeroDivisionError, match="integer division"): + hooks.call("bli") + hook3_mock.assert_not_called() + + +def test_builtin_vs_plugin_hooks(): + hooks.register_builtin("bla", lambda: True) + assert hooks.registered("bla") == True + + hooks.register_from_plugin("blub", lambda: True) + assert hooks.registered("blub") == True + + hooks.load_plugins(force=True) + + assert hooks.registered("bla") == True + assert hooks.registered("blub") == False

5 years, 12 months

Fixed rewrite of all host files during all page requests

by Lars Michelsen

Module: check_mk Branch: master Commit: 23698a61672196f47e8220c2583a8aeff2615c7a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=23698a61672196… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 22 20:28:41 2018 +0100 Fixed rewrite of all host files during all page requests Seems this was introduced during development of 1.6 for some reason. Probably some kind of debug code that has been left behind. It can clearly not be intended to rewrite all folder files during each request. Change-Id: I4365874ac5c1393a71519d3933c6cbe759872e70 --- cmk/gui/watolib.py | 1 - 1 file changed, 1 deletion(-) diff --git a/cmk/gui/watolib.py b/cmk/gui/watolib.py index f92aa20..fe83244 100644 --- a/cmk/gui/watolib.py +++ b/cmk/gui/watolib.py @@ -3825,7 +3825,6 @@ def update_config_based_host_attributes(): declare_custom_host_attrs() Folder.invalidate_caches() - Folder.root_folder().rewrite_hosts_files() def _clear_config_based_host_attributes():

5 years, 12 months

Reserved 20 Werk IDS

by Moritz Kiemer

Module: check_mk Branch: master Commit: d42049083e35ddcf7ae6732c438537c20e392f6f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d42049083e35dd… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Nov 23 09:45:02 2018 +0100 Reserved 20 Werk IDS Change-Id: I0ea35c9ce049d502fb63ef8d6d1de6946828b72e --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 3914622..811c12a 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -6941 +6961

5 years, 12 months

← Newer
1
...
6
7
8
9
10
11
12
...
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