Checkmk git commits November 2018

checkmk-commits@lists.checkmk.com

15 participants
465 discussions

Moved hosts from shipped.py to dedicated module

by Kenneth Okoh

Module: check_mk Branch: master Commit: c644e7ea1fbf0f0e2e0c1561f02e45190a743156 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c644e7ea1fbf0f… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Thu Nov 22 08:19:36 2018 +0100 Moved hosts from shipped.py to dedicated module Change-Id: I9d6f72a55757bb4da52fa55ee674748513e25e19 --- cmk/gui/plugins/sidebar/hosts.py | 122 +++++++++++++++++++++++++++++++++++++ cmk/gui/plugins/sidebar/shipped.py | 101 ------------------------------ 2 files changed, 122 insertions(+), 101 deletions(-) diff --git a/cmk/gui/plugins/sidebar/hosts.py b/cmk/gui/plugins/sidebar/hosts.py new file mode 100644 index 0000000..c40c586 --- /dev/null +++ b/cmk/gui/plugins/sidebar/hosts.py @@ -0,0 +1,122 @@ +#!/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.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 + else: + col += 1 + + if col < num_columns: + html.close_tr() + html.close_table() + + +snapin_allhosts_styles = """ + .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, +} diff --git a/cmk/gui/plugins/sidebar/shipped.py b/cmk/gui/plugins/sidebar/shipped.py index 3ec7331..d7deed0 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.views as views import cmk.gui.dashboard as dashboard import cmk.gui.sites as sites from cmk.gui.htmllib import HTML @@ -45,7 +44,6 @@ from cmk.gui.plugins.sidebar import ( sidebar_snapins, visuals_by_topic, bulletlink, - link, footnotelinks, snapin_width, snapin_site_choice, @@ -115,105 +113,6 @@ sidebar_snapins["dashboards"] = { } #. -# .--Hosts---------------------------------------------------------------. -# | _ _ _ | -# | | | | | ___ ___| |_ ___ | -# | | |_| |/ _ \/ __| __/ __| | -# | | _ | (_) \__ \ |_\__ \ | -# | |_| |_|\___/|___/\__|___/ | -# | | -# '----------------------------------------------------------------------' - - -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() - - 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() - - -snapin_allhosts_styles = """ - .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, -} - -#. # .--Performance---------------------------------------------------------. # | ____ __ | # | | _ \ ___ _ __ / _| ___ _ __ _ __ ___ __ _ _ __ ___ ___ |

5 years, 10 months

6912 nagios: Dropped legacy Nagios GUI

by Lars Michelsen

