Checkmk git commits September 2017

checkmk-commits@lists.checkmk.com

11 participants
255 discussions

Some localtime_s/localtime_r Kung Fu, level: Black belt :-P

by Sven Panne

Module: check_mk Branch: master Commit: f2e47d7b9369aec61969a77d45c16fb0bc644ea7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f2e47d7b9369ae… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Sep 8 15:23:34 2017 +0200 Some localtime_s/localtime_r Kung Fu, level: Black belt :-P Change-Id: Ib9735c0b466baa384e8f06285748d3cff4a2560e --- configure.ac | 8 ++++++++ livestatus/src/ChronoUtils.h | 25 ++++++++++++++++++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index d00f144..44ef454 100644 --- a/configure.ac +++ b/configure.ac @@ -164,6 +164,14 @@ AC_DEFINE([_GLIBCXX_REGEX_STATE_LIMIT], [2500], AC_DEFINE([BOOST_SYSTEM_NO_DEPRECATED], [1], [we do not want any old stuff]) +# GCC is a bit picky about redefinitions of built-in macros. Alas, "built-in" +# simply means "starts with double underscore", so we have to hack around that +# below. Note that clang is happy, even without the guard. +AH_VERBATIM([__STDC_WANT_LIB_EXT1__], [/* we want C11 library extensions */ +#ifndef __STDC_WANT_LIB_EXT1__ +# define __STDC_WANT_LIB_EXT1__ 1 +#endif]) + # HACKING ALERT: automake can't really handle optional subdirectories, so we # have to do this in a slightly hacky way by using M4's silent includes. m4_sinclude([livestatus/config_files.m4]) diff --git a/livestatus/src/ChronoUtils.h b/livestatus/src/ChronoUtils.h index 5399b37..a55d22d 100644 --- a/livestatus/src/ChronoUtils.h +++ b/livestatus/src/ChronoUtils.h @@ -26,7 +26,7 @@ #define ChronoUtils_h #include "config.h" // IWYU pragma: keep -#include <sys/time.h> +#include <time.h> #include <chrono> #include <cstdlib> #include <ctime> @@ -46,7 +46,30 @@ inline double elapsed_ms_since(std::chrono::steady_clock::time_point then) { inline tm to_tm(std::chrono::system_clock::time_point tp) { time_t t = std::chrono::system_clock::to_time_t(tp); struct tm ret; + // NOTE: A brilliant example of how to make a simple API function a total + // chaos follows... +#if defined(__STDC_LIB_EXT1__) + // C11 function, only guaranteed to be available when a + // #define __STDC_WANT_LIB_EXT1_ 1 + // is done before including <time.h>. Signature: + // struct tm *localtime_s(const time_t *restrict timer, + // struct tm *restrict result) + localtime_s(&t, &ret); +#elif defined(__WIN32) + // Win32 variant, it keeps us entertained with swapped parameters and a + // different return value, yay! Signature: + // errno_t localtime_s(struct tm* _tm, const time_t *time) + // We have to de-confuse cppcheck: + // cppcheck-suppress uninitvar + localtime_s(&ret, &t); +#else + // POSIX.1-2008 variant, available under MinGW64 only under obscure + // circumstances, so better avoid it there. Signature: + // struct tm *localtime(const time_t *timer) localtime_r(&t, &ret); +#endif + // Reason: see Win32 section above + // cppcheck-suppress uninitvar return ret; }

7 years

Fixed issue in recent logger change

by Lars Michelsen

Module: check_mk Branch: master Commit: 44aace34e27ee2c8cb89f59e43f68067c4f47fb8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44aace34e27ee2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 8 13:18:29 2017 +0200 Fixed issue in recent logger change Change-Id: Ie05cf09749d3b1b0bbfa6c07368a633add2457b7 --- web/plugins/userdb/ldap.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 4371739..919dc5e 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -323,7 +323,7 @@ class LDAPUserConnector(UserConnector): def _discover_nearest_dc(self, domain): import ad locator = ad.Locator() - locator.m_logger = self.logger + locator.m_logger = self._logger try: server = locator.locate(domain) self.log(' DISCOVERY: Discovered server %r from %r' % (server, domain))

7 years

5202 FIX Fixed timeouts when generating reports (regression in #4957)

by Lars Michelsen

Module: check_mk Branch: master Commit: ed834df0c78fa6e198594cee35566e6ebe76c6e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed834df0c78fa6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 8 13:00:13 2017 +0200 5202 FIX Fixed timeouts when generating reports (regression in #4957) When creating PDF reports that contain grouped view elements, these reports were rendering too many data. In case of larger reports with a lot of graphs, this could lead to timeouts resulting in "Proxy Errors" messages in the GUI. This issue was introduced with werk 4957 since Check_MK 1.4.0p9. Change-Id: I0cb632c1c0cc273da8f2f61ff51300def1c5c797 --- .werks/5202 | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.werks/5202 b/.werks/5202 new file mode 100644 index 0000000..74e5d1c --- /dev/null +++ b/.werks/5202 @@ -0,0 +1,15 @@ +Title: Fixed timeouts when generating reports (regression in #4957) +Level: 2 +Component: reporting +Compatible: compat +Edition: cee +Version: 1.5.0i1 +Date: 1504868229 +Class: fix + +When creating PDF reports that contain grouped view elements, these +reports were rendering too many data. In case of larger reports with +a lot of graphs, this could lead to timeouts resulting in "Proxy Errors" +messages in the GUI. + +This issue was introduced with werk 4957 since Check_MK 1.4.0p9.

7 years

LDAP discovery log: Use ldap logger

by Lars Michelsen

Module: check_mk Branch: master Commit: 1a84c24ada6851e477a0563ade49fdbcfbf4c1e4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a84c24ada6851… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 8 11:54:51 2017 +0200 LDAP discovery log: Use ldap logger Change-Id: I7996cf1c15e3be8936ed5eb66e163ab66336ebfd --- web/plugins/userdb/ldap.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 644d037..4371739 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -47,7 +47,7 @@ import time import copy import cmk.paths -from log import logger +import log try: # docs: http://www.python-ldap.org/doc/html/index.html @@ -178,7 +178,7 @@ class LDAPUserConnector(UserConnector): self._ldap_obj = None self._ldap_obj_config = None - self._ldap_logger = logger.getChild("ldap") + self._logger = log.logger.getChild("ldap") self._user_cache = {} self._group_cache = {} @@ -215,8 +215,9 @@ class LDAPUserConnector(UserConnector): return self._config['id'] + # TODO: Clean this up and make log calls different log levels def log(self, s): - self._ldap_logger.debug('LDAP [%s]: %s' % (self.id(), s)) + self._logger.debug('LDAP [%s]: %s' % (self.id(), s)) def connect_server(self, server): @@ -320,9 +321,9 @@ class LDAPUserConnector(UserConnector): def _discover_nearest_dc(self, domain): - import ad, log + import ad locator = ad.Locator() - locator.m_logger = log.logger + locator.m_logger = self.logger try: server = locator.locate(domain) self.log(' DISCOVERY: Discovered server %r from %r' % (server, domain))

7 years

5201 FIX check_mkevents: Removed deprecated "less verbose output" option

by Lars Michelsen

Module: check_mk Branch: master Commit: c786d94a287633ab18be78e827666165b365100b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c786d94a287633… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 8 11:36:04 2017 +0200 5201 FIX check_mkevents: Removed deprecated "less verbose output" option This parameter was not working anymore for a long time. It is not implemented in the current check and has been removed from the GUI now. Change-Id: I94c4673e6dcd2a6a5c367ebe3de5cfd2998be206 --- .werks/5201 | 11 +++++++++++ checks/.f12 | 2 +- checks/check_mkevents | 3 --- web/plugins/wato/mkeventd.py | 17 ++--------------- 4 files changed, 14 insertions(+), 19 deletions(-) diff --git a/.werks/5201 b/.werks/5201 new file mode 100644 index 0000000..03cfbcb --- /dev/null +++ b/.werks/5201 @@ -0,0 +1,11 @@ +Title: check_mkevents: Removed deprecated "less verbose output" option +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1504863316 +Class: fix + +This parameter was not working anymore for a long time. It is not implemented in the +current check and has been removed from the GUI now. diff --git a/checks/.f12 b/checks/.f12 index 7d65f22..6e3cc8c 100644 --- a/checks/.f12 +++ b/checks/.f12 @@ -2,5 +2,5 @@ SITE=${SITE:-$(cat ../.site 2>/dev/null || true)} SITE=${SITE:-$(omd sites --bare | head -n 1)} echo "TARGET: /omd/sites/$SITE/share/check_mk/checks" -sudo rsync --exclude=check_mkevents -ar --delete-after ./ /omd/sites/$SITE/share/check_mk/checks/ +sudo rsync -ar --delete-after ./ /omd/sites/$SITE/share/check_mk/checks/ diff --git a/checks/check_mkevents b/checks/check_mkevents index 9b298f2..c4ef0a3 100644 --- a/checks/check_mkevents +++ b/checks/check_mkevents @@ -13,9 +13,6 @@ def check_mkevents_arguments(params): if params.get("ignore_acknowledged"): args += "-a " - if params.get("less_verbose"): - args += "-l " - hostspec = params.get("hostspec", "$HOSTADDRESS$") if type(hostspec) == list: hostspec = "/".join(hostspec) diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index 36c92ba..d8b2529 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -2970,20 +2970,6 @@ register_rule( totext = _("acknowledged events will not be honored"), ) ), - ( "less_verbose", - FixedValue( - True, - title = _("Less verbose output"), - help = _("If enabled the check reports less information in its output. " - "You will see no information regarding the worst state or unacknowledged events. " - " For example a default output without this option is " - "<tt>WARN - 1 events (1 unacknowledged), worst state is WARN (Last line: Incomplete Content)</tt>." - "Output with less verbosity: " - "<tt>WARN - 1 events (Worst line: Incomplete Content)</tt><br>" - ), - totext = _("produce a more terse output"), - ) - ), ( "remote", Alternative( title = _("Access to the Event Console"), @@ -3026,7 +3012,8 @@ register_rule( ) ), ], - optional_keys = [ "application", "remote", "ignore_acknowledged", "less_verbose", "item" ], + optional_keys = [ "application", "remote", "ignore_acknowledged", "item" ], + ignored_keys = [ "less_verbose" ], # is deprecated ), match = 'all', )

7 years

5200 FIX Removed CEE specific link to Reports from Bookmark list pages

by Lars Michelsen

Module: check_mk Branch: master Commit: dea9bc177a70d7efd70ab4230a97844e0cd22cdb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dea9bc177a70d7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 8 11:19:29 2017 +0200 5200 FIX Removed CEE specific link to Reports from Bookmark list pages Change-Id: Icf0f136875b57973c2a8591cde13abaa65270f13 --- .werks/5200 | 11 +++++++++++ web/htdocs/pagetypes.py | 11 ++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/.werks/5200 b/.werks/5200 new file mode 100644 index 0000000..8da8413 --- /dev/null +++ b/.werks/5200 @@ -0,0 +1,11 @@ +Title: Removed CEE specific link to Reports from Bookmark list pages +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1504862344 + + diff --git a/web/htdocs/pagetypes.py b/web/htdocs/pagetypes.py index 4aef668..2a5836a 100644 --- a/web/htdocs/pagetypes.py +++ b/web/htdocs/pagetypes.py @@ -790,7 +790,16 @@ class Overridable(Base): # moved to pagetypes.py html.context_button(_("Views"), "edit_views.py", "view") html.context_button(_("Dashboards"), "edit_dashboards.py", "dashboard") - html.context_button(_("Reports"), "edit_reports.py", "report") + + def has_reporting(): + try: + import reporting + return True + except ImportError: + return False + + if has_reporting(): + html.context_button(_("Reports"), "edit_reports.py", "report") ### if render_custom_context_buttons: ### render_custom_context_buttons()

7 years

5199 FIX winperf_if: DHCP was always shown as enabled

by Lars Michelsen

Module: check_mk Branch: master Commit: 732e97db7cc8260d85c134b633dabc77cb6c9ee4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=732e97db7cc826… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 8 11:10:34 2017 +0200 5199 FIX winperf_if: DHCP was always shown as enabled Change-Id: I59b0d7db25742fe750046142e8d94aa49d415702 --- .werks/5199 | 11 +++++++++++ checks/winperf_if | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/5199 b/.werks/5199 new file mode 100644 index 0000000..32d0649 --- /dev/null +++ b/.werks/5199 @@ -0,0 +1,11 @@ +Title: winperf_if: DHCP was always shown as enabled +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1504861811 + + diff --git a/checks/winperf_if b/checks/winperf_if index 1e7b741..7821d77 100644 --- a/checks/winperf_if +++ b/checks/winperf_if @@ -324,7 +324,7 @@ def check_if_dhcp(item, _no_params, info, nic_names, nic_index): match = name == item if match: - if as_dict["DHCPEnabled"]: + if as_dict["DHCPEnabled"] == "TRUE": return 1, "dhcp enabled" else: return 0, "dhcp %s" % as_dict["DHCPEnabled"]

7 years

More cross-compiler tweaks.

by Sven Panne

Module: check_mk Branch: master Commit: 857018cac156862e9fcaa7310be2477754b05cc9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=857018cac15686… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Sep 8 11:04:40 2017 +0200 More cross-compiler tweaks. Change-Id: I303ba27a20723749d8f9eb6f9a11f57aa5947cb1 --- livestatus/src/ChronoUtils.h | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/livestatus/src/ChronoUtils.h b/livestatus/src/ChronoUtils.h index da53b07..5399b37 100644 --- a/livestatus/src/ChronoUtils.h +++ b/livestatus/src/ChronoUtils.h @@ -58,6 +58,11 @@ template <typename Rep, typename Period> inline timeval to_timeval(std::chrono::duration<Rep, Period> dur) { using namespace std::chrono; timeval tv; + // NOTE: The static_casts below are needed to avoid warning on e.g. some + // 32bit platforms, because the underlying types might be larger than the + // timeval fields. We can't use the correct POSIX types time_t and + // suseconds_t because of the broken MinGW cross compiler, so we revert to + // decltype. tv.tv_sec = static_cast<decltype(tv.tv_sec)>(duration_cast<seconds>(dur).count()); tv.tv_usec = static_cast<decltype(tv.tv_usec)>( @@ -85,9 +90,9 @@ typename Dur::rep time_point_part(std::chrono::system_clock::time_point &tp) { class FormattedTimePoint { public: FormattedTimePoint(std::chrono::system_clock::time_point tp, - const std::string &format = "%F %T") + const std::string &format = default_format) : _tp(tp), _format(format) {} - FormattedTimePoint(time_t t, const std::string &format = "%F %T") + FormattedTimePoint(time_t t, const std::string &format = default_format) : _tp(std::chrono::system_clock::from_time_t(t)), _format(format) {} friend std::ostream &operator<<(std::ostream &os, @@ -99,6 +104,13 @@ public: private: std::chrono::system_clock::time_point _tp; std::string _format; + + // NOTE: In a perfect world we would simply use "%F %T" below, but the "%F" + // format is a C99 addition, and the "%T" format is part of The Single Unix + // Specification. Both formats should be available in any C++11-compliant + // compiler, but the MinGW cross compiler doesn't get this right. So let's + // use their ancient expansions... + static constexpr auto default_format = "%Y-%m-%d %H:%M:%S"; }; #endif // ChronoUtils_h

7 years

The user profile sync is now taking the authorized_sites of a user into account

by Lars Michelsen

Module: check_mk Branch: master Commit: f714c15d9c1a834ede4d9905f970eaf071242d1c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f714c15d9c1a83… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 8 10:16:28 2017 +0200 The user profile sync is now taking the authorized_sites of a user into account Change-Id: I49de8222f6beb418f7cb66fa14bf271eac2934c7 --- web/htdocs/config.py | 42 ++++++++++++++++++++++++++++++++++++------ web/htdocs/notifications.py | 2 +- web/htdocs/sites.py | 2 +- web/htdocs/wato.py | 23 +++++++++++------------ web/htdocs/watolib.py | 22 ++-------------------- web/plugins/userdb/ldap.py | 2 +- web/plugins/wato/bi.py | 2 +- 7 files changed, 53 insertions(+), 42 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f714c15d9c…

7 years

Make ChronoUtils.h a bit more cross-compiler-friendly.

by Sven Panne

Module: check_mk Branch: master Commit: c5f7f424e0a8fa2eb850478351a492afff78efe9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c5f7f424e0a8fa… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Sep 8 09:52:45 2017 +0200 Make ChronoUtils.h a bit more cross-compiler-friendly. Change-Id: I7ade92c1d2fc401af81a8e8b48628c1f3259ba22 --- livestatus/src/ChronoUtils.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/livestatus/src/ChronoUtils.h b/livestatus/src/ChronoUtils.h index ca78ff8..da53b07 100644 --- a/livestatus/src/ChronoUtils.h +++ b/livestatus/src/ChronoUtils.h @@ -58,8 +58,9 @@ template <typename Rep, typename Period> inline timeval to_timeval(std::chrono::duration<Rep, Period> dur) { using namespace std::chrono; timeval tv; - tv.tv_sec = static_cast<time_t>(duration_cast<seconds>(dur).count()); - tv.tv_usec = static_cast<suseconds_t>( + tv.tv_sec = + static_cast<decltype(tv.tv_sec)>(duration_cast<seconds>(dur).count()); + tv.tv_usec = static_cast<decltype(tv.tv_usec)>( duration_cast<microseconds>(dur % seconds(1)).count()); return tv; }

7 years

← Newer
1
...
17
18
19
20
21
22
23
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2017