Checkmk git commits December 2015

checkmk-commits@lists.checkmk.com

8 participants
193 discussions

by Mathias Kettner

Module: check_mk Branch: master Commit: 4b342e5f6033f1028c8478f039b4c6638931e805 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b342e5f6033f1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 8 17:14:21 2015 +0100 Remove trailing empty line in wato.py --- web/htdocs/wato.py | 1 - 1 file changed, 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 38b50d8..f1abedb 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -20697,4 +20697,3 @@ def register_builtin_host_tags(): ('ip-v4', u'IPv4'), ('ip-v6', u'IPv6') ] -

8 years, 11 months

GUI-Test: fix f12 helper

by Mathias Kettner

Module: check_mk Branch: master Commit: 30cac38fbaf055405b9c3c9568403b39edbfcbb6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=30cac38fbaf055… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 8 16:38:54 2015 +0100 GUI-Test: fix f12 helper --- web/guitest/.f12 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/guitest/.f12 b/web/guitest/.f12 index 60cc876..fa3ba39 100644 --- a/web/guitest/.f12 +++ b/web/guitest/.f12 @@ -1,5 +1,5 @@ #!/bin/bash SITE=${SITE:-$(cat ../../.site 2>/dev/null || true)} SITE=${SITE:-$(omd sites --bare | head -n 1)} -sudo mkdir -p /omd/sites/$SITE/var/check_mk/guitests +sudo install -m 755 -o $SITE -g $SITE -d /omd/sites/$SITE/var/check_mk/guitests sudo install -o $SITE -g $SITE -v -m 644 *.mk /omd/sites/$SITE/var/check_mk/guitests

8 years, 11 months

GUI-Tests: fix dependency on dynamic selection ids

by Mathias Kettner

