Checkmk git commits August 2016

checkmk-commits@lists.checkmk.com

8 participants
256 discussions

Unbreak Icon for Passwords in Mini-WATO-Snapin

by Konstantin Büttner

Module: check_mk Branch: master Commit: 4e70b34ee719ea95ed01b73c9465495e823119ea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4e70b34ee719ea… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Aug 11 14:25:41 2016 +0200 Unbreak Icon for Passwords in Mini-WATO-Snapin Why does this flag even exist? --- web/plugins/sidebar/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py index f1dc800..cbcebd3 100644 --- a/web/plugins/sidebar/wato.py +++ b/web/plugins/sidebar/wato.py @@ -52,7 +52,7 @@ def render_wato(mini): if not permission or config.may(permission) or config.may("wato.seeall"): url = "wato.py?mode=%s" % mode if mini: - html.icon_button(url, title, icon, target="main") + html.icon_button(url, title, icon, target="main", ty="icon") else: iconlink(title, url, icon)

8 years, 1 month

3773 FIX check_http: fixed proxy authentication

by Simon Betz

Module: check_mk Branch: master Commit: 203860380a001bc6eaac5c1fd2e7ea1e02ef2f44 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=203860380a001b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Aug 11 10:28:50 2016 +0200 3773 FIX check_http: fixed proxy authentication --- .werks/3773 | 9 +++++++++ ChangeLog | 1 + checks/check_http | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/3773 b/.werks/3773 new file mode 100644 index 0000000..1130cd7 --- /dev/null +++ b/.werks/3773 @@ -0,0 +1,9 @@ +Title: check_http: fixed proxy authentication +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1470904065 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 80dce87..8c2c54d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -330,6 +330,7 @@ * 3715 FIX: agent_ipmi_sensors: fixed error handling * 3772 FIX: ipmi_sensors: fixed missing states * 3562 FIX: agent_vsphere.pysphere: fixed problems related to ssl certificate validation on older distributions/python versions + * 3773 FIX: check_http: fixed proxy authentication Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/check_http b/checks/check_http index 6e7bfec..1b29aed 100644 --- a/checks/check_http +++ b/checks/check_http @@ -97,7 +97,7 @@ def check_http_arguments(params): args += [ "-a", passwordstore_get_cmdline("%s:%%s" % username, password) ] if "proxy_auth" in settings: - username, password = settings["auth"] + username, password = settings["proxy_auth"] args += [ "-b", passwordstore_get_cmdline("%s:%%s" % username, password) ] if "onredirect" in settings:

8 years, 1 month

Workaround for a cppcheck bug regarding raw string literals.

by Sven Panne

Module: check_mk Branch: master Commit: 2408c2937fbfffab879a804423bb4c88c3ade53b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2408c2937fbfff… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Aug 10 16:44:58 2016 +0200 Workaround for a cppcheck bug regarding raw string literals. clang-tidy recommends raw string literals, which is fine in itself. Alas, current cppcheck versions use a somehow naive preprocessor which can't handle them. :-P Workaround for now: Tell clang-tidy that our normal, escaped string literals are OK. *sigh*... --- 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 a85a110..be8068d 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 << R"(\u)" << hex << setw(4) << setfill('0') << value; + os << "\\u" << hex << setw(4) << setfill('0') << value; // NOLINT 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(R"(")"); // " + add("\""); // NOLINT // 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(R"(")"); // " + add("\""); // NOLINT } void Renderer::outputDecodedUTF8(const char *start, const char *end) {

