Checkmk git commits August 2018

checkmk-commits@lists.checkmk.com

10 participants
351 discussions

CMK-850: Fixed white text on grey background in wato

by Marcel Arentz

Module: check_mk Branch: master Commit: 1287e726c3c0076513fddd600b7f866cb59fc0ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1287e726c3c007… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Aug 27 18:08:49 2018 +0200 CMK-850: Fixed white text on grey background in wato Change-Id: I2057eabb8426a3c481ad93ce65d4ca69ae8c734b --- web/htdocs/themes/facelift/theme.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/themes/facelift/theme.css b/web/htdocs/themes/facelift/theme.css index 71c7157..a377372 100644 --- a/web/htdocs/themes/facelift/theme.css +++ b/web/htdocs/themes/facelift/theme.css @@ -791,9 +791,9 @@ div.graph_with_timeranges { padding: 0; text-align: left; bottom: -4px; } - .wato div.floatfolder div.title a, .wato div.floatfolder div.title body.main .popup_menu span, body.main .popup_menu .wato div.floatfolder div.title span { - color: #1A243D; + .wato div.floatfolder div.title a, .wato div.floatfolder div.title body.main .popup_menu span, body.main .popup_menu .wato div.floatfolder div.title span, .wato div.floatfolder.locked div.title { font-size: 13px; + color: #1A243D; font-weight: 500; } .wato div.floatfolder .infos { bottom: 24px;

5 years, 10 months

CMK-849: Fixed Arrow in WATO hosts

by Marcel Arentz

Module: check_mk Branch: master Commit: 0700f1f47cae45b552c2089dfc6d36d30d1485b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0700f1f47cae45… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Aug 27 17:40:28 2018 +0200 CMK-849: Fixed Arrow in WATO hosts Change-Id: I540ad0510bff61fae379993c0b8cb9d2229d0642 --- web/htdocs/themes/facelift/theme.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/web/htdocs/themes/facelift/theme.css b/web/htdocs/themes/facelift/theme.css index 3da362a..71c7157 100644 --- a/web/htdocs/themes/facelift/theme.css +++ b/web/htdocs/themes/facelift/theme.css @@ -714,7 +714,9 @@ div.graph_with_timeranges { content: "»"; position: absolute; left: 0px; - top: 10px; + top: 0px; + font-size: 29px; + font-weight: 800; color: #ffd703; } .wato div.folderpath ul li:first-child:before { content: " "; }

5 years, 10 months

Drodown choice: Show "no element message" when submitted without choice instead of "invalid value message"

by Lars Michelsen

Module: check_mk Branch: master Commit: fb217dfcd4e36e50adeda1816ad573d889649041 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fb217dfcd4e36e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 28 17:50:44 2018 +0200 Drodown choice: Show "no element message" when submitted without choice instead of "invalid value message" Change-Id: I064f42fe28a4c9724ebfba092066f59dc85c7f59 --- cmk/gui/valuespec.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmk/gui/valuespec.py b/cmk/gui/valuespec.py index 91924b2..4c550c0 100644 --- a/cmk/gui/valuespec.py +++ b/cmk/gui/valuespec.py @@ -1675,6 +1675,8 @@ class DropdownChoice(ValueSpec): if self._invalid_choice == "replace": return self.default_value() # garbled URL or len(choices) == 0 + elif not choices: + raise MKUserError(varprefix, self._empty_text) else: raise MKUserError(varprefix, self._invalid_choice_error) @@ -1704,7 +1706,7 @@ class DropdownChoice(ValueSpec): if value != None: raise MKUserError(varprefix, self._invalid_choice_error) else: - raise MKUserError(varprefix, _("There is no element available to choose from.")) + raise MKUserError(varprefix, self._empty_text) ValueSpec.custom_validate(self, value, varprefix)

5 years, 10 months

6500 FIX Fixed config generation for shadow hosts/services

by Sven Panne

Module: check_mk Branch: master Commit: 36519864874251eb05ec80617f092461aa1fb1c8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36519864874251… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Aug 28 16:53:32 2018 +0200 6500 FIX Fixed config generation for shadow hosts/services The Check_MK Micro Core configuration generated by "cmk -U", "cmk -O", or "cmk -R" was broken for shadow hosts/services, leading to CMC crashes later when the core tried to use such a configuration. This was a regression since 1.5.0i1 and has been fixed now. Change-Id: I2f8d468da2f17021b6151e3f1a725befb03f108b --- .werks/6500 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.werks/6500 b/.werks/6500 new file mode 100644 index 0000000..07adbb4 --- /dev/null +++ b/.werks/6500 @@ -0,0 +1,14 @@ +Title: Fixed config generation for shadow hosts/services +Level: 2 +Component: config +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.6.0i1 +Date: 1535467796 + +The Check_MK Micro Core configuration generated by "cmk -U", "cmk -O", or +"cmk -R" was broken for shadow hosts/services, leading to CMC crashes later +when the core tried to use such a configuration. This was a regression +since 1.5.0i1 and has been fixed now.

5 years, 10 months

6458 FIX IPMI Management board: Use USER privilege level for monitoring

by Lars Michelsen

Module: check_mk Branch: master Commit: 7c9884423203b74aeb37294a94eba4974ea9f5d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7c9884423203b7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 28 17:58:29 2018 +0200 6458 FIX IPMI Management board: Use USER privilege level for monitoring Previous versions used the ADMIN privilege level for monitoring via IPMI which is way too much for this read-only access which is needed by Check_MK for monitoring. When you tried to use a non ADMIN privileged user before, an error like this occured: ERROR: Requested privilege level is not allowed over this channel while requesting privelege level 3 for [user] You can now use less privileged users for monitoring. FEED-931 Change-Id: I90e5edc5baee579ba287ab9bea51799e3658c305 --- .werks/6458 | 20 +++++ Pipfile | 5 +- Pipfile.lock | 85 +++++++++++---------- cmk_base/data_sources/ipmi.py | 3 +- omd/packages/python-modules/Makefile | 2 +- .../python-modules/src/pyghmi-1.1.0.tar.gz | Bin 146145 -> 0 bytes .../python-modules/src/pyghmi-1.2.14.tar.gz | Bin 0 -> 150078 bytes 7 files changed, 71 insertions(+), 44 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7c98844232…

5 years, 10 months

Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 116ada3d7e328bbfb128a1d47615b4a48b537a25 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=116ada3d7e328b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 28 17:52:05 2018 +0200 Reserved 20 Werk IDS Change-Id: I8e551d65e1c224abc41fb5deb6dc36d14fab431b --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index f46dfa3..7491812 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -6509 +6529

5 years, 10 months

6457 FIX IPMI Management board: Improved error handling when sensors can not be read

by Lars Michelsen

Module: check_mk Branch: master Commit: daede5c8f149bde65051d9633abab664b4c5fe41 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=daede5c8f149bd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 28 16:02:03 2018 +0200 6457 FIX IPMI Management board: Improved error handling when sensors can not be read When the IPMI sensors can not be read because of an incompatible device, the error is now handled more gracefully. The other IPMI data, like firmware information, is fetched even when the sensors can not be read and the exceptions are visible on the command line when executing e.g. cmk -vd [hostname] or cmk -vvd [hostname]. FEED-931 Change-Id: Id67ab4e70749a6ce8d9f6b71877b0238eaaaf472 --- .werks/6457 | 14 ++++++++++++++ cmk_base/data_sources/ipmi.py | 13 +++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/.werks/6457 b/.werks/6457 new file mode 100644 index 0000000..d40d4ff --- /dev/null +++ b/.werks/6457 @@ -0,0 +1,14 @@ +Title: IPMI Management board: Improved error handling when sensors can not be read +Level: 1 +Component: core +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1535464665 + +When the IPMI sensors can not be read because of an incompatible device, the +error is now handled more gracefully. The other IPMI data, like firmware information, +is fetched even when the sensors can not be read and the exceptions are visible on +the command line when executing e.g. cmk -vd [hostname] or cmk -vvd [hostname]. diff --git a/cmk_base/data_sources/ipmi.py b/cmk_base/data_sources/ipmi.py index 2ebfee3..c3a1b29 100644 --- a/cmk_base/data_sources/ipmi.py +++ b/cmk_base/data_sources/ipmi.py @@ -78,7 +78,7 @@ class IPMIManagementBoardDataSource(ManagementBoardDataSource, CheckMKAgentDataS # Improve bad exceptions thrown by pyghmi e.g. in case of connection issues if type(e) == IpmiException and "%s" % e == "None": - raise MKAgentError("IPMI communication failed") + raise MKAgentError("IPMI communication failed: %r" % e) else: raise @@ -88,6 +88,8 @@ class IPMIManagementBoardDataSource(ManagementBoardDataSource, CheckMKAgentDataS # address instead credentials = self._credentials + self._logger.debug("Connecting to %s:623 (User: %s, Privlevel: 2)" % + (self._ipaddress, credentials["username"])) return ipmi_cmd.Command(bmc=self._ipaddress, userid=credentials["username"], password=credentials["password"]) @@ -95,7 +97,14 @@ class IPMIManagementBoardDataSource(ManagementBoardDataSource, CheckMKAgentDataS def _fetch_ipmi_sensors_section(self, connection): self._logger.debug("Fetching sensor data via UDP from %s:623" % (self._ipaddress)) - sdr = ipmi_sdr.SDR(connection) + + try: + sdr = ipmi_sdr.SDR(connection) + except NotImplementedError, e: + self._logger.verbose("Failed to fetch sensor data: %r" % e) + self._logger.debug("Exception", exc_info=e) + return "" + sensors = [] for number in sdr.get_sensor_numbers(): rsp = connection.raw_command(command=0x2d, netfn=4, data=(number,))

5 years, 10 months

Add missing newline to error messages in "cmk -d" output

by Lars Michelsen

Module: check_mk Branch: master Commit: 93c18b4f4f3503bf96188be61513d711a9d17edd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=93c18b4f4f3503… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 28 16:20:15 2018 +0200 Add missing newline to error messages in "cmk -d" output FEED-931 Change-Id: If323c52d621076146ca09fa4e780f2621a220cd3 --- cmk_base/modes/check_mk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk_base/modes/check_mk.py b/cmk_base/modes/check_mk.py index f87edf5..27ae0ba 100644 --- a/cmk_base/modes/check_mk.py +++ b/cmk_base/modes/check_mk.py @@ -365,7 +365,7 @@ def mode_dump_agent(hostname): for source in sources.get_data_sources(): source_state, source_output, _source_perfdata = source.get_summary_result() if source_state != 0: - console.error("ERROR [%s]: %s" % (source.id(), source_output)) + console.error("ERROR [%s]: %s\n" % (source.id(), source_output)) has_errors = True console.output(output)

5 years, 10 months

6456 FIX IPMI Management board: Fixed "cmk -d" on hosts with enabled mgmt board

by Lars Michelsen

Module: check_mk Branch: master Commit: e8abf8b1ffab58040dbf142a1d1a82efc3b1e61f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e8abf8b1ffab58… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 28 15:32:44 2018 +0200 6456 FIX IPMI Management board: Fixed "cmk -d" on hosts with enabled mgmt board An exception occurred on hosts having IPMI management board enabled when executing "cmk -d [hostname]" on the console: C+: OMD[stable]:~$ cmk --debug -d ipmi-host Traceback (most recent call last): File "/omd/sites/stable/bin/cmk", line 96, in <module> exit_status = modes.call(o, a, opts, args) File "/omd/sites/stable/lib/python/cmk_base/modes/__init__.py", line 80, in call return mode.handler_function(*handler_args) File "/omd/sites/stable/lib/python/cmk_base/modes/check_mk.py", line 366, in mode_dump_agent source_state, source_output, source_perfdata = source.get_summary_result() File "/omd/sites/stable/lib/python/cmk_base/data_sources/abstract.py", line 392, in get_summary_result return self._summary_result() File "/omd/sites/stable/lib/python/cmk_base/data_sources/ipmi.py", line 152, in _summary_result return 0, "Version: %s" % self._get_ipmi_version(), [] File "/omd/sites/stable/lib/python/cmk_base/data_sources/ipmi.py", line 156, in _get_ipmi_version section = self._host_sections.sections.get("mgmt_ipmi_firmware") AttributeError: 'NoneType' object has no attribute 'sections' C-: FEED-931 Change-Id: Id6d76ddc578c62d3ae384c68b70ae15dc034446e --- .werks/6456 | 30 ++++++++++++++++++++++++++++++ cmk_base/data_sources/abstract.py | 10 +++++----- cmk_base/data_sources/ipmi.py | 3 +++ 3 files changed, 38 insertions(+), 5 deletions(-) diff --git a/.werks/6456 b/.werks/6456 new file mode 100644 index 0000000..745acec --- /dev/null +++ b/.werks/6456 @@ -0,0 +1,30 @@ +Title: IPMI Management board: Fixed "cmk -d" on hosts with enabled mgmt board +Level: 1 +Component: core +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1535462867 + +An exception occurred on hosts having IPMI management board enabled when executing +"cmk -d [hostname]" on the console: + +C+: +OMD[stable]:~$ cmk --debug -d ipmi-host +Traceback (most recent call last): + File "/omd/sites/stable/bin/cmk", line 96, in <module> + exit_status = modes.call(o, a, opts, args) + File "/omd/sites/stable/lib/python/cmk_base/modes/__init__.py", line 80, in call + return mode.handler_function(*handler_args) + File "/omd/sites/stable/lib/python/cmk_base/modes/check_mk.py", line 366, in mode_dump_agent + source_state, source_output, source_perfdata = source.get_summary_result() + File "/omd/sites/stable/lib/python/cmk_base/data_sources/abstract.py", line 392, in get_summary_result + return self._summary_result() + File "/omd/sites/stable/lib/python/cmk_base/data_sources/ipmi.py", line 152, in _summary_result + return 0, "Version: %s" % self._get_ipmi_version(), [] + File "/omd/sites/stable/lib/python/cmk_base/data_sources/ipmi.py", line 156, in _get_ipmi_version + section = self._host_sections.sections.get("mgmt_ipmi_firmware") +AttributeError: 'NoneType' object has no attribute 'sections' +C-: diff --git a/cmk_base/data_sources/abstract.py b/cmk_base/data_sources/abstract.py index 595af9a..fa47bb7 100644 --- a/cmk_base/data_sources/abstract.py +++ b/cmk_base/data_sources/abstract.py @@ -116,25 +116,25 @@ class DataSource(object): self._ipaddress = ipaddress self._exception = None - self._cmk_section = None + self._host_sections = None try: cpu_tracking.push_phase(self._cpu_tracking_id()) raw_data, is_cached_data = self._get_raw_data() - if get_raw_data: - return raw_data - host_sections = self._convert_to_sections(raw_data) + self._host_sections = host_sections = self._convert_to_sections(raw_data) assert isinstance(host_sections, HostSections) + if get_raw_data: + return raw_data + if host_sections.persisted_sections and not is_cached_data: self._store_persisted_sections(host_sections.persisted_sections) # Add information from previous persisted infos host_sections = self._update_info_with_persisted_sections(host_sections) - self._host_sections = host_sections return host_sections except MKTerminate: diff --git a/cmk_base/data_sources/ipmi.py b/cmk_base/data_sources/ipmi.py index e6e8fdb..2ebfee3 100644 --- a/cmk_base/data_sources/ipmi.py +++ b/cmk_base/data_sources/ipmi.py @@ -152,6 +152,9 @@ class IPMIManagementBoardDataSource(ManagementBoardDataSource, CheckMKAgentDataS def _get_ipmi_version(self): + if self._host_sections is None: + return "unknown" + section = self._host_sections.sections.get("mgmt_ipmi_firmware") if not section: return "unknown"

5 years, 10 months

Changed shebang of livedump to standard one ( To make it use the sites python by default)

by Lars Michelsen

Module: check_mk Branch: master Commit: 85c670cef2432e377a5eed3a2a5b6734194d3dbb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=85c670cef2432e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 28 09:44:51 2018 +0200 Changed shebang of livedump to standard one (To make it use the sites python by default) Change-Id: Iad3c3f9463767bb099aacabb6ce2f9f04f45f333 --- bin/livedump | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/livedump b/bin/livedump index 266ff82..2624b5d 100755 --- a/bin/livedump +++ b/bin/livedump @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- encoding: utf-8; py-indent-offset: 4 -*- # +------------------------------------------------------------------+ # | ____ _ _ __ __ _ __ |

5 years, 10 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2018