Checkmk git commits April 2019

checkmk-commits@lists.checkmk.com

15 participants
599 discussions

7361 FIX lnx_if: Ignore docker veth* interfaces when inventorizing Linux interfaces

by Simon Betz

Module: check_mk Branch: master Commit: de775aca7e28438a508599c8a4f737d529eb1a01 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de775aca7e2843… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Apr 2 14:49:17 2019 +0200 7361 FIX lnx_if: Ignore docker veth* interfaces when inventorizing Linux interfaces Change-Id: I8a8767788d31f017cf831cafb3d7c3a2fc5228ac --- .werks/7361 | 11 +++++++++++ inventory/lnx_if | 4 ++++ 2 files changed, 15 insertions(+) diff --git a/.werks/7361 b/.werks/7361 new file mode 100644 index 0000000..b15da95 --- /dev/null +++ b/.werks/7361 @@ -0,0 +1,11 @@ +Title: lnx_if: Ignore docker veth* interfaces when inventorizing Linux interfaces +Level: 1 +Component: inv +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1554209263 +Class: fix + +See Werk 5946 for detailed information. Inventorizing these docker +interface may led to superfluous inventory changes. diff --git a/inventory/lnx_if b/inventory/lnx_if index edd49c5..6b5c297 100644 --- a/inventory/lnx_if +++ b/inventory/lnx_if @@ -43,6 +43,10 @@ def inv_lnx_if(parsed, params): _if_in_errors, _if_out_octets, _outucast, _outmcast, _outbcast, \ _if_out_discards, _if_out_errors, _if_out_qlen, if_alias, if_phys_address in parsed: + if if_descr.startswith("veth"): + # Always exclude dockers veth* interfaces on docker nodes + continue + if if_type in ("231", "232"): continue # Useless entries for "TenGigabitEthernet2/1/21--Uncontrolled" # Ignore useless half-empty tables (e.g. Viprinet-Router)

5 years, 3 months

Actually test something sensible regarding OffsetStringHostMacroColumn.

by Sven Panne

