Checkmk git commits December 2016

checkmk-commits@lists.checkmk.com

10 participants
391 discussions

by Marcel Arentz

Module: check_mk Branch: master Commit: 05f426b17b07830758701a031f55be309c800e21 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=05f426b17b0783… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Dec 12 21:41:13 2016 +0100 fixed broken werks Change-Id: I4938b59b318d2691222c2b2667f1d3b1a0088367 --- .werks/4161 | 5 ++--- .werks/4179 | 9 +++++++++ ChangeLog | 4 ++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.werks/4161 b/.werks/4161 index e9b4435..5f2a644 100644 --- a/.werks/4161 +++ b/.werks/4161 @@ -1,9 +1,8 @@ -Title: oracle_dataguard_stats, oracle_longactivesessions, oracle_rman: fixed crashes +Title: emcvnx_sp_util: fixed empty data handling Level: 1 Component: checks Compatible: compat Version: 1.4.0i3 -Date: 1481573325 +Date: 1481550595 Class: fix -Fixed crashes on Checks if there are timestamps in the output. diff --git a/.werks/4179 b/.werks/4179 new file mode 100644 index 0000000..e9b4435 --- /dev/null +++ b/.werks/4179 @@ -0,0 +1,9 @@ +Title: oracle_dataguard_stats, oracle_longactivesessions, oracle_rman: fixed crashes +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i3 +Date: 1481573325 +Class: fix + +Fixed crashes on Checks if there are timestamps in the output. diff --git a/ChangeLog b/ChangeLog index cec7ff8..aefb968 100644 --- a/ChangeLog +++ b/ChangeLog @@ -61,14 +61,14 @@ * 4101 FIX: citrix_sessions: Output error message in case of missing session information.... * 4102 FIX: logwatch: Fixed crash due to non-existant logfile... * 4160 FIX: emcvnx_info: fixed data handling, now detects errors + * 4161 FIX: emcvnx_sp_util: fixed empty data handling * 4162 FIX: esx_vsphere_vm.heartbeat: fixed KeyError * 4163 FIX: kernel: fixed empty data handling * 4164 FIX: livestatus_status: fixed ValueError for values in scientific notation * 4103 FIX: kaspersky_av_client: No longer crash when date of last full scan is unknown... - * 4178 FIX: apt: Fixed crash on unexpected output... - * 4161 FIX: oracle_dataguard_stats, oracle_longactivesessions, oracle_rman: fixed crashes... * 4177 FIX: smart: added compatibility for Intel SSDs... * 4178 FIX: apt: Fixed crash on unexpected output... + * 4179 FIX: oracle_dataguard_stats, oracle_longactivesessions, oracle_rman: fixed crashes... Multisite: * 4070 Added a painter for the service check period

7 years, 9 months

fixed broken werks...

by Marcel Arentz

Module: check_mk Branch: master Commit: 7b8f88789c67f91ecc454d38734c424411c24a8e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b8f88789c67f9… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Dec 12 21:36:00 2016 +0100 fixed broken werks... Change-Id: Id37a141da093b48bc30c8e11a0b2635d8193f24e --- .werks/4160 | 7 +++---- .werks/4178 | 10 ++++++++++ ChangeLog | 6 ++++-- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.werks/4160 b/.werks/4160 index 32ce35a..158ea22 100644 --- a/.werks/4160 +++ b/.werks/4160 @@ -1,10 +1,9 @@ -Title: apt: Fixed crash on unexpected output +Title: emcvnx_info: fixed data handling, now detects errors Level: 1 Component: checks +Class: fix Compatible: compat Version: 1.4.0i3 -Date: 1481573187 -Class: fix +Date: 1481550183 -Fixed crash if line does not start with "Inst". diff --git a/.werks/4178 b/.werks/4178 new file mode 100644 index 0000000..32ce35a --- /dev/null +++ b/.werks/4178 @@ -0,0 +1,10 @@ +Title: apt: Fixed crash on unexpected output +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i3 +Date: 1481573187 +Class: fix + +Fixed crash if line does not start with "Inst". + diff --git a/ChangeLog b/ChangeLog index 64deb7c..cec7ff8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -60,13 +60,15 @@ * 4158 FIX: fileinfo: fixed file handling containing spaces * 4101 FIX: citrix_sessions: Output error message in case of missing session information.... * 4102 FIX: logwatch: Fixed crash due to non-existant logfile... + * 4160 FIX: emcvnx_info: fixed data handling, now detects errors * 4162 FIX: esx_vsphere_vm.heartbeat: fixed KeyError * 4163 FIX: kernel: fixed empty data handling * 4164 FIX: livestatus_status: fixed ValueError for values in scientific notation * 4103 FIX: kaspersky_av_client: No longer crash when date of last full scan is unknown... - * 4160 FIX: apt: Fixed crash on unexpected output... + * 4178 FIX: apt: Fixed crash on unexpected output... * 4161 FIX: oracle_dataguard_stats, oracle_longactivesessions, oracle_rman: fixed crashes... - * 4177 FIX: smart: added compatibility for Intel SSDs + * 4177 FIX: smart: added compatibility for Intel SSDs... + * 4178 FIX: apt: Fixed crash on unexpected output... Multisite: * 4070 Added a painter for the service check period

