Checkmk git commits February 2018

checkmk-commits@lists.checkmk.com

11 participants
330 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 5b09ce8b59b36df7ae4c8d2db42d9a8c925cb56f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5b09ce8b59b36d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 26 17:18:44 2018 +0100 Add missing code change for #5869 Change-Id: I62233a04d7cee56aa11aadff8709e54f60f28d8c --- checks/mem | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/checks/mem b/checks/mem index d90f085..58d6c71 100644 --- a/checks/mem +++ b/checks/mem @@ -490,13 +490,14 @@ def check_mem_windows(item, params, info): warn, crit = params[paramname] # In perfdata show warn/crit as absolute values + # Absolute thresholds are in MB -> transform to KB if type(warn) == float: - warn_kb = total_kb * warn / 100 / 1024 + warn_kb = total_kb * warn / 100 else: warn_kb = warn * 1024 if type(crit) == float: - crit_kb = total_kb * crit / 100 / 1024 + crit_kb = total_kb * crit / 100 else: crit_kb = crit * 1024

6 years, 7 months

Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 3e5f3776249259062a7208810c9cea0be5bf4dc1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e5f3776249259… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 26 16:45:27 2018 +0100 Reserved 20 Werk IDS Change-Id: I2ddbfd814921b37761d4014311047f13c8ed02a7 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index f3ff04e..8c4b9d8 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5869 +5889

6 years, 7 months

5869 FIX mem.win: Fixed displaying of percentage thresholds in graphs ( Regression in 1.4.0p21)

by Lars Michelsen

Module: check_mk Branch: master Commit: bc85082a17878ec9887d5c691d23a750bef075c1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc85082a17878e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 26 16:47:06 2018 +0100 5869 FIX mem.win: Fixed displaying of percentage thresholds in graphs (Regression in 1.4.0p21) The werk #5518 repaired displaying of absolute thresholds, but broke displaying of percentage levels in the graphs. Change-Id: I18390df337be731fc7933fe79b67ffcc659cb310 --- .werks/5869 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.werks/5869 b/.werks/5869 new file mode 100644 index 0000000..a0968b3 --- /dev/null +++ b/.werks/5869 @@ -0,0 +1,12 @@ +Title: mem.win: Fixed displaying of percentage thresholds in graphs (Regression in 1.4.0p21) +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i4 +Date: 1519659946 + +The werk #5518 repaired displaying of absolute thresholds, but broke +displaying of percentage levels in the graphs.

6 years, 7 months

Win-agent: refactor ListenSocket::check_only_from

by Jukka Aro

