Checkmk git commits July 2018

checkmk-commits@lists.checkmk.com

10 participants
467 discussions

by Andreas Umbreit

Module: check_mk Branch: master Commit: be3f4d509ad461b031ac474edb4745e504bc2cbd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be3f4d509ad461… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Thu Jul 5 07:57:11 2018 +0200 CMK-563: Add Werk 5502 5502 FIX Prevent baked tar.gz agents from changing ownership of files on host When extracting a tar.gz packaged agent from the agent bakery as root (as it is normallly done), the user and group ownerships of the extracted files would be set to the Check_MK site user, if such user is available on the target host. This would lead to a wrong ownership on some folders like "/etc", "/usr" and "/var". In order to prevent this, the agent bakery now creates the tar.gz packages correctly by setting an ownership of "root". Change-Id: I0337aaddf8bed83a8cc03c5908415fabbd0be40f --- .werks/5502 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.werks/5502 b/.werks/5502 new file mode 100644 index 0000000..da33566 --- /dev/null +++ b/.werks/5502 @@ -0,0 +1,13 @@ +Title: Prevent baked tar.gz agents from changing ownership of files on host +Level: 1 +Component: agents +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.6.0i1 +Date: 1530769691 + +When extracting a tar.gz packaged agent from the agent bakery as root (as it is normallly done), the user and group ownerships of the extracted files would be set to the Check_MK site user, if such user is available on the target host. This would lead to a wrong ownership on some folders like "/etc", "/usr" and "/var". + +In order to prevent this, the agent bakery now creates the tar.gz packages correctly by setting an ownership of "root".

6 years, 2 months

6307 FIX hyperv_checkpoints: Parameters did not correctly apply

by Simon Betz

Module: check_mk Branch: master Commit: c0e206a5204a9e6986403d33acfda01c1d410b07 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c0e206a5204a9e… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Jul 6 14:20:55 2018 +0200 6307 FIX hyperv_checkpoints: Parameters did not correctly apply Change-Id: Ic57cd6b715de3cdd5259f984cb49ead70dfb55a6 --- .werks/6307 | 11 +++++++++++ checks/hyperv_checkpoints | 49 +++++++++++++++++++++++++++-------------------- 2 files changed, 39 insertions(+), 21 deletions(-) diff --git a/.werks/6307 b/.werks/6307 new file mode 100644 index 0000000..01c580e --- /dev/null +++ b/.werks/6307 @@ -0,0 +1,11 @@ +Title: hyperv_checkpoints: Parameters did not correctly apply +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1530879569 + + diff --git a/checks/hyperv_checkpoints b/checks/hyperv_checkpoints index 9378e0a..0c3d79d 100644 --- a/checks/hyperv_checkpoints +++ b/checks/hyperv_checkpoints @@ -31,33 +31,41 @@ def inventory_hyperv_checkpoints(info): - return [ (None, {} )] + return [(None, {})] -def check_hyperv_checkpoints(item, params, info): - oldest = 0 - number_of_checkpoints = 0 +def check_hyperv_checkpoints(item, params, info): + snapshots = [] for line in info: - if len(line) == 2: - snapshot, age = line - oldest = max(int(age), oldest) - number_of_checkpoints += 1 + if len(line) != 2: + continue + snapshots.append((line[0], int(line[1]))) - if number_of_checkpoints > 0: - state = 0 - if params.get('age'): - warn, crit = params['age'] - if crit >= oldest: + if snapshots: + yield 0, "%s checkpoints" % len(snapshots) + + # We assume that the last snapshot is the last line + # of the agent output + for title, key, snapshot in [ + ("Oldest", "age_oldest", max(snapshots, key=lambda x:x[1])), + ("Last", "age", snapshots[-1]), + ]: + name, age = snapshot + infotext = "%s: %s (%s)" % (title, get_age_human_readable(age), name) + warn, crit = params.get(key, (None, None)) + if crit is not None and age >= crit: state = 2 - elif warn >= oldest: + elif warn is not None and age >= warn: state = 1 - perfdata = [("age", oldest, warn, crit)] - else: - perfdata = [("age", oldest)] - return state, "%s Checkpoints, Oldest is: %s" % \ - (number_of_checkpoints, get_age_human_readable(oldest)), perfdata + else: + state = 0 + if state: + infotext += " (warn/crit at %s/%s)" % ( + get_age_human_readable(warn), + get_age_human_readable(crit)) + yield state, infotext, [(key, age, warn, crit)] else: - return 0, "No Checkpoints found", [("age", 0)] + yield 0, "No Checkpoints found" check_info["hyperv_checkpoints"] = { @@ -67,4 +75,3 @@ check_info["hyperv_checkpoints"] = { "group" : "vm_snapshots", "has_perfdata" : True, } -

