Checkmk git commits March 2018

checkmk-commits@lists.checkmk.com

10 participants
326 discussions

5883 FIX Fixed broken conversion of customized agent tag group ( Regression #5257)

by Lars Michelsen

Module: check_mk Branch: master Commit: 21f049d809ef451b62f436a12d1637c3c8536758 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=21f049d809ef45… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 5 13:13:41 2018 +0100 5883 FIX Fixed broken conversion of customized agent tag group (Regression #5257) Change-Id: I031f09d574e915bbd3ecd963d4d912b21bb4fd06 --- .werks/5883 | 10 ++++++++++ web/htdocs/watolib.py | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/.werks/5883 b/.werks/5883 new file mode 100644 index 0000000..6289fb4 --- /dev/null +++ b/.werks/5883 @@ -0,0 +1,10 @@ +Title: Fixed broken conversion of customized agent tag group (Regression #5257) +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1520251998 +Class: fix + + diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 3bdaa27..7bfa980 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -6152,6 +6152,16 @@ def configured_aux_tags(): def is_builtin_host_tag_group(tag_group_id): + # Special handling for the agent tag group. It was a tag group created with + # the sample WATO configuration until version 1.5x. This means users could've + # customized the group. In case we find such a customization we treat it as + # not builtin tag group. + if tag_group_id == "agent": + for tag_group in config.wato_host_tags: + if tag_group[0] == tag_group_id: + return False + return True + for tag_group in builtin_host_tags: if tag_group[0] == tag_group_id: return True

6 years, 3 months

5884 FIX Fixed host tag removal confirm dialog (1.5 regression)

by Lars Michelsen

Module: check_mk Branch: master Commit: 7466ee8b8038b1e3ec35e6f4cd1fe4be8b9f4967 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7466ee8b8038b1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 5 13:19:36 2018 +0100 5884 FIX Fixed host tag removal confirm dialog (1.5 regression) Change-Id: I7229d0cd23a54a21a361399858933e46185bdae4 --- .werks/5883 | 3 ++- .werks/5884 | 10 ++++++++++ web/htdocs/wato.py | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/5883 b/.werks/5883 index 6289fb4..a559c89 100644 --- a/.werks/5883 +++ b/.werks/5883 @@ -7,4 +7,5 @@ Version: 1.5.0i4 Date: 1520251998 Class: fix - +The customized agent tag group was handled as internal tag group. For this reason +the user could not "uncustomize" it. diff --git a/.werks/5884 b/.werks/5884 new file mode 100644 index 0000000..a7db028 --- /dev/null +++ b/.werks/5884 @@ -0,0 +1,10 @@ +Title: Fixed host tag removal confirm dialog (1.5 regression) +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1520252363 +Class: fix + + diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 47e29c4..b0bb1a0 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -11819,7 +11819,7 @@ class ModeHostTags(WatoMode, watolib.HosttagsConfiguration): del_id = html.var("_delete") if del_id: operations = None - for e in self.tag_groups: + for e in self._hosttags: if e[0] == del_id: # In case of tag group deletion, the operations is a pair of tag_id # and list of choice-ids.

6 years, 3 months

5885 FIX Builtin auxiliary tags were not available when editing tags ( Regression in 1.5)

by Lars Michelsen

Module: check_mk Branch: master Commit: 925b53090a8402f229d1510002ce4ee8b5ebcd0c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=925b53090a8402… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 5 14:26:59 2018 +0100 5885 FIX Builtin auxiliary tags were not available when editing tags (Regression in 1.5) Change-Id: I910cf27a55155d7b14b899ad6ec68957ef68208e --- .werks/5885 | 10 ++++++++++ web/htdocs/wato.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/5885 b/.werks/5885 new file mode 100644 index 0000000..830582d --- /dev/null +++ b/.werks/5885 @@ -0,0 +1,10 @@ +Title: Builtin auxiliary tags were not available when editing tags (Regression in 1.5) +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1520256370 +Class: fix + + diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b0bb1a0..6c752fd 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12307,7 +12307,7 @@ class ModeEditHosttagGroup(ModeEditHosttagConfiguration): def _get_taggroups_valuespec(self): - host_tags, aux_tags = self._untainted_hosttags_config.get_legacy_format() + aux_tags = watolib.get_effective_aux_tags(self._untainted_hosttags_config.get_legacy_format()[1]) return ListOf( Tuple(

6 years, 3 months

5710 FIX jolokia_generic.string: Fix broken parameter handling

by Konstantin Büttner

Module: check_mk Branch: master Commit: ba179bd45cf091c266214f907b999034bb09f7fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba179bd45cf091… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Mar 5 12:57:52 2018 +0100 5710 FIX jolokia_generic.string: Fix broken parameter handling Previously, any strings against which to match would be ignored. This has been fixed. Thanks to Alexander Hotz for the patch! Change-Id: I397eceeb113ce83904fca4f5e84b8776fbdbf017 --- .werks/5710 | 13 +++++++++++++ checks/jolokia_generic | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/5710 b/.werks/5710 new file mode 100644 index 0000000..2f008d5 --- /dev/null +++ b/.werks/5710 @@ -0,0 +1,13 @@ +Title: jolokia_generic.string: Fix broken parameter handling +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i4 +Date: 1520250977 + +Previously, any strings against which to match would be ignored. This has been fixed. + +Thanks to Alexander Hotz for the patch! diff --git a/checks/jolokia_generic b/checks/jolokia_generic index bf39f21..fdccfbe 100644 --- a/checks/jolokia_generic +++ b/checks/jolokia_generic @@ -64,7 +64,7 @@ def check_jolokia_generic_string(item, params, parsed): value = parsed[item]["value"] default_status = params.get("default_status", 0) - search_strings = params.get("search_strings", []) + search_strings = params.get("match_strings", []) for search_string, status in search_strings: if search_string in value: return status, "%s: %s matches" % (value, search_string)

6 years, 3 months

5881 FIX Tag condition editor could show wrong tag selection after submission

by Lars Michelsen

Module: check_mk Branch: master Commit: 877cd231242b66762e4d1fac9f10dc7abf72aba0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=877cd231242b66… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 5 12:39:35 2018 +0100 5881 FIX Tag condition editor could show wrong tag selection after submission Change-Id: Ib840f5571ceefae0d685c69740549e0ae2954e1a --- .werks/5881 | 11 +++++++++++ web/htdocs/watolib.py | 6 +++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.werks/5881 b/.werks/5881 new file mode 100644 index 0000000..7e25c75 --- /dev/null +++ b/.werks/5881 @@ -0,0 +1,11 @@ +Title: Tag condition editor could show wrong tag selection after submission +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i4 +Date: 1520249655 + + diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index a56ba3f..3bdaa27 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -7086,18 +7086,18 @@ def render_condition_editor(tag_specs, varprefix=""): # Show dropdown with "is/isnot/ignore" and beginning # of div that is switched visible by is/isnot def tag_condition_dropdown(tagtype, deflt, id): - html.open_td() + dropdown_id = varprefix + tagtype + "_" + id onchange="valuespec_toggle_dropdownn(this, '%stag_sel_%s');" % (varprefix, id) choices = [("ignore", _("ignore")), ("is", _("is")), ("isnot", _("isnot"))] - html.dropdown(varprefix + tagtype + "_" + id, choices, deflt=deflt, onchange=onchange) + html.dropdown(dropdown_id, choices, deflt=deflt, onchange=onchange) html.close_td() html.open_td(class_="tag_sel") if html.form_submitted(): - div_is_open = html.var(tagtype + "_" + id, "ignore") != "ignore" + div_is_open = html.var(dropdown_id, "ignore") != "ignore" else: div_is_open = deflt != "ignore" html.open_div(id_="%stag_sel_%s" % (varprefix, id), style="display: none;" if not div_is_open else None)

6 years, 3 months

5882 FIX Agent bakery host selection was showing wrong settings after saving

by Lars Michelsen

Module: check_mk Branch: master Commit: 265aa8d901502bd768bb5080db72277817f9fa16 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=265aa8d901502b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 5 12:42:10 2018 +0100 5882 FIX Agent bakery host selection was showing wrong settings after saving On the configuration page of the Automatic agent updates, there is a condition configuration. When saving new conditions, for example host tag conditions, these conditions were not shown correctly on the page right after saving. When browsing away and opening the page again, the correct settings were shown. Change-Id: I58088840fac31c46aace3af9d054320e9a9f8d48 --- .werks/5882 | 14 ++++++++++++++ web/htdocs/valuespec.py | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/5882 b/.werks/5882 new file mode 100644 index 0000000..6d423eb --- /dev/null +++ b/.werks/5882 @@ -0,0 +1,14 @@ +Title: Agent bakery host selection was showing wrong settings after saving +Level: 1 +Component: agents +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.5.0i4 +Date: 1520249710 + +On the configuration page of the Automatic agent updates, there is a condition +configuration. When saving new conditions, for example host tag conditions, these +conditions were not shown correctly on the page right after saving. When browsing +away and opening the page again, the correct settings were shown. diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 0c4f76b..6472fd7 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -3428,7 +3428,7 @@ class Dictionary(ValueSpec): if self._columns == 2: label += ":" colon_printed = True - html.checkbox("%s_USE" % vp, param in value, label=label, + html.checkbox("%s_USE" % vp, visible, label=label, onclick="valuespec_toggle_option(this, %r)" % div_id) else: visible = True

6 years, 3 months

5880 FIX Dashboards: Fixed broken links in views provider columns

by Lars Michelsen

Module: check_mk Branch: master Commit: 9c5250f8cf42bdf3bd6fef838c07c3336746a0c3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9c5250f8cf42bd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 5 12:08:44 2018 +0100 5880 FIX Dashboards: Fixed broken links in views provider columns The links were opening wrong pages when clicking on it. Change-Id: I3b3a51259a7ce80b85e784eec21fdba741d87879 --- .werks/5880 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.werks/5880 b/.werks/5880 new file mode 100644 index 0000000..fc9c5ab --- /dev/null +++ b/.werks/5880 @@ -0,0 +1,11 @@ +Title: Dashboards: Fixed broken links in views provider columns +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cme +State: unknown +Version: 1.5.0i4 +Date: 1520248062 + +The links were opening wrong pages when clicking on it.

6 years, 3 months

Removed bogus test.

by Sven Panne

Module: check_mk Branch: master Commit: 607767bf20aa91aecbd4e8a88d496d8bbe292a5f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=607767bf20aa91… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Mar 5 12:00:11 2018 +0100 Removed bogus test. Change-Id: Ib30009f510c23938b98f0d20f1d3e8f3ce1bdce4 --- tests/mkeventd/test_mkeventd_status.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tests/mkeventd/test_mkeventd_status.py b/tests/mkeventd/test_mkeventd_status.py index 3b94f75..ee19745 100644 --- a/tests/mkeventd/test_mkeventd_status.py +++ b/tests/mkeventd/test_mkeventd_status.py @@ -15,10 +15,6 @@ import cmk.ec.main # UNIT TESTS # -def test_mkeventd_unit(): - assert mkeventd - - class FakeStatusSocket(object): def __init__(self, query): self._query = query

6 years, 3 months

Centralized computation of partial filter.

by Sven Panne

Module: check_mk Branch: master Commit: 0d3742667d1bdcbfb501b9af20e22ec5bbf09124 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d3742667d1bdc… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Mar 5 11:44:27 2018 +0100 Centralized computation of partial filter. This removes some (inconsistent) copy-n-paste. Note that the identical treatment of conjuctions and disjunctions still looks wrong, but it isn't more wrong than before, and at least we have only one place to fix this now. Change-Id: I9cd6242904a79e05d40a747107db682578d73aff --- livestatus/src/TableStateHistory.cc | 48 +++++++++++++++++++++++++++---------- livestatus/src/TableStateHistory.h | 3 +++ 2 files changed, 38 insertions(+), 13 deletions(-) diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index 89be3cc..be342bd 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -45,12 +45,12 @@ #include "OffsetSStringColumn.h" #include "OffsetStringColumn.h" #include "OffsetTimeColumn.h" +#include "OringFilter.h" // IWYU pragma: keep #include "Query.h" #include "Row.h" #include "StringUtils.h" #include "TableHosts.h" #include "TableServices.h" -class OringFilter; #ifdef CMC // This seems to be an IWYU bug: If we remove the includes as suggested, we @@ -239,8 +239,6 @@ LogEntry *TableStateHistory::getNextLogentry() { return _it_entries->second.get(); } -// TODO(sp) IsObjectFilter in TableCachedStatehist recurses into sub-filters, -// while we don't. Is this really intentional? namespace { class IsObjectFilter : public FilterVisitor { public: @@ -252,8 +250,25 @@ public: mk::starts_with(column_name, "service_"); } } - void visit(const AndingFilter & /*unused*/) override {} - void visit(const OringFilter & /*unused*/) override {} + + // TODO(sp): Handling and/or the same way looks suspicious... + void visit(const AndingFilter &f) override { + for (const auto &sub_filter : f) { + if (!_value) { + return; + } + sub_filter->accept(*this); + } + } + + void visit(const OringFilter &f) override { + for (const auto &sub_filter : f) { + if (!_value) { + return; + } + sub_filter->accept(*this); + } + } bool _value = true; }; @@ -281,11 +296,14 @@ private: }; } // namespace -void TableStateHistory::answerQuery(Query *query) { - // Create a partial filter, that contains only such filters that check - // attributes of current hosts and services +// Create a partial filter, that contains only such filters that check +// attributes of current hosts and services + +// static +std::unique_ptr<Filter> TableStateHistory::createPartialFilter( + const AndingFilter &f) { std::vector<std::unique_ptr<Filter>> subfilters; - for (const auto &filter : *query->filter()) { + for (const auto &filter : f) { IsObjectFilter is_obj; filter->accept(is_obj); if (is_obj._value) { @@ -293,8 +311,12 @@ void TableStateHistory::answerQuery(Query *query) { } } std::reverse(subfilters.begin(), subfilters.end()); - AndingFilter object_filter(LogicalOperator::and_, std::move(subfilters)); + return std::make_unique<AndingFilter>(LogicalOperator::and_, + std::move(subfilters)); +} +void TableStateHistory::answerQuery(Query *query) { + auto object_filter = createPartialFilter(*query->filter()); std::lock_guard<std::mutex> lg(_log_cache->_lock); if (!_log_cache->logCachePreChecks()) { return; @@ -464,9 +486,9 @@ void TableStateHistory::answerQuery(Query *query) { // filtered out. Note: we currently do not filter out hosts // since they might be needed for service states if (!entry->_svc_desc.empty()) { - if (!object_filter.accepts(Row(state), - query->authUser(), - query->timezoneOffset())) { + if (!object_filter->accepts(Row(state), + query->authUser(), + query->timezoneOffset())) { object_blacklist.insert(key); delete state; continue; diff --git a/livestatus/src/TableStateHistory.h b/livestatus/src/TableStateHistory.h index db8d4b0..cf8492a 100644 --- a/livestatus/src/TableStateHistory.h +++ b/livestatus/src/TableStateHistory.h @@ -32,7 +32,9 @@ #include "LogCache.h" #include "Logfile.h" #include "Table.h" +class AndingFilter; class Column; +class Filter; class HostServiceState; class LogEntry; class MonitoringCore; @@ -54,6 +56,7 @@ public: void answerQuery(Query *query) override; bool isAuthorized(Row row, const contact *ctc) const override; std::shared_ptr<Column> column(std::string colname) const override; + static std::unique_ptr<Filter> createPartialFilter(const AndingFilter &f); protected: bool _abort_query;

6 years, 3 months

The NEB's disable_statehist_filtering option is a no-op now.

by Sven Panne

Module: check_mk Branch: master Commit: 90d51fb1155f054e421c8b3978d267f2fe4ef672 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90d51fb1155f05… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Mar 5 11:27:37 2018 +0100 The NEB's disable_statehist_filtering option is a no-op now. We always use filtering now, similar code is in the CMC for ages, and the option was totally untested. The removal of this code path opens up chances for removing some copy-n-paste. Change-Id: I3d6ddd9ec4633bc91c9d96ec262436ce0314b746 --- livestatus/src/MonitoringCore.h | 1 - livestatus/src/TableStateHistory.cc | 13 +++++-------- livestatus/src/module.cc | 7 ++----- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/livestatus/src/MonitoringCore.h b/livestatus/src/MonitoringCore.h index 68b81bb..88666bb 100644 --- a/livestatus/src/MonitoringCore.h +++ b/livestatus/src/MonitoringCore.h @@ -95,7 +95,6 @@ public: virtual Encoding dataEncoding() = 0; virtual size_t maxResponseSize() = 0; virtual size_t maxCachedMessages() = 0; - virtual bool stateHistoryFilteringEnabled() = 0; virtual AuthorizationKind hostAuthorization() const = 0; virtual AuthorizationKind serviceAuthorization() const = 0; diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index 042b831..89be3cc 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -40,7 +40,6 @@ #include "HostServiceState.h" #include "LogEntry.h" #include "Logger.h" -#include "MonitoringCore.h" #include "OffsetDoubleColumn.h" #include "OffsetIntColumn.h" #include "OffsetSStringColumn.h" @@ -286,13 +285,11 @@ void TableStateHistory::answerQuery(Query *query) { // Create a partial filter, that contains only such filters that check // attributes of current hosts and services std::vector<std::unique_ptr<Filter>> subfilters; - if (core()->stateHistoryFilteringEnabled()) { - for (const auto &filter : *query->filter()) { - IsObjectFilter is_obj; - filter->accept(is_obj); - if (is_obj._value) { - subfilters.push_back(filter->copy()); - } + for (const auto &filter : *query->filter()) { + IsObjectFilter is_obj; + filter->accept(is_obj); + if (is_obj._value) { + subfilters.push_back(filter->copy()); } } std::reverse(subfilters.begin(), subfilters.end()); diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index 5bac8be..bf50124 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -89,7 +89,6 @@ int g_num_queued_connections = 0; // current number of active connections (for statistics) std::atomic_int32_t g_livestatus_active_connections{0}; size_t g_thread_stack_size = 1024 * 1024; /* stack size of threads */ -static int fl_disable_statehist_filtering; void *g_nagios_handle; int g_unix_socket = -1; @@ -644,9 +643,6 @@ public: Encoding dataEncoding() override { return fl_data_encoding; } size_t maxResponseSize() override { return fl_max_response_size; } size_t maxCachedMessages() override { return fl_max_cached_messages; } - bool stateHistoryFilteringEnabled() override { - return fl_disable_statehist_filtering == 0; - } // TODO(sp) Unused in Livestatus NEB: Strange & ugly... AuthorizationKind hostAuthorization() const override { @@ -1045,7 +1041,8 @@ void livestatus_parse_arguments(const char *args_orig) { Warning(fl_logger_nagios) << "livecheck has been removed from Livestatus, sorry."; } else if (strcmp(left, "disable_statehist_filtering") == 0) { - fl_disable_statehist_filtering = atoi(right); + Warning(fl_logger_nagios) + << "the disable_statehist_filtering option has been removed, filtering is always active now."; } else { Warning(fl_logger_nagios) << "ignoring invalid option " << left << "=" << right;

6 years, 3 months

← Newer
1
...
24
25
26
27
28
29
30
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2018