Module: check_mk Branch: master Commit: 23d69840a8caa38a547e58704a281571346c52c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=23d69840a8caa3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 22 12:00:07 2018 +0100 6912 nagios: Dropped legacy Nagios GUI The "classic" Nagios GUI has been removed from our packages for security reasons. It was only left for users using the Nagios core in previous versions and was only supporting single site setups. Change-Id: Ie4172ccabd2c0d59bbdaa57188f619ef3b9e6ada --- .werks/6912 | 11 +++++++++++ omd/packages/nagios/nagios.make | 26 +------------------------- omd/packages/omd/CORE.hook | 23 +++++------------------ 3 files changed, 17 insertions(+), 43 deletions(-) diff --git a/.werks/6912 b/.werks/6912 new file mode 100644 index 0000000..882f619 --- /dev/null +++ b/.werks/6912 @@ -0,0 +1,11 @@ +Title: nagios: Dropped legacy Nagios GUI +Level: 1 +Component: packages +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1542884289 +Class: fix + +The "classic" Nagios GUI has been removed from our packages for security reasons. It was only left +for users using the Nagios core in previous versions and was only supporting single site setups. diff --git a/omd/packages/nagios/nagios.make b/omd/packages/nagios/nagios.make index e83a3a6..27ffca6 100644 --- a/omd/packages/nagios/nagios.make +++ b/omd/packages/nagios/nagios.make @@ -31,35 +31,11 @@ $(NAGIOS_BUILD): $(NAGIOS_PATCHING) $(TOUCH) $@ $(NAGIOS_INSTALL): - $(MAKE) DESTDIR=$(DESTDIR) -C $(NAGIOS_DIR) install-base install-cgis install-html install-classicui - rm -f $(DESTDIR)$(OMD_ROOT)/share/nagios/htdocs/config.php.inc - - # Install Themes - mkdir -p $(DESTDIR)$(OMD_ROOT)/share/nagios/htdocs/themes/classicui - cp -af $(DESTDIR)$(OMD_ROOT)/share/nagios/htdocs/stylesheets $(DESTDIR)$(OMD_ROOT)/share/nagios/htdocs/themes/classicui/ - cp -af $(DESTDIR)$(OMD_ROOT)/share/nagios/htdocs/images $(DESTDIR)$(OMD_ROOT)/share/nagios/htdocs/themes/classicui/ - $(MAKE) DESTDIR=$(DESTDIR) -C $(NAGIOS_DIR) install-exfoliation - mkdir -p $(DESTDIR)$(OMD_ROOT)/share/nagios/htdocs/themes/exfoliation - cp -af $(DESTDIR)$(OMD_ROOT)/share/nagios/htdocs/stylesheets $(DESTDIR)$(OMD_ROOT)/share/nagios/htdocs/themes/exfoliation/ - cp -af $(DESTDIR)$(OMD_ROOT)/share/nagios/htdocs/images $(DESTDIR)$(OMD_ROOT)/share/nagios/htdocs/themes/exfoliation/ - # remove original files - rm -rf $(DESTDIR)$(OMD_ROOT)/share/nagios/htdocs/stylesheets - rm -rf $(DESTDIR)$(OMD_ROOT)/share/nagios/htdocs/images - # Link ClassicUI - cd $(DESTDIR)$(OMD_ROOT)/share/nagios/htdocs; rm -rf styleshets; ln -sfn themes/classicui/stylesheets - cd $(DESTDIR)$(OMD_ROOT)/share/nagios/htdocs; rm -rf images; ln -sfn themes/classicui/images + $(MAKE) DESTDIR=$(DESTDIR) -C $(NAGIOS_DIR) install-base mkdir -p $(DESTDIR)$(OMD_ROOT)/lib/nagios install -m 664 $(NAGIOS_DIR)/p1.pl $(DESTDIR)$(OMD_ROOT)/lib/nagios - mkdir -p $(DESTDIR)$(OMD_ROOT)/share/nagios/htdocs/ssi - install -m 755 $(PACKAGE_DIR)/$(NAGIOS)/ssi-wrapper.pl $(DESTDIR)$(OMD_ROOT)/share/nagios/htdocs/ssi - - for f in common avail cmd config extinfo histogram history notifications outages showlog status statusmap statuswml statuswrl summary tac trends ; do \ - ln -sfn ssi-wrapper.pl $(DESTDIR)$(OMD_ROOT)/share/nagios/htdocs/ssi/$$f-header.ssi ; \ - ln -sfn ssi-wrapper.pl $(DESTDIR)$(OMD_ROOT)/share/nagios/htdocs/ssi/$$f-footer.ssi ; \ - done - # Copy package documentations to have these information in the binary packages mkdir -p $(DESTDIR)$(OMD_ROOT)/share/doc/$(NAGIOS) for file in README THANKS LEGAL LICENSE ; do \ diff --git a/omd/packages/omd/CORE.hook b/omd/packages/omd/CORE.hook index 2681e0e..b8720d6 100755 --- a/omd/packages/omd/CORE.hook +++ b/omd/packages/omd/CORE.hook @@ -23,7 +23,6 @@ case "$1" in if [ -e $OMD_ROOT/bin/cmc ] ; then echo "cmc" elif [ -e $OMD_ROOT/bin/nagios ] ; then echo "nagios" elif [ -e $OMD_ROOT/bin/icinga ] ; then echo "icinga" - elif [ -e $OMD_ROOT/bin/shinken-arbiter ] ; then echo "shinken" else echo "none" fi ;; @@ -31,18 +30,17 @@ case "$1" in [ ! -e $OMD_ROOT/bin/cmc ] || echo "cmc: Check_MK Micro core" [ ! -e $OMD_ROOT/bin/nagios ] || echo "nagios: Nagios" [ ! -e $OMD_ROOT/bin/icinga ] || echo "icinga: Icinga" - [ ! -e $OMD_ROOT/bin/shinken-arbiter ] || echo "shinken: Shinken" echo "none: No monitoring core" ;; set) # cleanup the former selection - if [ "$2" != "nagios" ] ; then - rm -f $OMD_ROOT/etc/apache/conf.d/nagios.conf - rm -f $OMD_ROOT/etc/apache/conf.d/icinga.conf - fi - if [ "$2" != "shinken" ] ; then + if [ -e $OMD_ROOT/etc/apache/conf.d/shinken.conf ] ; then rm -f $OMD_ROOT/etc/apache/conf.d/shinken.conf + fi + if [ -e $OMD_ROOT/etc/apache/conf.d/nagios.conf ] ; then rm -f $OMD_ROOT/etc/apache/conf.d/nagios.conf + fi + if [ -e $OMD_ROOT/etc/apache/conf.d/icinga.conf ] ; then rm -f $OMD_ROOT/etc/apache/conf.d/icinga.conf fi if [ "$2" != "cmc" ] ; then @@ -61,8 +59,6 @@ case "$1" in # now setup the new selection if [ "$2" == "nagios" ] then - make_link ../../nagios/apache.conf $OMD_ROOT/etc/apache/conf.d/nagios.conf - make_link ../../icinga/apache.conf $OMD_ROOT/etc/apache/conf.d/icinga.conf make_link nagios $OMD_ROOT/etc/init.d/core # Refresh Check_MK Configuration after changing back from CMC if [ -e $OMD_ROOT/var/check_mk/core/config ] ; then @@ -70,16 +66,7 @@ case "$1" in fi elif [ "$2" == "icinga" ] then - make_link ../../nagios/apache.conf $OMD_ROOT/etc/apache/conf.d/nagios.conf - make_link ../../icinga/apache.conf $OMD_ROOT/etc/apache/conf.d/icinga.conf make_link icinga $OMD_ROOT/etc/init.d/core - elif [ "$2" == "shinken" ] - then - # Thruk is the default interface, but classic is possible - make_link ../../shinken/apache-cgi.conf $OMD_ROOT/etc/apache/conf.d/nagios.conf - make_link ../../icinga/apache.conf $OMD_ROOT/etc/apache/conf.d/icinga.conf - make_link ../../shinken/apache.conf $OMD_ROOT/etc/apache/conf.d/shinken.conf - make_link shinken $OMD_ROOT/etc/init.d/core elif [ "$2" == "cmc" ] then make_link cmc $OMD_ROOT/etc/init.d/core

