Checkmk git commits March 2019

checkmk-commits@lists.checkmk.com

17 participants
451 discussions

7238 FIX check_smtp: Float warning / critical thresholds can now be configured using the GUI

by Lars Michelsen

Module: check_mk Branch: master Commit: a145684d558c5abf5e96924e1284881c04cd1590 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a145684d558c5a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 13 10:08:29 2019 +0100 7238 FIX check_smtp: Float warning / critical thresholds can now be configured using the GUI The active check check_smtp already supported floating point warning and critical thresholds, but the GUI only accepted integral numbers. Change-Id: I89f5eaad50bb69c6bc2d952363c7df9456ff63c2 --- .werks/7238 | 12 ++++++++++++ checks/check_smtp | 2 +- cmk/gui/plugins/wato/active_checks.py | 22 ++++++++++++++++++---- 3 files changed, 31 insertions(+), 5 deletions(-) diff --git a/.werks/7238 b/.werks/7238 new file mode 100644 index 0000000..4585c89 --- /dev/null +++ b/.werks/7238 @@ -0,0 +1,12 @@ +Title: check_smtp: Float warning / critical thresholds can now be configured using the GUI +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1552466701 + +The active check check_smtp already supported floating point warning and critical +thresholds, but the GUI only accepted integral numbers. diff --git a/checks/check_smtp b/checks/check_smtp index 425ff8c..3ff9da4 100644 --- a/checks/check_smtp +++ b/checks/check_smtp @@ -62,7 +62,7 @@ def check_smtp_arguments(params): args += ' -f %s' % quote_shell_string(settings["from"]) if "response_time" in settings: - args += ' -w %d -c %d' % (settings["response_time"][0], settings["response_time"][1]) + args += ' -w %0.4f -c %0.4f' % (settings["response_time"][0], settings["response_time"][1]) if "timeout" in settings: args += ' -t %d' % settings["timeout"] diff --git a/cmk/gui/plugins/wato/active_checks.py b/cmk/gui/plugins/wato/active_checks.py index 6cc087c..34e4003 100644 --- a/cmk/gui/plugins/wato/active_checks.py +++ b/cmk/gui/plugins/wato/active_checks.py @@ -1569,15 +1569,29 @@ class RulespecActiveChecksSmtp(HostRulespec): "SMTP AUTH type to check (default none, only LOGIN supported)" ), elements=[ - TextAscii(title=_("Username"), size=12, allow_empty=False), - Password(title=_("Password"), size=12, allow_empty=False), + TextAscii( + title=_("Username"), + size=12, + allow_empty=False, + ), + Password( + title=_("Password"), + size=12, + allow_empty=False, + ), ])), ("response_time", Tuple( title=_("Expected response time"), elements=[ - Integer(title=_("Warning if above"), unit=_("sec")), - Integer(title=_("Critical if above"), unit=_("sec")), + Float( + title=_("Warning if above"), + unit=_("sec"), + ), + Float( + title=_("Critical if above"), + unit=_("sec"), + ), ])), ("timeout", Integer(

5 years, 6 months

Fixed broken single host tag painter

by Lars Michelsen

Module: check_mk Branch: master Commit: 9123e9d5aefdc169f84e6042446318a63927774b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9123e9d5aefdc1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 13 08:45:46 2019 +0100 Fixed broken single host tag painter Change-Id: I3377e2e5ffef683f9b426f685d8f03efcb218246 --- cmk/gui/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/gui/views.py b/cmk/gui/views.py index 033e7ee..9c473cd 100644 --- a/cmk/gui/views.py +++ b/cmk/gui/views.py @@ -617,7 +617,7 @@ def load_host_tag_painters(): "ident": property(lambda self: self._ident), "title": property(lambda self: self._spec["title"]), "columns": property(lambda self: self._spec["columns"]), - "render": lambda self, row: paint_host_tag(row, self._tag_id), + "render": lambda self, row, cell: paint_host_tag(row, self._tag_id), "short_title": property(lambda self: self._spec["short"]), # Use title of the tag value for grouping, not the complete # dictionary of custom variables!

5 years, 6 months

Fixed broken virtual host tree link in snapin

by Lars Michelsen

Module: check_mk Branch: master Commit: e2ae1f26f9c1e71f54b762a5bedeb11c379dc56a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e2ae1f26f9c1e7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 13 08:44:47 2019 +0100 Fixed broken virtual host tree link in snapin Change-Id: I70bbffbcff219e2f13159148d60f5989e3bc6834 --- cmk/gui/plugins/sidebar/virtual_host_tree.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cmk/gui/plugins/sidebar/virtual_host_tree.py b/cmk/gui/plugins/sidebar/virtual_host_tree.py index f2eb573..6616ac2 100644 --- a/cmk/gui/plugins/sidebar/virtual_host_tree.py +++ b/cmk/gui/plugins/sidebar/virtual_host_tree.py @@ -86,10 +86,9 @@ class VirtualHostTree(SidebarSnapin): self._load() if not config.virtual_host_trees: url = 'wato.py?varname=virtual_host_trees&mode=edit_configvar' - multisite_link = html.render_a(_("global settings"), href=url, target="main") html.p( _('You have not defined any virtual host trees. You can do this ' - 'in the %s.') % multisite_link) + 'in the <a href="%s" target="main">global settings</a>.') % url) return self._show_tree_selection()

