Checkmk git commits October 2017

checkmk-commits@lists.checkmk.com

10 participants
288 discussions

5217 FIX BI: Improved error handling in case of not existing but referenced rule

by Lars Michelsen

Module: check_mk Branch: master Commit: 33cf88df3c7e2b11aba648ab7bd88739536dc74a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=33cf88df3c7e2b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 2 08:35:33 2017 +0200 5217 FIX BI: Improved error handling in case of not existing but referenced rule The error handling has been improved for the situation where an aggregation references a not existing BI rule. Change-Id: I1e3978fd559c65dc32ba0d97a898d885a2cf595e --- .werks/5217 | 12 ++++++++++++ web/plugins/wato/bi.py | 7 +++++++ 2 files changed, 19 insertions(+) diff --git a/.werks/5217 b/.werks/5217 new file mode 100644 index 0000000..10cddb8 --- /dev/null +++ b/.werks/5217 @@ -0,0 +1,12 @@ +Title: BI: Improved error handling in case of not existing but referenced rule +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1506926056 + +The error handling has been improved for the situation where an aggregation +references a not existing BI rule. diff --git a/web/plugins/wato/bi.py b/web/plugins/wato/bi.py index ad907a9..e2e046b 100644 --- a/web/plugins/wato/bi.py +++ b/web/plugins/wato/bi.py @@ -1066,6 +1066,9 @@ class ModeBIAggregations(ModeBI): def render_aggregation_rule_tree(self, aggregation): toplevel_rule = self.aggregation_toplevel_rule(aggregation) + if not toplevel_rule: + html.show_error(_("The top level rule does not exist.")) + return self.render_rule_tree(toplevel_rule["id"], toplevel_rule["id"]) @@ -1318,9 +1321,13 @@ class ModeBIRules(ModeBI): def _aggregation_recursive_sub_rule_ids(self, ruleid): rule = self.find_rule_by_id(ruleid) + if not rule: + return [] + sub_rule_ids = self.aggregation_sub_rule_ids(rule) if not sub_rule_ids: return [] + result = sub_rule_ids[:] for sub_rule_id in sub_rule_ids: result += self._aggregation_recursive_sub_rule_ids(sub_rule_id)

6 years, 11 months

EC: Status requests use precalculated header lists

by Lars Michelsen

Module: check_mk Branch: master Commit: 6e0b12c3118e9ab56aed03278ef8cb4719e638de URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e0b12c3118e9a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 29 13:42:35 2017 +0200 EC: Status requests use precalculated header lists Change-Id: I8a4157a4b8eea6aab10509026a82394f8369e18d --- bin/mkeventd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index 2ec83db..ea812cf 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -795,7 +795,7 @@ def log_event_history_to_mongodb(event, what, who, addinfo): def get_event_history_from_mongodb(filters, limit): history_entries = [] - headers = [ c[0] for c in g_status_server.table_history.columns ] + headers = g_status_server.table_history.column_names if not g_mongo_conn: connect_mongodb() @@ -999,7 +999,7 @@ def get_event_history(filters, limit): def get_event_history_from_file(filters, limit): history_entries = [] - headers = [ c[0] for c in g_status_server.table_history.columns ] + headers = g_status_server.table_history.column_names log_dir = g_state_dir + "/history" if not os.path.exists(log_dir): return headers, [] @@ -3278,7 +3278,7 @@ class StatusTable(object): def __init__(self): super(StatusTable, self).__init__() - #self.column_names = [ c[0] for c in self.columns ] + self.column_names = [ c[0] for c in self.columns ] @@ -4220,11 +4220,11 @@ class EventStatus(object): result.append(event_line) - return [ e[0] for e in g_status_server.table_events.columns ], result + return g_status_server.table_events.column_names, result def get_rule_stats(self): - return [ e[0] for e in g_status_Server.table_rules.columns ], sorted(self._rule_stats.iteritems(), key=lambda x: x[0]) + return g_status_Server.table_rules.column_names, sorted(self._rule_stats.iteritems(), key=lambda x: x[0]) #. # .--Actions-------------------------------------------------------------.

6 years, 11 months

Fixed bug in recent EC changes

by Lars Michelsen

Module: check_mk Branch: master Commit: bae9b73ace978ef1b2ec0fb4a4a58afd52c7170a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bae9b73ace978e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 2 10:47:10 2017 +0200 Fixed bug in recent EC changes Change-Id: Ic77b5faf1aac2e01fa9f59f8d743d2b36274ab7d --- bin/mkeventd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/mkeventd b/bin/mkeventd index ea812cf..bf7707d 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -3179,7 +3179,7 @@ class QueryGET(Query): if name == "event_host" and opfunc == filter_operators['in']: self.only_host = set(argument) - filters.append((name, opfunc, argument)) + self.filters.append((name, opfunc, argument)) elif header == "Limit":

6 years, 11 months

EC: Use global logger in QueryGET()

by Lars Michelsen

Module: check_mk Branch: master Commit: 06f14e2ffb3230b6034ea96e655b7b8c25ae4463 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=06f14e2ffb3230… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 2 12:01:23 2017 +0200 EC: Use global logger in QueryGET() Change-Id: I84065f106684be905746fe2aac61e2d54b2bfd51 --- bin/mkeventd | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/mkeventd b/bin/mkeventd index c8dcd12..c162969 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -3080,6 +3080,7 @@ class Query(object): def __init__(self, raw_query): super(Query, self).__init__() + self.logger = logger self.output_format = "python" self._raw_query = raw_query

