Checkmk git commits November 2018

checkmk-commits@lists.checkmk.com

15 participants
465 discussions

Added missing GUI notification image (located in sidebar footer)

by Lars Michelsen

Module: check_mk Branch: master Commit: 80a0e9605d9621ae445b92560aa3b794244a4bfe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=80a0e9605d9621… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 9 15:25:38 2018 +0100 Added missing GUI notification image (located in sidebar footer) Change-Id: I5261d7d22e3a239524304eb6b7887932e164f7e2 --- web/htdocs/images/icon_sidebar_messages.png | Bin 1248 -> 773 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/images/icon_sidebar_messages.png b/web/htdocs/images/icon_sidebar_messages.png index d66c01a..68999f4 100644 Binary files a/web/htdocs/images/icon_sidebar_messages.png and b/web/htdocs/images/icon_sidebar_messages.png differ

5 years, 7 months

Change naming of patches from diff to dif in order to match the general pattern

by Alex Zurhake

Module: check_mk Branch: master Commit: df65fb2f79e508cc5e8bce91c334d64226f75621 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=df65fb2f79e508… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Thu Nov 8 15:20:47 2018 +0100 Change naming of patches from diff to dif in order to match the general pattern Change-Id: I4c8a0d8c7ee333df542e35650b3e8fe86e7815b0 --- omd/packages/pnp4nagios/Makefile | 2 +- ...timerange-exception.diff => 0096-fix-custom-timerange-exception.dif} | 0 ...ervice-descr.diff => 0097-encode-special-chars-in-service-descr.dif} | 0 ...-allow-skip-authorization.diff => 0100-allow-skip-authorization.dif} | 0 ...01-allow-at-symbol-in-keys.diff => 0101-allow-at-symbol-in-keys.dif} | 0 ...izeof-issue-with-php72.diff => 0103-fix-sizeof-issue-with-php72.dif} | 0 .../{0103-fix-time-selection.diff => 0103-fix-time-selection.dif} | 0 7 files changed, 1 insertion(+), 1 deletion(-) diff --git a/omd/packages/pnp4nagios/Makefile b/omd/packages/pnp4nagios/Makefile index 4862d7f..f575685 100644 --- a/omd/packages/pnp4nagios/Makefile +++ b/omd/packages/pnp4nagios/Makefile @@ -29,7 +29,7 @@ CONFIGUREOPTS = \ build: tar xzf $(DIR).tar.gz - for p in patches/*.diff ; do \ + for p in patches/*.dif ; do \ echo "applying $$p..." ; \ patch -p1 -b -d $(DIR) < $$p ; \ done diff --git a/omd/packages/pnp4nagios/patches/0096-fix-custom-timerange-exception.diff b/omd/packages/pnp4nagios/patches/0096-fix-custom-timerange-exception.dif similarity index 100% rename from omd/packages/pnp4nagios/patches/0096-fix-custom-timerange-exception.diff rename to omd/packages/pnp4nagios/patches/0096-fix-custom-timerange-exception.dif diff --git a/omd/packages/pnp4nagios/patches/0097-encode-special-chars-in-service-descr.diff b/omd/packages/pnp4nagios/patches/0097-encode-special-chars-in-service-descr.dif similarity index 100% rename from omd/packages/pnp4nagios/patches/0097-encode-special-chars-in-service-descr.diff rename to omd/packages/pnp4nagios/patches/0097-encode-special-chars-in-service-descr.dif diff --git a/omd/packages/pnp4nagios/patches/0100-allow-skip-authorization.diff b/omd/packages/pnp4nagios/patches/0100-allow-skip-authorization.dif similarity index 100% rename from omd/packages/pnp4nagios/patches/0100-allow-skip-authorization.diff rename to omd/packages/pnp4nagios/patches/0100-allow-skip-authorization.dif diff --git a/omd/packages/pnp4nagios/patches/0101-allow-at-symbol-in-keys.diff b/omd/packages/pnp4nagios/patches/0101-allow-at-symbol-in-keys.dif similarity index 100% rename from omd/packages/pnp4nagios/patches/0101-allow-at-symbol-in-keys.diff rename to omd/packages/pnp4nagios/patches/0101-allow-at-symbol-in-keys.dif diff --git a/omd/packages/pnp4nagios/patches/0103-fix-sizeof-issue-with-php72.diff b/omd/packages/pnp4nagios/patches/0103-fix-sizeof-issue-with-php72.dif similarity index 100% rename from omd/packages/pnp4nagios/patches/0103-fix-sizeof-issue-with-php72.diff rename to omd/packages/pnp4nagios/patches/0103-fix-sizeof-issue-with-php72.dif diff --git a/omd/packages/pnp4nagios/patches/0103-fix-time-selection.diff b/omd/packages/pnp4nagios/patches/0103-fix-time-selection.dif similarity index 100% rename from omd/packages/pnp4nagios/patches/0103-fix-time-selection.diff rename to omd/packages/pnp4nagios/patches/0103-fix-time-selection.dif

5 years, 7 months

Moved views from shipped.py to dedicated module

by Kenneth Okoh

Module: check_mk Branch: master Commit: 2dec90a1666170b4be744574e25d2b15eb616d29 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2dec90a1666170… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Thu Nov 8 14:44:27 2018 +0100 Moved views from shipped.py to dedicated module Change-Id: I4c22bb8e29c6eec2234ece600244244cf5cb8f3f --- cmk/gui/plugins/sidebar/shipped.py | 79 -------------------------- cmk/gui/plugins/sidebar/views.py | 112 +++++++++++++++++++++++++++++++++++++ 2 files changed, 112 insertions(+), 79 deletions(-) diff --git a/cmk/gui/plugins/sidebar/shipped.py b/cmk/gui/plugins/sidebar/shipped.py index 2e8c04b..3f54f4d 100644 --- a/cmk/gui/plugins/sidebar/shipped.py +++ b/cmk/gui/plugins/sidebar/shipped.py @@ -36,7 +36,6 @@ import cmk.paths import cmk.gui.config as config import cmk.gui.views as views import cmk.gui.dashboard as dashboard -import cmk.gui.pagetypes as pagetypes import cmk.gui.sites as sites from cmk.gui.htmllib import HTML from cmk.gui.i18n import _ @@ -56,84 +55,6 @@ from cmk.gui.plugins.sidebar import ( ) #. -# .--Views---------------------------------------------------------------. -# | __ ___ | -# | \ \ / (_) _____ _____ | -# | \ \ / /| |/ _ \ \ /\ / / __| | -# | \ V / | | __/\ V V /\__ \ | -# | \_/ |_|\___| \_/\_/ |___/ | -# | | -# '----------------------------------------------------------------------' - - -def render_views(): - views.load_views() - dashboard.load_dashboards() - - def render_topic(topic, entries): - first = True - for t, title, name, is_view in entries: - if is_view and config.visible_views and name not in config.visible_views: - continue - if is_view and config.hidden_views and name in config.hidden_views: - continue - if t == topic: - if first: - html.begin_foldable_container("views", topic, False, topic, indent=True) - first = False - if is_view: - bulletlink(title, "view.py?view_name=%s" % name, onclick = "return wato_views_clicked(this)") - elif "?name=" in name: - bulletlink(title, name) - else: - bulletlink(title, 'dashboard.py?name=%s' % name, onclick = "return wato_views_clicked(this)") - - # TODO: One day pagestypes should handle the complete snapin. - # for page_type in pagetypes.all_page_types().values(): - # if issubclass(page_type, pagetypes.PageRenderer): - # for t, title, url in page_type.sidebar_links(): - # if t == topic: - # bulletlink(title, url) - - if not first: # at least one item rendered - html.end_foldable_container() - - # TODO: One bright day drop this whole visuals stuff and only use page_types - page_type_topics = {} - for page_type in pagetypes.all_page_types().values(): - if issubclass(page_type, pagetypes.PageRenderer): - for t, title, url in page_type.sidebar_links(): - page_type_topics.setdefault(t, []).append((t, title, url, False)) - - visuals_topics_with_entries = visuals_by_topic(views.permitted_views().items() + dashboard.permitted_dashboards().items()) - all_topics_with_entries = [] - for topic, entries in visuals_topics_with_entries: - if topic in page_type_topics: - entries = entries + page_type_topics[topic] - del page_type_topics[topic] - all_topics_with_entries.append((topic, entries)) - - all_topics_with_entries += sorted(page_type_topics.items()) - - for topic, entries in all_topics_with_entries: - render_topic(topic, entries) - - - links = [] - if config.user.may("general.edit_views"): - if config.debug: - links.append((_("Export"), "export_views.py")) - links.append((_("Edit"), "edit_views.py")) - footnotelinks(links) - -sidebar_snapins["views"] = { - "title" : _("Views"), - "description" : _("Links to global views and dashboards"), - "render" : render_views, - "allowed" : [ "user", "admin", "guest" ], -} - -#. # .--Dashboards----------------------------------------------------------. # | ____ _ _ _ | # | | _ \ __ _ ___| |__ | |__ ___ __ _ _ __ __| |___ | diff --git a/cmk/gui/plugins/sidebar/views.py b/cmk/gui/plugins/sidebar/views.py new file mode 100644 index 0000000..6ed8387 --- /dev/null +++ b/cmk/gui/plugins/sidebar/views.py @@ -0,0 +1,112 @@ +#!/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. + +# TODO: Split this file into single snapin or topic files + +# TODO: Refactor all snapins to the new snapin API and move page handlers +# from sidebar.py to the snapin objects that need these pages. + +import cmk.gui.config as config +import cmk.gui.views as views +import cmk.gui.dashboard as dashboard +import cmk.gui.pagetypes as pagetypes +from cmk.gui.i18n import _ +from cmk.gui.globals import html + +from cmk.gui.plugins.sidebar import ( + sidebar_snapins, + visuals_by_topic, + bulletlink, + footnotelinks, +) + + +def render_views(): + views.load_views() + dashboard.load_dashboards() + + def render_topic(topic, entries): + first = True + for t, title, name, is_view in entries: + if is_view and config.visible_views and name not in config.visible_views: + continue + if is_view and config.hidden_views and name in config.hidden_views: + continue + if t == topic: + if first: + html.begin_foldable_container("views", topic, False, topic, indent=True) + first = False + if is_view: + bulletlink(title, "view.py?view_name=%s" % name, onclick = "return wato_views_clicked(this)") + elif "?name=" in name: + bulletlink(title, name) + else: + bulletlink(title, 'dashboard.py?name=%s' % name, onclick = "return wato_views_clicked(this)") + + # TODO: One day pagestypes should handle the complete snapin. + # for page_type in pagetypes.all_page_types().values(): + # if issubclass(page_type, pagetypes.PageRenderer): + # for t, title, url in page_type.sidebar_links(): + # if t == topic: + # bulletlink(title, url) + + if not first: # at least one item rendered + html.end_foldable_container() + + # TODO: One bright day drop this whole visuals stuff and only use page_types + page_type_topics = {} + for page_type in pagetypes.all_page_types().values(): + if issubclass(page_type, pagetypes.PageRenderer): + for t, title, url in page_type.sidebar_links(): + page_type_topics.setdefault(t, []).append((t, title, url, False)) + + visuals_topics_with_entries = visuals_by_topic(views.permitted_views().items() + dashboard.permitted_dashboards().items()) + all_topics_with_entries = [] + for topic, entries in visuals_topics_with_entries: + if topic in page_type_topics: + entries = entries + page_type_topics[topic] + del page_type_topics[topic] + all_topics_with_entries.append((topic, entries)) + + all_topics_with_entries += sorted(page_type_topics.items()) + + for topic, entries in all_topics_with_entries: + render_topic(topic, entries) + + + links = [] + if config.user.may("general.edit_views"): + if config.debug: + links.append((_("Export"), "export_views.py")) + links.append((_("Edit"), "edit_views.py")) + footnotelinks(links) + +sidebar_snapins["views"] = { + "title" : _("Views"), + "description" : _("Links to global views and dashboards"), + "render" : render_views, + "allowed" : [ "user", "admin", "guest" ], +}

5 years, 7 months

Refactored views to new snapin API

by Kenneth Okoh

Module: check_mk Branch: master Commit: 4a361d49acd6c231e13cdf3af0c55a4a1227acf9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4a361d49acd6c2… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Fri Nov 9 10:48:17 2018 +0100 Refactored views to new snapin API Change-Id: I422965ed6670c8ff1dfc7cdc3017bd9a775d379f --- cmk/gui/plugins/sidebar/views.py | 153 +++++++++++++++++++++------------------ 1 file changed, 83 insertions(+), 70 deletions(-) diff --git a/cmk/gui/plugins/sidebar/views.py b/cmk/gui/plugins/sidebar/views.py index 6ed8387..8c4e87e 100644 --- a/cmk/gui/plugins/sidebar/views.py +++ b/cmk/gui/plugins/sidebar/views.py @@ -33,80 +33,93 @@ import cmk.gui.config as config import cmk.gui.views as views import cmk.gui.dashboard as dashboard import cmk.gui.pagetypes as pagetypes -from cmk.gui.i18n import _ -from cmk.gui.globals import html - from cmk.gui.plugins.sidebar import ( - sidebar_snapins, + SidebarSnapin, + snapin_registry, visuals_by_topic, bulletlink, footnotelinks, ) +from cmk.gui.i18n import _ +from cmk.gui.globals import html -def render_views(): - views.load_views() - dashboard.load_dashboards() - - def render_topic(topic, entries): - first = True - for t, title, name, is_view in entries: - if is_view and config.visible_views and name not in config.visible_views: - continue - if is_view and config.hidden_views and name in config.hidden_views: - continue - if t == topic: - if first: - html.begin_foldable_container("views", topic, False, topic, indent=True) - first = False - if is_view: - bulletlink(title, "view.py?view_name=%s" % name, onclick = "return wato_views_clicked(this)") - elif "?name=" in name: - bulletlink(title, name) - else: - bulletlink(title, 'dashboard.py?name=%s' % name, onclick = "return wato_views_clicked(this)") - - # TODO: One day pagestypes should handle the complete snapin. - # for page_type in pagetypes.all_page_types().values(): - # if issubclass(page_type, pagetypes.PageRenderer): - # for t, title, url in page_type.sidebar_links(): - # if t == topic: - # bulletlink(title, url) - - if not first: # at least one item rendered - html.end_foldable_container() - - # TODO: One bright day drop this whole visuals stuff and only use page_types - page_type_topics = {} - for page_type in pagetypes.all_page_types().values(): - if issubclass(page_type, pagetypes.PageRenderer): - for t, title, url in page_type.sidebar_links(): - page_type_topics.setdefault(t, []).append((t, title, url, False)) - - visuals_topics_with_entries = visuals_by_topic(views.permitted_views().items() + dashboard.permitted_dashboards().items()) - all_topics_with_entries = [] - for topic, entries in visuals_topics_with_entries: - if topic in page_type_topics: - entries = entries + page_type_topics[topic] - del page_type_topics[topic] - all_topics_with_entries.append((topic, entries)) - - all_topics_with_entries += sorted(page_type_topics.items()) - - for topic, entries in all_topics_with_entries: - render_topic(topic, entries) - - - links = [] - if config.user.may("general.edit_views"): - if config.debug: - links.append((_("Export"), "export_views.py")) - links.append((_("Edit"), "edit_views.py")) - footnotelinks(links) - -sidebar_snapins["views"] = { - "title" : _("Views"), - "description" : _("Links to global views and dashboards"), - "render" : render_views, - "allowed" : [ "user", "admin", "guest" ], -} +(a)snapin_registry.register +class Views(SidebarSnapin): + @staticmethod + def type_name(): + return "views" + + @classmethod + def title(cls): + return _("Views") + + @classmethod + def description(cls): + return _("Links to global views and dashboards") + + def show(self): + views.load_views() + dashboard.load_dashboards() + + def render_topic(topic, entries): + first = True + for t, title, name, is_view in entries: + if is_view and config.visible_views and name not in config.visible_views: + continue + if is_view and config.hidden_views and name in config.hidden_views: + continue + if t == topic: + if first: + html.begin_foldable_container("views", topic, False, topic, indent=True) + first = False + if is_view: + bulletlink( + title, + "view.py?view_name=%s" % name, + onclick="return wato_views_clicked(this)") + elif "?name=" in name: + bulletlink(title, name) + else: + bulletlink( + title, + 'dashboard.py?name=%s' % name, + onclick="return wato_views_clicked(this)") + + # TODO: One day pagestypes should handle the complete snapin. + # for page_type in pagetypes.all_page_types().values(): + # if issubclass(page_type, pagetypes.PageRenderer): + # for t, title, url in page_type.sidebar_links(): + # if t == topic: + # bulletlink(title, url) + + if not first: # at least one item rendered + html.end_foldable_container() + + # TODO: One bright day drop this whole visuals stuff and only use page_types + page_type_topics = {} + for page_type in pagetypes.all_page_types().values(): + if issubclass(page_type, pagetypes.PageRenderer): + for t, title, url in page_type.sidebar_links(): + page_type_topics.setdefault(t, []).append((t, title, url, False)) + + visuals_topics_with_entries = visuals_by_topic(views.permitted_views().items() + + dashboard.permitted_dashboards().items()) + all_topics_with_entries = [] + for topic, entries in visuals_topics_with_entries: + if topic in page_type_topics: + entries = entries + page_type_topics[topic] + del page_type_topics[topic] + all_topics_with_entries.append((topic, entries)) + + all_topics_with_entries += sorted(page_type_topics.items()) + + for topic, entries in all_topics_with_entries: + render_topic(topic, entries) + + links = [] + if config.user.may("general.edit_views"): + if config.debug: + links.append((_("Export"), "export_views.py")) + links.append((_("Edit"), "edit_views.py")) + footnotelinks(links)

5 years, 7 months

Unbreak mysqlclient on CentOS 5.

by Sven Panne

Module: check_mk Branch: master Commit: 561400b0957c8eb051b217d3390a2ac2829f2bca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=561400b0957c8e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Nov 9 13:42:43 2018 +0100 Unbreak mysqlclient on CentOS 5. Change-Id: I1589b2f96960ca60e36b87dc72e1040db1d32b7c --- omd/packages/python-modules/Makefile | 2 ++ .../patches/0018-mysqlclient-fortify-source.patch | 14 ++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/omd/packages/python-modules/Makefile b/omd/packages/python-modules/Makefile index 67881d8..f8028ad 100644 --- a/omd/packages/python-modules/Makefile +++ b/omd/packages/python-modules/Makefile @@ -5,6 +5,7 @@ SHELL = /bin/bash VERSION = $(OMD_VERSION) PATCHES := $(wildcard patches/*.dif) +PATCHES += patches/0018-mysqlclient-fortify-source.patch MODULES = @@ -28,6 +29,7 @@ MODULES += pymssql-2.1.3.tar.gz # needed for check_sql (together with freetds) LEGACY_LDAP=0 ifeq ($(DISTRO_CODE),el5) LEGACY_LDAP=1 + PATCHES += patches/0018-mysqlclient-fortify-source.patch endif ifeq ($(LEGACY_LDAP), 1) diff --git a/omd/packages/python-modules/patches/0018-mysqlclient-fortify-source.patch b/omd/packages/python-modules/patches/0018-mysqlclient-fortify-source.patch new file mode 100644 index 0000000..eb6f05b --- /dev/null +++ b/omd/packages/python-modules/patches/0018-mysqlclient-fortify-source.patch @@ -0,0 +1,14 @@ +diff -Nur dest/mysqlclient-1.3.13.orig/_mysql.c dest/mysqlclient-1.3.13/_mysql.c +--- dest/mysqlclient-1.3.13.orig/_mysql.c 2017-12-21 12:09:51.000000000 +0100 ++++ dest/mysqlclient-1.3.13/_mysql.c 2018-11-09 13:36:46.859066671 +0100 +@@ -1,3 +1,10 @@ ++/* CentOS 5's <unistd.h>, _FORTIFY_SOURCE and more recent GCCs don't like each ++ * other, leading to invalid asssembler: ++ * ++ * {standard input}: Assembler messages: ++ * {standard input}:3177: Error: symbol `pread64' is already defined ++ */ ++#undef _FORTIFY_SOURCE + /* + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by