5 years, 10 months

Improved "omd config" CORE description text

by Lars Michelsen

Module: check_mk Branch: master Commit: 0b40386b90b36b244ab60a05487e57bfa65aef8e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b40386b90b36b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 22 11:03:50 2018 +0100 Improved "omd config" CORE description text Change-Id: If345b67ed31410ac5cb7e3796d6f0f59628c56fc --- omd/packages/omd/CORE.hook | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/omd/packages/omd/CORE.hook b/omd/packages/omd/CORE.hook index 9b488d9..2681e0e 100755 --- a/omd/packages/omd/CORE.hook +++ b/omd/packages/omd/CORE.hook @@ -3,11 +3,10 @@ # Alias: Monitoring core # Menu: Basic # Description: -# Here you can choose your monitoring core to run. Currently available -# are Nagios and Shinken. You also can decide to run no monitoring core in -# this instance. This can be useful for instances running a GUI such -# as Check_MK Multisite or Thruk which can connect to other monitoring -# sites via Livestatus. +# Here you can choose your monitoring core to run. You also can decide +# to run no monitoring core in this instance. This can be useful for +# instances running a GUI only site which can connect to other +# monitoring sites via Livestatus. # Helper function that creates a symlink only if the # target of the link exists

5 years, 10 months

deb-changelog, deb-environment and check-edition trigger unneccesarry builds, since they are phony targets.

by Alex Zurhake

