Checkmk git commits August 2016

checkmk-commits@lists.checkmk.com

8 participants
256 discussions

fixed exception on adding new host tags, side effect of wk3721

by Andreas Boesl

Module: check_mk Branch: master Commit: 73743faa8d079d5b14f182309264a67a607d57ab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=73743faa8d079d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Aug 17 13:06:29 2016 +0200 fixed exception on adding new host tags, side effect of wk3721 --- web/htdocs/wato.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 6e3277d..1fff9f4 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -14802,7 +14802,8 @@ def save_changed_custom_attrs(all_attrs, what): def declare_custom_host_attrs(): # First remove all previously registered custom host attributes for attr_name in g_host_attribute.keys(): - if attr_name not in builtin_host_attribute_names: + if attr_name not in builtin_host_attribute_names and not\ + attr_name.startswith("tag_"): undeclare_host_attribute(attr_name) # now declare the custom attributes

7 years, 10 months

3785 WATO rulesets: now able to set a negate option for services and items

by Andreas Boesl

Module: check_mk Branch: master Commit: 5f614e1c7977da459e6e6e1b9dff4056dd9e6f35 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5f614e1c7977da… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Aug 17 13:12:48 2016 +0200 3785 WATO rulesets: now able to set a negate option for services and items You can now set a negate checkbox for services, just like the negate host checkbox. --- .werks/3785 | 10 ++++++ ChangeLog | 1 + web/htdocs/wato.py | 91 ++++++++++++++++++++++++++++++++++++++----------- web/htdocs/watolib.py | 2 ++ 4 files changed, 84 insertions(+), 20 deletions(-) diff --git a/.werks/3785 b/.werks/3785 new file mode 100644 index 0000000..74404c1 --- /dev/null +++ b/.werks/3785 @@ -0,0 +1,10 @@ +Title: WATO rulesets: now able to set a negate option for services and items +Level: 2 +Component: wato +Compatible: compat +Version: 1.4.0i1 +Date: 1471432220 +Class: feature + +You can now set a negate checkbox for services, just like the negate host checkbox. + diff --git a/ChangeLog b/ChangeLog index 0bf197f..902662b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -456,6 +456,7 @@ * 3724 Password input fields: Added note about plain text storing (if done so) * 3728 Automatically creating automation user for Check_MK internal use with WATO default config... * 3559 WATO API: now able to bake agents with the new action "bake_agents" + * 3785 WATO rulesets: now able to set a negate option for services and items... * 3060 FIX: Folder properties: Fixed exception when a user has no alias set... * 3062 FIX: Git integration: Fixed not adding files in WATO folders to git control * 3203 FIX: Distributed WATO: Fixed exception in remote host service discovery... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 1fff9f4..e8887be 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12842,28 +12842,51 @@ def render_conditions(ruleset, tagspecs, host_list, item_list, varname, folder): else: condition = _("Host name is ") + ", ".join(tt_list[:-1]) condition += _(" or ") + tt_list[-1] - elif host_list[0][0] == '!': + elif host_list[0][0] == ENTRY_NEGATE_CHAR: hosts = [ h[1:] for h in host_list[:-1] ] - condition = _("Host is not one of ") + ", ".join(hosts) + if len(hosts) == 1: + condition = _("Host is not ") + hosts[0] + else: + condition = _("Host is not one of ") + ", ".join(hosts) # other cases should not occur, e.g. list of explicit hosts # plus ALL_HOSTS. if condition: html.write('<li class="condition">%s</li>' % condition) + def boldify(what): + return "%s" % what + # Item list if ruleset["itemtype"] and item_list != ALL_SERVICES: - tt_list = [] - for t in item_list: - if t.endswith("$"): - tt_list.append("%s <tt>%s</tt>" % (_("is"), t[:-1])) - else: - tt_list.append("%s <tt>%s</tt>" % (_("begins with"), t)) - if ruleset["itemtype"] == "service": - condition = _("Service name ") + " or ".join(tt_list) + condition_prefix = _("Service name ") elif ruleset["itemtype"] == "item": - condition = ruleset["itemname"] + " " + " or ".join(tt_list) - html.write('<li class="condition">%s</li>' % condition) + condition_prefix = ruleset["itemname"] + " " + + negated = item_list[-1] == ALL_SERVICES[0] + if negated: + item_list = item_list[:-1] + cleaned_item_list = [ i.lstrip(ENTRY_NEGATE_CHAR) for i in negated and item_list ] + else: + cleaned_item_list = item_list + + explicit_items = [ i[:-1] for i in cleaned_item_list if i[-1] == "$" ] + prefix_items = [ i for i in cleaned_item_list if i[-1] != "$" ] + + explicit_text = negated and _("is not ") or _("is ") + prefix_text = negated and _("begins not with ") or _("begins with ") + + condition_texts = [] + for what, text in [ (explicit_items, explicit_text), + (prefix_items, prefix_text) ]: + if not what: + continue + condition_text = text + " or ".join(map(boldify, what)) + condition_texts.append(condition_prefix + condition_text) + + html.write('<li class="condition">%s</li>' %\ + (negated and _(" and ") or _(" or ")).join(condition_texts)) + html.write("</ul>") @@ -12881,9 +12904,9 @@ def get_rule_conditions(ruleset): host_list = vs.from_html_vars("hostlist") vs.validate_value(host_list, "hostlist") if negate: - host_list = [ "!" + h for h in host_list ] + host_list = [ ENTRY_NEGATE_CHAR + h for h in host_list ] # append ALL_HOSTS to negated host lists - if len(host_list) > 0 and host_list[0][0] == '!': + if len(host_list) > 0 and host_list[0][0] == ENTRY_NEGATE_CHAR: host_list += ALL_HOSTS elif len(host_list) == 0 and negate: host_list = ALL_HOSTS # equivalent @@ -12893,9 +12916,11 @@ def get_rule_conditions(ruleset): if itemtype: explicit = html.get_checkbox("explicit_services") if not explicit: - item_list = [ "" ] + item_list = ALL_SERVICES else: itemenum = ruleset["itemenum"] + 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") ] @@ -12904,6 +12929,14 @@ def get_rule_conditions(ruleset): item_list = vs.from_html_vars("itemlist") vs.validate_value(item_list, "itemlist") + if negate: + item_list = [ ENTRY_NEGATE_CHAR + i for i in item_list] + + if len(item_list) > 0 and item_list[0][0] == ENTRY_NEGATE_CHAR: + item_list += ALL_SERVICES + elif len(item_list) == 0 and negate: + item_list = ALL_SERVICES # equivalent + if len(item_list) == 0: raise MKUserError("item_0", _("Please specify at least one %s or " "this rule will never match.") % ruleset["itemname"]) @@ -13097,6 +13130,7 @@ def mode_edit_rule(phase, new = False): orientation = "horizontal", valuespec = TextAscii(size = 30)).render_input("hostlist", explicit_hosts) + html.write(" ") html.checkbox("negate_hosts", negate_hosts, label = _("Negate: make rule apply for all but the above hosts")) html.write("</div>") @@ -13145,22 +13179,33 @@ def mode_edit_rule(phase, new = False): html.write('<div id="%s" style="display: %s; padding: 0px;">' % ( div_id, not checked and "none" or "")) itemenum = rulespec["itemenum"] + + negate_entries = len(item_list) > 0 and item_list[0].startswith(ENTRY_NEGATE_CHAR) + if negate_entries: + cleaned_item_list = [ i.lstrip(ENTRY_NEGATE_CHAR) for i in item_list[:-1] ] # strip last entry (ALL_SERVICES) + else: + cleaned_item_list = item_list + if itemenum: - value = [ x.rstrip("$") for x in item_list ] + value = [ x.rstrip("$") for x in cleaned_item_list ] itemspec = ListChoice(choices = itemenum, columns = 3) itemspec.render_input("item", value) else: ListOfStrings( orientation = "horizontal", - valuespec = RegExpUnicode(size = 30)).render_input("itemlist", item_list) - + valuespec = RegExpUnicode(size = 30)).render_input("itemlist", cleaned_item_list) html.write(" ") + + html.checkbox("negate_entries", negate_entries, label = + _("Negate: make rule apply for all but the above entries")) + + if not itemenum: html.help(_("The entries here are regular expressions to match the beginning. " "Add a <tt>$</tt> for an exact match. An arbitrary substring is matched " "with <tt>.*</tt> Please note that on windows systems any backslashes need to be escaped." "For example C:\\\\tmp\\\\message.log")) - html.write("</div>") + html.write("</div>") forms.end() html.button("save", _("Save")) @@ -13197,6 +13242,7 @@ def save_rulesets(folder, rulesets): def save_rule(out, folder, rulespec, rule): out.write(" ( ") value, tag_specs, host_list, item_list, rule_options = parse_rule(rulespec, rule) + if rulespec["valuespec"]: out.write(repr(value) + ", ") elif not value: @@ -13223,7 +13269,11 @@ def save_rule(out, folder, rulespec, rule): if item_list == ALL_SERVICES: out.write("ALL_SERVICES") else: - out.write(repr(item_list)) + if item_list[-1] == ALL_SERVICES[0]: + out.write(repr(item_list[:-1])) + out.write(" + ALL_SERVICES") + else: + out.write(repr(item_list)) if rule_options: out.write(", %r" % rule_options) @@ -13319,6 +13369,7 @@ def register_rule(group, varname, valuespec = None, title = None, if not itemname and itemtype == "service": itemname = _("Service") + ruleset = { "group" : group, "varname" : varname, diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 639baf6..ef013ab 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -115,6 +115,8 @@ ALL_HOSTS = [ '@all' ] ALL_SERVICES = [ "" ] NEGATE = '@negate' NO_ITEM = {} # Just an arbitrary unique thing +ENTRY_NEGATE_CHAR = "!" + # Actions for log_pending RESTART = 1

