Checkmk git commits October 2017

checkmk-commits@lists.checkmk.com

10 participants
288 discussions

by Sven Panne

Module: check_mk Branch: master Commit: 75ab5efe3e220c127aed90b9e57336ab281c4824 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=75ab5efe3e220c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Oct 25 16:04:12 2017 +0200 Unified HostListFilter implementations. Doesn't win a beauty contest yet, but better than before... Change-Id: Idb08e8176c630ceb25834359085b729c07b2f92d --- livestatus/src/HostListColumn.cc | 5 +-- livestatus/src/HostListColumn.h | 6 ++-- livestatus/src/HostListFilter.cc | 76 ++++++++++++++++++++++++++-------------- 3 files changed, 56 insertions(+), 31 deletions(-) diff --git a/livestatus/src/HostListColumn.cc b/livestatus/src/HostListColumn.cc index 105946f..46b6b38 100644 --- a/livestatus/src/HostListColumn.cc +++ b/livestatus/src/HostListColumn.cc @@ -29,7 +29,7 @@ #include "Row.h" #include "auth.h" -hostsmember *HostListColumn::getMembers(Row row) const { +HostListColumn::host_list HostListColumn::getMembers(Row row) const { if (auto p = columnData<hostsmember *>(row)) { return *p; } @@ -39,7 +39,8 @@ hostsmember *HostListColumn::getMembers(Row row) const { void HostListColumn::output(Row row, RowRenderer &r, const contact *auth_user) const { ListRenderer l(r); - for (hostsmember *mem = getMembers(row); mem != nullptr; mem = mem->next) { + for (const hostsmember *mem = getMembers(row); mem != nullptr; + mem = mem->next) { host *hst = mem->host_ptr; if (auth_user == nullptr || is_authorized_for(_mc, auth_user, hst, nullptr)) { diff --git a/livestatus/src/HostListColumn.h b/livestatus/src/HostListColumn.h index 965195e..f0eb856 100644 --- a/livestatus/src/HostListColumn.h +++ b/livestatus/src/HostListColumn.h @@ -58,11 +58,13 @@ public: const contact *auth_user) const override; std::unique_ptr<Filter> createFilter( RelationalOperator relOp, const std::string &value) const override; + #ifdef CMC - const std::unordered_set<Host *> *getMembers(Row row) const; + using host_list = const std::unordered_set<Host *> *; #else - hostsmember *getMembers(Row row) const; + using host_list = const hostsmember *; #endif + host_list getMembers(Row row) const; private: MonitoringCore *_mc; diff --git a/livestatus/src/HostListFilter.cc b/livestatus/src/HostListFilter.cc index 0ce01fe..5e18c6b 100644 --- a/livestatus/src/HostListFilter.cc +++ b/livestatus/src/HostListFilter.cc @@ -28,48 +28,70 @@ #include "HostListColumn.h" #include "Logger.h" #include "Row.h" + +#ifdef CMC +#include <unordered_set> +#include "World.h" +#include "cmc.h" +class Host; +#else #include "nagios.h" +#endif HostListFilter::HostListFilter(const HostListColumn &column, RelationalOperator relOp, std::string value) : _column(column), _relOp(relOp), _ref_value(std::move(value)) {} -bool HostListFilter::accepts(Row row, const contact * /* auth_user */, - std::chrono::seconds /* timezone_offset */) const { - // data points to a primary data object. We need to extract a pointer to a - // host list - hostsmember *mem = _column.getMembers(row); - - // test for empty list - if (_ref_value.empty()) { - if (_relOp == RelationalOperator::equal) { - return mem == nullptr; - } - if (_relOp == RelationalOperator::not_equal) { - return mem != nullptr; - } - } +namespace { +bool isEmpty(HostListColumn::host_list hostlist) { +#ifdef CMC + return hostlist->empty(); +#else + return hostlist == nullptr; +#endif +} - bool is_member = false; - for (; mem != nullptr; mem = mem->next) { - char *host_name = mem->host_name; +bool contains(HostListColumn::host_list hostlist, + const std::string &ref_value) { +#ifdef CMC + return hostlist->find(g_live_world->getHost(ref_value)) != hostlist->end(); +#else + for (; hostlist != nullptr; hostlist = hostlist->next) { + char *host_name = hostlist->host_name; if (host_name == nullptr) { - host_name = mem->host_ptr->name; + host_name = hostlist->host_ptr->name; } - - if (host_name == _ref_value) { - is_member = true; - break; + if (host_name == ref_value) { + return true; } } + return false; +#endif +} +} // namespace +bool HostListFilter::accepts(Row row, const contact * /* auth_user */, + std::chrono::seconds /* timezone_offset */) const { + auto hostlist = _column.getMembers(row); switch (_relOp) { - case RelationalOperator::less: - return !is_member; - case RelationalOperator::greater_or_equal: - return is_member; case RelationalOperator::equal: + if (!_ref_value.empty()) { + Informational(_column.logger()) + << "Sorry, equality for host lists implemented only for emptiness"; + return false; + } + return isEmpty(hostlist); case RelationalOperator::not_equal: + if (!_ref_value.empty()) { + Informational(_column.logger()) + << "Sorry, inequality for host lists implemented only for emptiness"; + return false; + } + return !isEmpty(hostlist); + case RelationalOperator::less: + return !contains(hostlist, _ref_value); + case RelationalOperator::greater_or_equal: + return contains(hostlist, _ref_value); case RelationalOperator::matches: case RelationalOperator::doesnt_match: case RelationalOperator::equal_icase:

