Checkmk git commits October 2017

checkmk-commits@lists.checkmk.com

10 participants
288 discussions

Be explicit about which columns have a filtering capability.

by Sven Panne

Module: check_mk Branch: master Commit: 1e28cf732cf26f87fa7b5f5891bf8fa6b35932be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e28cf732cf26f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Oct 27 10:13:23 2017 +0200 Be explicit about which columns have a filtering capability. Change-Id: Ic3a5f59f268b74b812e17c9f03067faaf0630b60 --- livestatus/src/BlobColumn.cc | 7 +++++++ livestatus/src/BlobColumn.h | 11 +++++++++-- livestatus/src/Column.cc | 6 ------ livestatus/src/Column.h | 2 +- livestatus/src/NullColumn.cc | 7 +++++++ livestatus/src/NullColumn.h | 8 ++++++++ 6 files changed, 32 insertions(+), 9 deletions(-) diff --git a/livestatus/src/BlobColumn.cc b/livestatus/src/BlobColumn.cc index 6cf2aa9..00908de 100644 --- a/livestatus/src/BlobColumn.cc +++ b/livestatus/src/BlobColumn.cc @@ -23,6 +23,7 @@ // Boston, MA 02110-1301 USA. #include "BlobColumn.h" +#include <stdexcept> #include "Renderer.h" #include "Row.h" @@ -34,3 +35,9 @@ void BlobColumn::output(Row row, RowRenderer &r, r.output(Null()); } } + +std::unique_ptr<Filter> BlobColumn::createFilter( + RelationalOperator /*unused*/, const std::string & /*unused*/) const { + throw std::runtime_error("filtering on blob column " + name() + + " not supported"); +} diff --git a/livestatus/src/BlobColumn.h b/livestatus/src/BlobColumn.h index c205864..451b948 100644 --- a/livestatus/src/BlobColumn.h +++ b/livestatus/src/BlobColumn.h @@ -31,6 +31,8 @@ #include <vector> #include "Column.h" #include "contact_fwd.h" +#include "opids.h" +class Filter; class Row; class RowRenderer; @@ -41,10 +43,15 @@ public: int offset) : Column(name, description, indirect_offset, extra_offset, extra_extra_offset, offset) {} - virtual std::unique_ptr<std::vector<char>> getBlob(Row row) const = 0; + ColumnType type() const override { return ColumnType::blob; } + void output(Row row, RowRenderer &r, const contact *auth_user) const override; - ColumnType type() const override { return ColumnType::blob; } + + std::unique_ptr<Filter> createFilter( + RelationalOperator relOp, const std::string &value) const override; + + virtual std::unique_ptr<std::vector<char>> getBlob(Row row) const = 0; }; #endif // BlobColumn_h diff --git a/livestatus/src/Column.cc b/livestatus/src/Column.cc index 0d122b7..a3675f7 100644 --- a/livestatus/src/Column.cc +++ b/livestatus/src/Column.cc @@ -23,7 +23,6 @@ // Boston, MA 02110-1301 USA. #include "Column.h" -#include <stdexcept> #include <utility> #include "Logger.h" @@ -57,11 +56,6 @@ const void *Column::shiftPointer(Row row) const { _offset); } -std::unique_ptr<Filter> Column::createFilter( - RelationalOperator /*unused*/, const std::string & /*unused*/) const { - throw std::runtime_error("filtering on column " + _name + " not supported"); -} - std::unique_ptr<Aggregator> Column::createAggregator( StatsOperation /*unused*/) const { return nullptr; diff --git a/livestatus/src/Column.h b/livestatus/src/Column.h index 48365ba..1eff6ba 100644 --- a/livestatus/src/Column.h +++ b/livestatus/src/Column.h @@ -65,7 +65,7 @@ public: const contact *auth_user) const = 0; virtual std::unique_ptr<Filter> createFilter( - RelationalOperator relOp, const std::string &value) const; + RelationalOperator relOp, const std::string &value) const = 0; virtual std::unique_ptr<Aggregator> createAggregator( StatsOperation operation) const; diff --git a/livestatus/src/NullColumn.cc b/livestatus/src/NullColumn.cc index 4f098ee..c08d4b0 100644 --- a/livestatus/src/NullColumn.cc +++ b/livestatus/src/NullColumn.cc @@ -23,10 +23,17 @@ // Boston, MA 02110-1301 USA. #include "NullColumn.h" +#include <stdexcept> #include "Renderer.h" #include "Row.h" +class Filter; void NullColumn::output(Row /* row */, RowRenderer& r, const contact* /* auth_user */) const { r.output(Null()); } + +std::unique_ptr<Filter> NullColumn::createFilter( + RelationalOperator /*unused*/, const std::string& /*unused*/) const { + throw std::runtime_error("filtering on null column not supported"); +} diff --git a/livestatus/src/NullColumn.h b/livestatus/src/NullColumn.h index b10b376..2d1bf4d 100644 --- a/livestatus/src/NullColumn.h +++ b/livestatus/src/NullColumn.h @@ -26,9 +26,12 @@ #define NullColumn_h #include "config.h" // IWYU pragma: keep +#include <memory> #include <string> #include "Column.h" #include "contact_fwd.h" +#include "opids.h" +class Filter; class Row; class RowRenderer; @@ -39,9 +42,14 @@ public: int offset) : Column(name, description, indirect_offset, extra_offset, extra_extra_offset, offset) {} + ColumnType type() const override { return ColumnType::null; } + void output(Row row, RowRenderer &r, const contact *auth_user) const override; + + std::unique_ptr<Filter> createFilter( + RelationalOperator relOp, const std::string &value) const override; }; #endif // NullColumn_h