5 years, 6 months

Additional WATO path cleanups

by Lars Michelsen

Module: check_mk Branch: master Commit: ae4c47572030caa44e5f507845df0dcb7805ece5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ae4c47572030ca… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 11 18:26:53 2019 +0100 Additional WATO path cleanups multisite_dir, sites_mk and liveproxyd_config_dir are not evaluated at module load time anymore. Change-Id: Iee5909aa1a88f47fb4030673bd2ddf2804caaaa5 --- cmk/gui/plugins/wato/bi.py | 6 +++--- cmk/gui/userdb.py | 22 +++++++++++++--------- cmk/gui/wato/pages/custom_attributes.py | 6 +++--- cmk/gui/wato/pages/read_only.py | 2 +- cmk/gui/wato/pages/roles.py | 4 ++-- cmk/gui/watolib/__init__.py | 3 +-- cmk/gui/watolib/activate_changes.py | 5 +++-- cmk/gui/watolib/config_domains.py | 6 +++--- cmk/gui/watolib/host_tags.py | 6 +++--- cmk/gui/watolib/sites.py | 14 ++++++++------ cmk/gui/watolib/utils.py | 8 ++++++-- 11 files changed, 46 insertions(+), 36 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ae4c475720…

5 years, 6 months

Reserved 50 Werk IDS

by Andreas Boesl

Module: check_mk Branch: master Commit: 7a8625cf73b40cb230435e84968205a933a51309 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a8625cf73b40c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Mar 12 12:57:21 2019 +0100 Reserved 50 Werk IDS Change-Id: If3bb1d73c5c4f63cdd19921cfe863cea2a286503 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 96cf9b5..5b838eb 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -7244 +7294

5 years, 6 months

Another integration test fix for new meta_data attribute

by Lars Michelsen

Module: check_mk Branch: master Commit: 1fd74c96f91638fdd5760eac15df25582cacf706 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1fd74c96f91638… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 12 10:00:57 2019 +0100 Another integration test fix for new meta_data attribute Change-Id: Ia0b922e9a0b5a7f2842dcf1fce0e38bd6ae81d4a --- tests/testlib/__init__.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index a2341c9..e69baed 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -1448,6 +1448,10 @@ class CMKWebSession(WebSession): assert result is None folder = self.get_folder(folder_path) + + # Ignore the automatically generated meta_data attribute for the moment + del folder["attributes"]["meta_data"] + assert folder["attributes"] == attributes def get_folder(self, folder_path, effective_attributes=False):

5 years, 6 months

add libpq.so.5 as dependency needed by psycopg2

by Alex Zurhake

Module: check_mk Branch: master Commit: 1260fd6f33847616d98318e5b9db9be060148e62 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1260fd6f338476… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Tue Mar 12 09:19:01 2019 +0100 add libpq.so.5 as dependency needed by psycopg2 Change-Id: Ife7130dc797c1e7d4426ef7d1b82ee74592fdcd1 --- omd/distros/CENTOS_6.mk | 1 + omd/distros/CENTOS_7.mk | 1 + omd/distros/DEBIAN_8.mk | 3 ++- omd/distros/DEBIAN_9.mk | 3 ++- omd/distros/SLES_12.mk | 1 + omd/distros/SLES_12SP1.mk | 1 + omd/distros/SLES_12SP2.mk | 1 + omd/distros/SLES_12SP3.mk | 1 + omd/distros/SLES_15.mk | 1 + omd/distros/UBUNTU_14.04.mk | 3 ++- omd/distros/UBUNTU_15.04.mk | 3 ++- omd/distros/UBUNTU_16.04.mk | 3 ++- omd/distros/UBUNTU_16.10.mk | 3 ++- omd/distros/UBUNTU_17.04.mk | 3 ++- omd/distros/UBUNTU_17.10.mk | 3 ++- omd/distros/UBUNTU_18.04.mk | 3 ++- omd/distros/UBUNTU_18.10.mk | 3 ++- 17 files changed, 27 insertions(+), 10 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1260fd6f33…