7 years, 10 months

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: b4de4be7b402ed964d07f9bb72bc18b34a01391e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b4de4be7b402ed… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Aug 17 09:54:12 2016 +0200 Fetched livestatus from downstream. --- livestatus/src/Renderer.cc | 30 ++++++++++++++++++++---------- livestatus/src/Renderer.h | 10 ++++++++++ 2 files changed, 30 insertions(+), 10 deletions(-) diff --git a/livestatus/src/Renderer.cc b/livestatus/src/Renderer.cc index e733394..af8e7ab 100644 --- a/livestatus/src/Renderer.cc +++ b/livestatus/src/Renderer.cc @@ -115,6 +115,15 @@ void Renderer::output(double value) { } } +void Renderer::output(PlainChar value) { add(string(1, value._ch)); } + +void Renderer::output(HexEscape value) { + ostringstream os; + os << R"(\x)" << hex << setw(2) << setfill('0') + << static_cast<unsigned>(static_cast<unsigned char>(value._ch)); + add(os.str()); +} + void Renderer::output(char16_t value) { ostringstream os; os << R"(\u)" << hex << setw(4) << setfill('0') << value; @@ -157,7 +166,7 @@ void Renderer::truncatedUTF8() { void Renderer::invalidUTF8(unsigned char ch) { if (_debug_level >= 2) { - Informational() << "invalid byte " << int(ch) << "in UTF-8 sequence"; + Informational() << "invalid byte " << int(ch) << " in UTF-8 sequence"; } } @@ -167,12 +176,9 @@ void Renderer::outputByteString(const string &prefix, add(R"(")"); // " for (auto ch : value) { if (isBoringChar(ch)) { - add(string(1, ch)); + output(PlainChar{ch}); } else { - ostringstream os; - os << R"(\x)" << hex << setw(2) << setfill('0') - << static_cast<unsigned>(ch); - add(os.str()); + output(HexEscape{ch}); } } add(R"(")"); // " @@ -201,8 +207,12 @@ void Renderer::outputUnicodeString(const string &prefix, const char *start, void Renderer::outputUTF8(const char *start, const char *end) { for (const char *p = start; p != end; ++p) { unsigned char ch0 = *p; - if (isBoringChar(ch0)) { - add(string(1, *p)); + if ((ch0 & 0x80) == 0x00) { + if (isBoringChar(ch0)) { + output(PlainChar{*p}); + } else { + output(char32_t{ch0}); + } } else if ((ch0 & 0xE0) == 0xC0) { // 2 byte encoding if (ch0 == 0xC0 || ch0 == 0xC1) { @@ -269,7 +279,7 @@ void Renderer::outputLatin1(const char *start, const char *end) { for (const char *p = start; p != end; ++p) { unsigned char ch = *p; if (isBoringChar(ch)) { - add(string(1, *p)); + output(PlainChar{*p}); } else { output(char32_t{ch}); } @@ -280,7 +290,7 @@ void Renderer::outputMixed(const char *start, const char *end) { for (const char *p = start; p != end; ++p) { unsigned char ch0 = *p; if (isBoringChar(ch0)) { - add(string(1, *p)); + output(PlainChar{*p}); } else if ((ch0 & 0xE0) == 0xC0) { // Possible 2 byte encoding? => Assume UTF-8, ignore overlong // encodings diff --git a/livestatus/src/Renderer.h b/livestatus/src/Renderer.h index df8f0f1..a1bbb49 100644 --- a/livestatus/src/Renderer.h +++ b/livestatus/src/Renderer.h @@ -39,6 +39,14 @@ enum class OutputFormat { csv, broken_csv, json, python, python3 }; struct Null {}; +struct PlainChar { + char _ch; +}; + +struct HexEscape { + char _ch; +}; + class Renderer { public: static std::unique_ptr<Renderer> make( @@ -58,6 +66,8 @@ public: } void output(double value); + void output(PlainChar value); + void output(HexEscape value); void output(char16_t value); void output(char32_t value); void output(Null value);

7 years, 10 months

fixed http warn/crit response time levels: unsupported operand

by Simon Betz

Module: check_mk Branch: master Commit: 6ad45e15e8b0bb5c9eaf631167defbbeae19c3ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6ad45e15e8b0bb… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Aug 16 14:53:33 2016 +0200 fixed http warn/crit response time levels: unsupported operand --- checks/check_http | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/check_http b/checks/check_http index 1b29aed..ebdd702 100644 --- a/checks/check_http +++ b/checks/check_http @@ -80,8 +80,8 @@ def check_http_arguments(params): args.append('--sni') if "response_time" in settings: - args += [ '-w', '%f' % settings["response_time"][0]/1000.0, - '-c', '%f' % settings["response_time"][1]/1000.0 ] + args += [ '-w', '%f' % (settings["response_time"][0]/1000.0), + '-c', '%f' % (settings["response_time"][1]/1000.0) ] if "timeout" in settings: args += [ '-t', settings["timeout"] ]

7 years, 10 months

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: 563b470a1c023182eb1828e89e347fb37129f0d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=563b470a1c0231… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Aug 16 14:14:08 2016 +0200 Fetched livestatus from downstream. --- livestatus/src/DynamicLogwatchFileColumn.cc | 7 ++-- livestatus/src/HostFileColumn.cc | 59 +++++++++++++++++---------- livestatus/src/HostFileColumn.h | 2 +- livestatus/src/Renderer.cc | 43 +++++++++++-------- livestatus/src/Renderer.h | 19 ++++----- livestatus/src/RendererJSON.cc | 4 +- livestatus/src/RendererPython.cc | 4 +- livestatus/src/RendererPython3.cc | 4 +- 8 files changed, 82 insertions(+), 60 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=563b470a1c…

7 years, 10 months

3774 FIX apc_symmetra: fixed wrong status and values handling

by Simon Betz

Module: check_mk Branch: master Commit: 8d4ca06985d3bbdd874edb9099820686b499b497 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d4ca06985d3bb… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Aug 16 13:50:38 2016 +0200 3774 FIX apc_symmetra: fixed wrong status and values handling --- .werks/3774 | 10 ++ ChangeLog | 1 + checks/apc_symmetra | 317 +++++++++++++++++++++++++++++---------------------- 3 files changed, 193 insertions(+), 135 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8d4ca06985…

7 years, 10 months

esx_vsphere_hostsystem: Removed unused variable extra_info

by Konstantin Büttner

Module: check_mk Branch: master Commit: e8dddca9a21fbb4c17648e8f0df93cc79dd1b96c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e8dddca9a21fbb… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Aug 15 11:44:04 2016 +0200 esx_vsphere_hostsystem: Removed unused variable extra_info --- checks/esx_vsphere_hostsystem | 1 - 1 file changed, 1 deletion(-) diff --git a/checks/esx_vsphere_hostsystem b/checks/esx_vsphere_hostsystem index 4a29001..e63f2ab 100644 --- a/checks/esx_vsphere_hostsystem +++ b/checks/esx_vsphere_hostsystem @@ -461,7 +461,6 @@ def check_esx_vsphere_hostsystem_multipath(item, params, info): else: crit_min, warn_min, warn_max, crit_max = limits - extra_info = "" count = state_values[1] if count < crit_min: state = max(state, 2)

7 years, 10 months

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: 852001c7df49949e8450d04de4631cec928ec49f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=852001c7df4994… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Aug 12 17:23:06 2016 +0200 Fetched livestatus from downstream. --- livestatus/src/EventConsoleConnection.cc | 1 - livestatus/src/module.cc | 1 - livestatus/src/unixcat.cc | 1 - 3 files changed, 3 deletions(-) diff --git a/livestatus/src/EventConsoleConnection.cc b/livestatus/src/EventConsoleConnection.cc index ea6fd30..7ebdb48 100644 --- a/livestatus/src/EventConsoleConnection.cc +++ b/livestatus/src/EventConsoleConnection.cc @@ -22,7 +22,6 @@ // to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, // Boston, MA 02110-1301 USA. -// IWYU pragma: no_include <bits/socket_type.h> #include "EventConsoleConnection.h" #include <sys/socket.h> #include <sys/un.h> diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index 396441e..07a7a43 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -25,7 +25,6 @@ // Needed for strdup and S_ISSOCK #define _XOPEN_SOURCE 500 -// IWYU pragma: no_include <bits/socket_type.h> #include "config.h" #include <fcntl.h> #include <pthread.h> diff --git a/livestatus/src/unixcat.cc b/livestatus/src/unixcat.cc index 2ec7701..80d6ac7 100644 --- a/livestatus/src/unixcat.cc +++ b/livestatus/src/unixcat.cc @@ -22,7 +22,6 @@ // to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, // Boston, MA 02110-1301 USA. -// IWYU pragma: no_include <bits/socket_type.h> #include <pthread.h> #include <sys/select.h> #include <sys/socket.h>

7 years, 10 months

Now that we have a sane cppcheck version, remove NOLINTs.

by Sven Panne

Module: check_mk Branch: master Commit: a6fa699588a11f9c77898aba18a2ee82b2b71662 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a6fa699588a11f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Aug 12 15:59:10 2016 +0200 Now that we have a sane cppcheck version, remove NOLINTs. --- livestatus/src/Renderer.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/livestatus/src/Renderer.cc b/livestatus/src/Renderer.cc index be8068d..a85a110 100644 --- a/livestatus/src/Renderer.cc +++ b/livestatus/src/Renderer.cc @@ -117,7 +117,7 @@ void Renderer::output(double value) { void Renderer::output(char16_t value) { ostringstream os; - os << "\\u" << hex << setw(4) << setfill('0') << value; // NOLINT + os << R"(\u)" << hex << setw(4) << setfill('0') << value; add(os.str()); } @@ -174,7 +174,7 @@ void Renderer::outputDecodedLatin1(const string &prefix, const char *start, void Renderer::outputDecoded(const string &prefix, const char *start, const char *end, Encoding data_encoding) { add(prefix); - add("\""); // NOLINT + add(R"(")"); // " // TODO(sp) Use polymorphism instead of switch. // TODO(sp) Use codecvt framework instead of homemade stuff. switch (data_encoding) { @@ -188,7 +188,7 @@ void Renderer::outputDecoded(const string &prefix, const char *start, outputDecodedMixed(start, end); break; } - add("\""); // NOLINT + add(R"(")"); // " } void Renderer::outputDecodedUTF8(const char *start, const char *end) {

7 years, 10 months

Use direct initialization for read position, making cppcheck completely happy.

by Sven Panne

Module: check_mk Branch: master Commit: 3ed7f19d9cd087882bd3e58d44b9a40d4fa8dd59 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3ed7f19d9cd087… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Aug 12 11:56:24 2016 +0200 Use direct initialization for read position, making cppcheck completely happy. --- livestatus/src/Logfile.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/livestatus/src/Logfile.cc b/livestatus/src/Logfile.cc index bde700b..81e9b3c 100644 --- a/livestatus/src/Logfile.cc +++ b/livestatus/src/Logfile.cc @@ -53,6 +53,7 @@ Logfile::Logfile(const CommandsHolder &commands_holder, const char *path, , _path(strdup(path)) , _since(0) , _watch(watch) + , _read_pos{} , _lineno(0) #ifdef CMC , _world(nullptr)

7 years, 11 months

← Newer
1
...
12
13
14
15
16
17
18
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2016