Module: check_mk Branch: master Commit: d0d43dfc6c41784b37f5b3f658d9207d0e4ba5c2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d0d43dfc6c4178… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Apr 2 11:11:25 2019 +0200 Actually test something sensible regarding OffsetStringHostMacroColumn. Change-Id: I4b14524fe640e34eaf330426cdccf34f9462a46c --- Makefile | 1 + livestatus/src/test/DummyNagios.cc | 1 - .../src/test/test_OffsetStringMacroColumn.cc | 187 ++++++++++++++++++--- 3 files changed, 160 insertions(+), 29 deletions(-) diff --git a/Makefile b/Makefile index 5a154c9..78e1695 100644 --- a/Makefile +++ b/Makefile @@ -83,6 +83,7 @@ FILES_TO_FORMAT := $(wildcard $(addprefix agents/,*.cc *.c *.h)) \ $(wildcard $(addprefix agents/windows/test/sections,*.cc *.h)) \ $(wildcard $(addprefix livestatus/api/c++/,*.cc *.h)) \ $(wildcard $(addprefix livestatus/src/,*.cc *.h)) \ + $(wildcard $(addprefix livestatus/src/test/,*.cc *.h)) \ $(wildcard $(addprefix bin/,*.cc *.c *.h)) \ $(wildcard $(addprefix enterprise/core/src/,*.cc *.h)) \ $(wildcard $(addprefix enterprise/core/src/checkhelper/,*.cc *.h)) \ diff --git a/livestatus/src/test/DummyNagios.cc b/livestatus/src/test/DummyNagios.cc index 160e415..eeec43d 100644 --- a/livestatus/src/test/DummyNagios.cc +++ b/livestatus/src/test/DummyNagios.cc @@ -100,5 +100,4 @@ scheduled_downtime *scheduled_downtime_list; servicegroup *servicegroup_list; service *service_list; timeperiod *timeperiod_list; - } diff --git a/livestatus/src/test/test_OffsetStringMacroColumn.cc b/livestatus/src/test/test_OffsetStringMacroColumn.cc index 36ea292..08898b3 100644 --- a/livestatus/src/test/test_OffsetStringMacroColumn.cc +++ b/livestatus/src/test/test_OffsetStringMacroColumn.cc @@ -1,35 +1,166 @@ -#include <memory> +#include <algorithm> +#include <cstddef> +#include <iterator> +#include <string> #include "Column.h" #include "OffsetStringHostMacroColumn.h" #include "Row.h" #include "gtest/gtest.h" #include "nagios.h" -TEST(OffsetStringHostMacroColumn, simple) { - // Backwards you must build the list, my young padawan... - customvariablesmember cvm1{const_cast<char *>("HARRY"), - const_cast<char *>("HIRSCH"), 0, nullptr}; - customvariablesmember cvm2{const_cast<char *>("ERNIE"), - const_cast<char *>("BERT"), 0, &cvm1}; - customvariablesmember *custom_variables = &cvm2; - Row row{&custom_variables}; - - OffsetStringHostMacroColumn oshmc("funny_column_name", "Cool description!", - -1, -1, -1, nullptr, 0); - - EXPECT_EQ("funny_column_name", oshmc.name()); - EXPECT_EQ("Cool description!", oshmc.description()); - EXPECT_EQ(&custom_variables, oshmc.columnData<void>(row)); - EXPECT_EQ(ColumnType::string, oshmc.type()); - - auto cvm = *oshmc.columnData<const customvariablesmember *const>(row); - EXPECT_STREQ("ERNIE", cvm->variable_name); - EXPECT_STREQ("BERT", cvm->variable_value); - - cvm = cvm->next; - EXPECT_STREQ("HARRY", cvm->variable_name); - EXPECT_STREQ("HIRSCH", cvm->variable_value); - - cvm = cvm->next; - EXPECT_EQ(nullptr, cvm); +extern char *macro_user[MAX_USER_MACROS]; + +namespace { +class OffsetStringMacroColumnTest : public ::testing::Test { +protected: + void SetUp() override { + std::fill(std::begin(macro_user), std::end(macro_user), nullptr); + macro_user[10] = cc("I drink and I know things"); + + // g++'s -Wmissing-field-initializers warning incorrectly fires if we + // use designated initializers for this. :-P + host_.name = cc("sesame_street"); + host_.display_name = cc("the display name"); + host_.alias = cc("the alias"); + host_.address = cc("the address"); + host_.host_check_command = cc("the host check command"); + host_.custom_variables = &cvm2_; + host_.plugin_output = cc("the plugin output"); + host_.long_plugin_output = cc("the long plugin output"); + host_.perf_data = cc("the perf data"); + } + + void set_host_notes(const char *notes) { host_.notes = cc(notes); } + + std::string expanded_host_notes() const { return oshmc_.getValue(row_); } + + // Backwards the list you must build, my young padawan... + customvariablesmember cvm1_{.variable_name = cc("ERNIE"), + .variable_value = cc("Bert"), + .has_been_modified = 0, + .next = nullptr}; + customvariablesmember cvm2_{.variable_name = cc("HARRY"), + .variable_value = cc("Hirsch"), + .has_been_modified = 0, + .next = &cvm1_}; + host host_{}; + Row row_{&host_}; + OffsetStringHostMacroColumn oshmc_{ + "funny_column_name", "Cool description!", -1, -1, -1, nullptr, + offsetof(host, notes)}; + +private: + // Nagios and const-correctness: A Tale of Two Worlds... + static char *cc(const char *str) { return const_cast<char *>(str); } + +}; // namespace + +} // namespace + +TEST_F(OffsetStringMacroColumnTest, simple) { + EXPECT_EQ("funny_column_name", oshmc_.name()); + EXPECT_EQ("Cool description!", oshmc_.description()); + EXPECT_EQ(ColumnType::string, oshmc_.type()); + EXPECT_EQ(&host_, oshmc_.columnData<void>(row_)); +} + +TEST_F(OffsetStringMacroColumnTest, getValue_basic) { + set_host_notes("checking $HOSTNAME$..."); + EXPECT_EQ("checking sesame_street...", expanded_host_notes()); + + set_host_notes("checking $HOSTDISPLAYNAME$..."); + EXPECT_EQ("checking the display name...", expanded_host_notes()); + + set_host_notes("checking $HOSTALIAS$..."); + EXPECT_EQ("checking the alias...", expanded_host_notes()); + + set_host_notes("checking $HOSTADDRESS$..."); + EXPECT_EQ("checking the address...", expanded_host_notes()); + + set_host_notes("checking $HOSTOUTPUT$..."); + EXPECT_EQ("checking the plugin output...", expanded_host_notes()); + + set_host_notes("checking $LONGHOSTOUTPUT$..."); + EXPECT_EQ("checking the long plugin output...", expanded_host_notes()); + + set_host_notes("checking $HOSTPERFDATA$..."); + EXPECT_EQ("checking the perf data...", expanded_host_notes()); + + set_host_notes("checking $HOSTCHECKCOMMAND$..."); + EXPECT_EQ("checking the host check command...", expanded_host_notes()); + + set_host_notes("Hi, I'm $_HOSTERNIE$!"); + EXPECT_EQ("Hi, I'm Bert!", expanded_host_notes()); + + set_host_notes("Hi, I'm $_HOSTKERMIT$!"); + EXPECT_EQ("Hi, I'm $_HOSTKERMIT$!", expanded_host_notes()); + + set_host_notes("checking $SERVICEDESC$..."); + EXPECT_EQ("checking $SERVICEDESC$...", expanded_host_notes()); + + set_host_notes("checking $SERVICEDISPLAYNAME$..."); + EXPECT_EQ("checking $SERVICEDISPLAYNAME$...", expanded_host_notes()); + + set_host_notes("checking $SERVICEOUTPUT$..."); + EXPECT_EQ("checking $SERVICEOUTPUT$...", expanded_host_notes()); + + set_host_notes("checking $LONGSERVICEOUTPUT$..."); + EXPECT_EQ("checking $LONGSERVICEOUTPUT$...", expanded_host_notes()); + + set_host_notes("checking $SERVICEPERFDATA$..."); + EXPECT_EQ("checking $SERVICEPERFDATA$...", expanded_host_notes()); + + set_host_notes("checking $SERVICECHECKCOMMAND$..."); + EXPECT_EQ("checking $SERVICECHECKCOMMAND$...", expanded_host_notes()); + + set_host_notes("checking $_SERVICEERNIE$..."); + EXPECT_EQ("checking $_SERVICEERNIE$...", expanded_host_notes()); + + set_host_notes("checking $_SERVICEKERMIT$..."); + EXPECT_EQ("checking $_SERVICEKERMIT$...", expanded_host_notes()); + + set_host_notes("checking $USER11$..."); + EXPECT_EQ("checking I drink and I know things...", expanded_host_notes()); + + set_host_notes("checking $USER42$..."); + EXPECT_EQ("checking $USER42$...", expanded_host_notes()); + + set_host_notes("checking $NONSENSE$..."); + EXPECT_EQ("checking $NONSENSE$...", expanded_host_notes()); +} + +TEST_F(OffsetStringMacroColumnTest, getValue_border_cases) { + host_.name = nullptr; + set_host_notes("checking $HOSTNAME$..."); + EXPECT_EQ("checking $HOSTNAME$...", expanded_host_notes()); + + host_.notes = nullptr; + EXPECT_EQ("", expanded_host_notes()); + + set_host_notes(""); + EXPECT_EQ("", expanded_host_notes()); + + set_host_notes("checking $HOSTALIAS$$HOSTADDRESS$..."); + EXPECT_EQ("checking the aliasthe address...", expanded_host_notes()); + + set_host_notes("$HOSTALIAS$$HOSTADDRESS$"); + EXPECT_EQ("the aliasthe address", expanded_host_notes()); + + set_host_notes("$"); + EXPECT_EQ("$", expanded_host_notes()); + + set_host_notes("foo$bar"); + EXPECT_EQ("foofoo$bar", expanded_host_notes()); // TODO(sp) WRONG!!! + + set_host_notes("checking $USER0$..."); + EXPECT_EQ("checking $USER0$...", expanded_host_notes()); + + set_host_notes("checking $USER1$..."); + EXPECT_EQ("checking $USER1$...", expanded_host_notes()); + + set_host_notes("checking $USER256$..."); + EXPECT_EQ("checking $USER256$...", expanded_host_notes()); + + set_host_notes("checking $USER257$..."); + EXPECT_EQ("checking $USER257$...", expanded_host_notes()); }

