Checkmk git commits April 2018

checkmk-commits@lists.checkmk.com

10 participants
287 discussions

5830 FIX Fixed DST shift correction for downtimes, causing CMC to use 100% CPU

by Sven Panne

Module: check_mk Branch: master Commit: aea18ed983fa91d6e8ee13cf374f9fb20f5c052f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aea18ed983fa91… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Apr 4 13:11:33 2018 +0200 5830 FIX Fixed DST shift correction for downtimes, causing CMC to use 100% CPU When a downtime was configured to recur every hour and a 1h DST shift happened, the CMC would go into an infinite loop with 100% CPU load and no monitoring at all. If the downtime in question was set in an ad hoc fashion via the GUI (not via rules), the only way to work around this issue was to remove the state file, losing all downtimes, acknowledgements and comments. Change-Id: Iebca5c808b39947682da235b08dffb73a883299b --- .werks/5830 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.werks/5830 b/.werks/5830 new file mode 100644 index 0000000..04e9074 --- /dev/null +++ b/.werks/5830 @@ -0,0 +1,14 @@ +Title: Fixed DST shift correction for downtimes, causing CMC to use 100% CPU +Level: 2 +Component: core +Compatible: compat +Edition: cee +Version: 1.5.0i4 +Date: 1522839759 +Class: fix + +When a downtime was configured to recur every hour and a 1h DST shift +happened, the CMC would go into an infinite loop with 100% CPU load and no +monitoring at all. If the downtime in question was set in an ad hoc fashion +via the GUI (not via rules), the only way to work around this issue was to +remove the state file, losing all downtimes, acknowledgements and comments.

6 years, 5 months

Fixed typos.

by Sven Panne

Module: check_mk Branch: master Commit: ec3cb4989f00863d02c967e5c40388ade0c2a069 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec3cb4989f0086… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Apr 4 12:10:04 2018 +0200 Fixed typos. Change-Id: I42f481517cbf576d4ae2b88005d0f1f3409eafac --- cmk/ec/main.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index adc2217..a5a385a 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -2000,7 +2000,7 @@ class EventServer(ECServerThread): self.rewrite_event(rule, event, ()) self._event_status.new_event(event) log_event_history(self.settings, event, "COUNTFAILED") - event_has_opened(self.settings, event_server, rule, event) + event_has_opened(self.settings, g_event_server, rule, event) if rule.get("autodelete"): event["phase"] = "closed" log_event_history(self.settings, event, "AUTODELETE") @@ -2251,7 +2251,7 @@ class EventServer(ECServerThread): existing_event["delay_until"] = time.time() + rule["delay"] existing_event["phase"] = "delayed" else: - event_has_opened(self.settings, event_server, rule, existing_event) + event_has_opened(self.settings, g_event_server, rule, existing_event) log_event_history(self.settings, existing_event, "COUNTREACHED") @@ -2273,7 +2273,7 @@ class EventServer(ECServerThread): if self.new_event_respecting_limits(event): if event["phase"] == "open": - event_has_opened(self.settings, event_server, rule, event) + event_has_opened(self.settings, g_event_server, rule, event) if rule.get("autodelete"): event["phase"] = "closed" log_event_history(self.settings, event, "AUTODELETE")

6 years, 5 months

Removed global variable g_event_server, part 2.

by Sven Panne

Module: check_mk Branch: master Commit: 162d761efb24569183ec727b97d882a5537e73a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=162d761efb2456… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Apr 3 14:05:13 2018 +0200 Removed global variable g_event_server, part 2. Change-Id: I3a507b82fa33bc16618cca056bab12c5202e2f7d --- cmk/ec/main.py | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=162d761efb…

6 years, 5 months

5936 FIX Fixed broken metrics in Fireeye statistics checks. Affected performance graphs are now generated correctly.

by Simon Betz

