Checkmk git commits April 2018

checkmk-commits@lists.checkmk.com

10 participants
287 discussions

6035 FIX Improved error handling when images can not be rendered

by Lars Michelsen

Module: check_mk Branch: master Commit: 9d73f8d7db6cfcc9895f432b3adb2696d0b89e47 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9d73f8d7db6cfc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 25 15:23:34 2018 +0200 6035 FIX Improved error handling when images can not be rendered When embedding a custom image into a report an unhandled exception "Decompressed Data Too Large" could occur for some images which have huge meta data information. This exception is now catched and displayed as regular graph error instead of producing a trace / crash dump. Change-Id: Iab8b3e2ed4ad2eff2b02690f416d9a372e084922 --- .werks/6035 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.werks/6035 b/.werks/6035 new file mode 100644 index 0000000..56942a3 --- /dev/null +++ b/.werks/6035 @@ -0,0 +1,14 @@ +Title: Improved error handling when images can not be rendered +Level: 1 +Component: reporting +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.6.0i1 +Date: 1524662502 + +When embedding a custom image into a report an unhandled exception +"Decompressed Data Too Large" could occur for some images which have +huge meta data information. This exception is now catched and displayed +as regular graph error instead of producing a trace / crash dump.

6 years, 2 months

5923 FIX Windows: section MRPE was incorrectly formatted

by Jukka Aro