8 years, 1 month

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: 60b6182e39a124bb394b5a93e7c59eeb3b161b57 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=60b6182e39a124… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Aug 10 15:16:48 2016 +0200 Fetched livestatus from downstream. --- livestatus/src/AttributelistColumn.h | 4 ++-- livestatus/src/BlobColumn.h | 4 ++-- livestatus/src/ColumnsColumn.h | 4 ++-- livestatus/src/ContactgroupsColumn.h | 4 ++-- livestatus/src/ContactgroupsMemberColumn.h | 7 ++++--- livestatus/src/ContactsColumn.h | 2 +- livestatus/src/CustomTimeperiodColumn.h | 5 +++-- livestatus/src/CustomVarsExplicitColumn.h | 7 ++++--- livestatus/src/DoubleColumn.h | 4 ++-- livestatus/src/DoublePointerColumn.h | 2 +- livestatus/src/DownCommColumn.h | 2 +- livestatus/src/DynamicEventConsoleReplicationColumn.cc | 4 ++-- livestatus/src/DynamicEventConsoleReplicationColumn.h | 4 ++-- livestatus/src/DynamicLogwatchFileColumn.h | 3 ++- livestatus/src/EmptyColumn.h | 2 +- livestatus/src/FixedIntColumn.h | 4 ++-- livestatus/src/GlobalCountersColumn.h | 7 ++++--- livestatus/src/HostContactsColumn.h | 6 +++--- livestatus/src/HostSpecialDoubleColumn.h | 7 ++++--- livestatus/src/HostSpecialIntColumn.h | 8 ++++---- livestatus/src/HostgroupsColumn.h | 4 ++-- livestatus/src/HostlistColumn.h | 5 +++-- livestatus/src/HostlistStateColumn.h | 2 +- livestatus/src/IntColumn.h | 5 +++-- livestatus/src/IntPointerColumn.h | 9 +++++---- livestatus/src/ListColumn.h | 4 ++-- livestatus/src/LogwatchListColumn.h | 2 +- livestatus/src/MetricsColumn.h | 4 ++-- livestatus/src/NullColumn.h | 2 +- livestatus/src/OffsetDoubleColumn.h | 7 ++++--- livestatus/src/OffsetIntColumn.h | 6 +++--- livestatus/src/OffsetSStringColumn.h | 7 ++++--- livestatus/src/OffsetStringColumn.h | 7 ++++--- livestatus/src/OffsetStringHostMacroColumn.h | 6 +++--- livestatus/src/OffsetStringMacroColumn.h | 5 +++-- livestatus/src/OffsetStringServiceMacroColumn.h | 6 +++--- livestatus/src/OffsetTimeColumn.h | 5 +++-- livestatus/src/RendererBrokenCSV.h | 10 +++++----- livestatus/src/ServiceContactsColumn.h | 9 +++++---- livestatus/src/ServiceSpecialDoubleColumn.h | 8 ++++---- livestatus/src/ServiceSpecialIntColumn.h | 8 ++++---- livestatus/src/ServicegroupsColumn.h | 4 ++-- livestatus/src/ServicelistColumn.h | 6 +++--- livestatus/src/ServicelistStateColumn.h | 5 +++-- livestatus/src/StatusSpecialIntColumn.h | 5 +++-- livestatus/src/StringColumn.h | 4 ++-- livestatus/src/StringPointerColumn.h | 2 +- livestatus/src/TableEventConsole.h | 15 ++++++++++----- livestatus/src/TimePointerColumn.h | 5 +++-- 49 files changed, 140 insertions(+), 117 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=60b6182e39…

8 years, 1 month

3562 FIX agent_vsphere.pysphere: fixed problems related to ssl certificate validation on older distributions /python versions

by Andreas Boesl