6 years, 10 months

Formatting only.

by Sven Panne

Module: check_mk Branch: master Commit: 6cbd926e95485d076927ab68b80f44c6425c0fb2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6cbd926e95485d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Oct 27 09:56:49 2017 +0200 Formatting only. Change-Id: Ib348e18da3f62ed4d834e4e3237ee4de32f518b6 --- livestatus/src/ContactGroupsMemberColumn.cc | 2 +- livestatus/src/HostContactsColumn.cc | 2 +- livestatus/src/MetricsColumn.cc | 2 +- livestatus/src/ServiceContactsColumn.cc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/livestatus/src/ContactGroupsMemberColumn.cc b/livestatus/src/ContactGroupsMemberColumn.cc index 033d818..2250e58 100644 --- a/livestatus/src/ContactGroupsMemberColumn.cc +++ b/livestatus/src/ContactGroupsMemberColumn.cc @@ -27,7 +27,7 @@ #include "nagios.h" std::vector<std::string> ContactGroupsMemberColumn::getValue( - Row row, const contact * /*auth_user*/) const { + Row row, const contact* /*auth_user*/) const { std::vector<std::string> names; if (auto cg = columnData<contactgroup>(row)) { for (auto cm = cg->members; cm != nullptr; cm = cm->next) { diff --git a/livestatus/src/HostContactsColumn.cc b/livestatus/src/HostContactsColumn.cc index 4e9a88f..938be73 100644 --- a/livestatus/src/HostContactsColumn.cc +++ b/livestatus/src/HostContactsColumn.cc @@ -28,7 +28,7 @@ #include "nagios.h" std::vector<std::string> HostContactsColumn::getValue( - Row row, const contact * /*auth_user*/) const { + Row row, const contact* /*auth_user*/) const { std::unordered_set<std::string> names; if (auto hst = columnData<host>(row)) { for (auto cm = hst->contacts; cm != nullptr; cm = cm->next) { diff --git a/livestatus/src/MetricsColumn.cc b/livestatus/src/MetricsColumn.cc index 84cb3ba..6d63b7f 100644 --- a/livestatus/src/MetricsColumn.cc +++ b/livestatus/src/MetricsColumn.cc @@ -26,7 +26,7 @@ #include "Row.h" std::vector<std::string> MetricsColumn::getValue( - Row /*row*/, const contact * /*auth_user*/) const { + Row /*row*/, const contact* /*auth_user*/) const { (void)_mc; return {}; } diff --git a/livestatus/src/ServiceContactsColumn.cc b/livestatus/src/ServiceContactsColumn.cc index 10d2cff..e3d405e 100644 --- a/livestatus/src/ServiceContactsColumn.cc +++ b/livestatus/src/ServiceContactsColumn.cc @@ -28,7 +28,7 @@ #include "nagios.h" std::vector<std::string> ServiceContactsColumn::getValue( - Row row, const contact * /*auth_user*/) const { + Row row, const contact* /*auth_user*/) const { std::unordered_set<std::string> names; if (auto svc = columnData<service>(row)) { for (auto cm = svc->contacts; cm != nullptr; cm = cm->next) {

