Checkmk git commits January 2018

checkmk-commits@lists.checkmk.com

10 participants
255 discussions

Fixed double escaping of AC test result output

by Lars Michelsen

Module: check_mk Branch: master Commit: 7393ea2c9960065298289251d3b66b821247ecc8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7393ea2c996006… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 4 14:25:10 2018 +0100 Fixed double escaping of AC test result output Change-Id: I309c7d8a2e07bda4c3070f7e26d1612fb9f2cc3e --- web/htdocs/wato.py | 2 +- web/htdocs/watolib.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 657d6ba..a056777 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -16695,7 +16695,7 @@ class ModeAnalyzeConfig(WatoMode): html.open_tr() html.td(html.attrencode(site_id)) - html.td(html.permissive_attrencode("%s: %s" % (result.status_name(), result.text))) + html.td("%s: %s" % (result.status_name(), result.text)) html.close_tr() html.close_table() diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 44ad842..b2e8c2d 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -9595,7 +9595,7 @@ class ACTest(object): log_exception() result = ACResultCRIT("<pre>%s</pre>" % _("Failed to execute the test %s: %s") % (html.attrencode(self.__class__.__name__), - html.attrencode(traceback.format_exc()))) + traceback.format_exc())) result.from_test(self) yield result

6 years, 8 months

5593 Added AC test to warn about unencrypted agent updater communication

by Lars Michelsen

Module: check_mk Branch: master Commit: 7487779357d4f2db1879a68f75f14d8648f07db1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7487779357d4f2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 4 14:19:00 2018 +0100 5593 Added AC test to warn about unencrypted agent updater communication Change-Id: I8c8d868d544a85ce1d5b3497afda96e1db4524f0 --- .werks/5593 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.werks/5593 b/.werks/5593 new file mode 100644 index 0000000..07bb54b --- /dev/null +++ b/.werks/5593 @@ -0,0 +1,10 @@ +Title: Added AC test to warn about unencrypted agent updater communication +Level: 1 +Component: agents +Compatible: compat +Edition: cee +Version: 1.5.0i3 +Date: 1515071915 +Class: feature + +

6 years, 8 months

Updated bug entries #2856

by Lars Michelsen

Module: check_mk Branch: master Commit: 1396f67fee40a4db873e880b153f90bfeb1ce1ca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1396f67fee40a4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 8 08:49:36 2018 +0100 Updated bug entries #2856 Change-Id: Icef39c577315cd5bb5f329d487703fa8aa56df38 --- .bugs/2856 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/2856 b/.bugs/2856 index fb7c7fb..5594a9d 100644 --- a/.bugs/2856 +++ b/.bugs/2856 @@ -1,8 +1,11 @@ Title: cmk-update-agent: Process output (error messages) of curl calls Component: agents -State: open +Class: nastiness +State: closed Date: 2017-01-16 08:48:37 Targetversion: 1.2.9 -Class: nastiness Should really be done for easier debugging. curl outputs useful messages in case of errors. + +2018-01-06 14:08:44: changed state open -> closed +curl implementation has been dropped

6 years, 8 months

FIX 5608 temperature.include: Fixed device levels handling

by Simon Betz

Module: check_mk Branch: master Commit: 5cee9c2549b8cd11207fa0371ff6be0d57471744 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5cee9c2549b8cd… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Jan 5 15:32:21 2018 +0100 FIX 5608 temperature.include: Fixed device levels handling Change-Id: I2fa617ce7a02c1a352051e07f5a333cb8eccbe2b --- .werks/5608 | 11 +++++++++++ checks/temperature.include | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/5608 b/.werks/5608 new file mode 100644 index 0000000..4f9127d --- /dev/null +++ b/.werks/5608 @@ -0,0 +1,11 @@ +Title: temperature.include: Fixed device levels handling +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i3 +Date: 1515162662 + + diff --git a/checks/temperature.include b/checks/temperature.include index a38a8eb..73268d5 100644 --- a/checks/temperature.include +++ b/checks/temperature.include @@ -131,7 +131,7 @@ def check_temperature_determine_levels(dlh, usr_warn, usr_crit, usr_warn_lower, # Use device's levels if present, otherwise yours elif dlh == "devdefault": - if dev_warn is not None and dev_crit is None: + if dev_warn is not None and dev_crit is not None: warn, crit = dev_warn, dev_crit else: warn, crit = usr_warn, usr_crit

6 years, 8 months

Reserved 20 Werk IDS

by Simon Betz

Module: check_mk Branch: master Commit: 902c156e627641fe21e6c242580fa1df7df0ea7f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=902c156e627641… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Jan 5 13:47:21 2018 +0100 Reserved 20 Werk IDS Change-Id: Id854f6a9f8bcf0dc61c4bdcb15b1e543b1e44985 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index d837ea7..142e175 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5608 +5628

6 years, 8 months

5268 FIX cmk-update-agent: Improve exception handling

by Andreas Umbreit

Module: check_mk Branch: master Commit: 368d73a5030d4fd347b5754fb24c0b8abf1a7621 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=368d73a5030d4f… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Fri Jan 5 12:42:52 2018 +0100 5268 FIX cmk-update-agent: Improve exception handling Due to an inconsistent exception handling in cmk-update-agent program flow, the running program could exit before releasing its lock file. This could result in an error message <pre> ERROR An instance of cmk_update_agent.py is already running on this system. Aborting... </pre> when running cmk-update-agent again. If you are affected by this error, please delete the lock file "cmk-update-agent.pid", located at your system's or user's temp-dir, once manually. Change-Id: I93900acb653513675f61855f0d8ede07c7f054b3 --- .werks/5268 | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.werks/5268 b/.werks/5268 new file mode 100644 index 0000000..5664392 --- /dev/null +++ b/.werks/5268 @@ -0,0 +1,18 @@ +Title: cmk-update-agent: Improve exception handling +Level: 1 +Component: agents +Compatible: compat +Edition: cee +Version: 1.5.0i3 +Date: 1515151892 +Class: fix + +Due to an inconsistent exception handling in cmk-update-agent program flow, the running program could exit before releasing its lock file. + +This could result in an error message +<pre> +ERROR An instance of cmk_update_agent.py is already running on this system. Aborting... +</pre> +when running cmk-update-agent again. + +If you are affected by this error, please delete the lock file "cmk-update-agent.pid", located at your system's or user's temp-dir, once manually.

6 years, 8 months

updated up to now unreleased werk 5550

by Marcel Arentz

Module: check_mk Branch: master Commit: 16d07d1e0b5820066aacd9ce210745d76ed905ca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=16d07d1e0b5820… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Fri Jan 5 10:26:55 2018 +0100 updated up to now unreleased werk 5550 Change-Id: Ife7fdf1dfc170de8061a6e5699dabe8aaf72a553 --- agents/windows/plugins/mk_oracle.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/plugins/mk_oracle.ps1 b/agents/windows/plugins/mk_oracle.ps1 index f0558ae..f8ec0a2 100644 --- a/agents/windows/plugins/mk_oracle.ps1 +++ b/agents/windows/plugins/mk_oracle.ps1 @@ -1155,7 +1155,7 @@ Function sql_locks { || '|||||||||||||||||' from v$instance i ; - '@ +'@ echo $query_locks } }