6 years, 10 months

Agent updater must be compiled during "make dist" ( not when building OMD package)

by Lars Michelsen

Module: check_mk Branch: master Commit: 4582224a8399fbe3068e36d06dc47dee60e5f5c4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4582224a8399fb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 25 15:52:09 2017 +0200 Agent updater must be compiled during "make dist" (not when building OMD package) Change-Id: Icd9258bf7c91b67150561b09e8df469696b6cff6 --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index ac44566..3adacc4 100644 --- a/Makefile +++ b/Makefile @@ -194,6 +194,9 @@ check-version: # Would also use --exclude-vcs, but this is also not available # And --transform is also missing ... dist: mk-livestatus-$(VERSION).tar.gz $(DISTNAME).tar.gz config.h.in $(DIST_DEPS) +ifeq ($(ENTERPRISE),yes) + $(MAKE) -C enterprise make-agent-updater +endif @EXCLUDES= ; \ if [ -d .git ]; then \ git rev-parse --short HEAD > COMMIT ; \

6 years, 10 months

Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 9e5e3c39b1aa78390c1fdb621a37e7dd428c031c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9e5e3c39b1aa78… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 25 15:11:23 2017 +0200 Reserved 20 Werk IDS Change-Id: Ia28126be4eea56476e162621dea1fca130777057 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index f424816..2244fb3 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5418 +5438

6 years, 10 months

5418 New filters: Regex matches for host and service contacts

by Lars Michelsen