5 years, 3 months

Fixed typo

by Simon Betz

Module: check_mk Branch: master Commit: 16f9a5c4e52fb67fed48636c27b46be728fdaf70 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=16f9a5c4e52fb6… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Apr 2 15:35:21 2019 +0200 Fixed typo Change-Id: Id1add393b36eef8b5baa87ee7d28b235fe1976f5 --- .werks/7361 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/7361 b/.werks/7361 index b15da95..2a9588d 100644 --- a/.werks/7361 +++ b/.werks/7361 @@ -8,4 +8,4 @@ Date: 1554209263 Class: fix See Werk 5946 for detailed information. Inventorizing these docker -interface may led to superfluous inventory changes. +interfaces may lead to superfluous inventory changes.

5 years, 3 months

Fixed auxiliary tag filter after recent changes

by Lars Michelsen

Module: check_mk Branch: master Commit: f147e977f81960b82475d0be064bc67e77aed8e4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f147e977f81960… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 2 15:23:50 2019 +0200 Fixed auxiliary tag filter after recent changes Change-Id: I0a2c0553938ce2e202eef4216ebc283c9eb72a14 --- cmk/gui/plugins/visuals/filters.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/cmk/gui/plugins/visuals/filters.py b/cmk/gui/plugins/visuals/filters.py index c3a3e93..d31ca37 100644 --- a/cmk/gui/plugins/visuals/filters.py +++ b/cmk/gui/plugins/visuals/filters.py @@ -2519,12 +2519,10 @@ class FilterHostAuxTags(Filter): Filter.__init__(self, info='host', htmlvars=htmlvars, link_columns=[]) - self.auxtags = config.wato_aux_tags - def display(self): + aux_tag_choices = [("", "")] + config.tags.aux_tag_list.get_choices() for num in range(self.count): - html.dropdown( - '%s_%d' % (self.prefix, num), [("", "")] + self.auxtags, ordered=True, class_='neg') + html.dropdown('%s_%d' % (self.prefix, num), aux_tag_choices, ordered=True, class_='neg') html.open_nobr() html.checkbox('%s_%d_neg' % (self.prefix, num), False, label=_("negate")) html.close_nobr() @@ -2547,8 +2545,8 @@ class FilterHostAuxTags(Filter): return '' def _host_auxtags_filter(self, tag, negate): - return "Filter: host_tags %s '%s' '%s'" % ( - "!=" if negate else "=", livestatus.lqencode(tag), livestatus.lqencode(tag)) + return "Filter: host_tags %s %s %s" % ("!=" if negate else "=", livestatus.lqencode(tag), + livestatus.lqencode(tag)) def double_height(self): return True