7 years, 9 months

fixed problems with werk ids...

by Marcel Arentz

Module: check_mk Branch: master Commit: 57044c129313af8055389cf7039e19fe299f1578 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=57044c129313af… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Dec 12 21:27:56 2016 +0100 fixed problems with werk ids... Change-Id: If383eee3f08aef8b82d3adead527dfa453a47307 --- .werks/4159 | 7 +++---- ChangeLog | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.werks/4159 b/.werks/4159 index d9241b9..8197d71 100644 --- a/.werks/4159 +++ b/.werks/4159 @@ -1,10 +1,9 @@ -Title: smart: added compatibility for Intel SSDs +Title: mem.win: Fixed KeyError Level: 1 Component: checks +Class: fix Compatible: compat Version: 1.4.0i3 -Date: 1481573068 -Class: feature +Date: 1481548894 -The check is now able to use temperature information from Intel SSDs. diff --git a/ChangeLog b/ChangeLog index a161a04..fda18ad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,7 +20,7 @@ * 4109 websphere_mq_instance, websphere_mq_instance.manager: new checks for Websphere MQ * 4110 netscaler_vserver: now lower levels for health are configurable * 4098 ups_cps_battery, ups_cps_battery.temp, ups_cps_inphase, ups_cps_outphase: Several checks to monitor CPS UPS devices - * 4159 smart: added compatibility for Intel SSDs... + * 4159 FIX: mem.win: fixed KeyError * 3987 FIX: Check_MK Agent Access: Windows agent reported incorrect only from value * 3952 FIX: diskstat: fixed bug if multipath devices having an alias... * 3939 FIX: f5_bigip_conns: readded performance data and graphs...

7 years, 9 months

moved bugfix werk to a valid number

by Marcel Arentz

Module: check_mk Branch: master Commit: ae3f60a96ec18642aa7230a6c039708aff97e5ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ae3f60a96ec186… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Dec 12 21:30:30 2016 +0100 moved bugfix werk to a valid number Change-Id: I1561061073414e0a47a568b59b357cb2f51dc52b --- .werks/4177 | 10 ++++++++++ ChangeLog | 1 + 2 files changed, 11 insertions(+) diff --git a/.werks/4177 b/.werks/4177 new file mode 100644 index 0000000..d5459c1 --- /dev/null +++ b/.werks/4177 @@ -0,0 +1,10 @@ +Title: smart: added compatibility for Intel SSDs +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i3 +Date: 1481573068 +Class: fix + +The check is now able to use temperature information from Intel SSDs. + diff --git a/ChangeLog b/ChangeLog index fda18ad..64deb7c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -66,6 +66,7 @@ * 4103 FIX: kaspersky_av_client: No longer crash when date of last full scan is unknown... * 4160 FIX: apt: Fixed crash on unexpected output... * 4161 FIX: oracle_dataguard_stats, oracle_longactivesessions, oracle_rman: fixed crashes... + * 4177 FIX: smart: added compatibility for Intel SSDs Multisite: * 4070 Added a painter for the service check period

7 years, 9 months

Reserved 10 Werk IDS

by Marcel Arentz