Module: check_mk Branch: master Commit: 407e32c12ed4c838ea7e581f69cf489287941a09 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=407e32c12ed4c8… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Thu Nov 22 15:01:32 2018 +0100 deb-changelog, deb-environment and check-edition trigger unneccesarry builds, since they are phony targets. EDITION is set by defines.make. Therefore check-edition was removed. deb-changelog creates debian/changelog which is a file. This is also the only point where deb-environment was used. Therefor both targets were put together in the target "debian/changelog". Change-Id: Ied3a7dfeac8ed0cccc77e6fdb81db7ca8d68cb18 --- omd/Makefile | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/omd/Makefile b/omd/Makefile index 512334b..fd49c5d 100644 --- a/omd/Makefile +++ b/omd/Makefile @@ -83,19 +83,14 @@ PRE_CMA := $(BUILD_HELPER_DIR)/pre-cma .PHONY: install-global -check-edition: - @if [ -z "$(EDITION)" ]; then \ - echo "FEHLER: Du musst eine Edition angeben! (EDITION=raw|enterprise|managed)" ; \ - exit 1 ; \ - fi - -build: check-edition $(PACKAGES) +build: $(PACKAGES) pack: skel #TODO: Define dependecies here correctly... -$(PRE_INSTALL): check-edition +$(PRE_INSTALL): rm -rf $(DESTDIR) + rm -rf $(BUILD_HELPER_DIR)/*-install mkdir -p $(DESTDIR)$(OMD_PHYSICAL_BASE) A="$(OMD_PHYSICAL_BASE)" ; ln -s $${A:1} $(DESTDIR)/omd touch $@ @@ -215,7 +210,7 @@ install-global: install fi -rpm: check-edition +rpm: PKG_VERSION=$(OMD_VERSION) ; \ PKG_VERSION=$${PKG_VERSION/.cee/} ; \ PKG_VERSION=$${PKG_VERSION/.cre/} ; \ @@ -247,16 +242,15 @@ rpm: check-edition mv -v $(RPM_TOPDIR)/SRPMS/*.src.rpm $(REPO_PATH) rm -rf $(RPM_TOPDIR) rpm.buildroot -# Build DEB from prebuild binary. This currently needs 'make dist' and thus only -# works within a GIT repository. -deb-environment: + +# create a debian/changelog to build the package +debian/changelog: + # Build DEB from prebuild binary. This currently needs 'make dist' and thus only + # works within a GIT repository. @if test -z "$(DEBFULLNAME)" || test -z "$(DEBEMAIL)"; then \ echo "please read 'man dch' and set DEBFULLNAME and DEBEMAIL" ;\ exit 1; \ fi - -# create a debian/changelog to build the package -deb-changelog: deb-environment # this is a hack! rm -f debian/changelog PKG_VERSION=$(OMD_VERSION) ; \ @@ -267,7 +261,7 @@ deb-changelog: deb-environment --newversion 0.$(DISTRO_CODE) "`cat debian/changelog.tmpl`" dch --release "releasing ...." -deb: check-edition deb-changelog +deb: debian/changelog PKG_VERSION=$(OMD_VERSION) ; \ PKG_VERSION=$${PKG_VERSION/.cee/} ; \ PKG_VERSION=$${PKG_VERSION/.cre/} ; \ @@ -322,7 +316,7 @@ setversion: test: t/test_all.sh -$(PRE_CMA): check-edition +$(PRE_CMA): # make the cmc the default core sed -i 's/default)/default) echo "cmc"; exit;/g' packages/omd/CORE.hook # enable the event console by default

5 years, 10 months

Testcommit

by Lars Michelsen

Module: check_mk Branch: master Commit: 62f5cdb8414391a5d409d103ca6307a8a15fad16 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=62f5cdb8414391… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 23 10:45:48 2018 +0100 Testcommit Change-Id: I6398aebd1c067af4fc4de00a3eadfd7fda86c9f4 --- README | 1 + 1 file changed, 1 insertion(+) diff --git a/README b/README index 7d8bee1..fcd7e67 100644 --- a/README +++ b/README @@ -54,3 +54,4 @@ To create a DEB package execute this: Don't forget to insert your name and mail address. As a result your should find packages named like this: check-mk-[edition]-[version].[deb|rpm] in your current directory. +

5 years, 10 months

