Checkmk git commits July 2016

checkmk-commits@lists.checkmk.com

10 participants
213 discussions

changed title in inventory plugin win_system for consistency

by Simon Betz

Module: check_mk Branch: master Commit: 7e06bb4006d2eeef129c4120ddacf747a615083e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e06bb4006d2ee… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jul 13 11:03:56 2016 +0200 changed title in inventory plugin win_system for consistency --- inventory/win_system | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventory/win_system b/inventory/win_system index 09195a5..d634d9d 100644 --- a/inventory/win_system +++ b/inventory/win_system @@ -46,7 +46,7 @@ def inv_win_system(info): if varname == "SerialNumber": node["serial"] = value elif varname == "Manufacturer": - node["vendor"] = value + node["manufacturer"] = value elif varname == "Name": node["product"] = value elif varname == "Model":

8 years, 2 months

3707 FIX oracle_tablespaces: cleanup

by Simon Betz

Module: check_mk Branch: master Commit: 6e16fdbf283b210627b225fddac2bcfbf8c095a6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e16fdbf283b21… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jul 13 10:01:20 2016 +0200 3707 FIX oracle_tablespaces: cleanup --- .werks/3707 | 13 +++ ChangeLog | 1 + checks/oracle_tablespaces | 245 +++++++++++++++++++++++++-------------------- 3 files changed, 149 insertions(+), 110 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6e16fdbf28…

8 years, 2 months

3670 FIX Fixed empty AV PDF report when exporting it from a quicksearch result view

by Lars Michelsen

Module: check_mk Branch: master Commit: ef8c1c24efc10f4f351ef4399771a4a848b22a87 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ef8c1c24efc10f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 13 09:14:50 2016 +0200 3670 FIX Fixed empty AV PDF report when exporting it from a quicksearch result view --- .werks/3670 | 10 ++++++++++ ChangeLog | 1 + 2 files changed, 11 insertions(+) diff --git a/.werks/3670 b/.werks/3670 new file mode 100644 index 0000000..61d63ac --- /dev/null +++ b/.werks/3670 @@ -0,0 +1,10 @@ +Title: Fixed empty AV PDF report when exporting it from a quicksearch result view +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1468394083 + + diff --git a/ChangeLog b/ChangeLog index 7f6eef6..40523dc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -391,6 +391,7 @@ * 3662 FIX: Fixed creation/editing of dashboards (regression since 1.2.8p5) * 3668 FIX: Fixed slow loading of GUI pages when using a localized GUI * 3669 FIX: LDAP: Fixed very long running LDAP sync when using group based sync plugins + * 3670 FIX: Fixed empty AV PDF report when exporting it from a quicksearch result view WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection...

8 years, 2 months

Fetched Livestatus from upstream.

by Sven Panne