Module: check_mk Branch: master Commit: 5296d031790408b0a4d663f6dcd52717c1548b02 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5296d031790408… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 25 15:12:51 2017 +0200 5418 New filters: Regex matches for host and service contacts There are 2 new filters for the GUI views available which can be used to filter lists of hosts or services using regex matches on their contacts. Change-Id: I808c34e1c6fdc0c48a8c8c21c2c8e6295c7b6db5 --- .werks/5418 | 11 +++++++++++ web/plugins/visuals/filters.py | 6 ++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.werks/5418 b/.werks/5418 new file mode 100644 index 0000000..453ce76 --- /dev/null +++ b/.werks/5418 @@ -0,0 +1,11 @@ +Title: New filters: Regex matches for host and service contacts +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1508937092 +Class: feature + +There are 2 new filters for the GUI views available which can be used +to filter lists of hosts or services using regex matches on their contacts. diff --git a/web/plugins/visuals/filters.py b/web/plugins/visuals/filters.py index 993abc9..34c2d18 100644 --- a/web/plugins/visuals/filters.py +++ b/web/plugins/visuals/filters.py @@ -403,8 +403,10 @@ declare_filter(205, FilterMultigroup("service", _("Several Service Group declare_filter(106, FilterGroupCombo("host_contact", _("Host Contact Group"), False), _("Optional selection of host contact group")) declare_filter(206, FilterGroupCombo("service_contact", _("Service Contact Group"), False), _("Optional selection of service contact group")) -declare_filter(107, FilterText("host_ctc", _("Host Contact"), "host", "host_contacts", "host_ctc", ">=")) -declare_filter(207, FilterText("service_ctc", _("Service Contact"), "service", "service_contacts", "service_ctc", ">=")) +declare_filter(107, FilterText("host_ctc", _("Host Contact"), "host", "host_contacts", "host_ctc", ">=")) +declare_filter(107, FilterText("host_ctc_regex", _("Host Contact (Regex)"), "host", "host_contacts", "host_ctc_regex", "~~")) +declare_filter(207, FilterText("service_ctc", _("Service Contact"), "service", "service_contacts", "service_ctc", ">=")) +declare_filter(207, FilterText("service_ctc_regex", _("Service Contact (Regex)"), "service", "service_contacts", "service_ctc_regex", "~~")) # Selection of one group to be used in the info "hostgroup" or "servicegroup".

6 years, 10 months

Fixed CustomVars* class hierarchy.

by Sven Panne

Module: check_mk Branch: master Commit: 9767794d39e0402b5f307bfeda58c799bc8a3510 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9767794d39e040… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Oct 25 10:02:30 2017 +0200 Fixed CustomVars* class hierarchy. Apart from being simpler and more consistent, this enables the full power of our filtering machinery custom variable names/values. Previously only a membership test was possible. Change-Id: I6b3b6c7af56bc23ff52c731e1a85397f40de21f6 --- livestatus/src/CustomVarsColumn.cc | 66 -------------------------------- livestatus/src/CustomVarsColumn.h | 47 ----------------------- livestatus/src/CustomVarsDictColumn.cc | 34 ++++++++-------- livestatus/src/CustomVarsDictColumn.h | 16 +++++--- livestatus/src/CustomVarsDictFilter.cc | 10 +++-- livestatus/src/CustomVarsDictFilter.h | 6 +-- livestatus/src/CustomVarsListFilter.cc | 64 ------------------------------- livestatus/src/CustomVarsListFilter.h | 51 ------------------------ livestatus/src/CustomVarsNamesColumn.cc | 52 +++++++++++++------------ livestatus/src/CustomVarsNamesColumn.h | 25 ++++++------ livestatus/src/CustomVarsValuesColumn.cc | 49 +++++++++++++----------- livestatus/src/CustomVarsValuesColumn.h | 25 ++++++------ livestatus/src/Makefile.am | 2 - livestatus/src/Renderer.h | 2 +- 14 files changed, 119 insertions(+), 330 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9767794d39…

6 years, 10 months

5131 suseconnect: New check to monitor information about SLES licenses via SUSEConnect

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 7fd05746f83dbc6645e5cda8c5cede20ccc49081 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7fd05746f83dbc… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Sep 14 11:59:27 2017 +0200 5131 suseconnect: New check to monitor information about SLES licenses via SUSEConnect This check parses the information provided by the SUSEConnect command. If the command is availible, information about the registration status, subscription status, subscription type, registration code as well as the start and end date of the SLES license are shown. The information is also shown in the Hardware/Software Inventory. As a preparation you need to install the agent plugin {SUSEConnect} into your agent's plugins directory (usually {/usr/lib/check_mk_agent/plugins}). The check can be configured via the corresponding WATO rule {SLES License}. Change-Id: I2823064d2c69b1baaa949fb3d1de7c9fcc944072 --- .werks/5131 | 20 ++++++ agents/plugins/mk_suseconnect | 30 +++++++++ checkman/suseconnect | 23 +++++++ checks/suseconnect | 123 +++++++++++++++++++++++++++++++++++ inventory/suseconnect | 46 +++++++++++++ web/plugins/wato/check_parameters.py | 42 ++++++++++++ 6 files changed, 284 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7fd05746f8…

6 years, 10 months

5350 check_http: Special characters in expected string of the content

by Tom Baerwinkel

Module: check_mk Branch: master Commit: f4caa30fafb1549f82b2b81c575fc033cdc22e5f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f4caa30fafb154… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Oct 25 12:06:50 2017 +0200 5350 check_http: Special characters in expected string of the content The option "Fixed string to expect in the content" of the WATO-Rule "Check HTTP service" now allows the user to enter special character like umlauts. Change-Id: If9d373bd5ab35222c524a5e03a32eb9966dc698b --- .werks/5350 | 12 ++++++++++++ web/plugins/wato/active_checks.py | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/5350 b/.werks/5350 new file mode 100644 index 0000000..71fa635 --- /dev/null +++ b/.werks/5350 @@ -0,0 +1,12 @@ +Title: check_http: Special characters in expected string of the content +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1508925797 +Class: feature + +The option "Fixed string to expect in the content" of the WATO-Rule +"Check HTTP service" now allows the user to enter special character +like umlauts. diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index ce015c6..95e2f83 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -1044,7 +1044,7 @@ register_rule(group, ) ), ( "expect_string", - TextAscii( + TextUnicode( title = _("Fixed string to expect in the content"), allow_empty = False, )

6 years, 10 months

Made LogwatchListColumn a ListColumn.

by Sven Panne

Module: check_mk Branch: master Commit: c68acf7cd2c1c509586b623dfa35c557004c5336 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c68acf7cd2c1c5… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Oct 25 13:15:09 2017 +0200 Made LogwatchListColumn a ListColumn. This unifies things and enables the use of our filtering machinery on this column type (which was previously not possible). Change-Id: I003d046d1f3aa549152dc1f1a0a49cdf9222662c --- livestatus/src/LogwatchListColumn.cc | 61 +++++++++++++++++++++++------------- livestatus/src/LogwatchListColumn.h | 17 +++++++--- 2 files changed, 52 insertions(+), 26 deletions(-) diff --git a/livestatus/src/LogwatchListColumn.cc b/livestatus/src/LogwatchListColumn.cc index 18a8f10..c60d473 100644 --- a/livestatus/src/LogwatchListColumn.cc +++ b/livestatus/src/LogwatchListColumn.cc @@ -23,6 +23,8 @@ // Boston, MA 02110-1301 USA. #include "LogwatchListColumn.h" +#include <algorithm> +#include <iterator> #include <ostream> #include "FileSystem.h" #include "Logger.h" @@ -38,35 +40,52 @@ #endif void LogwatchListColumn::output(Row row, RowRenderer &r, - const contact * /* auth_user */) const { + const contact *auth_user) const { ListRenderer l(r); - auto logwatch_path = _mc->mkLogwatchPath(); - if (logwatch_path.empty()) { - return; + for (const auto &filename : getValue(row, auth_user)) { + l.output(filename); } +} -#ifdef CMC - auto hst = columnData<Host>(row); - if (hst == nullptr) { - return; - } - std::string host_name = hst->name(); -#else - auto hst = columnData<host>(row); - if (hst == nullptr) { - return; +std::vector<std::string> LogwatchListColumn::getValue( + Row row, const contact * /*auth_user*/) const { + auto dir = getDirectory(row); + if (dir.empty()) { + return {}; } - std::string host_name = hst->name; -#endif - - auto dir = logwatch_path + pnp_cleanup(host_name); try { if (fs::exists(dir)) { - for (const auto &entry : fs::directory_iterator(dir)) { - l.output(entry.path().filename().string()); - } + std::vector<std::string> filenames; + auto it = fs::directory_iterator(dir); + std::transform(begin(it), end(it), std::back_inserter(filenames), + [](const auto &entry) { + return entry.path().filename().string(); + }); + return filenames; } } catch (const fs::filesystem_error &e) { Warning(logger()) << name() << ": " << e.what(); } + return {}; +} + +std::string LogwatchListColumn::getDirectory(Row row) const { + auto logwatch_path = _mc->mkLogwatchPath(); + auto host_name = getHostName(row); + return logwatch_path.empty() || host_name.empty() + ? "" + : logwatch_path + pnp_cleanup(host_name); +} + +std::string LogwatchListColumn::getHostName(Row row) const { +#ifdef CMC + if (auto hst = columnData<Host>(row)) { + return hst->name(); + } +#else + if (auto hst = columnData<host>(row)) { + return hst->name; + } +#endif + return ""; } diff --git a/livestatus/src/LogwatchListColumn.h b/livestatus/src/LogwatchListColumn.h index 42c7aeb..67705de 100644 --- a/livestatus/src/LogwatchListColumn.h +++ b/livestatus/src/LogwatchListColumn.h @@ -27,26 +27,33 @@ #include "config.h" // IWYU pragma: keep #include <string> -#include "Column.h" +#include <vector> +#include "ListColumn.h" #include "contact_fwd.h" class MonitoringCore; class Row; class RowRenderer; -class LogwatchListColumn : public Column { +class LogwatchListColumn : public ListColumn { public: LogwatchListColumn(const std::string &name, const std::string &description, int indirect_offset, int extra_offset, int extra_extra_offset, int offset, MonitoringCore *mc) - : Column(name, description, indirect_offset, extra_offset, - extra_extra_offset, offset) + : ListColumn(name, description, indirect_offset, extra_offset, + extra_extra_offset, offset) , _mc(mc) {} - ColumnType type() const override { return ColumnType::list; } + void output(Row row, RowRenderer &r, const contact *auth_user) const override; + std::vector<std::string> getValue(Row row, + const contact *auth_user) const override; + private: MonitoringCore *_mc; + + std::string getDirectory(Row row) const; + std::string getHostName(Row row) const; }; #endif // LogwatchListColumn_h

6 years, 10 months

5346 cisco_mem/cisco_mem_asa/cisco_mem_asa64: trend computation

by Tom Baerwinkel

Module: check_mk Branch: master Commit: e2f45116dc6c79566a0eafaa83b33fc203a35c71 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e2f45116dc6c79… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Oct 20 13:28:50 2017 +0200 5346 cisco_mem/cisco_mem_asa/cisco_mem_asa64: trend computation It is now possible to enable the trend computation for the checks cisco_mem, cisco_mem_asa, and cisco_mem_asa64 via the corresponding WATO rule. Change-Id: I7d65b43330bbd46e28513342f730fc1adcd5ea7d --- .werks/5346 | 12 ++++++ checks/cisco_mem | 3 +- checks/cisco_mem.include | 72 ++++++++++++++++++++++++------------ checks/cisco_mem_asa | 3 +- checks/cisco_mem_asa64 | 3 +- web/plugins/metrics/check_mk.py | 53 +++++++++++++++++++++++++- web/plugins/wato/check_parameters.py | 53 +++++++++++++++----------- 7 files changed, 148 insertions(+), 51 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e2f45116dc…

6 years, 10 months

5346 cisco_mem/cisco_mem_asa/cisco_mem_asa64: trend computation

by Tom Baerwinkel

6 years, 10 months

← Newer
1
2
3
4
5
6
7
8
9
...
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