Module: check_mk Branch: master Commit: 6265266f866f04aeca275150d0a5a0befd957d2c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6265266f866f04… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Wed Apr 25 13:41:10 2018 +0200 5923 FIX Windows: section MRPE was incorrectly formatted The output of section MRPE was incorrectly formatted. A null character at the end of the output string caused the output to be cut abruptly and missing a newline character before the following section header. Broken by commit 6503810d95eddff68cd9c7faabe8d64c15c5cc02 that was included in releases 1.5.0i3 and 1.5.0b1. --- .werks/5923 | 16 ++++++++++++++++ agents/windows/build_version | 2 +- agents/windows/it/test_section_mrpe.py | 27 +++++++++++++++++++-------- agents/windows/sections/SectionMRPE.cc | 10 ++++++---- 4 files changed, 42 insertions(+), 13 deletions(-) diff --git a/.werks/5923 b/.werks/5923 new file mode 100644 index 0000000..b0197f0 --- /dev/null +++ b/.werks/5923 @@ -0,0 +1,16 @@ +Title: Windows: section MRPE was incorrectly formatted +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1524656219 +Class: fix + +The output of section MRPE was incorrectly formatted. A null character +at the end of the output string caused the output to be cut abruptly +and missing a newline character before the following section header. +Broken by commit d0ae246003d630f80ad5ff3fbe469552738141a9 that was +included in releases 1.5.0i3 and 1.5.0b1. + + diff --git a/agents/windows/build_version b/agents/windows/build_version index c5f1662..0080ae0 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3250 +3252 diff --git a/agents/windows/it/test_section_mrpe.py b/agents/windows/it/test_section_mrpe.py index a55614e..73de0ac 100644 --- a/agents/windows/it/test_section_mrpe.py +++ b/agents/windows/it/test_section_mrpe.py @@ -11,6 +11,7 @@ from remote import (actual_output, assert_subprocess, config, remote_ip, class Globals(object): section = 'mrpe' + alone = True pluginname = 'check_crit.bat' param = 'foobar' checkname = 'Dummy' @@ -25,9 +26,13 @@ def testfile(): return os.path.basename(__file__) -(a)pytest.fixture -def testconfig(config): - config.set('global', 'sections', Globals.section) +(a)pytest.fixture(params=['alone', 'with_systemtime']) +def testconfig(request, config): + Globals.alone = request.param == 'alone' + if Globals.alone: + config.set('global', 'sections', Globals.section) + else: + config.set('global', 'sections', '%s systemtime' % Globals.section) config.set('global', 'crash_debug', 'yes') config.add_section(Globals.section) if Globals.newline < 0: @@ -43,11 +48,17 @@ def testconfig(config): @pytest.fixture def expected_output(): drive = r'[A-Z]:%s' % re.escape(os.sep) - return [ - re.escape(r'<<<%s>>>' % Globals.section), - r'$%s$ %s 2 CRIT - This check is always critical' % - (Globals.pluginname, Globals.checkname) - ] + expected = [ + re.escape(r'<<<%s>>>' % Globals.section), + r'$%s$ %s 2 CRIT - This check is always critical' % + (Globals.pluginname, Globals.checkname) + ] + if not Globals.alone: + expected += [ + re.escape(r'<<<systemtime>>>'), + r'\d+' + ] + return expected @pytest.fixture( diff --git a/agents/windows/sections/SectionMRPE.cc b/agents/windows/sections/SectionMRPE.cc index e222702..a4a7334 100644 --- a/agents/windows/sections/SectionMRPE.cc +++ b/agents/windows/sections/SectionMRPE.cc @@ -104,8 +104,7 @@ bool SectionMRPE::produceOutputInner(std::ostream &out, try { ExternalCmd command(modified_command, _env, _logger, _winapi); Debug(_logger) << "Script started -> collecting data"; - string buffer; - buffer.resize(8192); + string buffer(8192, '\0'); char *buf_start = &buffer[0]; char *pos = &buffer[0]; while (command.exitCode() == STILL_ACTIVE) { @@ -114,10 +113,13 @@ bool SectionMRPE::produceOutputInner(std::ostream &out, pos += read; _winapi.Sleep(10); } - command.readStdout(pos, buffer.size() - (pos - buf_start), false); - + DWORD read = command.readStdout( + pos, buffer.size() - (pos - buf_start), false); + pos += read; + buffer.resize(pos - buf_start); rtrim(buffer); ltrim(buffer); + // replace newlines std::transform(buffer.cbegin(), buffer.cend(), buffer.begin(), [](char ch) {

6 years, 2 months

Win-agent: fix accidental test case restriction

by Jukka Aro

Module: check_mk Branch: master Commit: 3d6a13ff31952fd5df9ff26d07f932efb1e1eeda URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d6a13ff31952f… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Wed Apr 25 13:33:53 2018 +0200 Win-agent: fix accidental test case restriction A selected subset of tests for manual ( = outside Jenkins) execution of integration tests was accidentally committed and pushed. Jenkins job was still running the entire test suite, though. --- agents/windows/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/Makefile.am b/agents/windows/Makefile.am index a85b4b7..b917e1d 100644 --- a/agents/windows/Makefile.am +++ b/agents/windows/Makefile.am @@ -177,7 +177,7 @@ integrationtest: install-strip if [[ $$USER == jenkins ]] ; then \ $(PYTEST) $(PYTEST_JENKINS) ; \ else \ - $(PYTEST) $(PYTEST_OPTIONS) test_section_check_mk.py ; \ + $(PYTEST) $(PYTEST_OPTIONS) ; \ fi ; \ cd -

6 years, 2 months

5757 FIX esx_vsphere_sensors: ignore 'Unknown' sensors

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 2734981f46ee4533ad9eb5305aac245d0cd569e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2734981f46ee45… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Apr 25 12:04:47 2018 +0200 5757 FIX esx_vsphere_sensors: ignore 'Unknown' sensors Previously, sensors where only ignored by the check esx_vsphere_sensors if the special agent delivered 'unknown'. Now, also the status 'Unknown' is ignored which is delivered by some systems. Change-Id: I382a295e4ed49af7faef419173688d52d79eeeb6 --- .werks/5757 | 12 ++++++++++++ agents/special/agent_vsphere | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/5757 b/.werks/5757 new file mode 100644 index 0000000..967ca6e --- /dev/null +++ b/.werks/5757 @@ -0,0 +1,12 @@ +Title: esx_vsphere_sensors: ignore 'Unknown' sensors +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1524650419 +Class: fix + +Previously, sensors where only ignored by the check esx_vsphere_sensors +if the special agent delivered 'unknown'. Now, also the status 'Unknown' +is ignored which is delivered by some systems. diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index ca5d0d3..7ceffae 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -1506,7 +1506,7 @@ if not error: output("<<<esx_vsphere_sensors:sep(59)>>>") for key in sorted(hostsystems_sensors[hostname].keys()): data = hostsystems_sensors[hostname][key] - if data["key"] in ["green", "unknown", "Green"]: + if data["key"].lower() in ["green", "unknown"]: continue output('%s;%s;%s;%s;%s;%s;%s;%s;%s' % ( data["name"].replace(";", "_"),

6 years, 2 months

6032 FIX Debian/Ubuntu: Disable possible duplicate startup on systemd based systems

by Lars Michelsen

Module: check_mk Branch: master Commit: 8a2a53bdb19decc23d1680d9c23b5eb3ee530d47 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8a2a53bdb19dec… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 25 11:27:18 2018 +0200 6032 FIX Debian/Ubuntu: Disable possible duplicate startup on systemd based systems Change-Id: I58497a92bbe5fb61aec55ee3723b0d1db48bc93f --- .werks/6032 | 11 +++++++++++ omd/debian/postinst.in | 7 ++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.werks/6032 b/.werks/6032 new file mode 100644 index 0000000..9260974 --- /dev/null +++ b/.werks/6032 @@ -0,0 +1,11 @@ +Title: Debian/Ubuntu: Disable possible duplicate startup on systemd based systems +Level: 1 +Component: omd +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1524648393 + + diff --git a/omd/debian/postinst.in b/omd/debian/postinst.in index a1fd761..50a7da5 100755 --- a/omd/debian/postinst.in +++ b/omd/debian/postinst.in @@ -105,11 +105,8 @@ case "$1" in if test -d /usr/lib/systemd && dpkg -S /sbin/init 2>/dev/null | grep ^systemd >/dev/null; then echo "Installing systemd service: omd.init" - # Disable startup of eventually existing SysV scripts - if test -e $DEFAULT ; then - echo "Disabling startup through old SysV (/etc/init.d/omd*) scripts" - echo "AUTOSTART=0" > $DEFAULT - fi + echo "Disabling startup through SysV (/etc/init.d/*) scripts" + echo "AUTOSTART=0" > $DEFAULT echo "Activating startup during system boot" cp /omd/versions/default/share/omd/omd.service /etc/systemd/system/omd.service

6 years, 2 months

Tweaked werk text.

by Sven Panne

Module: check_mk Branch: master Commit: b636c111f68ac9cda5856163afe456a816f5a5fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b636c111f68ac9… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Apr 24 14:52:50 2018 +0200 Tweaked werk text. Change-Id: I6e8a536e21195b3669b85eeddd5ef792f3a1d37c --- .werks/5579 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.werks/5579 b/.werks/5579 index deba512..e965a39 100644 --- a/.werks/5579 +++ b/.werks/5579 @@ -1,4 +1,4 @@ -Title: Rule event limit can now be configured individually per rule +Title: Introduce per-rule event limit Level: 1 Component: ec Compatible: compat @@ -7,6 +7,6 @@ Version: 1.5.0i2 Date: 1513083425 Class: feature -The rule event limit can now be customized per rule. There is a new -option "Custom rule event limit" available in the EC rule editor -that can be used for this purpose. +A per-rule event limit can now be configured via the new "Custom rule event +limit" option available in the event console's rule editor. It overrides the +rule event limit configured globally in the event console.

6 years, 2 months

Fixed typo.

by Sven Panne

Module: check_mk Branch: master Commit: d69ca46717fba7b2669ca6794966a1f6ee8ed68a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d69ca46717fba7… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Apr 24 14:53:57 2018 +0200 Fixed typo. Change-Id: I596a7e39c22e2e6621b25f95ea26f330c459b55c --- .werks/5580 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/5580 b/.werks/5580 index c56463f..7747a1d 100644 --- a/.werks/5580 +++ b/.werks/5580 @@ -7,6 +7,6 @@ Version: 1.5.0i2 Date: 1513088405 Class: feature -A per-host event limit can now be confgigured via the new "Host & Service +A per-host event limit can now be configured via the new "Host & Service Parameters" ruleset "Host event limit". It overrides the host event limit configured globally in the event console.

6 years, 2 months

Tweaked werk text.

by Sven Panne

Module: check_mk Branch: master Commit: 789c2c83e706f079edbc28359473a1aa5ff51e1c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=789c2c83e706f0… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Apr 24 14:49:30 2018 +0200 Tweaked werk text. Change-Id: Iafa3f709882b0a10cb0dd6578f013ca7cbf14e71 --- .werks/5580 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.werks/5580 b/.werks/5580 index 308ec43..c56463f 100644 --- a/.werks/5580 +++ b/.werks/5580 @@ -1,4 +1,4 @@ -Title: Host event limit can now be configured individuall per Host & service ruleset +Title: Introduce per-host event limit Level: 1 Component: ec Compatible: compat @@ -7,6 +7,6 @@ Version: 1.5.0i2 Date: 1513088405 Class: feature -The host event limit can now be customized per host & service parameter ruleset. -There is a new ruleset named "Host event limit" available to configure the host -event limit individually for overriding the global limit. +A per-host event limit can now be confgigured via the new "Host & Service +Parameters" ruleset "Host event limit". It overrides the host event limit +configured globally in the event console.

6 years, 2 months

5992 FIX HW/SW Inventory: Fixed AttributeError if any plugin provides wrong data structure

by Simon Betz

Module: check_mk Branch: master Commit: bb405766fdec85d271061844ab9587b29ef387ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb405766fdec85… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Apr 24 10:36:47 2018 +0200 5992 FIX HW/SW Inventory: Fixed AttributeError if any plugin provides wrong data structure Change-Id: I00f4176cc865f17096526ba18d41525220189f4b --- .werks/5992 | 10 ++++++++++ cmk/structured_data.py | 23 ++++++++++++++++------- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/.werks/5992 b/.werks/5992 new file mode 100644 index 0000000..cd7f7f9 --- /dev/null +++ b/.werks/5992 @@ -0,0 +1,10 @@ +Title: HW/SW Inventory: Fixed AttributeError if any plugin provides wrong data structure +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1524558923 +Class: fix + + diff --git a/cmk/structured_data.py b/cmk/structured_data.py index cdfd557..209e4fe 100644 --- a/cmk/structured_data.py +++ b/cmk/structured_data.py @@ -207,13 +207,14 @@ class StructuredDataTree(object): def _is_numeration(self, entries): for entry in entries: - #TODO Skipping invalid entries such as - # esx_vsphere_clusters: {u'hostsystems': [LIST OF STRINGS], ...} - #if not isinstance(entry, dict): - # continue - for k, v in entry.iteritems(): - if isinstance(v, list): - return False + # Skipping invalid entries such as + # {u'KEY': [LIST OF STRINGS], ...} + try: + for k, v in entry.iteritems(): + if isinstance(v, list): + return False + except AttributeError: + return False return True # ---delegators----------------------------------------------------------- @@ -301,6 +302,10 @@ class StructuredDataTree(object): # Just for testing return self._root.get_tree_repr() + + def __repr__(self): + return "%s(%s)" % (self.__class__.__name__, pprint.pformat(self.get_raw_tree())) + # ---web------------------------------------------------------------------ def show(self, renderer, path=None): @@ -362,6 +367,10 @@ class NodeAttribute(object): # Just for testing raise NotImplementedError() + + def __repr__(self): + return "%s(%s)" % (self.__class__.__name__, pprint.pformat(self.get_raw_tree())) + # ---web------------------------------------------------------------------ def show(self, renderer, path=None):

6 years, 2 months

6029 FIX Fixed error handling when RPM building fails

by Lars Michelsen

Module: check_mk Branch: master Commit: 4ee24ab82691a4003140686d5a3602865be887d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ee24ab82691a4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 24 07:47:07 2018 +0200 6029 FIX Fixed error handling when RPM building fails Change-Id: I16a9569ac63088e06441a8351e2cf15fdff1f9d6 --- .werks/6029 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.werks/6029 b/.werks/6029 new file mode 100644 index 0000000..057070b --- /dev/null +++ b/.werks/6029 @@ -0,0 +1,11 @@ +Title: Fixed error handling when RPM building fails +Level: 1 +Component: agents +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.6.0i1 +Date: 1524548807 + +

6 years, 2 months

← Newer
1
2
3
4
5
6
7
8
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2018