6 years, 8 months

5606 job: This check is now cluster-aware and worst or best state is configurable

by Simon Betz

Module: check_mk Branch: master Commit: cfbccd9fefd1c661ae8563a8de86758a4fa0b6c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cfbccd9fefd1c6… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jan 4 09:20:05 2018 +0100 5606 job: This check is now cluster-aware and worst or best state is configurable Change-Id: I6cc647b7c094ff24815d75de91f9f8333a1eb6a0 --- .werks/5606 | 10 ++ checkman/job | 3 + checks/job | 210 +++++++++++++++++++---------------- web/plugins/wato/check_parameters.py | 18 ++- 4 files changed, 142 insertions(+), 99 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=cfbccd9fef…

6 years, 8 months

Removed global using directives.

by Sven Panne

Module: check_mk Branch: master Commit: 7e276430e66942481d7a68e4e7e2d7cf6f1420d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e276430e66942… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jan 3 10:42:25 2018 +0100 Removed global using directives. Change-Id: I15efa66e09b04d055fd306c393391f500b6d6f8a --- bin/mkevent.cc | 25 +++---- livestatus/api/c++/Livestatus.cc | 10 ++- livestatus/api/c++/demo.cc | 7 +- livestatus/src/ClientQueue.cc | 15 ++--- livestatus/src/DowntimesOrComments.cc | 6 +- livestatus/src/EventConsoleConnection.cc | 10 ++- livestatus/src/InputBuffer.cc | 25 +++---- livestatus/src/LogCache.cc | 8 +-- livestatus/src/LogEntry.cc | 35 +++++----- livestatus/src/Logfile.cc | 32 ++++----- livestatus/src/Logger.cc | 57 +++++++--------- livestatus/src/OutputBuffer.cc | 24 +++---- livestatus/src/RendererBrokenCSV.cc | 7 +- livestatus/src/StringUtils.cc | 48 ++++++------- livestatus/src/TimeperiodsCache.cc | 25 +++---- livestatus/src/global_counters.cc | 4 +- livestatus/src/mk_inventory.cc | 4 +- livestatus/src/mk_logwatch.cc | 9 ++- livestatus/src/module.cc | 111 +++++++++++++++---------------- livestatus/src/pnp4nagios.cc | 15 ++--- livestatus/src/unixcat.cc | 27 +++----- 21 files changed, 213 insertions(+), 291 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7e276430e6…

6 years, 8 months

Fixed check for invalid 4-byte UTF-8 sequences.

by Sven Panne

Module: check_mk Branch: master Commit: 46d81328b79dd1a162ece5039f42010b3ec5d0a4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=46d81328b79dd1… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jan 2 14:43:03 2018 +0100 Fixed check for invalid 4-byte UTF-8 sequences. This was a classic copy-n-paste braino, found by cppcheck. Change-Id: I8fc02f617f453e26cc2f97969c31eaf7bbb2ea87 --- livestatus/src/Renderer.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/livestatus/src/Renderer.cc b/livestatus/src/Renderer.cc index 5f626d6..4cc8d70 100644 --- a/livestatus/src/Renderer.cc +++ b/livestatus/src/Renderer.cc @@ -211,7 +211,7 @@ void Renderer::outputUTF8(const char *start, const char *end) { return invalidUTF8(ch2); } unsigned char ch3 = *++p; - if ((ch2 & 0xC0) != 0x80) { + if ((ch3 & 0xC0) != 0x80) { return invalidUTF8(ch3); } output(char32_t(((ch0 & 0x07) << 18) | //

6 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2018