Module: check_mk Branch: master Commit: 553306cb99072ca374da36d5b87981f30d624d36 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=553306cb99072c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 8 16:36:18 2015 +0100 GUI-Tests: fix dependency on dynamic selection ids --- web/guitest/wato.mk | 2 +- web/htdocs/guitester.py | 26 ++++++++++++++++++++++++-- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/web/guitest/wato.mk b/web/guitest/wato.mk index 3088f07..3ee6047 100644 --- a/web/guitest/wato.mk +++ b/web/guitest/wato.mk @@ -253,7 +253,7 @@ 'variables': {'_change_alias': 'on', '_change_ipaddress': 'on', '_change_parents': 'on', - '_transid': 'invalid', + '_transid': 'valid', 'attr_alias': 'Der L\xc3\xb6k\xc3\xa4le R\xc3\xb6chner', 'attr_display_ipaddress': '1', 'attr_display_ipv6address': '0', diff --git a/web/htdocs/guitester.py b/web/htdocs/guitester.py index fe498c8..804d3b3 100644 --- a/web/htdocs/guitester.py +++ b/web/htdocs/guitester.py @@ -190,12 +190,34 @@ def guitest_check_single_value(reference, reality): def guitest_check_element_list(reference, reality): errors = [] + one_missing = False for entry in reference: - if entry not in reality: + if not guitest_entry_in_reference_list(entry, reality): errors.append("missing entry %r" % (entry,)) + one_missing = True + if one_missing: + for entry in reality: + if not guitest_entry_in_reference_list(entry, reference): + errors.append("exceeding entry %r" % (entry,)) return errors +def guitest_entry_in_reference_list(entry, ref_list): + for ref_entry in ref_list: + if guitest_entries_match(ref_entry, entry): + return True + return False + + +def guitest_entries_match(ref, real): + if type(ref) in (list, tuple): + return len(ref) == len(real) and \ + map(guitest_drop_dynamic_ids, ref) == map(guitest_drop_dynamic_ids, real) + else: + return guitest_drop_dynamic_ids(ref) == guitest_drop_dynamic_ids(real) + + + def guitest_check_datatables(reference, reality): if len(reference) != len(reality): return [ _("Expected %d data tables, but got %d") % (len(reference), len(reality)) ] @@ -254,5 +276,5 @@ def find_common_prefix(a, b): def guitest_drop_dynamic_ids(text): - return re.sub("selection=[a-f0-9---]{36}", "selection=*", + return re.sub("selection(%3d|=)[a-f0-9---]{36}", "selection=*", re.sub("_transid=1[4-6][0-9]{8}/[0-9]+", "_transid=TRANSID", text))

8 years, 11 months

Neuer WATO-Test

by Mathias Kettner

Module: check_mk Branch: master Commit: adb4d799c751cee187aeee9ea1e47098365ab60c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=adb4d799c751ce… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 8 16:20:04 2015 +0100 Neuer WATO-Test --- web/guitest/wato.mk | 202 ++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 183 insertions(+), 19 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=adb4d799c7…

8 years, 11 months

GUI-Tests: new options for repairing tests

by Mathias Kettner

Module: check_mk Branch: master Commit: 4d2e128f69e054d0fe0f7c34b0524b34332356ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d2e128f69e054… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 8 16:11:55 2015 +0100 GUI-Tests: new options for repairing tests --- doc/helpers/cmk-guitest | 63 +++++++++++++++++++++++----------- web/guitest/.f12 | 2 +- web/guitest/updatetests | 4 +++ web/guitest/wato.mk | 86 +++++++++++++++++++++++------------------------ web/htdocs/guitester.py | 63 ++++++++++++++++++++++++++++++---- web/htdocs/htmllib.py | 2 +- 6 files changed, 148 insertions(+), 72 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4d2e128f69…

8 years, 11 months

Revert "#2867 check_http: client certificate and private key file parameters can now be set in wato "

by Sebastian Herbord

Module: check_mk Branch: master Commit: 3c7ea37d710ab4a764ff654813a57af14d08246c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c7ea37d710ab4… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Dec 8 14:28:35 2015 +0100 Revert "#2867 check_http: client certificate and private key file parameters can now be set in wato" This reverts commit dc53cb4d19abb62d55e29865e48188268a39b0f3. --- .werks/2867 | 9 --------- ChangeLog | 1 - checks/check_http | 6 ------ web/plugins/wato/active_checks.py | 15 --------------- 4 files changed, 31 deletions(-) diff --git a/.werks/2867 b/.werks/2867 deleted file mode 100644 index 94afa52..0000000 --- a/.werks/2867 +++ /dev/null @@ -1,9 +0,0 @@ -Title: check_http: client certificate and private key file parameters can now be set in wato -Level: 1 -Component: checks -Compatible: compat -Version: 1.2.7i4 -Date: 1449481056 -Class: feature - -Users of these parameters should take extra care to verify the file names specified are valid. diff --git a/ChangeLog b/ChangeLog index a5e3a1d..9be5a43 100644 --- a/ChangeLog +++ b/ChangeLog @@ -54,7 +54,6 @@ * 2780 cisco_vss: detect this check on newer (15.1) devices * 2874 netstat_an.bat: Restrict output of connections to TCP, safes performance * 2866 ewon: Added support for monitoring Wagner OxyReduct devices with their data exposed through an ewon router... - * 2867 check_http: client certificate and private key file parameters can now be set in wato... * 2884 mssql_blocked_sessions: the state of the blocked sessions is now configurable * 1313 apc_sts_inputs: New Check for APC Static Transfer Swichtes: Input Phases * 1314 apc_sts_source: New Check to monitor if the input source changes on APC STS devices diff --git a/checks/check_http b/checks/check_http index d1adddc..85f882d 100644 --- a/checks/check_http +++ b/checks/check_http @@ -145,12 +145,6 @@ def check_http_arguments(params): if settings.get("urlize"): args += ' -L' - if "client_certificate" in settings: - args += ' -J %s' % settings["client_certificate"] - - if "private_key" in settings: - args += ' -K %s' % settings["private_key"] - if not omit_ip: args = " -I " + address + args return args diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 6aa2d3c..8f798f7 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -973,21 +973,6 @@ register_rule(group, "to the checked URL and this clickable."), ) ), - ( "client_certificate", - Filename( - title = _("Client Certificate File"), - help = _("Set the certificate the client uses to identify itself to the https server. " - "Needs to be in PEM format. " - "Please be very careful to enter a valid filename."), - ) - ), - ( "private_key", - Filename( - title = _("Private Key File"), - help = _("Set the private key file (PEM format) matching the client certificate. " - "Please be very careful to enter a valid filename."), - ) - ), ] ),

8 years, 11 months

windows agent: made the conversion of file times clearer

by Sebastian Herbord