6 years, 11 months

Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 18ef2b83eabf0aedb9f4731400ff6d6cd05f25eb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18ef2b83eabf0a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 2 11:55:43 2017 +0200 Reserved 20 Werk IDS Change-Id: If71ca9df9703f98bf41200865b4b891267eb618b --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 57e22db..4a9e81e 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5358 +5378

6 years, 11 months

5358 FIX Event console status queries now handle the Limit header correctly

by Lars Michelsen

Module: check_mk Branch: master Commit: 6c1b337636939fe56bef397e929aaa85ecd41958 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c1b337636939f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 2 11:58:09 2017 +0200 5358 FIX Event console status queries now handle the Limit header correctly The event console status queries (e.g. used to show data in the GUI) were ignoring the Limit header which caused the EC to process too many rows in the response to status queries. Change-Id: I2eb6ac6c62b8f240e3df053741bb654ade28393c --- .werks/5358 | 12 ++++++++++++ bin/mkeventd | 5 +++++ 2 files changed, 17 insertions(+) diff --git a/.werks/5358 b/.werks/5358 new file mode 100644 index 0000000..dc2a26d --- /dev/null +++ b/.werks/5358 @@ -0,0 +1,12 @@ +Title: Event console status queries now handle the Limit header correctly +Level: 1 +Component: ec +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1506938154 +Class: fix + +The event console status queries (e.g. used to show data in the GUI) were +ignoring the Limit header which caused the EC to process too many rows +in the response to status queries. diff --git a/bin/mkeventd b/bin/mkeventd index 565adac..c8dcd12 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -3300,7 +3300,11 @@ class StatusTable(object): # TODO: Add support for ColumnHeaders like in livestatus? yield query.requested_columns + num_rows = 0 for row in self._enumerate(query): + if query.limit is not None and num_rows >= query.limit: + break # The maximum number of rows has been reached + # Apply filters # TODO: History filtering is done in history load code. Check for improvements if query.filters and query.table_name != "history": @@ -3309,6 +3313,7 @@ class StatusTable(object): continue yield self._build_result_row(row, requested_column_indexes) + num_rows += 1 # Must return a enumerable type containing fully populated lists (rows) matching the

6 years, 11 months

EC: Performance improvement (Respecting Columns: header now)

by Lars Michelsen

Module: check_mk Branch: master Commit: 3cb405f6e114fd143256c3272dfce4243708c597 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3cb405f6e114fd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 2 10:52:16 2017 +0200 EC: Performance improvement (Respecting Columns: header now) Change-Id: I855cdff9acbc0ea58782276b1f99da7bcccb847c --- bin/mkeventd | 313 ++++++++++++++++++++++++++++++++++------------------------- 1 file changed, 180 insertions(+), 133 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3cb405f6e1…

6 years, 11 months

Clear some static variables in Windows agent

by Jukka Aro

Module: check_mk Branch: master Commit: 37cc55f1008a2298d5dd00a4599249d23dec8045 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=37cc55f1008a22… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Thu Sep 21 13:04:13 2017 +0200 Clear some static variables in Windows agent Change static variables to member variables in SectionEventlog. The local static variables within member functions totally prevent unit testing. Change-Id: Id74816cf45411eb202c72b31909c7dea39e73362 --- agents/windows/sections/SectionEventlog.cc | 10 ++++------ agents/windows/sections/SectionEventlog.h | 2 ++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/agents/windows/sections/SectionEventlog.cc b/agents/windows/sections/SectionEventlog.cc index e3735eb..f3db993 100644 --- a/agents/windows/sections/SectionEventlog.cc +++ b/agents/windows/sections/SectionEventlog.cc @@ -71,8 +71,7 @@ void SectionEventlog::parseStateLine(char *line) { } void SectionEventlog::loadEventlogOffsets(const std::string &statefile) { - static bool records_loaded = false; - if (!records_loaded) { + if (!_records_loaded) { FILE *file = fopen(statefile.c_str(), "r"); if (file) { char line[256]; @@ -81,7 +80,7 @@ void SectionEventlog::loadEventlogOffsets(const std::string &statefile) { } fclose(file); } - records_loaded = true; + _records_loaded = true; } } @@ -297,13 +296,12 @@ bool SectionEventlog::produceOutputInner(std::ostream &out) { // been processed. When started, the eventlog // is skipped to the end. Historic messages are // not been processed. - static bool first_run = true; if (find_eventlogs(out)) { // Special handling on startup (first_run) // The last processed record number of each eventlog is stored in the // file eventstate.txt - if (first_run && !*_send_initial) { + if (_first_run && !*_send_initial) { for (eventlog_file_state &state : _state) { bool found_hint = false; for (eventlog_hint_t *hint : _hints) { @@ -345,6 +343,6 @@ bool SectionEventlog::produceOutputInner(std::ostream &out) { } saveEventlogOffsets(_env.eventlogStatefile()); } - first_run = false; + _first_run = false; return true; } diff --git a/agents/windows/sections/SectionEventlog.h b/agents/windows/sections/SectionEventlog.h index e557291..c702e2e 100644 --- a/agents/windows/sections/SectionEventlog.h +++ b/agents/windows/sections/SectionEventlog.h @@ -67,6 +67,8 @@ class SectionEventlog : public Section { eventlog_hints_t _hints; eventlog_state_t _state; + bool _records_loaded = false; + bool _first_run = true; public: SectionEventlog(Configuration &config, Logger *logger,

6 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2017