Module: check_mk Branch: master Commit: 9c9eb9ebd6ed001f9a694fc114f61aa7754b4065 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9c9eb9ebd6ed00… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Aug 10 15:24:04 2016 +0200 3562 FIX agent_vsphere.pysphere: fixed problems related to ssl certificate validation on older distributions/python versions --- .werks/3562 | 10 ++++++++++ ChangeLog | 1 + agents/special/agent_vsphere.pysphere | 7 +++++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.werks/3562 b/.werks/3562 new file mode 100644 index 0000000..420fad3 --- /dev/null +++ b/.werks/3562 @@ -0,0 +1,10 @@ +Title: agent_vsphere.pysphere: fixed problems related to ssl certificate validation on older distributions/python versions +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1470835398 + + diff --git a/ChangeLog b/ChangeLog index e376a15..80dce87 100644 --- a/ChangeLog +++ b/ChangeLog @@ -329,6 +329,7 @@ * 3759 FIX: cpu.loads: Fixed possible crash on missing data * 3715 FIX: agent_ipmi_sensors: fixed error handling * 3772 FIX: ipmi_sensors: fixed missing states + * 3562 FIX: agent_vsphere.pysphere: fixed problems related to ssl certificate validation on older distributions/python versions Multisite: * 3187 notification view: new filter for log command via regex diff --git a/agents/special/agent_vsphere.pysphere b/agents/special/agent_vsphere.pysphere index 66c1e36..6389333 100755 --- a/agents/special/agent_vsphere.pysphere +++ b/agents/special/agent_vsphere.pysphere @@ -226,8 +226,11 @@ try: sys.stderr.flush() # Disable ssl certificate validation - import ssl - ssl._create_default_https_context = ssl._create_unverified_context + try: # quick fix + import ssl + ssl._create_default_https_context = ssl._create_unverified_context + except: + pass host.connect(host_address+port, user, secret, sock_timeout=opt_timeout) if opt_debug: sys.stderr.write("Connected.\n")

8 years, 1 month

3561 FIX Removing a comment now also removes any linked acknowledgements

by Andreas Boesl

Module: check_mk Branch: master Commit: 9e2a1019333653deb306fdbaef53db2c6080fca1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9e2a1019333653… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Aug 10 15:14:50 2016 +0200 3561 FIX Removing a comment now also removes any linked acknowledgements Deleting a comment which is linked to an acknowledgment now also removes the corresponding acknowledgement. Previously there could be acknowledgements without any comments. --- .werks/3561 | 12 ++++++++++++ ChangeLog | 1 + web/plugins/views/commands.py | 17 +++++++++++++++-- web/plugins/views/datasources.py | 2 +- 4 files changed, 29 insertions(+), 3 deletions(-) diff --git a/.werks/3561 b/.werks/3561 new file mode 100644 index 0000000..2900c3d --- /dev/null +++ b/.werks/3561 @@ -0,0 +1,12 @@ +Title: Removing a comment now also removes any linked acknowledgements +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i1 +Date: 1470834520 +Class: fix + +Deleting a comment which is linked to an acknowledgment now +also removes the corresponding acknowledgement. + +Previously there could be acknowledgements without any comments. diff --git a/ChangeLog b/ChangeLog index 9a65d47..e376a15 100644 --- a/ChangeLog +++ b/ChangeLog @@ -426,6 +426,7 @@ * 3730 FIX: Improved GUI performance in case of different languages used by users... * 3753 FIX: Fixed graph hover popup of services having special characters in their names * 3758 FIX: Fixed wrong sorting of events in main dashboard in distributed environments + * 3561 FIX: Removing a comment now also removes any linked acknowledgements... WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/plugins/views/commands.py b/web/plugins/views/commands.py index 5a26683..434dc0f 100644 --- a/web/plugins/views/commands.py +++ b/web/plugins/views/commands.py @@ -781,13 +781,26 @@ multisite_commands.append({ }) # REMOVE COMMENTS (table comments) + +def remove_comments(cmdtag, spec, row): + if html.has_var("_remove_comments"): + commands = [("DEL_%s_COMMENT;%d" % (cmdtag, spec))] + if row.get("comment_entry_type") == 4: + if row.get("service_description"): + commands.append(("REMOVE_%s_ACKNOWLEDGEMENT;%s;%s" %\ + (cmdtag, row["host_name"], row["service_description"]))) + else: + commands.append(("REMOVE_%s_ACKNOWLEDGEMENT;%s" %\ + (cmdtag, row["host_name"]))) + + return commands, _("remove") + multisite_commands.append({ "tables" : [ "comment" ], "permission" : "action.addcomment", "title" : _("Remove comments"), "render" : lambda: html.button("_remove_comments", _("Remove")), - "action" : lambda cmdtag, spec, row: html.has_var("_remove_comments") and \ - ( "DEL_%s_COMMENT;%d" % (cmdtag, spec), _("remove")) + "action" : remove_comments }) #. diff --git a/web/plugins/views/datasources.py b/web/plugins/views/datasources.py index 465b9b6..eb03361 100644 --- a/web/plugins/views/datasources.py +++ b/web/plugins/views/datasources.py @@ -188,7 +188,7 @@ multisite_datasources["comments"] = { "title" : _("Host- and Servicecomments"), "table" : "comments", "infos" : [ "comment", "host", "service" ], - "keys" : [ "comment_id", "comment_type" ], + "keys" : [ "comment_id", "comment_type", "host_name", "service_description" ], "idkeys" : [ "comment_id" ], }