Fixed dictionary element evaluation during initialization

by Lars Michelsen

Module: check_mk Branch: master Commit: dc2cfc45e3d080a8995bae1baa866cef02f25938 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc2cfc45e3d080… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 23 10:41:34 2018 +0100 Fixed dictionary element evaluation during initialization The Dictionary() valuespec elements can either be a list of elements or a function reference which is meant to generate the elements on demand in the moment they are needed instead of the construction time of the valuespec. There are attributes optional_keys and required_keys which tell the Dictionary() valuespec how to handle the single elements. There are multiple ways to tell the object that none of the elements is optional. It can be done by either setting it to None, False or an empty list. And here comes the bug: When the "optional_keys" attribute was set to an empty list, the element generation function was called while it wasn't needed to call it. In many situations this is not a real problem because mostly the element function is cheap. But we had a situation where the element function initialized livestatus connections to all sites during the program initialization phase where such things should not be done. Change-Id: I33b4a80aa9ebcf587702f8e1633cbc833c127503 --- cmk/gui/valuespec.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/gui/valuespec.py b/cmk/gui/valuespec.py index 977116e..e2ab59c 100644 --- a/cmk/gui/valuespec.py +++ b/cmk/gui/valuespec.py @@ -3482,7 +3482,7 @@ class Dictionary(ValueSpec): self._default_keys = kwargs.get("default_keys", []) # keys present in default value if "optional_keys" in kwargs: ok = kwargs["optional_keys"] - if isinstance(ok, list): + if isinstance(ok, list) and ok: self._required_keys = \ [ e[0] for e in self._get_elements() if e[0] not in ok ] self._optional_keys = True

5 years, 10 months

6910 FIX cisco_secure: Don't crash upon missing port status

by Moritz Kiemer

Module: check_mk Branch: master Commit: 52f7f5dfb316407bbf22432a372a5144fb71409c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=52f7f5dfb31640… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Nov 22 09:46:27 2018 +0100 6910 FIX cisco_secure: Don't crash upon missing port status Change-Id: I80ccf47cbbc9d837a75db847fbaab7fc39c8bd93 --- .werks/6910 | 10 + checks/cisco_secure | 39 +- .../datasets/cisco_secure_1_regression.py | 883 +++++++++------------ .../datasets/cisco_secure_2_regression.py | 105 +++ 4 files changed, 536 insertions(+), 501 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=52f7f5dfb3…

5 years, 10 months

FEED-3061: Fix sxs-issue with windows agent updater build

by Andreas Umbreit

Module: check_mk Branch: master Commit: eba35c3850fee09a307b5524fb4a971337d3f6a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eba35c3850fee0… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Thu Nov 22 08:29:52 2018 +0100 FEED-3061: Fix sxs-issue with windows agent updater build In order to work correctly on even very old windows systems (XP etc.), we have to include the VC++ CRT Libraries within the frozen binary. Previously, we chose a newer version than that required by python.exe and got it automagically referenced in the application's manifest by PyInstaller by applying a sxs polixy. However, it turned out that this does not work any longer since Wine 3, so we now provide the (older) CRT version that is requested by python.exe's manifest directly. Change-Id: I28b8c0feac117abddae828568d4399bb121efe18 --- .../windows/frozen_binaries/pyinstaller-deps.make | 2 +- .../windows/frozen_binaries/src/vcredist_x86.exe | Bin 4479832 -> 1821192 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/frozen_binaries/pyinstaller-deps.make b/agents/windows/frozen_binaries/pyinstaller-deps.make index 3ec18b1..f6203ad 100644 --- a/agents/windows/frozen_binaries/pyinstaller-deps.make +++ b/agents/windows/frozen_binaries/pyinstaller-deps.make @@ -156,7 +156,7 @@ download_python: download_vcredist: mkdir -p $(SRC_DIR) && \ cd $(SRC_DIR) && \ - curl -O https://download.microsoft.com/download/5/D/8/5D8C65CB-C849-4025-8E95-C3966… + curl -O https://download.microsoft.com/download/1/1/1/1116b75a-9ec3-481a-a3c8-1777b… download_sources: download_python download_packages download_vcredist diff --git a/agents/windows/frozen_binaries/src/vcredist_x86.exe b/agents/windows/frozen_binaries/src/vcredist_x86.exe index 4170330..b8a3da8 100644 Binary files a/agents/windows/frozen_binaries/src/vcredist_x86.exe and b/agents/windows/frozen_binaries/src/vcredist_x86.exe differ