5 years, 3 months

7333 Introduce predefined conditions for rulesets

by Lars Michelsen

Module: check_mk Branch: master Commit: 6d5e82cee3797bda8ba6087dafd513ccb04445dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6d5e82cee3797b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 2 14:51:07 2019 +0200 7333 Introduce predefined conditions for rulesets In the rule-based configuration of Check_MK ("Host & Service Parameters" and "Manual Checks") it often happens that rules with the same conditions have to be created in different rule chains. With a larger number of rules, this quickly becomes confusing. To improve this situation we have now added a feature called "Predefined conditions". The idea is to preconfigure conditions in a central place, to which you can later refer in the individual rule chains. A predefined condition currently always consists of a full set of conditions (folder, tags, host specification, service specification). A rule can either use explicit conditions, as before, or refer to a predefined condition now. You access the predefined conditions via a context button from the pages on which you manage your rule chains. Change-Id: I1ec111639d49534f78799258211a01bf2167e537 --- .werks/7333 | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/.werks/7333 b/.werks/7333 new file mode 100644 index 0000000..37fcf9b --- /dev/null +++ b/.werks/7333 @@ -0,0 +1,23 @@ +Title: Introduce predefined conditions for rulesets +Level: 2 +Component: wato +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1554209050 +Class: feature + +In the rule-based configuration of Check_MK ("Host & Service Parameters" and +"Manual Checks") it often happens that rules with the same conditions have to +be created in different rule chains. With a larger number of rules, this +quickly becomes confusing. + +To improve this situation we have now added a feature called "Predefined +conditions". The idea is to preconfigure conditions in a central place, to +which you can later refer in the individual rule chains. A predefined condition +currently always consists of a full set of conditions (folder, tags, host +specification, service specification). A rule can either use explicit +conditions, as before, or refer to a predefined condition now. + +You access the predefined conditions via a context button from the pages on +which you manage your rule chains.

5 years, 3 months

wmi.include: Check_MK Discovery does not report 'vanished services' for WMI services if WMI timeout

by Simon Betz

Module: check_mk Branch: master Commit: 5e32f8765c7a4b280f09d220b6b871262758a515 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e32f8765c7a4b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Apr 2 12:30:37 2019 +0200 wmi.include: Check_MK Discovery does not report 'vanished services' for WMI services if WMI timeout Change-Id: I32f324f05dff187158fbe85f2d37f44d599c2a59 --- .werks/7357 | 22 +++ checks/wmi.include | 4 +- tests/unit/checks/test_wmi_check.py | 310 +++++++++++++++++++++++++++++++++++- 3 files changed, 332 insertions(+), 4 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5e32f8765c…

5 years, 3 months

apache_status: refactor IV

by Moritz Kiemer