Module: check_mk Branch: master Commit: 6f309919547a9560299ba8932fec03faad589eb4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6f309919547a95… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Dec 12 21:21:25 2016 +0100 Reserved 10 Werk IDS Change-Id: I4e5d96d7ed26c233f6cc0dadce13447f782449a2 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 7223c3c..ccbd775 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -4177 +4187

7 years, 9 months

4161 FIX oracle_dataguard_stats, oracle_longactivesessions, oracle_rman: fixed crashes

by Marcel Arentz

Module: check_mk Branch: master Commit: 1c6194b0c70b71ef6ae4b5cc7018b8bfb7983d82 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1c6194b0c70b71… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Dec 12 21:10:38 2016 +0100 4161 FIX oracle_dataguard_stats, oracle_longactivesessions, oracle_rman: fixed crashes Fixed crashes on Checks if there are timestamps in the output. Change-Id: I1f9dc6d33f2264418a888ba8a9f419006b85b776 --- .werks/4161 | 9 ++++----- ChangeLog | 2 +- checks/oracle_dataguard_stats | 4 +++- checks/oracle_longactivesessions | 3 +++ checks/oracle_rman | 2 ++ 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.werks/4161 b/.werks/4161 index 8ef12be..e9b4435 100644 --- a/.werks/4161 +++ b/.werks/4161 @@ -1,10 +1,9 @@ -Title: emcvnx_sp_util: fixed empty data handling +Title: oracle_dataguard_stats, oracle_longactivesessions, oracle_rman: fixed crashes Level: 1 Component: checks -Class: fix Compatible: compat -State: unknown Version: 1.4.0i3 -Date: 1481550595 - +Date: 1481573325 +Class: fix +Fixed crashes on Checks if there are timestamps in the output. diff --git a/ChangeLog b/ChangeLog index 6b31573..a161a04 100644 --- a/ChangeLog +++ b/ChangeLog @@ -60,12 +60,12 @@ * 4158 FIX: fileinfo: fixed file handling containing spaces * 4101 FIX: citrix_sessions: Output error message in case of missing session information.... * 4102 FIX: logwatch: Fixed crash due to non-existant logfile... - * 4161 FIX: emcvnx_sp_util: fixed empty data handling * 4162 FIX: esx_vsphere_vm.heartbeat: fixed KeyError * 4163 FIX: kernel: fixed empty data handling * 4164 FIX: livestatus_status: fixed ValueError for values in scientific notation * 4103 FIX: kaspersky_av_client: No longer crash when date of last full scan is unknown... * 4160 FIX: apt: Fixed crash on unexpected output... + * 4161 FIX: oracle_dataguard_stats, oracle_longactivesessions, oracle_rman: fixed crashes... Multisite: * 4070 Added a painter for the service check period diff --git a/checks/oracle_dataguard_stats b/checks/oracle_dataguard_stats index 953cb90..773a77c 100644 --- a/checks/oracle_dataguard_stats +++ b/checks/oracle_dataguard_stats @@ -35,7 +35,9 @@ def inventory_oracle_dataguard_stats(info): inventory = [] for line in info: - inventory.append(("%s.%s" % (line[0], line[1]), {})) + if len(line) == 1: + continue + inventory.append(("%s.%s" % (line[0], line[1]), {})) return inventory def check_oracle_dataguard_stats(item, params, info): diff --git a/checks/oracle_longactivesessions b/checks/oracle_longactivesessions index 5a1a60c..a1f8ebc 100644 --- a/checks/oracle_longactivesessions +++ b/checks/oracle_longactivesessions @@ -46,6 +46,9 @@ def check_oracle_longactivesessions(item, params, info): for line in info: + if len(line) <= 1: + continue + warn, crit = params["levels"] if line[0] == item: diff --git a/checks/oracle_rman b/checks/oracle_rman index e2d64c5..c790478 100644 --- a/checks/oracle_rman +++ b/checks/oracle_rman @@ -43,6 +43,8 @@ inventory_oracle_rman_incremental_details = True def inventory_oracle_rman(info): inventory = [] for line in info: + if len(line) == 1: + continue if line[4] in ('ARCHIVELOG', 'DB_FULL', 'DB_INCR', 'CONTROLFILE'): if len(line) == 8:

7 years, 9 months

4160 FIX apt: Fixed crash on unexpected output