Module: check_mk Branch: master Commit: 305f1a8a662d906deeb50d77a7b8a3285dad61b7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=305f1a8a662d90… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jul 12 16:32:05 2016 +0200 Fetched Livestatus from upstream. --- livestatus/src/ContactgroupsColumn.cc | 2 +- livestatus/src/DownCommColumn.cc | 7 ++-- livestatus/src/HostgroupsColumn.cc | 2 +- livestatus/src/ServicegroupsColumn.cc | 2 +- livestatus/src/TableEventConsole.h | 35 ++++++++++++++++--- livestatus/src/TableEventConsoleEvents.cc | 49 +++++++++++++++++++++++--- livestatus/src/TableEventConsoleHistory.cc | 52 +++++++++++++++++++++++++--- 7 files changed, 130 insertions(+), 19 deletions(-) diff --git a/livestatus/src/ContactgroupsColumn.cc b/livestatus/src/ContactgroupsColumn.cc index 850a7b5..529ad18 100644 --- a/livestatus/src/ContactgroupsColumn.cc +++ b/livestatus/src/ContactgroupsColumn.cc @@ -60,7 +60,7 @@ unique_ptr<ListColumn::Contains> ContactgroupsColumn::makeContains( const string &name) { class ContainsContactGroup : public Contains { public: - explicit ContainsContactGroup(contactgroup *element, int offset) + ContainsContactGroup(contactgroup *element, int offset) : _element(element), _offset(offset) {} bool operator()(void *row) override { diff --git a/livestatus/src/DownCommColumn.cc b/livestatus/src/DownCommColumn.cc index f54e0dd..49797d2 100644 --- a/livestatus/src/DownCommColumn.cc +++ b/livestatus/src/DownCommColumn.cc @@ -91,11 +91,12 @@ bool DownCommColumn::match(DowntimeOrComment *dt, void *data) { return dt->_host->name == h->name; } -unique_ptr<ListColumn::Contains> DownCommColumn::makeContains(const string &name) { +unique_ptr<ListColumn::Contains> DownCommColumn::makeContains( + const string &name) { class ContainsDownCommID : public Contains { public: - explicit ContainsDownCommID(unsigned long element, - const DowntimesOrComments &holder) + ContainsDownCommID(unsigned long element, + const DowntimesOrComments &holder) : _element(element), _holder(holder) {} bool operator()(void *row) override { diff --git a/livestatus/src/HostgroupsColumn.cc b/livestatus/src/HostgroupsColumn.cc index 9e1166c..85b222d 100644 --- a/livestatus/src/HostgroupsColumn.cc +++ b/livestatus/src/HostgroupsColumn.cc @@ -63,7 +63,7 @@ unique_ptr<ListColumn::Contains> HostgroupsColumn::makeContains( const string &name) { class ContainsHostGroup : public Contains { public: - explicit ContainsHostGroup(hostgroup *element, int offset) + ContainsHostGroup(hostgroup *element, int offset) : _element(element), _offset(offset) {} bool operator()(void *row) override { diff --git a/livestatus/src/ServicegroupsColumn.cc b/livestatus/src/ServicegroupsColumn.cc index f5a4094..988425a 100644 --- a/livestatus/src/ServicegroupsColumn.cc +++ b/livestatus/src/ServicegroupsColumn.cc @@ -65,7 +65,7 @@ unique_ptr<ListColumn::Contains> ServicegroupsColumn::makeContains( const string &name) { class ContainsServiceGroup : public Contains { public: - explicit ContainsServiceGroup(servicegroup *element, int offset) + ContainsServiceGroup(servicegroup *element, int offset) : _element(element), _offset(offset) {} bool operator()(void *row) override { diff --git a/livestatus/src/TableEventConsole.h b/livestatus/src/TableEventConsole.h index e37338a..c4a2104 100644 --- a/livestatus/src/TableEventConsole.h +++ b/livestatus/src/TableEventConsole.h @@ -28,6 +28,7 @@ #include "config.h" // IWYU pragma: keep #include <stdlib.h> #include <sys/types.h> +#include <algorithm> #include <cstdint> #include <functional> #include <map> @@ -75,6 +76,11 @@ protected: std::function<T(std::string)> f) : _name(name), _default_value(default_value), _f(f) {} + std::string getRaw(void *data) const { + auto row = static_cast<Row *>(data); + return row == nullptr ? "" : row->_map.at(_name); + } + T getValue(void *data) const { auto row = static_cast<Row *>(data); return row == nullptr ? _default_value : _f(row->_map.at(_name)); @@ -148,6 +154,14 @@ protected: : mk::split(x.substr(1), '\001'); }) {} + bool isNone(void *data) { + return _ecc.getRaw(data) == "\002"; + } + + _column_t getValue(void *data) { + return _ecc.getValue(data); + } + void output(void *data, Query *query) override { query->outputBeginList(); bool first = true; @@ -167,12 +181,23 @@ protected: } std::unique_ptr<Contains> makeContains( - const std::string & /*unused*/) override { - struct ContainsElem : public Contains { - // TODO(sp) Actually implement this. - bool operator()(void * /*unused*/) override { return false; } + const std::string &name) override { + class ContainsElem : public Contains { + public: + ContainsElem(const std::string &name, + const EventConsoleColumn<_column_t> &ecc) + : _name(name), _ecc(ecc) {} + bool operator()(void *row) override { + const _column_t &values = _ecc.getValue(row); + return std::find(values.begin(), values.end(), _name) != + values.end(); + } + + private: + std::string _name; + const EventConsoleColumn<_column_t> &_ecc; }; - return std::make_unique<ContainsElem>(); + return std::make_unique<ContainsElem>(name, _ecc); } }; diff --git a/livestatus/src/TableEventConsoleEvents.cc b/livestatus/src/TableEventConsoleEvents.cc index afc8037..2f08f2c 100644 --- a/livestatus/src/TableEventConsoleEvents.cc +++ b/livestatus/src/TableEventConsoleEvents.cc @@ -28,7 +28,9 @@ #include "TableHosts.h" #ifdef CMC +#include "ContactGroup.h" #include "Host.h" +#include "World.h" #else #include "auth.h" #endif @@ -129,11 +131,50 @@ const char *TableEventConsoleEvents::namePrefix() const { return "eventconsoleevents_"; } -bool TableEventConsoleEvents::isAuthorized(contact *ctc, void *data) { - host *host = static_cast<Row *>(data)->_host; +// TODO(sp) Move this into some kind of abstraction layer. +namespace { +bool hasContact(host *hst, contact *ctc) { +#ifdef CMC + return hst != nullptr && hst->hasContact(ctc); +#else + return is_authorized_for(ctc, hst, nullptr); +#endif +} + +bool hasContact(contactgroup *cg, contact *ctc) { +#ifdef CMC + return cg != nullptr && cg->isMember(ctc); +#else + return is_contact_member_of_contactgroup(cg, ctc) != 0; +#endif +} + +contactgroup *getContactGroup(const string &name) { #ifdef CMC - return host == nullptr || host->hasContact(ctc); + return g_live_world->getContactGroup(name); #else - return host == nullptr || is_authorized_for(ctc, host, nullptr); + // Older Nagios headers are not const-correct... :-P + return find_contactgroup(const_cast<char *>(name.c_str())); #endif } +} // namespace + +// TODO(sp) This is copy-n-pasted in TableEventConsoleHistory. +bool TableEventConsoleEvents::isAuthorized(contact *ctc, void *data) { + if (host *hst = static_cast<Row *>(data)->_host) { + return hasContact(hst, ctc); + } + + ListEventConsoleColumn *col = + static_cast<ListEventConsoleColumn *>(column("event_contact_groups")); + if (col->isNone(data)) { + return true; + } + + for (const auto &name : col->getValue(data)) { + if (hasContact(getContactGroup(name), ctc)) { + return true; + } + } + return false; +} diff --git a/livestatus/src/TableEventConsoleHistory.cc b/livestatus/src/TableEventConsoleHistory.cc index 055a4be..85a5fed 100644 --- a/livestatus/src/TableEventConsoleHistory.cc +++ b/livestatus/src/TableEventConsoleHistory.cc @@ -23,14 +23,19 @@ // Boston, MA 02110-1301 USA. #include "TableEventConsoleHistory.h" +#include <string> #include "TableEventConsoleEvents.h" #ifdef CMC +#include "ContactGroup.h" #include "Host.h" +#include "World.h" #else #include "auth.h" #endif +using std::string; + #ifdef CMC TableEventConsoleHistory::TableEventConsoleHistory( const Notes &downtimes_holder, const Notes &comments_holder, @@ -73,11 +78,50 @@ const char *TableEventConsoleHistory::namePrefix() const { return "eventconsolehistory_"; } -bool TableEventConsoleHistory::isAuthorized(contact *ctc, void *data) { - host *host = static_cast<Row *>(data)->_host; +// TODO(sp) Move this into some kind of abstraction layer. +namespace { +bool hasContact(host *hst, contact *ctc) { #ifdef CMC - return host == nullptr || host->hasContact(ctc); + return hst != nullptr && hst->hasContact(ctc); #else - return host == nullptr || is_authorized_for(ctc, host, nullptr); + return is_authorized_for(ctc, hst, nullptr); #endif } + +bool hasContact(contactgroup *cg, contact *ctc) { +#ifdef CMC + return cg != nullptr && cg->isMember(ctc); +#else + return is_contact_member_of_contactgroup(cg, ctc) != 0; +#endif +} + +contactgroup *getContactGroup(const string &name) { +#ifdef CMC + return g_live_world->getContactGroup(name); +#else + // Older Nagios headers are not const-correct... :-P + return find_contactgroup(const_cast<char *>(name.c_str())); +#endif +} +} // namespace + +// TODO(sp) This is copy-n-pasted in TableEventConsoleEvents. +bool TableEventConsoleHistory::isAuthorized(contact *ctc, void *data) { + if (host *hst = static_cast<Row *>(data)->_host) { + return hasContact(hst, ctc); + } + + ListEventConsoleColumn *col = + static_cast<ListEventConsoleColumn *>(column("event_contact_groups")); + if (col->isNone(data)) { + return true; + } + + for (const auto &name : col->getValue(data)) { + if (hasContact(getContactGroup(name), ctc)) { + return true; + } + } + return false; +}

8 years, 2 months

fixed inv_tree_list

by Simon Betz

Module: check_mk Branch: master Commit: d28e3895e5feac7dc10b5a903ae2decd2bbff039 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d28e3895e5feac… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jul 12 15:40:04 2016 +0200 fixed inv_tree_list --- inventory/hp_proliant_da_phydrv | 2 +- inventory/hp_proliant_mem | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/inventory/hp_proliant_da_phydrv b/inventory/hp_proliant_da_phydrv index 8df1462..16fbc64 100644 --- a/inventory/hp_proliant_da_phydrv +++ b/inventory/hp_proliant_da_phydrv @@ -33,7 +33,7 @@ def inv_hp_proliant_da_phydrv(info): "4" : "SAS", } - node = inv_tree("hardware.storage.disks:") + node = inv_tree_list("hardware.storage.disks:") for cntlr_index, index, bay, status, ref_hours, size, condition, \ bus_number, smart_status, model, serial, ty, fw in info: diff --git a/inventory/hp_proliant_mem b/inventory/hp_proliant_mem index 56cde26..a0c980e 100644 --- a/inventory/hp_proliant_mem +++ b/inventory/hp_proliant_mem @@ -47,7 +47,7 @@ def inv_hp_proliant_mem(info): "18" : 'FB-DIMM DDR3', } - node = inv_tree("hardware.memory.arrays:") + node = inv_tree_list("hardware.memory.arrays:") infos = {} for board_index, module_index, module_size_str, module_type, \

8 years, 2 months

3706 hp_proliant_systeminfo, hp_proliant_mem, hp_proliant_da_phydrv: new inventory plugins

by Simon Betz

Module: check_mk Branch: master Commit: 1bded88df362e89a6777571f992e49d7427036d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1bded88df362e8… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jul 12 15:25:06 2016 +0200 3706 hp_proliant_systeminfo, hp_proliant_mem, hp_proliant_da_phydrv: new inventory plugins --- .werks/3706 | 9 ++++ ChangeLog | 1 + checks/hp_proliant_da_phydrv | 48 ++++++++++--------- checks/hp_proliant_mem | 40 +++++++++------- inventory/hp_proliant_da_phydrv | 71 ++++++++++++++++++++++++++++ inventory/hp_proliant_mem | 97 ++++++++++++++++++++++++++++++++++++++ inventory/hp_proliant_systeminfo | 41 ++++++++++++++++ web/plugins/views/inventory.py | 2 +- 8 files changed, 269 insertions(+), 40 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1bded88df3…

8 years, 2 months

Reserved 10 Werk IDS

by Simon Betz

Module: check_mk Branch: master Commit: 6091058dddb7ce030bd8d2273974f04ec3826a7c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6091058dddb7ce… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jul 12 15:24:19 2016 +0200 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 981aad2..afb7f11 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -3706 +3716

8 years, 2 months

fixed dmidecode if there are already phy. arrays

by Simon Betz

Module: check_mk Branch: master Commit: a3cbd46a7fcc7683dc2ac6005c98e2ce60e71a44 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a3cbd46a7fcc76… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jul 12 15:18:22 2016 +0200 fixed dmidecode if there are already phy. arrays --- inventory/dmidecode | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/inventory/dmidecode b/inventory/dmidecode index 7bf90c2..86404a2 100644 --- a/inventory/dmidecode +++ b/inventory/dmidecode @@ -202,6 +202,7 @@ def inv_dmidecode_parse_physical_mem_array(lines): "devices" : [] } node.append(array) + for line in lines: if line[0] == "Location": array["location"] = line[1] @@ -213,24 +214,15 @@ def inv_dmidecode_parse_physical_mem_array(lines): array["maximum_capacity"] = dmidecode_parse_size(line[1]) def inv_dmidecode_parse_mem_device(lines): - # Do we already have an entry for a memory array? Then - # we assume that this device belongs to the most recently - # read array. Otherwise we create a dummy entry and replace - # that later with actual information - node = inv_tree_list("hardware.memory.arrays:") - if node: - array = node[-1] - else: - array = { "devices": []} - node.append(array) - + node = inv_tree_list("hardware.memory.arrays:") device = {} + inv_dmidecode_parse_generic(device, lines, { "Total Width" : "total_width", # 64 bits "Data Width" : "data_width", # 64 bits "Form Factor" : "form_factor", # SODIMM "Set" : "set", # None - "Locator" : "locator", # DIMM 2 + "Locator" : "locator", # PROC 1 DIMM 2 "Bank Locator" : "bank_locator", # Bank 2/3 "Type" : "type", # DDR2 "Type Detail" : "type_detail", # Synchronous @@ -242,10 +234,29 @@ def inv_dmidecode_parse_mem_device(lines): "Size" : "size", # 2048 MB }) + # Do we already have an entry for a memory array? Then + # we assume that this device belongs to the most recently + # read array. Otherwise we create a dummy entry and replace + # that later with actual information + # If there are already arrays we try to find the right index of + # the phy. array + index = None + if device.get("locator") and device["locator"].startswith("PROC"): + index = device["locator"].split()[1] + + if node: + try: + array = node[int(index) - 1] + except: + array = node[-1] + else: + array = { "devices": [] } + node.append(array) + if device["size"] != "No Module Installed": # Convert speed and size into numbers device["speed"] = dmidecode_parse_speed(device.get("speed", "Unknown")) - device["size"] = dmidecode_parse_size(device.get("size", "Unknown")) + device["size"] = dmidecode_parse_size(device.get("size", "Unknown")) array["devices"].append(device)

8 years, 2 months

fixed invalid parameter name

by Andreas Boesl

Module: check_mk Branch: master Commit: d8b8bcdb2164c3d7aa608f8519d88ecf1a5ba369 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d8b8bcdb2164c3… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jul 12 15:03:54 2016 +0200 fixed invalid parameter name --- web/htdocs/bi.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 231ddd2..6700bdb 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -2131,6 +2131,6 @@ def migrate_bi_configuration(): config.bi_packs = {} else: if config.host_aggregations and type(config.host_aggregations[0]) != dict: - config.host_aggregations = map(convert_aggregation, config.host_aggregation) + config.host_aggregations = map(convert_aggregation, config.host_aggregations) if config.aggregations and type(config.aggregations[0]) != dict: - config.aggregations = map(convert_aggregation, config.aggregation) + config.aggregations = map(convert_aggregation, config.aggregations)

8 years, 2 months

removed obsolete parameter

by Andreas Boesl

Module: check_mk Branch: master Commit: 228fba1215086ce9702c06b77e1e465127ab332c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=228fba1215086c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jul 12 15:01:50 2016 +0200 removed obsolete parameter --- web/htdocs/bi.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 612abc0..231ddd2 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -1168,7 +1168,6 @@ def execute_rule_node(node, status_info, aggregation_options): node_states = [] assumed_states = [] downtime_states = [] - host_downtime_states = [] service_period_states = [] ack_states = [] # Needed for computing the acknowledgement of non-OK nodes one_assumption = False @@ -1201,7 +1200,6 @@ def execute_rule_node(node, status_info, aggregation_options): # Compute downtime state downtime_state = func(*([downtime_states] + funcargs)) - host_downtime_state = func(*([host_downtime_states] + funcargs)) if aggregation_options["downtime_aggr_warn"]: state["in_downtime"] = downtime_state["state"] >= 1

8 years, 2 months

← Newer
1
...
13
14
15
16
17
18
19
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2016