Module: check_mk Branch: master Commit: 5dd5c1442a8b4b286b8872a74c7ff856e4c22126 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5dd5c1442a8b4b… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Apr 1 14:32:43 2019 +0200 apache_status: refactor IV Change-Id: I7cf22d7c32ca5ef3ff1b2bc06daab9b8506099c4 --- agents/plugins/apache_status | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/agents/plugins/apache_status b/agents/plugins/apache_status index 671d30a..658b655 100755 --- a/agents/plugins/apache_status +++ b/agents/plugins/apache_status @@ -140,15 +140,15 @@ def get_response(proto, address, portspec, page): try: request = urllib2.Request(url, headers={"Accept": "text/plain"}) return urllib2.urlopen(request) - except urllib2.URLError, e: - if 'unknown protocol' in str(e): + except urllib2.URLError as exc: + if 'unknown protocol' in str(exc): # HACK: workaround misconfigurations where port 443 is used for # serving non ssl secured http url = 'http://%s%s/server-status?auto' % (address, portspec) return urllib2.urlopen(url) raise - except Exception, e: - if 'doesn\'t match' in str(e) and is_local: + except Exception as exc: + if 'doesn\'t match' in str(exc) and is_local: # HACK: workaround if SSL port is found and localhost is using # SSL connections but certificate does not match return urllib2.urlopen(url, context=no_cert_verification()) @@ -181,11 +181,11 @@ def main(): break sys.stdout.write("%s %s %s\n" % (address, port, line)) - except urllib2.HTTPError, e: - sys.stderr.write('HTTP-Error (%s%s): %s %s\n' % (address, portspec, e.code, e)) + except urllib2.HTTPError as exc: + sys.stderr.write('HTTP-Error (%s%s): %s %s\n' % (address, portspec, exc.code, exc)) - except Exception, e: - sys.stderr.write('Exception (%s%s): %s\n' % (address, portspec, e)) + except Exception as exc: # pylint: disable=broad-except + sys.stderr.write('Exception (%s%s): %s\n' % (address, portspec, exc)) return 0

5 years, 3 months

7387 FIX apache_status: Ignore certificates from local hosts

by Moritz Kiemer

Module: check_mk Branch: master Commit: d895efc27f729de1e2d6621a9e96cc3c5927de71 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d895efc27f729d… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Apr 1 14:44:46 2019 +0200 7387 FIX apache_status: Ignore certificates from local hosts Previously not all cases of failing certificate verfication for local hosts were handled correctly, which could lead to missing data for that host. Instead of handling all cases of invalid certificates we now omit certificate verification for local addresses entirely. This only affects the addresses "127.0.0.1", "[::1]", and "localhost". Change-Id: I0ffc977ddf60b299f1e262e3c1d8fa45eb56bfc6 --- .werks/7387 | 17 +++++++++++++++++ agents/plugins/apache_status | 17 +++++++++-------- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/.werks/7387 b/.werks/7387 new file mode 100644 index 0000000..a817abb --- /dev/null +++ b/.werks/7387 @@ -0,0 +1,17 @@ +Title: apache_status: Ignore certificates from local hosts +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1554122535 +Class: fix + +Previously not all cases of failing certificate verfication for +local hosts were handled correctly, which could lead to missing +data for that host. +Instead of handling all cases of invalid certificates we now +omit certificate verification for local addresses entirely. +This only affects the addresses "127.0.0.1", "[::1]", and +"localhost". + diff --git a/agents/plugins/apache_status b/agents/plugins/apache_status index 658b655..ce5b28f 100755 --- a/agents/plugins/apache_status +++ b/agents/plugins/apache_status @@ -126,11 +126,16 @@ def _unpack_server(server): server.get('page', 'server-status')) -def no_cert_verification(): +def urlopen_no_cert_verification(url): + """urlopen without checking the cert + + workaround if SSL port is found and localhost is using + SSL connections but certificate does not match + """ context = ssl.create_default_context() context.check_hostname = False context.verify_mode = ssl.CERT_NONE - return context + return urllib2.urlopen(url, context=context) def get_response(proto, address, portspec, page): @@ -139,6 +144,8 @@ def get_response(proto, address, portspec, page): # Try to fetch the status page for each server try: request = urllib2.Request(url, headers={"Accept": "text/plain"}) + if is_local: + return urlopen_no_cert_verification(url) return urllib2.urlopen(request) except urllib2.URLError as exc: if 'unknown protocol' in str(exc): @@ -147,12 +154,6 @@ def get_response(proto, address, portspec, page): url = 'http://%s%s/server-status?auto' % (address, portspec) return urllib2.urlopen(url) raise - except Exception as exc: - if 'doesn\'t match' in str(exc) and is_local: - # HACK: workaround if SSL port is found and localhost is using - # SSL connections but certificate does not match - return urllib2.urlopen(url, context=no_cert_verification()) - raise def main():

5 years, 3 months

Improve predefined condition usage

by Lars Michelsen