by Marcel Arentz

Module: check_mk Branch: master Commit: f0ab03d2569a51bcbbbf3cd8051c140fb9d29859 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f0ab03d2569a51… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Dec 12 21:07:38 2016 +0100 4160 FIX apt: Fixed crash on unexpected output Fixed crash if line does not start with "Inst". Change-Id: If14dfdf9748402f64863c53337baf9b9aa7058f8 --- .werks/4160 | 8 ++++---- ChangeLog | 2 +- checks/apt | 2 ++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.werks/4160 b/.werks/4160 index 9a4d708..32ce35a 100644 --- a/.werks/4160 +++ b/.werks/4160 @@ -1,10 +1,10 @@ -Title: emcvnx_info: fixed data handling, now detects errors +Title: apt: Fixed crash on unexpected output Level: 1 Component: checks -Class: fix Compatible: compat -State: unknown Version: 1.4.0i3 -Date: 1481550183 +Date: 1481573187 +Class: fix +Fixed crash if line does not start with "Inst". diff --git a/ChangeLog b/ChangeLog index 180e432..6b31573 100644 --- a/ChangeLog +++ b/ChangeLog @@ -60,12 +60,12 @@ * 4158 FIX: fileinfo: fixed file handling containing spaces * 4101 FIX: citrix_sessions: Output error message in case of missing session information.... * 4102 FIX: logwatch: Fixed crash due to non-existant logfile... - * 4160 FIX: emcvnx_info: fixed data handling, now detects errors * 4161 FIX: emcvnx_sp_util: fixed empty data handling * 4162 FIX: esx_vsphere_vm.heartbeat: fixed KeyError * 4163 FIX: kernel: fixed empty data handling * 4164 FIX: livestatus_status: fixed ValueError for values in scientific notation * 4103 FIX: kaspersky_av_client: No longer crash when date of last full scan is unknown... + * 4160 FIX: apt: Fixed crash on unexpected output... Multisite: * 4070 Added a painter for the service check period diff --git a/checks/apt b/checks/apt index c9bb04e..a931211 100644 --- a/checks/apt +++ b/checks/apt @@ -70,6 +70,8 @@ def check_apt(_no_item, params, info): updates = [] sec_updates = [] for line in info: + if not line[0].startswith("Inst"): + continue inst, packet, version, hints = line[0].split(None, 3) if sec_regex.match(line[0]): sec_updates.append(packet)

7 years, 9 months

4159 smart: added compatibility for Intel SSDs

by Marcel Arentz