Module: check_mk Branch: master Commit: 49fb7f109a8d64e424494b2bd91aedfba2e2d2a9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=49fb7f109a8d64… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Apr 4 10:01:56 2018 +0200 5936 FIX Fixed broken metrics in Fireeye statistics checks. Affected performance graphs are now generated correctly. Change-Id: I39bbebef78d7d1c6bbc1f867aa4263733b79d549 --- .werks/5936 | 10 ++++++++++ web/plugins/metrics/check_mk.py | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/5936 b/.werks/5936 new file mode 100644 index 0000000..d39497e --- /dev/null +++ b/.werks/5936 @@ -0,0 +1,10 @@ +Title: Fixed broken metrics in Fireeye statistics checks. Affected performance graphs are now generated correctly. +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1522828886 +Class: fix + + diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index af91f66..3fa54ed 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -4196,7 +4196,7 @@ for what, color in [ metric_info_key = '%s_rate' % what.lower() metric_info[metric_info_key] = { 'title' : _('%s per Second') % what, - 'unit' : '1/sec', + 'unit' : '1/s', 'color' : color, } @@ -4209,7 +4209,7 @@ for what, color in [ metric_info_key = 'fireeye_stat_%s' % what.replace(' ', '').lower() metric_info[metric_info_key] = { 'title' : _('Emails containing %s per Second') % what, - 'unit' : '1/sec', + 'unit' : '1/s', 'color' : color, }

6 years, 5 months

Fixed broken agent baking with configured manual checks

by Lars Michelsen

Module: check_mk Branch: master Commit: f286671e0a7d49c5b682fbbacf5244139a32faab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f286671e0a7d49… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 4 09:55:36 2018 +0200 Fixed broken agent baking with configured manual checks Change-Id: Iad5dbb1eb26c6653dfa68ad41c7c7558bffa69e8 --- cmk_base/config.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/cmk_base/config.py b/cmk_base/config.py index 85c8d24..96d3767 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -238,6 +238,15 @@ def _verify_non_duplicate_hosts(): # statically defined in checks. def add_wato_static_checks_to_checks(): global checks + + # In case the checks are not loaded yet it seems the current mode + # is not working with the checks. In this case also don't load the + # static checks into the configuration. + # TODO: Clean this up. Shouldn't we move the "checks" stuff to the + # checks module? + if not cmk_base.checks.check_info: + return + static = [] for entries in static_checks.values(): for entry in entries:

6 years, 5 months

5943 FIX Fixed broken PDF export of host/service history views

by Lars Michelsen

Module: check_mk Branch: master Commit: c2f2e564c1e132c91416218d28f39c6ce03f5690 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c2f2e564c1e132… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 4 08:01:21 2018 +0200 5943 FIX Fixed broken PDF export of host/service history views Change-Id: I9d6b3a4803403b893273a0c3353f27a01ed9ea19 --- .werks/5943 | 11 +++++++++++ web/htdocs/views.py | 5 +++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/5943 b/.werks/5943 new file mode 100644 index 0000000..b84b788 --- /dev/null +++ b/.werks/5943 @@ -0,0 +1,11 @@ +Title: Fixed broken PDF export of host/service history views +Level: 1 +Component: reporting +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.5.0i4 +Date: 1522821525 + +This issue seemed to be introduced with 1.4.0p26. diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 8a46903..d1016ce 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -810,8 +810,9 @@ class Cell(object): if isinstance(txt, HTML): txt = "%s" % txt - txt = html.escaper.unescape_attributes(txt) - txt = html.strip_tags(txt) + elif not isinstance(txt, tuple): + txt = html.escaper.unescape_attributes(txt) + txt = html.strip_tags(txt) return css_classes, txt except Exception:

6 years, 5 months

5942 FIX Fixed broken BI availability with limit set to 0 (

by Lars Michelsen

regression in 1.4.0p26) Message-ID: <5ac469fa.7TSg3sAiyRQVYHho%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 41ecfc8110418ee07b0da1f0ae2b436c90700a8c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=41ecfc8110418e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 4 07:49:11 2018 +0200 5942 FIX Fixed broken BI availability with limit set to 0 (regression in 1.4.0p26) In case you are affected, you can set the availability limit to another value than 0 to workaround this issue. Change-Id: I7bf1ffa76f5b5b5197089cb11057378a9a940b51 --- .werks/5942 | 12 ++++++++++++ web/plugins/views/availability.py | 8 ++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.werks/5942 b/.werks/5942 new file mode 100644 index 0000000..3ea5cac --- /dev/null +++ b/.werks/5942 @@ -0,0 +1,12 @@ +Title: Fixed broken BI availability with limit set to 0 (regression in 1.4.0p26) +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i4 +Date: 1522820887 + +In case you are affected, you can set the availability limit to another value than +0 to workaround this issue. diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index b10e229..adba2fd 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -542,10 +542,10 @@ def render_bi_availability(title, aggr_rows): timewarp = None has_reached_logrow_limit = False - timeline_containers, fetched_rows = availability.get_timeline_containers(aggr_rows, - avoptions, - timewarp, - livestatus_limit + 1) + timeline_containers, fetched_rows = availability.get_timeline_containers( + aggr_rows, avoptions, timewarp, + livestatus_limit + 1 if livestatus_limit != None else None + ) if livestatus_limit and fetched_rows > livestatus_limit: has_reached_logrow_limit = True

6 years, 5 months

Added missing change from werk 5941

by Lars Michelsen

Module: check_mk Branch: master Commit: ddd9ecd04a53af61c2d097f5dd432604bf58e173 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ddd9ecd04a53af… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 4 07:32:23 2018 +0200 Added missing change from werk 5941 Change-Id: Iabe5102cc5dfeb04476286ecda68d0619e615546 --- omd/packages/nagios/skel/etc/init.d/nagios | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omd/packages/nagios/skel/etc/init.d/nagios b/omd/packages/nagios/skel/etc/init.d/nagios index 16fcf50..758f3ed 100755 --- a/omd/packages/nagios/skel/etc/init.d/nagios +++ b/omd/packages/nagios/skel/etc/init.d/nagios @@ -55,7 +55,7 @@ GRP=###SITE### # in case of start, restart or reload. This is in order to # avoid duplicate effort when being called by cmk -R or # cmk -O. -export CORE_NOVERIFY=yes +# export CORE_NOVERIFY=yes # Make sure that check plugins do not run localized. # check_icmp outputs performance data with german

6 years, 5 months

Removed comment

by Simon Betz

Module: check_mk Branch: master Commit: d994a3dc9e202cea971810fafa511dea33d9f003 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d994a3dc9e202c… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Apr 3 14:49:24 2018 +0200 Removed comment Change-Id: I33a7268667fac8cddbfd4ba98dee48c615f007c3 --- web/plugins/wato/bi.py | 1 - 1 file changed, 1 deletion(-) diff --git a/web/plugins/wato/bi.py b/web/plugins/wato/bi.py index 979079e..317ab0a 100644 --- a/web/plugins/wato/bi.py +++ b/web/plugins/wato/bi.py @@ -1617,7 +1617,6 @@ class ModeBIEditRule(ModeBI): vs_rule.validate_value(new_rule, 'rule') if self._ruleid and self._ruleid != new_rule["id"]: - #TODO test forbidden_packs = self._get_forbidden_packs_using_rule() if forbidden_packs: raise MKAuthException(_("You have no permission for changes in BI packs %s "

6 years, 5 months

5317 FIX BI rules: Fixed renaming rule

by Simon Betz

Module: check_mk Branch: master Commit: c3dcb8f03d916ec250922d5f25193d00447b198b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c3dcb8f03d916e… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Oct 6 12:27:48 2017 +0200 5317 FIX BI rules: Fixed renaming rule Change-Id: I0c48ca2925995f34f9461ca86dcd9a0ff8baa668 --- .werks/5317 | 11 +++++ web/plugins/wato/bi.py | 109 +++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 102 insertions(+), 18 deletions(-) diff --git a/.werks/5317 b/.werks/5317 new file mode 100644 index 0000000..d8ca292 --- /dev/null +++ b/.werks/5317 @@ -0,0 +1,11 @@ +Title: BI rules: Fixed renaming rule +Level: 1 +Component: bi +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i4 +Date: 1507285643 + + diff --git a/web/plugins/wato/bi.py b/web/plugins/wato/bi.py index 268b846..979079e 100644 --- a/web/plugins/wato/bi.py +++ b/web/plugins/wato/bi.py @@ -1617,17 +1617,20 @@ class ModeBIEditRule(ModeBI): vs_rule.validate_value(new_rule, 'rule') if self._ruleid and self._ruleid != new_rule["id"]: - existing_ruleid = self._ruleid + #TODO test + forbidden_packs = self._get_forbidden_packs_using_rule() + if forbidden_packs: + raise MKAuthException(_("You have no permission for changes in BI packs %s " + "which uses rule %s.") % (", ".join(forbidden_packs), self._ruleid)) + new_ruleid = new_rule["id"] c = wato_confirm(_("Confirm renaming existing BI rule"), _("Do you really want to rename the existing BI rule %s to %s?") % \ - (existing_ruleid, new_ruleid)) + (self._ruleid, new_ruleid)) + if c: - self._ruleid = new_ruleid - del self._pack["rules"][existing_ruleid] - self._pack["rules"][new_ruleid] = new_rule - self._rename_existing_ruleid_after_confirm(existing_ruleid) - self._add_change("bi-edit-rule", _("Renamed BI rule %s") % self._ruleid) + self._rename_ruleid_after_confirm(new_ruleid) + self._add_change("bi-edit-rule", _("Renamed BI rule from %s to %s") % (self._ruleid, new_ruleid)) self.save_config() else: @@ -1666,17 +1669,87 @@ class ModeBIEditRule(ModeBI): return "bi_rules" - def _rename_existing_ruleid_after_confirm(self, existing_ruleid): - for packinfo in self._packs.values(): - for rule_id, rule_info in packinfo['rules'].items(): - new_nodes = [] - for this_node in rule_info.get('nodes', []): - node_ty, node_info = this_node - if node_ty == 'call' and existing_ruleid == node_info[0]: - new_nodes.append( ('call', tuple( [self._ruleid] + list(node_info)[1:] )) ) - else: - new_nodes.append( this_node ) - rule_info['nodes'] = new_nodes + def _get_forbidden_packs_using_rule(self): + forbidden_packs = set() + for packid, packinfo in self._packs.iteritems(): + uses_rule = False + if self._pack == packinfo: + continue + for ruleid, rule_info in packinfo['rules'].iteritems(): + if ruleid == self._ruleid: + uses_rule = True + break + for node_type, node_info in rule_info.get('nodes', []): + if node_type == 'call' and self._ruleid == node_info[0]: + uses_rule = True + break + + for aggregation in packinfo.get("aggregations", []): + node = aggregation.get('node') + if node is None: + continue + if (node[0] == 'call' and self._ruleid == node[1][0]) or \ + (node[0] in ["foreach_host", "foreach_service"] and node[-1][-1][0] == 'call' and \ + self._ruleid == node[-1][-1][1][0]): + uses_rule = True + break + if uses_rule and not self.is_contact_for_pack(pack=packinfo): + forbidden_packs.add(packid) + return forbidden_packs + + + def _rename_ruleid_after_confirm(self, new_ruleid): + new_packs = self._packs.copy() + for packid, packinfo in self._packs.iteritems(): + for ruleid, rule_info in packinfo['rules'].iteritems(): + if ruleid == self._ruleid: + new_rule_info = rule_info.copy() + new_rule_info['id'] = new_ruleid + new_packs[packid]['rules'][new_ruleid] = new_rule_info + del new_packs[packid]['rules'][ruleid] + continue + + for node in rule_info.get('nodes', [])[::-1]: + new_node = self._get_new_node(node, new_ruleid) + if new_node is None: + continue + idx = new_packs[packid]['rules'][ruleid]['nodes'].index(node) + del new_packs[packid]['rules'][ruleid]['nodes'][idx] + new_packs[packid]['rules'][ruleid]['nodes'].insert(idx, new_node) + + for aggregation in packinfo.get("aggregations", [])[::-1]: + node = aggregation.get('node') + if node is None: + continue + new_node = self._get_new_node(node, new_ruleid) + if new_node is None: + continue + new_aggregation = aggregation.copy() + new_aggregation['node'] = new_node + idx = new_packs[packid]["aggregations"].index(aggregation) + del new_packs[packid]["aggregations"][idx] + new_packs[packid]["aggregations"].insert(idx, new_aggregation) + + self._packs = new_packs + self._ruleid = new_ruleid + + + def _get_new_node(self, node, new_ruleid): + new_node = None + if node[0] == 'call' and self._ruleid == node[1][0]: + new_node = self._create_call_node(new_ruleid, node[1][1]) + elif node[0] in ["foreach_host", "foreach_service"] and node[-1][-1][0] == 'call' and \ + self._ruleid == node[-1][-1][1][0]: + new_node = self._create_foreach_node(node[0], list(node[1][:-1]), new_ruleid, node[-1][-1][1][1]) + return new_node + + + def _create_call_node(self, ruleid, arguments): + return ('call', (ruleid, arguments)) + + + def _create_foreach_node(self, what, parameters, ruleid, arguments): + return (what, tuple(parameters + [self._create_call_node(ruleid, arguments)])) def page(self):

6 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2018