Module: check_mk Branch: master Commit: ea9ac8e82ec30fa1783fb4655eae69d949a8b007 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ea9ac8e82ec30f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Mar 30 21:41:37 2019 +0100 Improve predefined condition usage * Add option to search for predefined condition usage in the rule search * Add icon button to the predefined condition list to open a rule search for the choosen predefined condition. This can be useful to find all rules refering to a predefined condition. * Prevent deletion of a predefined condition in case it is still used by rules. Change-Id: Ie36d57de1dc14d45185622cd0834ba786e907284 --- cmk/gui/plugins/wato/utils/simple_modes.py | 6 +++++ cmk/gui/wato/pages/predefined_conditions.py | 34 +++++++++++++++++++++++------ cmk/gui/wato/pages/rulesets.py | 14 +++++++----- cmk/gui/watolib/predefined_conditions.py | 4 ++++ cmk/gui/watolib/rulesets.py | 4 ++++ 5 files changed, 49 insertions(+), 13 deletions(-) diff --git a/cmk/gui/plugins/wato/utils/simple_modes.py b/cmk/gui/plugins/wato/utils/simple_modes.py index 2b92361..007e6af 100644 --- a/cmk/gui/plugins/wato/utils/simple_modes.py +++ b/cmk/gui/plugins/wato/utils/simple_modes.py @@ -218,6 +218,8 @@ class SimpleListMode(SimpleWatoModeBase): raise MKUserError("_delete", \ _("You are not allowed to delete this %s.") % self._mode_type.name_singular()) + self._validate_deletion(ident, entries[ident]) + entry = entries.pop(ident) self._add_change("delete", entry, _("Removed the %s '%s'") % (self._mode_type.name_singular(), ident)) @@ -225,6 +227,10 @@ class SimpleListMode(SimpleWatoModeBase): return None, _("The %s has been deleted.") % self._mode_type.name_singular() + def _validate_deletion(self, ident, entry): + """Override this to implement custom validations""" + pass + def _delete_confirm_message(self): return _("Do you really want to delete this %s?") % self._mode_type.name_singular() diff --git a/cmk/gui/wato/pages/predefined_conditions.py b/cmk/gui/wato/pages/predefined_conditions.py index 5eb2689..6f812cf 100644 --- a/cmk/gui/wato/pages/predefined_conditions.py +++ b/cmk/gui/wato/pages/predefined_conditions.py @@ -27,6 +27,7 @@ import cmk.gui.config as config import cmk.gui.userdb as userdb +from cmk.gui.exceptions import MKUserError from cmk.gui.i18n import _ from cmk.gui.globals import html from cmk.gui.valuespec import ( @@ -39,6 +40,7 @@ from cmk.gui.valuespec import ( from cmk.gui.plugins.wato.check_mk_configuration import RulespecGroupUserInterface from cmk.gui.wato.pages.rulesets import VSExplicitConditions, RuleConditions +from cmk.gui.watolib.rulesets import AllRulesets, SearchedRulesets from cmk.gui.watolib.rulespecs import ServiceRulespec from cmk.gui.watolib.groups import load_contact_group_information from cmk.gui.watolib.predefined_conditions import PredefinedConditionStore @@ -109,13 +111,18 @@ class ModePredefinedConditions(SimpleListMode): def _table_title(self): return _("Predefined conditions") - # TODO: Can we validate predefined condition usage and prevent deletion? - def _delete_confirm_message(self): - return " ".join([ - _("The password may be used in checks. If you delete the password, " - "the checks won't be able to authenticate with this password anymore."), - super(ModePredefinedConditions, self)._delete_confirm_message() - ]) + def _validate_deletion(self, ident, entry): + rulesets = AllRulesets() + rulesets.load() + matched_rulesets = SearchedRulesets(rulesets, { + "rule_predefined_condition": ident + }).get_rulesets() + + if matched_rulesets: + raise MKUserError( + "_delete", + _("You can not delete this %s because it is <a href=\"%s\">in use</a>.") % + (self._mode_type.name_singular(), self._search_url(ident))) def page(self): html.p( @@ -125,6 +132,19 @@ class ModePredefinedConditions(SimpleListMode): "rulesets.")) super(ModePredefinedConditions, self).page() + def _show_action_cell(self, table, ident): + super(ModePredefinedConditions, self)._show_action_cell(table, ident) + + html.icon_button( + self._search_url(ident), + _("Show rules using this %s") % self._mode_type.name_singular(), "search") + + def _search_url(self, ident): + return html.makeuri_contextless([("mode", "rulesets"), + ("search_p_rule_predefined_condition", + DropdownChoice.option_id(ident)), + ("search_p_rule_predefined_condition_USE", "on")]) + def _show_entry_cells(self, table, ident, entry): table.cell(_("Title"), html.render_text(entry["title"])) diff --git a/cmk/gui/wato/pages/rulesets.py b/cmk/gui/wato/pages/rulesets.py index 95eea180..114b8bf 100644 --- a/cmk/gui/wato/pages/rulesets.py +++ b/cmk/gui/wato/pages/rulesets.py @@ -953,6 +953,7 @@ class ModeRuleSearch(WatoMode): "rule_disabled", "rule_ineffective", "rule_folder", + "rule_predefined_condition", ]), ], elements=[ @@ -1066,6 +1067,12 @@ class ModeRuleSearch(WatoMode): ), ], )), + ("rule_predefined_condition", + DropdownChoice( + title=_("Using predefined condition"), + choices=PredefinedConditionStore().choices(), + sorted=True, + )), ], ) @@ -1339,7 +1346,7 @@ class EditRuleMode(WatoMode): url = watolib.folder_preserving_link([("mode", "predefined_conditions")]) return DropdownChoice( title=_("Predefined condition"), - choices=self._predefined_condition_choices, + choices=PredefinedConditionStore().choices(), sorted=True, invalid_choice="complain", invalid_choice_title=_( @@ -1350,11 +1357,6 @@ class EditRuleMode(WatoMode): empty_text=(_("There are no elements defined for this selection yet.") + " " + _("You can create predefined conditions <a href=\"%s\">here</a>.") % url)) - def _predefined_condition_choices(self): - store = PredefinedConditionStore() - return [(ident, entry["title"]) - for ident, entry in store.filter_usable_entries(store.load_for_reading()).items()] - def _show_explicit_conditions(self): conditions = RuleConditions( folder_path=self._folder.path(), diff --git a/cmk/gui/watolib/predefined_conditions.py b/cmk/gui/watolib/predefined_conditions.py index 403c5c3..93a3095 100644 --- a/cmk/gui/watolib/predefined_conditions.py +++ b/cmk/gui/watolib/predefined_conditions.py @@ -55,3 +55,7 @@ class PredefinedConditionStore(WatoSimpleConfigFile): user_groups = userdb.contactgroups_of_user(config.user.id) return dict([(k, v) for k, v in entries.items() if v["owned_by"] in user_groups]) + + def choices(self): + return [(ident, entry["title"]) + for ident, entry in self.filter_usable_entries(self.load_for_reading()).items()] diff --git a/cmk/gui/watolib/rulesets.py b/cmk/gui/watolib/rulesets.py index 6b663dc..5bc6969 100644 --- a/cmk/gui/watolib/rulesets.py +++ b/cmk/gui/watolib/rulesets.py @@ -834,6 +834,10 @@ class Rule(object): "rule_disabled"] != self.is_disabled(): return False + if "rule_predefined_condition" in search_options and search_options[ + "rule_predefined_condition"] != self.predefined_condition_id(): + return False + if "rule_ineffective" in search_options and search_options[ "rule_ineffective"] != self.is_ineffective(): return False

5 years, 3 months

Rule editor: Refactored explicit service condition to valuespec

by Lars Michelsen

Module: check_mk Branch: master Commit: dff53709f96355b454ac9f2a368300525ab9323e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dff53709f96355… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 29 19:55:18 2019 +0100 Rule editor: Refactored explicit service condition to valuespec Cleaned up duplicate logic for explicit host and service conditions on the way. Change-Id: Id0ed0a502fe0c637103a9bb2cc5635f18262c741 --- cmk/gui/wato/pages/rulesets.py | 114 ++++++++++++++++++++--------------------- 1 file changed, 56 insertions(+), 58 deletions(-) diff --git a/cmk/gui/wato/pages/rulesets.py b/cmk/gui/wato/pages/rulesets.py index 45cbc47..d7b8a14 100644 --- a/cmk/gui/wato/pages/rulesets.py +++ b/cmk/gui/wato/pages/rulesets.py @@ -42,6 +42,7 @@ from cmk.gui.exceptions import MKUserError, MKAuthException from cmk.gui.i18n import _ from cmk.gui.globals import html from cmk.gui.valuespec import ( + Transform, FixedValue, Checkbox, ListChoice, @@ -1383,34 +1384,27 @@ class EditRuleMode(WatoMode): # Item list itemtype = self._rulespec.item_type if itemtype: - explicit = html.get_checkbox("explicit_services") - if not explicit: + explicit_services = self._vs_explicit_services().from_html_vars("explicit_services") + self._vs_explicit_services().validate_value(explicit_services, "explicit_services") + + if explicit_services is None: item_list = watolib.ALL_SERVICES else: - itemenum = self._rulespec.item_enum - negate = html.get_checkbox("negate_entries") - - if itemenum: - itemspec = ListChoice(choices=itemenum, columns=3) - item_list = [x + "$" for x in itemspec.from_html_vars("item")] - else: - vs = self._vs_service_conditions() - item_list = vs.from_html_vars("itemlist") - vs.validate_value(item_list, "itemlist") + item_list, negate = explicit_services if negate: item_list = [watolib.ENTRY_NEGATE_CHAR + i for i in item_list] - if len(item_list) > 0 and item_list[0][0] == watolib.ENTRY_NEGATE_CHAR: + if item_list and item_list[0][0] == watolib.ENTRY_NEGATE_CHAR: item_list += watolib.ALL_SERVICES - elif len(item_list) == 0 and negate: + elif not item_list and negate: item_list = watolib.ALL_SERVICES # equivalent - if len(item_list) == 0: + if not item_list: raise MKUserError( "item_0", - _("Please specify at least one %s or " - "this rule will never match.") % self._rulespec.item_name) + _("Please specify at least one %s or this rule will never match.") % + self._rulespec.item_name) else: item_list = None @@ -1543,15 +1537,7 @@ class EditRuleMode(WatoMode): # Explicit hosts / watolib.ALL_HOSTS forms.section(_("Explicit hosts"), css="condition explicit") - if self._rule.host_list == watolib.ALL_HOSTS: - explicit_hosts = None - else: - explicit_hosts = [ - h.strip("!") for h in self._rule.host_list if h != watolib.ALL_HOSTS[0] - ] - negate_hosts = len(self._rule.host_list) > 0 and self._rule.host_list[0].startswith("!") - explicit_hosts = (explicit_hosts, negate_hosts) - + explicit_hosts = self._get_explicit(self._rule.host_list, watolib.ALL_HOSTS) self._vs_explicit_hosts().render_input("explicit_hosts", explicit_hosts) # Itemlist @@ -1583,41 +1569,20 @@ class EditRuleMode(WatoMode): else: raise MKUserError(None, "Invalid item type '%s'" % itemtype) - checked = html.get_checkbox("explicit_services") - if checked is None: # read from rule itself - checked = len(self._rule.item_list) == 0 or self._rule.item_list[0] != "" - div_id = "item_list" - html.checkbox( - "explicit_services", - checked, - onclick="cmk.valuespecs.toggle_option(this, %r)" % div_id, - label=_("Specify explicit values")) - html.open_div( - id_=div_id, style=["display: none;" if not checked else "", "padding: 0px;"]) - - negate_entries = len(self._rule.item_list) > 0 and self._rule.item_list[0].startswith( - watolib.ENTRY_NEGATE_CHAR) - if negate_entries: - cleaned_item_list = [ - i.lstrip(watolib.ENTRY_NEGATE_CHAR) for i in self._rule.item_list[:-1] - ] # strip last entry (watolib.ALL_SERVICES) - else: - cleaned_item_list = self._rule.item_list + explicit_services = self._get_explicit(self._rule.item_list, watolib.ALL_SERVICES) + self._vs_explicit_services().render_input("explicit_services", explicit_services) - itemenum = self._ruleset.item_enum() - if itemenum: - value = [x.rstrip("$") for x in cleaned_item_list] - itemspec = ListChoice(choices=itemenum, columns=3) - itemspec.render_input("item", value) - else: - self._vs_service_conditions().render_input("itemlist", cleaned_item_list) + def _get_explicit(self, object_list, all_objects): + if object_list == all_objects: + return None - html.checkbox( - "negate_entries", - negate_entries, - label=_("Negate: make rule apply for all but the above entries")) + negate = object_list and object_list[0].startswith(watolib.ENTRY_NEGATE_CHAR) - html.close_div() + if negate: + # strip last entry (watolib.ALL_SERVICES/ALL_HOSTS) + object_list = [i.lstrip(watolib.ENTRY_NEGATE_CHAR) for i in object_list[:-1]] + + return object_list, negate def _show_rule_representation(self): content = "<pre>%s</pre>" % html.render_text(pprint.pformat(self._rule.to_dict_config())) @@ -1677,7 +1642,40 @@ class EditRuleMode(WatoMode): "the host names in question."), ) + def _vs_explicit_services(self): + return Alternative( + style="dropdown", + elements=[ + FixedValue( + None, + title=_("No explicit service filtering"), + totext="", + ), + Tuple( + title=_("Specify explicit values"), + elements=[ + self._vs_service_conditions(), + Checkbox( + label=_( + "Negate: make rule apply for all but the above entries" + ),), + ], + ), + ], + ) + def _vs_service_conditions(self): + itemenum = self._ruleset.item_enum() + if itemenum: + return Transform( + ListChoice( + choices=itemenum, + columns=3, + ), + forth=lambda item_list: [x + "$" for x in item_list], + back=lambda item_list: [x.rstrip("$") for x in item_list], + ) + return ListOfStrings( orientation="horizontal", valuespec=RegExpUnicode(size=30, mode=RegExpUnicode.prefix),

5 years, 3 months

← Newer
1
...
51
52
53
54
55
56
57
...
60
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2019