5 years, 7 months

Automatic yapf on cmk/gui/plugins/dashboard including i18n lines

by Óscar Nájera

Module: check_mk Branch: master Commit: 185c94266e62ca7857fb433aa89dcb1d27b05742 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=185c94266e62ca… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Thu Nov 8 13:48:38 2018 +0100 Automatic yapf on cmk/gui/plugins/dashboard including i18n lines CMK-1180 Change-Id: I99592cedca53f8b05df7c63cba93510b8c88c7af --- cmk/gui/plugins/dashboard/builtin.py | 503 +++++++++++++--------- cmk/gui/plugins/dashboard/custom_url.py | 17 +- cmk/gui/plugins/dashboard/failed_notifications.py | 3 +- cmk/gui/plugins/dashboard/graph.py | 35 +- cmk/gui/plugins/dashboard/notify_users.py | 5 +- cmk/gui/plugins/dashboard/snapin.py | 14 +- cmk/gui/plugins/dashboard/static_text.py | 4 +- 7 files changed, 344 insertions(+), 237 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=185c94266e…

5 years, 7 months

Typecheck idiom on cmk/gui/plugins/{dashboard, visuals}

by Óscar Nájera

Module: check_mk Branch: master Commit: 44ee0260bed289210ba10599f6a9e855cd876e34 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44ee0260bed289… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Thu Nov 8 13:52:24 2018 +0100 Typecheck idiom on cmk/gui/plugins/{dashboard,visuals} CMK-837 Change-Id: I10c3876d8d32857b4b53c832e1e84ebb8bd8c669 --- cmk/gui/plugins/dashboard/utils.py | 2 +- cmk/gui/plugins/visuals/filters.py | 6 +++--- cmk/gui/plugins/visuals/inventory.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmk/gui/plugins/dashboard/utils.py b/cmk/gui/plugins/dashboard/utils.py index 80ac2b9..db8c173 100644 --- a/cmk/gui/plugins/dashboard/utils.py +++ b/cmk/gui/plugins/dashboard/utils.py @@ -303,7 +303,7 @@ class Dashlet(object): return None urlfunc = self._dashlet_spec['urlfunc'] - if type(urlfunc) == type(lambda x: x): + if callable(urlfunc): return urlfunc() if '.' in urlfunc: diff --git a/cmk/gui/plugins/visuals/filters.py b/cmk/gui/plugins/visuals/filters.py index bb5bc7a..30c49b9 100644 --- a/cmk/gui/plugins/visuals/filters.py +++ b/cmk/gui/plugins/visuals/filters.py @@ -86,7 +86,7 @@ class FilterText(Filter): negate = "" if current_value: - if type(current_value) == unicode: + if isinstance(current_value, unicode): current_value = current_value.encode("utf-8") return "Filter: %s %s%s %s\n" % ( self.column, @@ -127,7 +127,7 @@ class FilterHostnameOrAlias(FilterUnicode): negate = "" if current_value: - if type(current_value) == unicode: + if isinstance(current_value, unicode): current_value = current_value.encode("utf-8") return "Filter: host_name %s%s %s\nFilter: alias %s%s %s\nOr: 2\n" % (( negate, @@ -1694,7 +1694,7 @@ if config.mkeventd_enabled: self._operator = operator def display(self): - if type(self._choices) == list: + if isinstance(self._choices, list): choices = self._choices else: choices = self._choices() diff --git a/cmk/gui/plugins/visuals/inventory.py b/cmk/gui/plugins/visuals/inventory.py index ffe5d32..cec8b1d 100644 --- a/cmk/gui/plugins/visuals/inventory.py +++ b/cmk/gui/plugins/visuals/inventory.py @@ -527,7 +527,7 @@ class FilterInvHasSoftwarePackage(Filter): def find_package(self, packages, name, from_version, to_version): for package in packages: - if type(name) == unicode: + if isinstance(name, unicode): if package["name"] != name: continue else:

5 years, 7 months

6634 FIX cmciii: Fix incorrect values due to ignored unit value

by Konstantin Büttner

Module: check_mk Branch: master Commit: fc4b8830a78155c65fd238d5e0d5ed4eec185d61 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc4b8830a78155… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Nov 9 11:03:41 2018 +0100 6634 FIX cmciii: Fix incorrect values due to ignored unit value In some cases, power or energy values would be off by a factor 1000 due to the unit reported via SNMP not being queried. This has been fixed. Change-Id: Ib2010960644e840eeeffc7b74f3fca44a784cbad --- .werks/6634 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.werks/6634 b/.werks/6634 new file mode 100644 index 0000000..ef2f427 --- /dev/null +++ b/.werks/6634 @@ -0,0 +1,12 @@ +Title: cmciii: Fix incorrect values due to ignored unit value +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1541757759 + +In some cases, power or energy values would be off by a factor 1000 +due to the unit reported via SNMP not being queried. This has been fixed.

5 years, 7 months

CMK-1238: configurable APC Symmetra battery state

by Florian Kromer

Module: check_mk Branch: master Commit: 52112c930a4bd306698808c10e2e211ccec9a64e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=52112c930a4bd3… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Wed Nov 7 10:12:40 2018 +0100 CMK-1238: configurable APC Symmetra battery state Make state when battery needs to be replaced configurable. Change-Id: I64c8e5f9fde2676114a88a4ff97277ca1c4a48a6 --- checks/apc_symmetra | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/checks/apc_symmetra b/checks/apc_symmetra index 6a566d4..a598ac0 100644 --- a/checks/apc_symmetra +++ b/checks/apc_symmetra @@ -166,7 +166,8 @@ def check_apc_symmetra(_no_item, params, parsed): if battery_replace: state, state_readable = { "1" : (0, "no battery needs replacing"), - "2" : (params.get("battery_replace_state"), "battery needs replacing"), }[battery_replace] + "2" : (params.get("battery_replace_state", 1), "battery needs replacing"), + }.get(battery_replace, (3, "battery needs replacing: unknown")) if battery_num_batt_packs and int(battery_num_batt_packs) > 1: yield 2, "%i batteries need replacement" % int(battery_num_batt_packs) elif state:

5 years, 7 months

Refactored snapin groups to new snapin API

by Kenneth Okoh

Module: check_mk Branch: master Commit: 5db5b3d477dfd313eb298e9276b66eb2f1d7801c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5db5b3d477dfd3… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Thu Nov 8 14:11:51 2018 +0100 Refactored snapin groups to new snapin API Change-Id: Icd13bac88169d0183f72864d399e4dda16b66216 --- cmk/gui/plugins/sidebar/groups.py | 81 ++++++++++++++++++++++++++++----------- 1 file changed, 58 insertions(+), 23 deletions(-) diff --git a/cmk/gui/plugins/sidebar/groups.py b/cmk/gui/plugins/sidebar/groups.py index 190cc54..e00446b 100644 --- a/cmk/gui/plugins/sidebar/groups.py +++ b/cmk/gui/plugins/sidebar/groups.py @@ -24,30 +24,65 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +import abc import cmk.gui.sites as sites +from cmk.gui.plugins.sidebar import ( + SidebarSnapin, + snapin_registry, + bulletlink +) from cmk.gui.i18n import _ from cmk.gui.globals import html -from cmk.gui.plugins.sidebar import sidebar_snapins, bulletlink - -def render_groups(what): - html.open_ul() - for name, alias in sites.all_groups(what): - url = "view.py?view_name=%sgroup&%sgroup=%s" % (what, what, html.urlencode(name)) - bulletlink(alias or name, url) - html.close_ul() - -sidebar_snapins["hostgroups"] = { - "title" : _("Host Groups"), - "description" : _("Directs links to all host groups"), - "render" : lambda: render_groups("host"), - "restart": True, - "allowed" : [ "user", "admin", "guest" ] -} -sidebar_snapins["servicegroups"] = { - "title" : _("Service Groups"), - "description" : _("Direct links to all service groups"), - "render" : lambda: render_groups("service"), - "restart": True, - "allowed" : [ "user", "admin", "guest" ] -} +class GroupSnapin(SidebarSnapin): + __metaclass__ = abc.ABCMeta + + @abc.abstractmethod + def _group_type_ident(self): + raise NotImplementedError() + + def show(self): + group_type = self._group_type_ident() + html.open_ul() + for name, alias in sites.all_groups(group_type.replace("group", "")): + url = "view.py?view_name=%s&%s=%s" % (group_type, group_type, html.urlencode(name)) + bulletlink(alias or name, url) + html.close_ul() + + @classmethod + def refresh_on_restart(cls): + return True + +(a)snapin_registry.register +class HostGroups(GroupSnapin): + def _group_type_ident(self): + return "hostgroup" + + @staticmethod + def type_name(): + return "hostgroups" + + @classmethod + def title(cls): + return _("Host Groups") + + @classmethod + def description(cls): + return _("Directs links to all host groups") + +(a)snapin_registry.register +class ServiceGroups(GroupSnapin): + def _group_type_ident(self): + return "servicegroup" + + @staticmethod + def type_name(): + return "servicegroups" + + @classmethod + def title(cls): + return _("Service Groups") + + @classmethod + def description(cls): + return _("Direct links to all service groups")

5 years, 7 months

← Newer
1
...
35
36
37
38
39
40
41
...
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