Module: check_mk Branch: master Commit: f2d7ce15d761b3487ad55c775f5539a91e121946 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f2d7ce15d761b3… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Dec 8 13:24:44 2015 +0100 windows agent: made the conversion of file times clearer --- agents/windows/Makefile | 4 ++-- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 5939364 -> 858624 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 5939364 -> 858624 bytes agents/windows/check_mk_agent.cc | 10 ++++++---- agents/windows/check_mk_agent.exe | Bin 4700679 -> 776192 bytes agents/windows/check_mk_agent.msi | Bin 10972160 -> 1893376 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 4700679 -> 776192 bytes agents/windows/install_agent-64.exe | Bin 1401623 -> 393401 bytes agents/windows/install_agent.exe | Bin 1272825 -> 383537 bytes 10 files changed, 9 insertions(+), 7 deletions(-) diff --git a/agents/windows/Makefile b/agents/windows/Makefile index c46113a..f609797 100644 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -27,9 +27,9 @@ SHELL = /bin/bash VERSION = 1.2.7i4 VERSION_DUMMY = @@@@@CHECK_MK_VERSION@@@@@ WINDRES = i686-w64-mingw32-windres -#COPTIONS = -s -O2 -Wall -Wformat=2 -Werror -static -static-libgcc -static-libstdc++ -fno-rtti -std=c++11 -DCHECK_MK_VERSION='"$(VERSION_DUMMY)"' -D__USE_MINGW_ANSI_STDIO +COPTIONS = -s -O2 -Wall -Wformat=2 -Werror -static -static-libgcc -static-libstdc++ -fno-rtti -std=c++11 -DCHECK_MK_VERSION='"$(VERSION_DUMMY)"' -D__USE_MINGW_ANSI_STDIO # for debug builds -COPTIONS = -O0 -Wall -Werror -static -static-libgcc -static-libstdc++ -fno-rtti -std=c++11 -ggdb -DCHECK_MK_VERSION='"$(VERSION_DUMMY)"' -D__USE_MINGW_ANSI_STDIO +#COPTIONS = -O0 -Wall -Werror -static -static-libgcc -static-libstdc++ -fno-rtti -std=c++11 -ggdb -DCHECK_MK_VERSION='"$(VERSION_DUMMY)"' -D__USE_MINGW_ANSI_STDIO MKDIR = mkdir -p ifeq ($(shell uname),Linux) diff --git a/agents/windows/build_version b/agents/windows/build_version index 2da17b6..e0f6509 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -677 +695 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 22226f9..7def727 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index cbeff7b..07a8fd9 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 1047595..cdeb491 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -284,14 +284,16 @@ double current_time() return file_time(&filetime); } -#define WINDOWS_TICK 10000000 -#define SEC_TO_UNIX_EPOCH 11644473600LL double file_time(const FILETIME *filetime) { + static const double SEC_TO_UNIX_EPOCH = 11644473600.0; + static const double WINDOWS_TICK = 10000000.0; + _ULARGE_INTEGER uli; uli.LowPart = filetime->dwLowDateTime; uli.HighPart = filetime->dwHighDateTime; - return double(uli.QuadPart / (double)WINDOWS_TICK - SEC_TO_UNIX_EPOCH); + + return (double(uli.QuadPart) / WINDOWS_TICK) - SEC_TO_UNIX_EPOCH; } void char_replace(char what, char into, char *in) @@ -1898,7 +1900,7 @@ bool output_fileinfo(SOCKET &out, const char *basename, WIN32_FIND_DATA *data) if (0 == (data->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { output(out, "%s\\%s|%" PRIu64 "|%.0f\n", basename, - data->cFileName, size, file_time(&data->ftLastWriteTime)); + data->cFileName, size, file_time(&data->ftLastWriteTime)); return true; } return false; diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 02df19d..f0d3bf6 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index e8ce49b..101d51a 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 65aa652..66dc13e 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 488dc08..3ff18bd 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 1ed96ae..eac862b 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

8 years, 11 months

GUI-Tests: better output for differing tables

by Mathias Kettner