5 years, 6 months

set test suite name

by Alex Zurhake

Module: check_mk Branch: master Commit: fa07abebc45c96dba775c174e00e003e7769ebcf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fa07abebc45c96… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Tue Mar 12 09:42:33 2019 +0100 set test suite name Change-Id: I29e6234c724f8febd82b89d1b29d367cc81cc118 --- buildscripts/scripts/integration-daily-master.jenkins | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildscripts/scripts/integration-daily-master.jenkins b/buildscripts/scripts/integration-daily-master.jenkins index 112e3f8..257986d 100644 --- a/buildscripts/scripts/integration-daily-master.jenkins +++ b/buildscripts/scripts/integration-daily-master.jenkins @@ -122,7 +122,7 @@ DISTRO_LIST.each { DISTRO -> sh "mount -t overlay overlay -o lowerdir=${TEST_DATA}/git,upperdir=${WORKSPACE}/$DISTRO-dest,workdir=${WORKSPACE}/$DISTRO-work ${WORKSPACE}/$DISTRO-dest" sh 'ls -lah' dir (DISTRO + '-dest') { - sh 'PYTEST_ADDOPTS="--junitxml=/omd/sites/int_master/junit.xml --maxfail 300" make -C tests test-integration' + sh "PYTEST_ADDOPTS='--junitxml=/omd/sites/int_master/junit.xml -o $DISTRO --maxfail 300' make -C tests test-integration" } } }

5 years, 6 months

6967 FIX Initialize step value for unknown metrics in rrddata columns

by Sven Panne

Module: check_mk Branch: master Commit: 00398621dc9f6ae477b45d1f26d4da3a5ff2524d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=00398621dc9f6a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Mar 12 08:58:35 2019 +0100 6967 FIX Initialize step value for unknown metrics in rrddata columns When unknown metrics were queried via rrddata Livestatus columns, the step value was not initialized, so a more or less random value was returned. Valgrind was of course unhappy about this, too. This has been fixed, and the step value is now zero under such circumstances. Change-Id: I1cd42c806445141ddf8d61d8b9cd653d9dc43c7c --- .werks/6967 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.werks/6967 b/.werks/6967 new file mode 100644 index 0000000..8eeec4e --- /dev/null +++ b/.werks/6967 @@ -0,0 +1,13 @@ +Title: Initialize step value for unknown metrics in rrddata columns +Level: 1 +Component: livestatus +Compatible: compat +Edition: cee +Version: 1.6.0i1 +Date: 1552377187 +Class: fix + +When unknown metrics were queried via rrddata Livestatus columns, the step +value was not initialized, so a more or less random value was returned. +Valgrind was of course unhappy about this, too. This has been fixed, and +the step value is now zero under such circumstances.

5 years, 6 months

Fixed web API tests after introducing the meta_data host attribute

by Lars Michelsen

Module: check_mk Branch: master Commit: 2febb3e9a67fdd44cf77b16a476183490706e7a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2febb3e9a67fdd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 12 08:47:28 2019 +0100 Fixed web API tests after introducing the meta_data host attribute Change-Id: Iddf8b3f8443477d8c9726e507832e419a17f5cf5 --- tests/testlib/__init__.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 2ceefbe..a2341c9 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -1320,6 +1320,10 @@ class CMKWebSession(WebSession): assert host["hostname"] == hostname assert host["path"] == folder + + # Ignore the automatically generated meta_data attribute for the moment + del host["attributes"]["meta_data"] + assert host["attributes"] == attributes # hosts: List of tuples of this structure: (hostname, folder_path, attributes) @@ -1364,6 +1368,10 @@ class CMKWebSession(WebSession): host = self.get_host(hostname) assert host["hostname"] == hostname + + # Ignore the automatically generated meta_data attribute for the moment + del host["attributes"]["meta_data"] + assert host["attributes"] == attributes def edit_hosts(self, edit_hosts):

5 years, 6 months

← Newer
1
...
25
26
27
28
29
30
31
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2019