6 years, 2 months

6307 FIX hyperv_checkpoints: Parameters did not correctly apply

by Simon Betz

6 years, 2 months

Cleaned up debug log entry

by Lars Michelsen

Module: check_mk Branch: master Commit: 0bb2ee2148799bc99e6d1b60c11bd2048fec44ab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0bb2ee2148799b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 6 13:42:10 2018 +0200 Cleaned up debug log entry Change-Id: I3007e3902708f3b5c1ce1ae8a340fa8b139415cd --- web/htdocs/http.py | 1 - 1 file changed, 1 deletion(-) diff --git a/web/htdocs/http.py b/web/htdocs/http.py index e18cfd8..5e7387c 100644 --- a/web/htdocs/http.py +++ b/web/htdocs/http.py @@ -381,7 +381,6 @@ class Response(object): self._headers_out.remove((this_key, this_val)) self._headers_out.append((key, val)) - self._logger.warning("%r" % self._headers_out) def set_cookie(self, varname, value, expires=None):

6 years, 2 months

Fixed and enabled useless-else-on-loop warnings.

by Sven Panne

Module: check_mk Branch: master Commit: 89cd158aae399a3bd4e68238ad962dc9867575cc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=89cd158aae399a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Jul 6 11:33:02 2018 +0200 Fixed and enabled useless-else-on-loop warnings. Change-Id: Id0e2224a12fa8ab9ab668259d1a45b58cd6b6ddf --- checks/casa_fan | 3 +-- cmk_base/checking.py | 3 +-- tests/pylint/pylintrc | 1 - web/plugins/wato/check_parameters.py | 3 +-- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/checks/casa_fan b/checks/casa_fan index 9cff0a9..0f6b91f 100644 --- a/checks/casa_fan +++ b/checks/casa_fan @@ -45,8 +45,7 @@ def check_casa_fan(item, no_params, info): return (3, "%s RPM, unknown fan status (!)" % speed) elif fan_status == "4": return (2, "FAN Failure (!!)") - else: - return (3, "Fan %s not found in snmp output" % item) + return (3, "Fan %s not found in snmp output" % item) check_info["casa_fan"] = { diff --git a/cmk_base/checking.py b/cmk_base/checking.py index ba40093..9794706 100644 --- a/cmk_base/checking.py +++ b/cmk_base/checking.py @@ -330,8 +330,7 @@ def _determine_check_params(params): elif tp_result == None: # Connection error return params["tp_default_value"] - else: - return params["tp_default_value"] + return params["tp_default_value"] else: return params diff --git a/tests/pylint/pylintrc b/tests/pylint/pylintrc index a19eb63..b0bd527 100644 --- a/tests/pylint/pylintrc +++ b/tests/pylint/pylintrc @@ -81,7 +81,6 @@ disable= unused-import, unused-variable, unused-wildcard-import, - useless-else-on-loop, useless-super-delegation, wildcard-import, wrong-import-order, diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 6e7139f..68c7117 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -7727,8 +7727,7 @@ def match_dual_level_type(value): for entry in value: if entry[1][0] < 0 or entry[1][1] < 0: return 1 - else: - return 0 + return 0 else: if value[0] < 0 or value[1] < 0: return 1

6 years, 2 months

6117 check_http: Add the possibility to perform certificate checks over a proxy

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 4dd2c672edd6ba42f9cb24d45fc33c5f9f9e619f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4dd2c672edd6ba… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Jun 29 13:08:38 2018 +0200 6117 check_http: Add the possibility to perform certificate checks over a proxy Change-Id: Id9fe1410ab0ebd4a6b237cce6f7fc036cb5d5cbf --- .werks/6117 | 10 ++++++++++ checks/check_http | 11 ++++++++++- web/plugins/wato/active_checks.py | 22 ++++++++++++++++++++++ 3 files changed, 42 insertions(+), 1 deletion(-) diff --git a/.werks/6117 b/.werks/6117 new file mode 100644 index 0000000..dc53989 --- /dev/null +++ b/.werks/6117 @@ -0,0 +1,10 @@ +Title: check_http: Add the possibility to perform certificate checks over a proxy +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1530270478 +Class: feature + + diff --git a/checks/check_http b/checks/check_http index 60fa94f..52b13e1 100644 --- a/checks/check_http +++ b/checks/check_http @@ -47,7 +47,12 @@ def _certificate_args(address_family, address, settings): args = [] if "cert_host" in settings: - if settings.get("sni"): + if settings.get('proxy'): + args += [ '-I', settings['proxy'] ] + args += [ '-H', settings['cert_host'] ] + args.append('--ssl') + args += ['-j', 'CONNECT'] + elif settings.get("sni"): args += [ '-H', settings['cert_host'] ] else: args += [ '-I', settings['cert_host'] ] @@ -61,6 +66,10 @@ def _certificate_args(address_family, address, settings): if "port" in settings: args += [ '-p', settings["port"] ] + if "proxy_auth" in settings: + username, password = settings["proxy_auth"] + args += [ "-b", passwordstore_get_cmdline("%s:%%s" % username, password) ] + if "cert_days" in settings: # legacy behavior if type(settings["cert_days"]) == int: diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 269aab7..aae43a2 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -1196,6 +1196,28 @@ register_rule(group, title = _("Enable SSL/TLS hostname extension support (SNI)"), ), ), + ( "proxy", + TextAscii( + title = _("Proxy host"), + help = _("To use a proxy you have to specify the Port of the proxy. ") + ), + ), + ( "proxy_auth", + Tuple( + title = _("Proxy-Authorization"), + help = _("Credentials for HTTP Proxy with basic authentication"), + elements = [ + TextAscii( + title = _("Username"), + size = 12, + allow_empty = False + ), + IndividualOrStoredPassword( + title = _("Password"), + ), + ] + ) + ), ], required_keys = [ "cert_days" ], ),

6 years, 2 months

mk_oracle: Option '--sections' can be used for testing single Oracle sections

by Simon Betz

Module: check_mk Branch: master Commit: c34ac304744b2791bfb76bb7e62a66f01e59e5bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c34ac304744b27… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jun 20 11:51:06 2018 +0200 mk_oracle: Option '--sections' can be used for testing single Oracle sections Change-Id: I948a5db7caa1a9a57381dd08d9eb1e614db14022 --- agents/plugins/mk_oracle | 58 +++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 50 insertions(+), 8 deletions(-) diff --git a/agents/plugins/mk_oracle b/agents/plugins/mk_oracle index 5a0ea17..cc6bedc 100755 --- a/agents/plugins/mk_oracle +++ b/agents/plugins/mk_oracle @@ -53,6 +53,9 @@ display_usage () { echo " -t Just check the connection" echo " --log Logs certain steps while execution" echo " ('flock' needs to be installed)" + echo " --sections S1,S2,.. Only execute stated sections" + echo " Note: asynchronous sections are execute" + echo " as synchronous sections" echo "" } @@ -83,6 +86,12 @@ while test -n "$1"; do shift ;; + --sections) + shift + MK_ORA_SECTIONS=($(echo "$1" | tr ',' '\n')) + shift + ;; + *) shift ;; @@ -1024,6 +1033,22 @@ do_dummy_sections () { } +do_section () { + local section=$1 + if [ -n "${MK_ORA_SECTIONS[*]}" ]; then + for mk_ora_section in "${MK_ORA_SECTIONS[@]}"; do + if [ "$mk_ora_section" = "${section}" ]; then + echo "yes" + return + fi + done + echo "no" + else + echo "yes" + fi +} + + skip_sid () { local sid="$1" if [ "$ONLY_SIDS" ]; then @@ -1112,6 +1137,10 @@ ora_session_environment () { # '----------------------------------------------------------------------' run_cached () { + if [ -n "${MK_ORA_SECTIONS[*]}" ]; then + return + fi + local sid="$1" local maxage="$2" local name="oracle_$1" @@ -1226,8 +1255,9 @@ mk_ora_db_connect () { DBHOST=$(echo "${ORACFGLINE}" | cut -d":" -f$((4+offset))) DBPORT=$(echo "${ORACFGLINE}" | cut -d":" -f$((5+offset))) - logging "[$LINENO] [${sid}] [mk_ora_db_connect]" "Connection variables" "ORADBUSER: $ORADBUSER"\ - "DBSYSCONNECT: $DBSYSCONNECT" "DBHOST: $DBHOST" "DBPORT: $DBPORT" "TNSALIAS: $TNSALIAS" + logging "[$LINENO] [${sid}] [mk_ora_db_connect]" "ORADBUSER: $ORADBUSER"\ + "DBSYSCONNECT: $DBSYSCONNECT" "DBHOST: $DBHOST" "DBPORT: $DBPORT"\ + "TNSALIAS: $TNSALIAS" TNSPINGOK=no if [ -f "${TNS_ADMIN}/tnsnames.ora" ]; then @@ -1411,13 +1441,25 @@ do_checks () { do_async_sections=${ASYNC_SECTIONS} fi - excluded=$(eval "echo \$EXCLUDE_$sid") - sections=$(remove_excluded_sections "$do_sync_sections" "$excluded") - asections=$(remove_excluded_sections "$do_async_sections" "$excluded") - logging "[$LINENO] [${sid}] [do_checks]" "Excluded: ${excluded}"\ - "Sections: ${sections}" "Async sections: ${asections}" + if [ -n "${MK_ORA_SECTIONS[*]}" ]; then + for section in $do_sync_sections $do_async_sections; do + if [ "$(do_section "$section")" = "yes" ]; then + sections=${sections:+"$sections "}"${section}" + fi + done + logging "[$LINENO] [${sid}] [do_checks]" "Do single sections: $sections" + ASYNC_SQL= + + else + excluded=$(eval "echo \$EXCLUDE_$sid") + sections=$(remove_excluded_sections "$do_sync_sections" "$excluded") + asections=$(remove_excluded_sections "$do_async_sections" "$excluded") + logging "[$LINENO] [${sid}] [do_checks]" "Excluded: ${excluded}"\ + "Sections: ${sections}" "Async sections: ${asections}" + + ASYNC_SQL=$(for section in $asections; do eval "sql_$section" ; done) + fi - ASYNC_SQL=$(for section in $asections ; do eval "sql_$section" ; done) export ASYNC_SQL if [ "$MK_ORA_LOGGING" = "1" ]; then logging "[$LINENO] [${sid}] [do_checks]" "Testmode: $(echo \

6 years, 2 months

Removed dead code

by Simon Betz

Module: check_mk Branch: master Commit: 16944baa8fb6f050e7459afa52a6c6f05240d00a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=16944baa8fb6f0… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Jul 6 09:17:26 2018 +0200 Removed dead code Change-Id: Ie988cb35a2eae9bc731fd09dcfa8941ed10b4d4b --- agents/plugins/mk_oracle | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/agents/plugins/mk_oracle b/agents/plugins/mk_oracle index 5ce0737..5a0ea17 100755 --- a/agents/plugins/mk_oracle +++ b/agents/plugins/mk_oracle @@ -1024,20 +1024,6 @@ do_dummy_sections () { } -do_section () { - local section=$1 - if [ -n "${MK_ORA_SECTIONS[*]}" ]; then - if [[ "${MK_ORA_SECTIONS[*]}" =~ ${section} ]]; then - echo "yes" - else - echo "no" - fi - else - echo "yes" - fi -} - - skip_sid () { local sid="$1" if [ "$ONLY_SIDS" ]; then

6 years, 2 months

Fixed and enabled deprecated-lambda warnings.

by Sven Panne

6 years, 2 months

Fixed unintended change in Encoder.urlencode_vars()

by Lars Michelsen

Module: check_mk Branch: master Commit: 2368f3360932477a815084bda081f556efe60f0f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2368f336093247… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 5 16:24:17 2018 +0200 Fixed unintended change in Encoder.urlencode_vars() * GUI craw found this. Thanks! * Extended the unit tests to find this earlier in the future Change-Id: I0335bd628c4d0a05c5e264fad790cbe7ab407ba1 --- tests/unit/web/test_htmllib_Encoder.py | 1 + web/htdocs/htmllib.py | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/tests/unit/web/test_htmllib_Encoder.py b/tests/unit/web/test_htmllib_Encoder.py index 74dfa83..4f51047 100644 --- a/tests/unit/web/test_htmllib_Encoder.py +++ b/tests/unit/web/test_htmllib_Encoder.py @@ -22,6 +22,7 @@ def test_htmllib_integration(register_builtin_html): ([("a", "+")], "a=%2B"), ([("a", " ")], "a=+"), ([("a", "/")], "a=%2F"), + ([("a", None)], "a="), ]) def test_urlencode_vars(inp, out): result = htmllib.Encoder().urlencode_vars(inp) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 3e516db..1512f15 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -183,6 +183,12 @@ class Encoder(object): value = str(value) elif type(value) == unicode: value = value.encode("utf-8") + elif value is None: + # TODO: This is not ideal and should better be cleaned up somehow. Shouldn't + # variables with None values simply be skipped? We currently can not find the + # call sites easily. This may be cleaned up once we establish typing. Until then + # we need to be compatible with the previous behavior. + value = "" #assert type(value) == str, "%s: %s" % (varname, value)

6 years, 2 months

← Newer
1
...
35
36
37
38
39
40
41
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2018