5 years, 10 months

6931 FIX cmk-update-agent.exe: Fix problem with missing Runtime Library

by Andreas Umbreit

Module: check_mk Branch: master Commit: ccbaf7cdf0a48997fcdc1d08029ae7fa03f2a5ef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ccbaf7cdf0a489… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Thu Nov 22 12:23:24 2018 +0100 6931 FIX cmk-update-agent.exe: Fix problem with missing Runtime Library Regression since 1.4.0p37 and 1.5.0 On some older Windows Systems and on Systems without a VC++ Runtime Library 2008 (or newer) installed, the cmk-update-agent.exe may crash, showing an error like <code>Error loading Python DLL</code>. We intend to ship a correct version of the needed runtime library within the executable, but this mechanism got broken, caused by a sublte change in our build system. With this werk, the correct DLLs get packaged within the executable and <code>cmk-update-agent.exe</code> will work again as intended on affected systems. (Jira: FEED-3061) Change-Id: Ia0670c56e5603741857499aa885c5c62d7cd31e7 --- .werks/6931 | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.werks/6931 b/.werks/6931 new file mode 100644 index 0000000..55759b0 --- /dev/null +++ b/.werks/6931 @@ -0,0 +1,19 @@ +Title: cmk-update-agent.exe: Fix problem with missing Runtime Library +Level: 1 +Component: agents +Compatible: compat +Edition: cee +Version: 1.6.0i1 +Date: 1542885280 +Class: fix + +Regression since 1.4.0p37 and 1.5.0 + +On some older Windows Systems and on Systems without a VC++ Runtime Library 2008 (or newer) +installed, the cmk-update-agent.exe may crash, showing an error like <code>Error loading Python DLL</code>. + +We intend to ship a correct version of the needed runtime library within the executable, but this mechanism +got broken, caused by a sublte change in our build system. + +With this werk, the correct DLLs get packaged within the executable and <code>cmk-update-agent.exe</code> +will work again as intended on affected systems.

5 years, 10 months

6651 FIX Single CPU utilization, apply Werk 6735: don' t double count guest cputime

by Óscar Nájera