Module: check_mk Branch: master Commit: b6f8b156ba6fd678174cf3939194c830bc7870e5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b6f8b156ba6fd6… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Mon Feb 26 16:31:05 2018 +0100 Win-agent: refactor ListenSocket::check_only_from Pass parameter as const ref. Refactor checks to subfunctions for improved readability. --- agents/windows/ListenSocket.cc | 84 +++++++++++++++++++++++------------------- agents/windows/ListenSocket.h | 2 +- agents/windows/build_version | 2 +- 3 files changed, 49 insertions(+), 39 deletions(-) diff --git a/agents/windows/ListenSocket.cc b/agents/windows/ListenSocket.cc index d52bb49..e5eb5de 100644 --- a/agents/windows/ListenSocket.cc +++ b/agents/windows/ListenSocket.cc @@ -25,14 +25,48 @@ #include "ListenSocket.h" #include <winsock2.h> #include <ws2ipdef.h> -#include <cassert> #include <cstring> #include <memory> +#include <numeric> #include "Logger.h" #include "WinApiAdaptor.h" #include "win_error.h" -static const size_t INET6_ADDRSTRLEN = 46; +namespace { + +const size_t INET6_ADDRSTRLEN = 46; + +inline bool familiesEqual(const ipspec &only_from, const SOCKADDR &ip) { + return only_from.ipv6 == (ip.sa_family == AF_INET6); +} + +inline bool ipv6Match(const ipspec &only_from, const SOCKADDR &ip) { + if (ip.sa_family != AF_INET6) { + return false; + } + + std::array<size_t, 8> indices; + std::iota(indices.begin(), indices.end(), 0); + const auto &addrv6 = reinterpret_cast<const sockaddr_in6 &>(ip); + return std::all_of(indices.cbegin(), indices.cend(), [&only_from, &addrv6]( + const size_t i) { + return only_from.ip.v6.address[i] == + (addrv6.sin6_addr.u.Word[i] & only_from.ip.v6.netmask[i]); + }); +} + +inline bool ipv4Match(const ipspec &only_from, const SOCKADDR &ip) { + if (ip.sa_family != AF_INET) { + return false; + } + const auto &addrv4 = reinterpret_cast<const sockaddr_in &>(ip); + uint32_t significant_bits = + addrv4.sin_addr.S_un.S_addr & only_from.ip.v4.netmask; + + return significant_bits == only_from.ip.v4.address; +} + +} // namespace ListenSocket::ListenSocket(int port, const only_from_t &source_whitelist, bool supportIPV6, Logger *logger, @@ -61,42 +95,18 @@ SOCKET ListenSocket::RemoveSocketInheritance(SOCKET oldsocket) const { return (SOCKET)newhandle; } -bool ListenSocket::check_only_from(sockaddr *ip) const { - if (_source_whitelist.size() == 0) return true; // no restriction set - - for (only_from_t::const_iterator it_from = _source_whitelist.begin(); - it_from != _source_whitelist.end(); ++it_from) { - const ipspec &only_from = *it_from; +bool ListenSocket::check_only_from(const SOCKADDR &ip) const { + if (_source_whitelist.empty()) return true; // no restriction set - if (only_from.ipv6 != (ip->sa_family == AF_INET6)) { - // test ipv6 address only against ipv6 filter and ipv4 address + return std::any_of( + _source_whitelist.cbegin(), _source_whitelist.cend(), + [&ip](const ipspec &only_from) { + // Test ipv6 address only against ipv6 filter and ipv4 address // against ipv4 filter. - // the only_from list already contains v4->v6 converted addresses - continue; - } - - if (ip->sa_family == AF_INET6) { - bool match = true; - sockaddr_in6 *addrv6 = (sockaddr_in6 *)ip; - for (int i = 0; i < 8 && match; ++i) { - match = - only_from.ip.v6.address[i] == - (addrv6->sin6_addr.u.Word[i] & only_from.ip.v6.netmask[i]); - } - if (match) { - return true; - } - } else { - uint32_t significant_bits = - ((sockaddr_in *)ip)->sin_addr.S_un.S_addr & - only_from.ip.v4.netmask; - - if (significant_bits == only_from.ip.v4.address) { - return true; - } - } - } - return false; + // The whitelist already contains v4->v6 converted addresses + return familiesEqual(only_from, ip) && + (ipv6Match(only_from, ip) || ipv4Match(only_from, ip)); + }); } SOCKET ListenSocket::init_listen_socket(int port) { @@ -223,7 +233,7 @@ SocketHandle ListenSocket::acceptConnection() const { SOCKET rawSocket = _winapi.accept(_socket.get(), remoteAddr, &addr_len); SocketHandle connection(RemoveSocketInheritance(rawSocket), _winapi); - if (connection && check_only_from(remoteAddr)) { + if (connection && check_only_from(*remoteAddr)) { return connection; } } diff --git a/agents/windows/ListenSocket.h b/agents/windows/ListenSocket.h index 7801728..17dfc49 100644 --- a/agents/windows/ListenSocket.h +++ b/agents/windows/ListenSocket.h @@ -59,7 +59,7 @@ public: private: SOCKET init_listen_socket(int port); - bool check_only_from(sockaddr *ip) const; + bool check_only_from(const SOCKADDR &ip) const; SOCKET RemoveSocketInheritance(SOCKET oldsocket) const; Logger *_logger; diff --git a/agents/windows/build_version b/agents/windows/build_version index 96d3ba4..e4bcd8c 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3122 +3123

6 years, 7 months

Fixed types and a file descriptor leak.

by Sven Panne