Module: check_mk Branch: master Commit: 3a80de2fd660bb49d745a228315131b60228f662 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a80de2fd660bb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 8 14:24:08 2015 +0100 GUI-Tests: better output for differing tables --- doc/helpers/cmk-guitest | 26 +++-- web/guitest/.f12 | 5 + web/guitest/runtests | 3 + web/guitest/wato.mk | 272 +++++++++++++++++++++++++++++++++++++++++++++++ web/htdocs/guitester.py | 89 ++++++++++++---- 5 files changed, 368 insertions(+), 27 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3a80de2fd6…

8 years, 11 months

#1315 check_mk_agent.linux: The ps section of the agent now supports long usernames

by Bastian Kuhn

Module: check_mk Branch: master Commit: b3ef665a7c4ba040ae93c84b2086d12336131e63 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b3ef665a7c4ba0… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Dec 8 13:53:24 2015 +0100 #1315 check_mk_agent.linux: The ps section of the agent now supports long usernames The ps command now return usernames up to 32 digits instead falling back to the user_id. Thanks for this Patch to Vinny Wadding --- .werks/1315 | 11 +++++++++++ ChangeLog | 1 + agents/check_mk_agent.linux | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/1315 b/.werks/1315 new file mode 100644 index 0000000..cf995d8 --- /dev/null +++ b/.werks/1315 @@ -0,0 +1,11 @@ +Title: check_mk_agent.linux: The ps section of the agent now supports long usernames +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1449579105 +Class: feature + +The ps command now return usernames up to 32 digits instead falling back to the user_id. +Thanks for this Patch to Vinny Wadding + diff --git a/ChangeLog b/ChangeLog index 197dbbb..a5e3a1d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -58,6 +58,7 @@ * 2884 mssql_blocked_sessions: the state of the blocked sessions is now configurable * 1313 apc_sts_inputs: New Check for APC Static Transfer Swichtes: Input Phases * 1314 apc_sts_source: New Check to monitor if the input source changes on APC STS devices + * 1315 check_mk_agent.linux: The ps section of the agent now supports long usernames... * 2660 FIX: fixed windows agent using the wrong working directory... * 2664 FIX: ps: Speedup in situation with many matching processes... * 2661 FIX: windows agent: fixed incomplete process list... diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 9d4e18c..f0f9f15 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -214,7 +214,7 @@ grep ^/dev < /proc/mounts # processes including username, without kernel processes echo '<<<ps>>>' -ps ax -o user,vsz,rss,cputime,etime,pid,command --columns 10000 | sed -e 1d -e 's/ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ */(\1,\2,\3,\4\/\5,\6) /' +ps ax -o user:32,vsz,rss,cputime,etime,pid,command --columns 10000 | sed -e 1d -e 's/ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ */(\1,\2,\3,\4\/\5,\6) /' # Memory usage echo '<<<mem>>>'

8 years, 11 months

smart: extended detection for MegCli. Thanks to Thomas Mittmann

by Bastian Kuhn

Module: check_mk Branch: master Commit: 3e929ad7da53c06074b9030092a8adbe00868ecf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e929ad7da53c0… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Dec 8 13:21:26 2015 +0100 smart: extended detection for MegCli. Thanks to Thomas Mittmann --- agents/plugins/smart | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/agents/plugins/smart b/agents/plugins/smart index 1a0f250..03c5baf 100755 --- a/agents/plugins/smart +++ b/agents/plugins/smart @@ -32,7 +32,12 @@ megaraid_info() { - PDINFO=$(MegaCli -PDlist -a0) + #PDINFO=$(MegaCli -PDlist -a0) + if [ -z "$1" ]; then + PDINFO=$(megacli -PDlist -a0) + else + PDINFO=$($1 -PDlist -a0) + fi echo "$PDINFO" | \ while read line ; do @@ -154,8 +159,19 @@ if which smartctl > /dev/null 2>&1 ; then # Call MegaRaid submodule if conditions are met - if which MegaCli > /dev/null && [ -c /dev/sg0 ] ; then - megaraid_info + if type MegaCli >/dev/null ; then + MegaCli_bin="MegaCli" + elif type MegaCli64 >/dev/null ; then + MegaCli_bin="MegaCli64" + elif type megacli >/dev/null ; then + MegaCli_bin="megacli" + else + MegaCli_bin="unknown" + fi + + if [ "$MegaCli_bin" != "unknown" ]; then + megaraid_info "$MegaCli_bin" fi + fi

8 years, 11 months

← Newer
1
...
9
10
11
12
13
14
15
...
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2015