Module: check_mk Branch: master Commit: 3ea78105bfc92dbac964cd6227b862d87a887de1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3ea78105bfc92d… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Dec 12 21:05:38 2016 +0100 4159 smart: added compatibility for Intel SSDs The check is now able to use temperature information from Intel SSDs. Change-Id: I6cbd6dfd8963f46aa4f4fca5d8e69230f9329380 --- .werks/4159 | 8 ++++---- ChangeLog | 2 +- checks/smart | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.werks/4159 b/.werks/4159 index f51190c..d9241b9 100644 --- a/.werks/4159 +++ b/.werks/4159 @@ -1,10 +1,10 @@ -Title: mem.win: fixed KeyError +Title: smart: added compatibility for Intel SSDs Level: 1 Component: checks -Class: fix Compatible: compat -State: unknown Version: 1.4.0i3 -Date: 1481548894 +Date: 1481573068 +Class: feature +The check is now able to use temperature information from Intel SSDs. diff --git a/ChangeLog b/ChangeLog index d33dd86..180e432 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ * 4109 websphere_mq_instance, websphere_mq_instance.manager: new checks for Websphere MQ * 4110 netscaler_vserver: now lower levels for health are configurable * 4098 ups_cps_battery, ups_cps_battery.temp, ups_cps_inphase, ups_cps_outphase: Several checks to monitor CPS UPS devices + * 4159 smart: added compatibility for Intel SSDs... * 3987 FIX: Check_MK Agent Access: Windows agent reported incorrect only from value * 3952 FIX: diskstat: fixed bug if multipath devices having an alias... * 3939 FIX: f5_bigip_conns: readded performance data and graphs... @@ -58,7 +59,6 @@ * 4138 FIX: statgrab: Fixed issue in FreeBSD agent when statgrab is not installed * 4158 FIX: fileinfo: fixed file handling containing spaces * 4101 FIX: citrix_sessions: Output error message in case of missing session information.... - * 4159 FIX: mem.win: fixed KeyError * 4102 FIX: logwatch: Fixed crash due to non-existant logfile... * 4160 FIX: emcvnx_info: fixed data handling, now detects errors * 4161 FIX: emcvnx_sp_util: fixed empty data handling diff --git a/checks/smart b/checks/smart index 27c7090..efd396d 100644 --- a/checks/smart +++ b/checks/smart @@ -178,7 +178,7 @@ check_info["smart.stats"] = { def inventory_smart_temp(info): disks = parse_smart_raw_values(info) for disk_name, disk in disks.iteritems(): - if "Temperature_Celsius" in disk: + if disk in [ "Temperature_Celsius", "Temperature_Internal" ]: yield (disk_name, {})

7 years, 9 months

4103 FIX kaspersky_av_client: No longer crash when date of last full scan is unknown

by Konstantin Büttner

Module: check_mk Branch: master Commit: 77b41e1459025c070819d627fe819c9ad0158632 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=77b41e1459025c… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Dec 12 17:31:39 2016 +0100 4103 FIX kaspersky_av_client: No longer crash when date of last full scan is unknown If no last full scan date is provided by the agent, this is treated as unknown. Change-Id: I32a1331d7197e11190f34773b9fee97c36d65ac1 --- .werks/4103 | 10 ++++++++++ ChangeLog | 1 + checks/kaspersky_av_client | 37 ++++++++++++++++++++----------------- 3 files changed, 31 insertions(+), 17 deletions(-) diff --git a/.werks/4103 b/.werks/4103 new file mode 100644 index 0000000..b480a46 --- /dev/null +++ b/.werks/4103 @@ -0,0 +1,10 @@ +Title: kaspersky_av_client: No longer crash when date of last full scan is unknown +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i3 +Date: 1481560244 + +If no last full scan date is provided by the agent, this is treated as unknown. diff --git a/ChangeLog b/ChangeLog index f0ad00a..d33dd86 100644 --- a/ChangeLog +++ b/ChangeLog @@ -65,6 +65,7 @@ * 4162 FIX: esx_vsphere_vm.heartbeat: fixed KeyError * 4163 FIX: kernel: fixed empty data handling * 4164 FIX: livestatus_status: fixed ValueError for values in scientific notation + * 4103 FIX: kaspersky_av_client: No longer crash when date of last full scan is unknown... Multisite: * 4070 Added a painter for the service check period diff --git a/checks/kaspersky_av_client b/checks/kaspersky_av_client index 14b3a89..f70349a 100644 --- a/checks/kaspersky_av_client +++ b/checks/kaspersky_av_client @@ -65,24 +65,27 @@ def check_kaspersky_av_client(_no_item, params, parsed): ( "signature_age", "Last update of signatures" ), ( "fullscan_age", "Last fullscan" ), ]: - age = parsed[key] - warn, crit = params[key] - if age >= crit: - state = 2 - elif age >= warn: - state = 1 + age = parsed.get(key) + if age == None: + yield 3, what + ": unknown" else: - state = 0 - - infotext = "%s %s ago" % (what, get_age_human_readable(age)) - if state > 0: - infotext += " (warn/crit at %s/%s)" % ( - get_age_human_readable(warn), - get_age_human_readable(crit)) - - yield state, infotext - - if parsed["fullscan_failed"]: + warn, crit = params[key] + if age >= crit: + state = 2 + elif age >= warn: + state = 1 + else: + state = 0 + + infotext = "%s %s ago" % (what, get_age_human_readable(age)) + if state > 0: + infotext += " (warn/crit at %s/%s)" % ( + get_age_human_readable(warn), + get_age_human_readable(crit)) + + yield state, infotext + + if parsed.get("fullscan_failed"): yield 2, "Last fullscan failed"