Module: check_mk Branch: master Commit: 093d38f369bf47bb21f065a90aee54b365459210 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=093d38f369bf47… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Thu Nov 22 09:38:12 2018 +0100 6651 FIX Single CPU utilization, apply Werk 6735: don't double count guest cputime Linux kernel includes guest cputime in user cputime and thus guest cputime must not be added when calculating total cputime for each core. This bugfix was already implement in Werk 6735 for the all cores combined total CPU utilization. Test are included to verify the correct behavior. CMK-1284 Change-Id: I6fc7737e4dcb2a77e1a555774fc0705b28247767 --- .werks/6651 | 15 ++++++++++ checks/cpu_util.include | 6 ++-- tests/unit/checks/test_kernel_check.py | 54 +++++++++++++++++++++++++++++----- 3 files changed, 64 insertions(+), 11 deletions(-) diff --git a/.werks/6651 b/.werks/6651 new file mode 100644 index 0000000..4532733 --- /dev/null +++ b/.werks/6651 @@ -0,0 +1,15 @@ +Title: Single CPU utilization, apply Werk 6735: don't double count guest cputime in total cputime +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1542875627 +Class: fix + +Linux kernel includes guest cputime in user cputime and thus guest cputime +must not be added when calculating total cputime for each core. This bugfix +was already implement in Werk 6735 for the all cores combined total CPU +utilization. + +Test are included to verify the correct behavior. diff --git a/checks/cpu_util.include b/checks/cpu_util.include index 30090ae..75beb21 100644 --- a/checks/cpu_util.include +++ b/checks/cpu_util.include @@ -231,9 +231,9 @@ def check_cpu_util_unix(values, params, cores=None): core_counter = 0 cores_padded = [line + [0] * (11 - len(line)) for line in cores] for core, user, nice, system, _idle, iowait,\ - irq, softirq, steal, guest, guest_nice in cores_padded: + irq, softirq, steal, _guest, _guest_nice in cores_padded: - total = user + nice + system + iowait + irq + softirq + steal + guest + guest_nice + total = user + nice + system + iowait + irq + softirq + steal prev_total = get_item_state("cpu.util.%s.total" % core, 0) total_diff = total - prev_total set_item_state("cpu.util.%s.total" % core, total) @@ -253,7 +253,7 @@ def check_cpu_util_unix(values, params, cores=None): state = 0 if total_perc >= crit: state = 2 - if total_perc >= warn: + elif total_perc >= warn: state = 1 if state > 0: yield state, "Core %s: %s (warn/crit at %s/%s)" % \ diff --git a/tests/unit/checks/test_kernel_check.py b/tests/unit/checks/test_kernel_check.py index 4eaebd2..e46ac71 100644 --- a/tests/unit/checks/test_kernel_check.py +++ b/tests/unit/checks/test_kernel_check.py @@ -1,19 +1,57 @@ import pytest from cmk_base.check_api import MKCounterWrapped -import checktestlib +from checktestlib import CheckResult, assertCheckResultsEqual pytestmark = pytest.mark.checks -(a)pytest.mark.parametrize("time_to_info,params,predicate", [ -(lambda t: [["cpu", 15*t, 10*t, 5*t, 5*t, 5*t, 5*t, 5*t]], {}, lambda cr: True), -(lambda t: [["cpu", 15*t, 10*t, 5*t, 5*t, 5*t, 5*t, 5*t]], {'core_util_graph': True, 'iowait': (30.0, 50.0)}, lambda cr: True), +def cpu_info(t): + return [ + ["cpu", 10 * t, 4 * t, 6 * t, 8 * t, 5 * t, 8 * t, 3 * t, 6 * t, 2 * t, 4 * t], + ["cpu0", 6 * t, 3 * t, 3 * t, 2 * t, 3 * t, 3 * t, 1 * t, 5 * t, 1 * t, 2 * t], + ["cpu1", 4 * t, 1 * t, 3 * t, 6 * t, 2 * t, 5 * t, 2 * t, 1 * t, 1 * t, 2 * t], + ] + + +def reference_result(deviation): + reference = [ + (0, 'user: 16.0%, system: 34.0%', [('user', 16.0, None, None, None, None), + ('system', 34.0, None, None, None, None), + ('wait', 10.0, None, None, None, None)]), + (0, 'wait: 10.0%', []), + (0, 'steal: 12.0%', [('steal', 12.0, None, None, None, None)]), + (0, 'guest: 12.0%', [('guest', 12.0, None, None, None, None)]), + (0, 'total: 84.0%', []), + ] + if isinstance(deviation, tuple): + reference[deviation[0]] = deviation[1] + if callable(deviation): + deviation(reference) + + return reference + + +(a)pytest.mark.parametrize("params, change", [ + ({ + 'levels_single': (20.0, 55.0) + }, lambda x: x.extend([(2, 'Core cpu0: 96.0% (warn/crit at 20.0%/55.0%)', []), (2, 'Core cpu1: 72.0% (warn/crit at 20.0%/55.0%)', [])])), + ({}, None), + ({ + 'iowait': (5, 6) + }, (1, (2, 'wait: 10.0%', []))), + ({ + 'core_util_time_total': (100.0, 300, 900) + }, None), ]) -def test_kernel_util_check(check_manager, time_to_info, params, predicate): +def test_kernel_util_check(check_manager, params, change): check = check_manager.get_check("kernel.util") + assert check.run_discovery(cpu_info(0)) == [(None, {})] try: - list(check.run_check(None, params, time_to_info(0))) + list(check.run_check(None, params, cpu_info(0))) except MKCounterWrapped: pass - result = checktestlib.CheckResult(check.run_check(None, params, time_to_info(60))) - assert predicate(result) + result = CheckResult(check.run_check(None, params, cpu_info(10))) + + reference = CheckResult(reference_result(change)) + + assertCheckResultsEqual(result, reference)

5 years, 10 months

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