Module: check_mk Branch: master Commit: 3685f1bde5c5b671e14050cfe8fc08077f38999d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3685f1bde5c5b6… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Feb 26 16:10:14 2018 +0100 Fixed types and a file descriptor leak. Change-Id: I7ae506ccc65539ccee0280c0cb2febe291a55ea7 --- bin/mkeventd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index be6cd9d..3389cb7 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -912,7 +912,7 @@ def log_event_history_to_file(settings, event, what, who, addinfo): columns += [quote_tab(event.get(colname[6:], defval)) # drop "event_" for colname, defval in g_status_server.table_events.columns] - get_logfile(settings.paths.history_dir.value).write("\t".join(map(to_utf8, columns)) + "\n") + get_logfile(settings.paths.history_dir.value).write_bytes("\t".join(map(to_utf8, columns)) + "\n") def to_utf8(x): @@ -964,7 +964,7 @@ def get_logfile(log_dir): active_history_period = timestamp - return file(log_dir + "/%d.log" % timestamp, "a") + return log_dir / ("%d.log" % timestamp) # Return timestamp of the beginning of the current history @@ -2894,7 +2894,7 @@ class EventServer(ECServerThread): def log_message(self, event): try: - get_logfile(self.settings.paths.messages_dir.value).write("%s %s %s%s: %s\n" % ( + get_logfile(self.settings.paths.messages_dir.value).write_bytes("%s %s %s%s: %s\n" % ( time.strftime("%b %d %H:%M:%S", time.localtime(event["time"])), event["host"], event["application"],

6 years, 7 months

Another addition to werk #5866

by Lars Michelsen

Module: check_mk Branch: master Commit: 8bc6f153605655ae8521c604a69f5d994e566f9b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8bc6f153605655… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 26 15:51:29 2018 +0100 Another addition to werk #5866 Change-Id: I0e7a98a1386c00149a8362fdda8e97d34bf98b30 --- web/htdocs/watolib.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 83610eb..44bc83a 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -8281,20 +8281,20 @@ class Rule(object): def get_mismatch_reasons(self, host_folder, hostname, item): """A generator that provides the reasons why a given folder/host/item not matches this rule""" host = host_folder.host(hostname) - host_tags = host.tags() if not self._matches_hostname(hostname): yield _("The host name does not match.") + if not self.folder.is_transitive_parent_of(host_folder): + yield _("The rule does not apply to the folder of the host.") + + host_tags = host.tags() for tag in self.tag_specs: if tag[0] != '/' and tag[0] != '!' and tag not in host_tags: yield _("The host is missing the tag %s") % tag elif tag[0] == '!' and tag[1:] in host_tags: yield _("The host has the tag %s") % tag - if not self.folder.is_transitive_parent_of(host_folder): - yield _("The rule does not apply to the folder of the host.") - if item != NO_ITEM and self.ruleset.item_type(): if not self.matches_item(item): yield _("The %s \"%s\" does not match this rule.") % \

6 years, 7 months

Moved all paths into cmk.ec.settings, making it the only source of truth for this.

by Sven Panne

Module: check_mk Branch: master Commit: a4f234670bc641ea6ed3a30d79e0d14e87337e8c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a4f234670bc641… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Feb 26 15:20:37 2018 +0100 Moved all paths into cmk.ec.settings, making it the only source of truth for this. Change-Id: Ic539e8e623c57426ae58f6de2fb266d897dbd088 --- bin/mkeventd | 65 ++++++++++++++++-------------------------------------- cmk/ec/settings.py | 52 +++++++++++++++++++++++++++++-------------- 2 files changed, 54 insertions(+), 63 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a4f234670b…

6 years, 7 months

5867 FIX Report scheduler: Sending mails manually could be triggered multiple times when reloading the page

by Lars Michelsen

Module: check_mk Branch: master Commit: b471c72da1ea62842e94af0435f6df0022937795 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b471c72da1ea62… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 26 12:37:00 2018 +0100 5867 FIX Report scheduler: Sending mails manually could be triggered multiple times when reloading the page Change-Id: Ia60e08eb96f30ae0025be4f1dd1b9638972765a5 --- .werks/5867 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.werks/5867 b/.werks/5867 new file mode 100644 index 0000000..23cb717 --- /dev/null +++ b/.werks/5867 @@ -0,0 +1,11 @@ +Title: Report scheduler: Sending mails manually could be triggered multiple times when reloading the page +Level: 1 +Component: reporting +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.5.0i4 +Date: 1519644639 + +

6 years, 7 months

Addition to werk #5866

by Lars Michelsen

Module: check_mk Branch: master Commit: 161b3457037f99bb53722844c8330acebd92a022 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=161b3457037f99… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 26 15:49:02 2018 +0100 Addition to werk #5866 Change-Id: Ie9c08c8fdc49c0e13a31c0bd100cae56a31a5a0b --- web/htdocs/watolib.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index da1f52e..83610eb 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -8281,14 +8281,15 @@ class Rule(object): def get_mismatch_reasons(self, host_folder, hostname, item): """A generator that provides the reasons why a given folder/host/item not matches this rule""" host = host_folder.host(hostname) + host_tags = host.tags() if not self._matches_hostname(hostname): yield _("The host name does not match.") for tag in self.tag_specs: - if tag[0] != '/' and tag[0] != '!' and tag not in host.tags(): + if tag[0] != '/' and tag[0] != '!' and tag not in host_tags: yield _("The host is missing the tag %s") % tag - elif tag[0] == '!' and tag[1:] in host.tags(): + elif tag[0] == '!' and tag[1:] in host_tags: yield _("The host has the tag %s") % tag if not self.folder.is_transitive_parent_of(host_folder):

6 years, 7 months

Rename variable

by Konstantin Büttner

Module: check_mk Branch: master Commit: 72c698aae444fadc2e208cecfa8f236eae5548ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=72c698aae444fa… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Feb 26 15:25:22 2018 +0100 Rename variable Change-Id: I6c74f94fdeb1e6f70409fdd5271a499adeb06015 --- checks/veritas_vcs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/checks/veritas_vcs b/checks/veritas_vcs index a7efbc9..0dc7c15 100644 --- a/checks/veritas_vcs +++ b/checks/veritas_vcs @@ -167,7 +167,7 @@ def inventory_veritas_vcs(parsed, item_type): yield item_name, None -def check_veritas_vcs(item, params, parsed, item_type): +def check_veritas_vcs(item, _no_params, parsed, item_type): if item not in parsed[item_type]: return # vanished @@ -220,8 +220,8 @@ def check_veritas_vcs(item, params, parsed, item_type): check_info['veritas_vcs'] = { 'parse_function' : parse_veritas_vcs, 'inventory_function' : lambda parsed: inventory_veritas_vcs(parsed, 'cluster'), - 'check_function' : lambda item, params, parsed: \ - check_veritas_vcs(item, params, parsed, "cluster"), + 'check_function' : lambda item, _no_params, parsed: \ + check_veritas_vcs(item, _no_params, parsed, "cluster"), 'service_description' : 'VCS Cluster %s', 'node_info' : True, } @@ -238,8 +238,8 @@ check_info['veritas_vcs'] = { check_info['veritas_vcs.system'] = { 'inventory_function' : lambda parsed: inventory_veritas_vcs(parsed, "system"), - 'check_function' : lambda item, params, parsed: \ - check_veritas_vcs(item, params, parsed, "system"), + 'check_function' : lambda item, _no_params, parsed: \ + check_veritas_vcs(item, _no_params, parsed, "system"), 'service_description' : 'VCS System %s', 'node_info' : True, } @@ -256,8 +256,8 @@ check_info['veritas_vcs.system'] = { check_info['veritas_vcs.servicegroup'] = { 'inventory_function' : lambda parsed: inventory_veritas_vcs(parsed, 'group'), - 'check_function' : lambda item, params, parsed: \ - check_veritas_vcs(item, params, parsed, 'group'), + 'check_function' : lambda item, _no_params, parsed: \ + check_veritas_vcs(item, _no_params, parsed, 'group'), 'service_description' : 'VCS Service Group %s', 'node_info' : True, } @@ -274,8 +274,8 @@ check_info['veritas_vcs.servicegroup'] = { check_info['veritas_vcs.resource'] = { 'inventory_function' : lambda parsed: inventory_veritas_vcs(parsed, 'resource'), - 'check_function' : lambda item, params, parsed: \ - check_veritas_vcs(item, params, parsed, 'resource'), + 'check_function' : lambda item, _no_params, parsed: \ + check_veritas_vcs(item, _no_params, parsed, 'resource'), 'service_description' : 'VCS Resource %s', 'node_info' : True, }

6 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2018