7 years, 9 months

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: be47bac9db0c05a65320a83b8888cc35668e0220 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be47bac9db0c05… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Dec 12 16:39:38 2016 +0100 Fetched livestatus from downstream. Change-Id: Ibc2504ca2db2408c3cbe9a3a28465d36a7f1dc38 --- livestatus/src/NegatingFilter.h | 1 + livestatus/src/Query.cc | 54 +++++++++-------------------------------- 2 files changed, 12 insertions(+), 43 deletions(-) diff --git a/livestatus/src/NegatingFilter.h b/livestatus/src/NegatingFilter.h index ce71102..733a099 100644 --- a/livestatus/src/NegatingFilter.h +++ b/livestatus/src/NegatingFilter.h @@ -27,6 +27,7 @@ #include "config.h" // IWYU pragma: keep #include "Filter.h" +#include "FilterVisitor.h" class NegatingFilter : public Filter { Filter *_filter; diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index 1f81fb3..a5a278d 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -31,9 +31,7 @@ #include <utility> #include "Aggregator.h" #include "Column.h" -#include "ColumnFilter.h" #include "Filter.h" -#include "FilterVisitor.h" #include "Logger.h" #include "NegatingFilter.h" #include "NullColumn.h" @@ -53,27 +51,8 @@ using std::runtime_error; using std::string; using std::to_string; using std::unique_ptr; -using std::unordered_set; using std::vector; -namespace { -class ColumnCollector : public FilterVisitor { -public: - explicit ColumnCollector(unordered_set<Column *> &columns) - : _columns(columns) {} - void visit(ColumnFilter &f) override { _columns.insert(f.column()); } - void visit(NegatingFilter &f) override { f.subfilter()->accept(*this); } - void visit(VariadicFilter &f) override { - for (const auto &sub_filter : f) { - sub_filter->accept(*this); - } - } - -private: - unordered_set<Column *> &_columns; -}; -} // namespace - Query::Query(const list<string> &lines, Table *table, Encoding data_encoding) : _data_encoding(data_encoding) , _response_header(OutputBuffer::ResponseHeader::off) @@ -190,25 +169,13 @@ Query::Query(const list<string> &lines, Table *table, Encoding data_encoding) } if (_columns.empty() && !doStats()) { - table->any_column( - [this](Column *c) { return _columns.push_back(c), false; }); + table->any_column([this](Column *c) { + return _columns.push_back(c), _all_columns.insert(c), false; + }); // TODO(sp) We overwrite the value from a possible ColumnHeaders: line // here, is that really what we want? _show_column_headers = true; } - - _all_columns.insert(_columns.begin(), _columns.end()); - for (const auto &sc : _stats_columns) { - // TODO(sp) We should really move column() from StatsColumn, it doesn't - // belong there... :-P - if (sc->column() != nullptr) { - _all_columns.insert(sc->column()); - } - } - - ColumnCollector cc(_all_columns); - _filter.accept(cc); - _wait_condition.accept(cc); } Query::~Query() { @@ -425,6 +392,7 @@ void Query::parseStatsLine(char *line) { } _stats_columns.push_back( make_unique<StatsColumn>(column, move(filter), operation)); + _all_columns.insert(column); /* Default to old behaviour: do not output column headers if we do Stats queries */ @@ -466,6 +434,7 @@ void Query::parseFilterLine(char *line, VariadicFilter &filter) { if (Filter *sub_filter = createFilter(column, relOp, value)) { filter.addSubfilter(sub_filter); + _all_columns.insert(column); } } @@ -487,18 +456,17 @@ void Query::parseStatsGroupLine(char *line) { void Query::parseColumnsLine(char *line) { while (char *column_name = next_field(&line)) { Column *column = _table->column(column_name); - if (column != nullptr) { - _columns.push_back(column); - } else { - Informational(_logger) << "Replacing non-existing column '" - << column_name << "' with null column"; + if (column == nullptr) { // Do not fail any longer. We might want to make this configurable. // But not failing has the advantage that an updated GUI, that // expects new columns, will be able to keep compatibility with // older Livestatus versions. - _columns.push_back( - new NullColumn(column_name, "non-existing column")); + Informational(_logger) << "Replacing non-existing column '" + << column_name << "' with null column"; + column = new NullColumn(column_name, "non-existing column"); } + _columns.push_back(column); + _all_columns.insert(column); } _show_column_headers = false; }

7 years, 9 months

← Newer
1
...
23
24
25
26
27
28
29
...
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2016