8 years, 1 month

Reserved 10 bug IDS

by Marcel Arentz

Module: check_mk Branch: master Commit: ce4be67e5c81b7bde7c9393670a46c4195e96048 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ce4be67e5c81b7… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Aug 10 13:12:51 2016 +0200 Reserved 10 bug IDS --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index e7b49f6..3ea5cbc 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -2507 +2517

8 years, 1 month

bug report regarding clustered services

by Marcel Arentz

Module: check_mk Branch: master Commit: eccd184f7fc4fdd48b8d811f9cac56ceea2aa869 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eccd184f7fc4fd… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Aug 10 13:27:30 2016 +0200 bug report regarding clustered services --- .bugs/2507 | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.bugs/2507 b/.bugs/2507 new file mode 100644 index 0000000..feca946 --- /dev/null +++ b/.bugs/2507 @@ -0,0 +1,20 @@ +Title: clustered services does not filter by hostname +Component: wato +State: open +Date: 2016-08-10 13:13:00 +Targetversion: 1.2.8 +Class: bug + +Wenn in "Clustered services" eine Regel erstellt wird, welche nur nach einem bestimmten Service auf einem bestimmten Host matchen sollte, greift diese dennoch auf allen Hosts, welche im Cluster sind und den genannten Service haben. Bsp: +Host A hat den Service 1 +Host B hat den Service 1 und 2 + +Gewünschtes Verhalten: +Die erste Regel soll nur den Service 1 des Host A beinhalten und dem Cluster hinzufügen. +Die zweite Regel soll nur den Service 2 des Host B beinhalten und dem Cluster hinzufügen. + +Tatsächliches Verhalten: +Die erste Regel fügt den Inhalt der Services 1 von beiden Hosts zu einem Service auf dem Cluster hinzu. +Die zweite Regel tut was sie soll, da auf Host A der Service nicht zur Verfügung steht. + +Der Service des Host B wird allerdings weiterhin als Host B zugeordnet angezeigt und der Service von Host A wird korrekt als "Already configured clustered services" definiert.

8 years, 1 month

Unbreak builds on old platforms.

by Sven Panne

Module: check_mk Branch: master Commit: df779de0dad6554ea01787b4a319c44a1f8cbf2e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=df779de0dad655… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Aug 10 13:27:33 2016 +0200 Unbreak builds on old platforms. --- bin/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/Makefile b/bin/Makefile index 3d48e4b..c683185 100644 --- a/bin/Makefile +++ b/bin/Makefile @@ -22,6 +22,8 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +# TODO(sp) We should really use autotools here... +CXX := g++-5 CXXFLAGS := -std=c++11 -g -O3 -Wall -Wextra EXECUTABLES := mkevent mkeventd_open514

8 years, 1 month

Nuked useless C <=> C++ impedance matching code.

by Sven Panne

Module: check_mk Branch: master Commit: 136d114baa3bdaa2b06d5d894542c921ede08817 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=136d114baa3bda… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Aug 10 10:35:15 2016 +0200 Nuked useless C <=> C++ impedance matching code. --- .../src/DynamicEventConsoleReplicationColumn.cc | 2 - livestatus/src/Makefile.am | 1 - livestatus/src/TableEventConsole.cc | 4 +- livestatus/src/module.cc | 78 +++++++++---- livestatus/src/store_c.cc | 115 -------------------- livestatus/src/store_c.h | 49 --------- 6 files changed, 59 insertions(+), 190 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=136d114baa…

8 years, 1 month

← Newer
1
...
14
15
16
17
18
19
20
...
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