6 years, 10 months

Improved const-correctness.

by Sven Panne

Module: check_mk Branch: master Commit: 50af1598239a443361d5cfe2aa6b16bde46059b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=50af1598239a44… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Oct 27 09:56:24 2017 +0200 Improved const-correctness. Change-Id: I5705ef69ace562e8df644a7684630c37a97be600 --- livestatus/src/Query.cc | 2 +- livestatus/src/Query.h | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index 74e42c0..29361e7 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -193,7 +193,7 @@ void Query::invalidRequest(const std::string &message) const { _output.setError(OutputBuffer::ResponseCode::invalid_request, message); } -std::unique_ptr<Filter> Query::createFilter(Column &column, +std::unique_ptr<Filter> Query::createFilter(const Column &column, RelationalOperator relOp, const std::string &value) { try { diff --git a/livestatus/src/Query.h b/livestatus/src/Query.h index 91cff49..b7d663b 100644 --- a/livestatus/src/Query.h +++ b/livestatus/src/Query.h @@ -112,9 +112,7 @@ private: bool doStats() const; void doWait(); - // TODO(sp) The column parameter should actually be a const reference, but - // Column::createFilter is not const-correct yet... - std::unique_ptr<Filter> createFilter(Column &column, + std::unique_ptr<Filter> createFilter(const Column &column, RelationalOperator relOp, const std::string &value); void parseFilterLine(char *line, VariadicFilter &filter);

6 years, 10 months

Pushed implementation of output() method up to ListColumn.

by Sven Panne

Module: check_mk Branch: master Commit: 889357592e794b571505c1925ad8693e58d26626 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=889357592e794b… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Oct 27 09:42:15 2017 +0200 Pushed implementation of output() method up to ListColumn. Change-Id: Ie845214b30ca4a7d82f7ab4e51708551101cf243 --- livestatus/src/Column.h | 3 +-- livestatus/src/CommentColumn.cc | 21 ++++++++++++--------- livestatus/src/ContactGroupsColumn.cc | 9 --------- livestatus/src/ContactGroupsColumn.h | 4 ---- livestatus/src/ContactGroupsMemberColumn.cc | 9 --------- livestatus/src/ContactGroupsMemberColumn.h | 4 ---- livestatus/src/CustomVarsNamesColumn.cc | 9 --------- livestatus/src/CustomVarsNamesColumn.h | 4 ---- livestatus/src/CustomVarsValuesColumn.cc | 9 --------- livestatus/src/CustomVarsValuesColumn.h | 4 ---- livestatus/src/HostContactsColumn.cc | 9 --------- livestatus/src/HostContactsColumn.h | 4 ---- livestatus/src/HostGroupsColumn.cc | 9 --------- livestatus/src/HostGroupsColumn.h | 4 ---- livestatus/src/ListColumn.cc | 10 ++++++++++ livestatus/src/ListColumn.h | 4 ++++ livestatus/src/LogwatchListColumn.cc | 9 --------- livestatus/src/LogwatchListColumn.h | 4 ---- livestatus/src/MetricsColumn.cc | 9 --------- livestatus/src/MetricsColumn.h | 4 ---- livestatus/src/ServiceContactsColumn.cc | 9 --------- livestatus/src/ServiceContactsColumn.h | 4 ---- livestatus/src/ServiceGroupsColumn.cc | 9 --------- livestatus/src/ServiceGroupsColumn.h | 4 ---- livestatus/src/TableEventConsole.h | 8 -------- 25 files changed, 27 insertions(+), 149 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=889357592e…

6 years, 10 months

5440 didactum_sensors_discrete: Discovers also smoke sensors

by Simon Betz

Module: check_mk Branch: master Commit: 265323e8b449d8c2d24b4779e85fec2471ef72af URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=265323e8b449d8… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Oct 27 09:21:09 2017 +0200 5440 didactum_sensors_discrete: Discovers also smoke sensors Change-Id: I2621e04a9b2791539df59bf7fcb215ec5c6fb5b2 --- .werks/5440 | 10 ++++++++++ checkman/didactum_sensors_discrete | 5 +++++ checks/didactum.include | 25 +++++++++++++------------ checks/didactum_sensors_discrete | 12 +++++++++--- 4 files changed, 37 insertions(+), 15 deletions(-) diff --git a/.werks/5440 b/.werks/5440 new file mode 100644 index 0000000..8821c78 --- /dev/null +++ b/.werks/5440 @@ -0,0 +1,10 @@ +Title: didactum_sensors_discrete: Discovers also smoke sensors +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1509088657 +Class: feature + + diff --git a/checkman/didactum_sensors_discrete b/checkman/didactum_sensors_discrete index 44fe197..c9b31ec 100644 --- a/checkman/didactum_sensors_discrete +++ b/checkman/didactum_sensors_discrete @@ -7,6 +7,11 @@ description: This check monitors discrete sensors of Didactum devices which support the DIDACTUM-SYSTEM-MIB. + The check is OK if the device status is "normal" or "on", + it is WARN if the device status is "warning", "high warning" + or "low warning" and the check reports CRIT in case of + "alarm", "high alarm" or "low alarm", otherwise UNKNOWN. + item: The discrete sensor identifier. diff --git a/checks/didactum.include b/checks/didactum.include index 8f337f9..9cdab2a 100644 --- a/checks/didactum.include +++ b/checks/didactum.include @@ -48,17 +48,7 @@ def parse_didactum_sensors(info): parsed = {} for line in info: - ty, name, status, value_str = line[:4] - parsed.setdefault(ty, {}) - - if value_str.isdigit(): - value = int(value_str) - else: - try: - value = float(value_str) - except: - value = value_str - + ty, name, status = line[:3] if status in map_states: state = map_states[status] state_readable = status @@ -66,12 +56,23 @@ def parse_didactum_sensors(info): state = 3 state_readable = "unknown[%s]" % status + parsed.setdefault(ty, {}) parsed[ty].setdefault(name, { "state" : state, "state_readable" : state_readable, - "value" : value, }) + if len(line) >= 4: + value_str = line[3] + if value_str.isdigit(): + value = int(value_str) + else: + try: + value = float(value_str) + except: + value = value_str + parsed[ty][name].update({"value": value}) + if len(line) == 8: crit_lower, warn_lower, warn, crit = line[4:] parsed[ty][name].update({ diff --git a/checks/didactum_sensors_discrete b/checks/didactum_sensors_discrete index c6af0ea..2a0d9a8 100644 --- a/checks/didactum_sensors_discrete +++ b/checks/didactum_sensors_discrete @@ -44,13 +44,20 @@ def inventory_didactum_sensors_discrete_dry(parsed): - return inventory_didactum_sensors(parsed, "dry") + inventory = [] + for discrete_sensort_type in ["dry", "smoke"]: + inventory += inventory_didactum_sensors(parsed, discrete_sensort_type) + return inventory def check_didactum_sensors_discrete_dry(item, params, parsed): if item in parsed.get("dry", {}): data = parsed["dry"][item] - return data["state"], "Status: %s" % data["state_readable"] + elif item in parsed.get("smoke", {}): + data = parsed["smoke"][item] + else: + return 3, "Discrete sensor %s not found in SNMP data." % item + return data["state"], "Status: %s" % data["state_readable"] check_info['didactum_sensors_discrete'] = { @@ -62,7 +69,6 @@ check_info['didactum_sensors_discrete'] = { "4", # DIDACTUM-SYSTEM-MIB::ctlInternalSensorsDiscretType "5", # DIDACTUM-SYSTEM-MIB::ctlInternalSensorsDiscretName "6", # DIDACTUM-SYSTEM-MIB::ctlInternalSensorsDiscretState - "7", # DIDACTUM-SYSTEM-MIB::ctlInternalSensorsDiscretValue ]), 'snmp_scan_function' : scan_didactum, 'includes' : [ 'didactum.include' ],

6 years, 10 months

Reduced #ifdef Kung Fu a bit.

by Sven Panne

Module: check_mk Branch: master Commit: bde05d62ac60a1eac8dddce756c6980bdc7771d7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bde05d62ac60a1… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Oct 26 14:52:43 2017 +0200 Reduced #ifdef Kung Fu a bit. Change-Id: Id49becf921ee8f83f21a59259188472ed81a4ef9 --- livestatus/src/Aggregator.h | 7 +------ livestatus/src/AndingFilter.h | 7 +------ livestatus/src/CommentColumn.cc | 1 + livestatus/src/CountAggregator.h | 7 +------ livestatus/src/CustomTimeperiodColumn.h | 1 - livestatus/src/CustomVarsDictColumn.cc | 1 + livestatus/src/CustomVarsNamesColumn.cc | 1 + livestatus/src/CustomVarsValuesColumn.cc | 1 + livestatus/src/DoubleAggregator.h | 7 +------ livestatus/src/DowntimeColumn.cc | 4 ++++ livestatus/src/Filter.h | 7 +------ livestatus/src/HostListColumn.cc | 1 + livestatus/src/HostListStateColumn.h | 2 +- livestatus/src/IntAggregator.h | 7 +------ livestatus/src/LogwatchListColumn.cc | 1 + livestatus/src/NegatingFilter.h | 7 +------ livestatus/src/OffsetStringMacroColumn.h | 1 - livestatus/src/OringFilter.h | 7 +------ livestatus/src/PerfdataAggregator.h | 7 +------ livestatus/src/ServiceListColumn.h | 2 +- livestatus/src/ServiceListFilter.cc | 1 + livestatus/src/ServiceListStateColumn.h | 2 +- livestatus/src/StatusSpecialIntColumn.cc | 1 + livestatus/src/TableEventConsole.h | 2 +- livestatus/src/TableEventConsoleEvents.h | 2 +- livestatus/src/TableEventConsoleHistory.h | 2 +- livestatus/src/TableStateHistory.h | 11 ++++++----- 27 files changed, 33 insertions(+), 67 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=bde05d62ac…

6 years, 10 months

5439 FIX storcli_vdrives: Configured check state of related device state was not set properly in some cases. Made that more robust.

by Simon Betz

Module: check_mk Branch: master Commit: f3567c6cb009aaa7ea7fd8c8e8c019ba2f3c9f3c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f3567c6cb009aa… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Oct 26 15:42:42 2017 +0200 5439 FIX storcli_vdrives: Configured check state of related device state was not set properly in some cases. Made that more robust. Change-Id: Ic0512e7e571a34a5cd4e059c2511b2255c75892c --- .werks/5439 | 11 +++++++++++ checks/storcli_vdrives | 16 ++++++++++------ 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/.werks/5439 b/.werks/5439 new file mode 100644 index 0000000..80cd831 --- /dev/null +++ b/.werks/5439 @@ -0,0 +1,11 @@ +Title: storcli_vdrives: Configured check state of related device state was not set properly in some cases. Made that more robust. +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1509025127 + + diff --git a/checks/storcli_vdrives b/checks/storcli_vdrives index c5d2886..596780e 100644 --- a/checks/storcli_vdrives +++ b/checks/storcli_vdrives @@ -36,11 +36,11 @@ factory_settings["storcli_vdrives_default_levels"] = { def parse_storcli_vdrives(info): raid_statenames = { - "Optl" : "Optimal", - "Pdgd" : "Partially Degraded", + "optl" : "Optimal", + "pdgd" : "Partially Degraded", "dgrd" : "Degraded", - "OfLn" : "Offline", - "Rec" : "Recovery", + "ofln" : "Offline", + "rec" : "Recovery", } parsed = {} @@ -53,7 +53,7 @@ def parse_storcli_vdrives(info): item, raid_type, rawstate, access, consistent = line[:5] parsed[item] = { "raid_type" : raid_type, - "state" : raid_statenames.get(rawstate, rawstate), + "state" : raid_statenames.get(rawstate.lower(), rawstate), "access" : access, "consistent" : consistent, } @@ -81,7 +81,11 @@ def check_storcli_vdrives(item, params, parsed): device_state = parsed[item]["state"] infotext = "State is %s" % device_state - status = params.get(device_state, 3) + if device_state in params: + status = params[device_state] + else: + status = 3 + infotext += " (unknown[%s])" % device_state yield status, infotext

6 years, 10 months

add function active_check_service_description

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 2bac5f1e42dd802b79f5141f72966bd901c1a6d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2bac5f1e42dd80… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Tue Oct 24 16:05:48 2017 +0200 add function active_check_service_description Add the function active_check_service_description to cmk_base/config.py as the single point of truth to retreive service descriptions for active checks. This makes it possible to define a renaming of service descriptions for active checks later on. Change-Id: I5d6a2cc84f3f19833b1d262e46ba435bb800470f --- cmk_base/automations/check_mk.py | 5 ++--- cmk_base/config.py | 14 +++++++++++++- cmk_base/core_config.py | 5 ----- cmk_base/core_nagios.py | 2 +- cmk_base/discovery.py | 3 +-- 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/cmk_base/automations/check_mk.py b/cmk_base/automations/check_mk.py index 4abdd0a..ba87c1d 100644 --- a/cmk_base/automations/check_mk.py +++ b/cmk_base/automations/check_mk.py @@ -570,9 +570,8 @@ class AutomationAnalyseServices(Automation): for acttype, rules in config.active_checks.items(): entries = rulesets.host_extra_conf(hostname, rules) if entries: - act_info = checks.active_check_info[acttype] for params in entries: - description = act_info["service_description"](params) + description = config.active_check_service_description(hostname, acttype, params) if description == servicedesc: return { "origin" : "active", @@ -1106,7 +1105,7 @@ class AutomationActiveCheck(Automation): if entries: act_info = checks.active_check_info[plugin] for params in entries: - description = act_info["service_description"](params).replace('$HOSTNAME$', hostname) + description = config.active_check_service_description(hostname, act_info, params) if description == item: args = core_config.active_check_arguments(hostname, description, act_info["argument_function"](params)) command_line = self._replace_core_macros(hostname, act_info["command_line"].replace("$ARG1$", args)) diff --git a/cmk_base/config.py b/cmk_base/config.py index a8e37fb..cca564a 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -461,7 +461,7 @@ def all_configured_clusters(): return cache -# This function should only be used during duplicate host check! It has to work like +# This function should only be used during duplicate host check! It has to work like # all_active_hosts() but with the difference that duplicates are not removed. def all_active_hosts_with_duplicates(): # Only available with CEE @@ -1050,6 +1050,18 @@ def service_description(hostname, check_type, item): return get_final_service_description(hostname, descr) +def active_check_service_description(hostname, active_check_type, params): + import cmk_base.checks as checks + if active_check_type not in checks.active_check_info: + return "Unimplemented check %s" % active_check_type + + act_info = checks.active_check_info[active_check_type] + description = act_info["service_description"](params) + description = description.replace('$HOSTNAME$', hostname) + + return get_final_service_description(hostname, description) + + def get_final_service_description(hostname, description): translations = get_service_translations(hostname) if translations: diff --git a/cmk_base/core_config.py b/cmk_base/core_config.py index 42a71d8..e9d20a2 100644 --- a/cmk_base/core_config.py +++ b/cmk_base/core_config.py @@ -311,11 +311,6 @@ def do_update(with_precompile): # | Active check specific functions | # '----------------------------------------------------------------------' -def active_check_service_description(hostname, act_info, params): - description = act_info["service_description"](params).replace('$HOSTNAME$', hostname) - return config.get_final_service_description(hostname, description) - - def active_check_arguments(hostname, description, args): if type(args) in [ str, unicode ]: return args diff --git a/cmk_base/core_nagios.py b/cmk_base/core_nagios.py index 618c298..9493c91 100644 --- a/cmk_base/core_nagios.py +++ b/cmk_base/core_nagios.py @@ -403,7 +403,7 @@ define service { checks.set_hostname(hostname) has_perfdata = act_info.get('has_perfdata', False) - description = core_config.active_check_service_description(hostname, act_info, params) + description = config.active_check_service_description(hostname, acttype, params) if do_omit_service(hostname, description): continue diff --git a/cmk_base/discovery.py b/cmk_base/discovery.py index f969b47..2f0bd71 100644 --- a/cmk_base/discovery.py +++ b/cmk_base/discovery.py @@ -1074,10 +1074,9 @@ def _merge_manual_services(services, hostname, on_error): # Similar for 'active_checks', but here we have parameters for acttype, rules in config.active_checks.items(): - act_info = checks.active_check_info[acttype] entries = rulesets.host_extra_conf(hostname, rules) for params in entries: - descr = act_info["service_description"](params) + descr = config.active_check_service_description(hostname, acttype, params) services[(acttype, descr)] = ('active', repr(params)) # Handle disabled services -> "ignored"

6 years, 10 months

5420 FIX diskspace cleanup: Fixed exception when " Delete additional files when disk space is below" is enabled

by Lars Michelsen

Module: check_mk Branch: master Commit: 87d6f765bea6229ef36406f415c4f2c3d1289e87 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=87d6f765bea622… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 26 14:30:07 2017 +0200 5420 FIX diskspace cleanup: Fixed exception when "Delete additional files when disk space is below" is enabled Change-Id: I44a6e0da464f61ea813d726610d2c7bf035a8a84 --- .werks/5420 | 10 ++++++++++ omd/packages/maintenance/diskspace | 1 + 2 files changed, 11 insertions(+) diff --git a/.werks/5420 b/.werks/5420 new file mode 100644 index 0000000..9c72ff0 --- /dev/null +++ b/.werks/5420 @@ -0,0 +1,10 @@ +Title: diskspace cleanup: Fixed exception when "Delete additional files when disk space is below" is enabled +Level: 1 +Component: omd +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1509020904 +Class: fix + + diff --git a/omd/packages/maintenance/diskspace b/omd/packages/maintenance/diskspace index 4502395..9824482 100755 --- a/omd/packages/maintenance/diskspace +++ b/omd/packages/maintenance/diskspace @@ -203,6 +203,7 @@ def cleanup_oldest_files(): return # check diskspace against configuration + bytes_free = get_free_space() if not opt_force and above_threshold(bytes_free): verbose('Free space is above threshold of %s. Nothing to be done.' % fmt_bytes(min_free_bytes))

6 years, 10 months

5421 FIX LDAP: Fixed broken sync of group memberships for users with capital umlauts in names

by Lars Michelsen

Module: check_mk Branch: master Commit: c9fdec9bfe23b3a9742b6b36fe4283580b0e1443 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c9fdec9bfe23b3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 26 14:55:06 2017 +0200 5421 FIX LDAP: Fixed broken sync of group memberships for users with capital umlauts in names Change-Id: I5dcae9d3783c2489918c59e9e9bbf07ab243658b --- .werks/5421 | 11 +++++++++++ web/plugins/userdb/ldap.py | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/5421 b/.werks/5421 new file mode 100644 index 0000000..84ecb38 --- /dev/null +++ b/.werks/5421 @@ -0,0 +1,11 @@ +Title: LDAP: Fixed broken sync of group memberships for users with capital umlauts in names +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1509022446 + + diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 6b24b30..f58a8ce 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -526,8 +526,8 @@ class LDAPUserConnector(UserConnector): new_obj = {} for key, val in obj.iteritems(): # Convert all keys to lower case! - new_obj[key.lower().decode('utf-8')] = [ i.decode('utf-8') for i in val ] - result.append((dn.lower().decode('utf-8'), new_obj)) + new_obj[key.decode('utf-8').lower()] = [ i.decode('utf-8') for i in val ] + result.append((dn.decode('utf-8').lower(), new_obj)) success = True except ldap.NO_SUCH_OBJECT, e: raise MKLDAPException(_('The given base object "%s" does not exist in LDAP (%s))') % (base, e))

6 years, 10 months

← Newer
1
2
3
4
5
6
7
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2017