Checkmk git commits May 2015

checkmk-commits@lists.checkmk.com

7 participants
200 discussions

Check_MK Git: check_mk: updated information of werk 2274

by Andreas Boesl

Module: check_mk Branch: master Commit: a3ff6814d93380226b13681b4c687c03d829df56 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a3ff6814d93380… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue May 19 13:58:13 2015 +0200 updated information of werk 2274 --- .werks/2274 | 5 +++ agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 301056 -> 301056 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 301056 -> 301056 bytes agents/windows/check_mk_agent.cc | 46 +++++++++++++--------- agents/windows/check_mk_agent.exe | Bin 182784 -> 182784 bytes agents/windows/check_mk_agent.msi | Bin 732160 -> 732160 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 182784 -> 182784 bytes agents/windows/install_agent-64.exe | Bin 178467 -> 178461 bytes agents/windows/install_agent.exe | Bin 159356 -> 159422 bytes 10 files changed, 33 insertions(+), 20 deletions(-) diff --git a/.werks/2274 b/.werks/2274 index 6eb1569..a6a7c76 100644 --- a/.werks/2274 +++ b/.werks/2274 @@ -7,3 +7,8 @@ Date: 1432024643 Class: feature If you need stdout only simply use <tt>check_mk_agent.exe file myfile</tt>. + +This feature also includes a small fix. If a plugin script wrote something to +stderr there was a possibility that the following stdout information was skipped. +This bug was only observed on a Win2k3 system. + diff --git a/agents/windows/build_version b/agents/windows/build_version index 4c5c807..9386c22 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -158 +161 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 3e24442..a351f11 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 6bd1285..9bb08cd 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 6ed2410..f6c7308 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -2837,8 +2837,10 @@ int launch_program(script_container* cont) STARTUPINFO si; SECURITY_ATTRIBUTES sa; SECURITY_DESCRIPTOR sd; // security information for pipes + PROCESS_INFORMATION pi; - HANDLE newstdout,read_stdout; // pipe handles + HANDLE script_stdout,read_stdout; // pipe handles + HANDLE script_stderr,read_stderr; // initialize security descriptor (Windows NT) if (IsWinNT()) @@ -2849,39 +2851,36 @@ int launch_program(script_container* cont) } else sa.lpSecurityDescriptor = NULL; + sa.nLength = sizeof(SECURITY_ATTRIBUTES); sa.bInheritHandle = true; // allow inheritable handles - if (!CreatePipe(&read_stdout,&newstdout,&sa,0)) // create stdout pipe - { + if (!CreatePipe(&read_stdout,&script_stdout,&sa,0)) // create stdout pipe + return 1; + + if (!CreatePipe(&read_stderr,&script_stderr,&sa,0)) // create stderr pipe return 1; - } //set startupinfo for the spawned process GetStartupInfo(&si); si.dwFlags = STARTF_USESTDHANDLES|STARTF_USESHOWWINDOW; si.wShowWindow = SW_HIDE; - si.hStdOutput = newstdout; - - - // Redirect sterr to NUL device - SECURITY_ATTRIBUTES secattr; - secattr.nLength = sizeof secattr; - secattr.lpSecurityDescriptor = NULL; - secattr.bInheritHandle = TRUE; - HANDLE hnul = CreateFile("NUL", GENERIC_WRITE, 0, &secattr, OPEN_EXISTING, 0, NULL); + si.hStdOutput = script_stdout; if (with_stderr) - si.hStdError = newstdout; + si.hStdError = script_stdout; else - si.hStdError = hnul; + si.hStdError = script_stderr; // spawn the child process if (!CreateProcess(NULL,cont->path,NULL,NULL,TRUE,CREATE_NEW_CONSOLE, NULL,NULL,&si,&pi)) { - CloseHandle(newstdout); + CloseHandle(script_stdout); CloseHandle(read_stdout); + + CloseHandle(script_stderr); + CloseHandle(read_stderr); return 1; } @@ -2908,9 +2907,18 @@ int launch_program(script_container* cont) exit_code = 2; break; } + GetExitCodeProcess(pi.hProcess, &exit); // while the process is running while (!buffer_full) { + if (!with_stderr) { + PeekNamedPipe(read_stderr, buf, sizeof(buf), &bread, &avail, NULL); + if (avail > 0) + // Just read from the pipe, we do not use this data + ReadFile(read_stderr, buf, sizeof(buf) - 1, &bread, NULL); + } + PeekNamedPipe(read_stdout, buf, sizeof(buf), &bread, &avail, NULL); + if (avail == 0) break; @@ -2953,10 +2961,10 @@ int launch_program(script_container* cont) CloseHandle(cont->job_object); CloseHandle(pi.hThread); CloseHandle(pi.hProcess); - CloseHandle(newstdout); + CloseHandle(script_stdout); CloseHandle(read_stdout); - if (!with_stderr) - CloseHandle(hnul); + CloseHandle(script_stderr); + CloseHandle(read_stderr); return exit_code; } diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 77655d9..c363734 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 e55928a..e46b1cf 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 d10fb2d..d837089 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 b7b9dc7..eb35a9c 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 607f59d..d098fc8 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

9 years, 1 month

Check_MK Git: check_mk: Minor code cleanup

by Konstantin Büttner

Module: check_mk Branch: master Commit: b99f5ddf877f54d99990c78cb30a7e9688dc35a4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b99f5ddf877f54… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue May 19 13:46:08 2015 +0200 Minor code cleanup --- web/plugins/wato/check_parameters.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index db770a8..368a17e 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -300,8 +300,6 @@ register_check_parameters( # | | |___| | | \ V /| | | | (_) | | | | | | | | | __/ | | | |_ | # | |_____|_| |_|\_/ |_|_| \___/|_| |_|_| |_| |_|\___|_| |_|\__| | # | | -# +----------------------------------------------------------------------+ -# | | # '----------------------------------------------------------------------' register_check_parameters(

9 years, 1 month

Check_MK Git: check_mk: readded missing logwatch icon

by Lars Michelsen

Module: check_mk Branch: master Commit: c9b04d89ccc07d0252d872d75d927f56fd32a2f9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c9b04d89ccc07d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 19 12:19:10 2015 +0200 readded missing logwatch icon --- web/plugins/icons/builtin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 7b8f6d7..7455270 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -423,7 +423,7 @@ def paint_notes(what, row, tags, host_custom_vars): if notes_url: return 'notes', _('Custom Notes'), notes_url -multisite_icons_and_actions['logwatch'] = { +multisite_icons_and_actions['notes'] = { 'columns': [ 'notes_url_expanded', 'check_command' ], 'paint': paint_notes, }

9 years, 1 month

Check_MK Git: check_mk: #2254 FIX Fixed error message in parameter columns of discovered services

by Lars Michelsen

Module: check_mk Branch: master Commit: defd075dae12af81c9f9f0f57fb16303823f2187 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=defd075dae12af… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue May 19 11:41:45 2015 +0200 #2254 FIX Fixed error message in parameter columns of discovered services All discovered services were showing up the "Invalid check parameter" error message in the "check parameters" column of the service discovery table of a host. This error was simply a problem of visualisation in this table and had no other negative effect, the checks worked without a problem. --- .werks/2254 | 13 +++++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 1 + web/plugins/wato/check_parameters.py | 9 ++++++++- 4 files changed, 23 insertions(+), 1 deletion(-) diff --git a/.werks/2254 b/.werks/2254 new file mode 100644 index 0000000..15b2180 --- /dev/null +++ b/.werks/2254 @@ -0,0 +1,13 @@ +Title: Fixed error message in parameter columns of discovered services +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1432028372 + +All discovered services were showing up the "Invalid check parameter" error message +in the "check parameters" column of the service discovery table of a host. +This error was simply a problem of visualisation in this table and had no other +negative effect, the checks worked without a problem. diff --git a/ChangeLog b/ChangeLog index b2b3c23..10f0137 100644 --- a/ChangeLog +++ b/ChangeLog @@ -498,6 +498,7 @@ * 2203 FIX: Fix sorting of unselected elements in a list choice with two panes * 2244 FIX: Fixed sorting of host tag topics in dropdown selections * 2263 FIX: Bulk service discovery: Fixed error when doing bulk inventory on locked folders... + * 2254 FIX: Fixed error message in parameter columns of discovered services... Notifications: * 1662 notification plugin spectrum: finalized script. now able to handle host notications diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2c223bc..12c0774 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3291,6 +3291,7 @@ def show_service_table(host, firsttime): except Exception, e: paramtext = _("Invalid check parameter: %s!") % e paramtext += _(" The parameter is: %r") % (params,) + paramtext += _(" The varname is: %s") % varname html.write(paramtext) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index db770a8..0cee1fc 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -7737,6 +7737,13 @@ def ps_convert_from_singlekeys(old_params): del params[key] return params +def ps_convert_inventorized_from_singlekeys(old_params): + params = ps_convert_from_singlekeys(old_params) + if 'user' in params: + del params['user'] + if 'process' in params: + del params['process'] + return params # Rule for disovered process checks register_check_parameters( @@ -7752,7 +7759,7 @@ register_check_parameters( )) ] ), - forth = ps_convert_from_singlekeys, + forth = ps_convert_inventorized_from_singlekeys, ), TextAscii( title = _("Process name as defined at discovery"),

9 years, 1 month

Check_MK Git: check_mk: #2274 windows agent: "check_mk_agent.exe test" now also outputs stderr of plugins

by Andreas Boesl

Module: check_mk Branch: master Commit: d7bb412222ff2a2cb60807a94d9295e9985652ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d7bb412222ff2a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue May 19 10:39:29 2015 +0200 #2274 windows agent: "check_mk_agent.exe test" now also outputs stderr of plugins If you need stdout only simply use <tt>check_mk_agent.exe file myfile</tt>. --- .werks/2274 | 9 +++++++++ ChangeLog | 1 + agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 301056 -> 301056 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 301056 -> 301056 bytes agents/windows/check_mk_agent.cc | 20 ++++++++++++++------ agents/windows/check_mk_agent.exe | Bin 182784 -> 182784 bytes agents/windows/check_mk_agent.msi | Bin 732160 -> 732160 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 182784 -> 182784 bytes agents/windows/install_agent-64.exe | Bin 178440 -> 178467 bytes 10 files changed, 25 insertions(+), 7 deletions(-) diff --git a/.werks/2274 b/.werks/2274 new file mode 100644 index 0000000..6eb1569 --- /dev/null +++ b/.werks/2274 @@ -0,0 +1,9 @@ +Title: windows agent: "check_mk_agent.exe test" now also outputs stderr of plugins +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1432024643 +Class: feature + +If you need stdout only simply use <tt>check_mk_agent.exe file myfile</tt>. diff --git a/ChangeLog b/ChangeLog index 6d1ccd4..b2b3c23 100644 --- a/ChangeLog +++ b/ChangeLog @@ -178,6 +178,7 @@ * 2271 logwatch_ec: Now able to create a single check for each logfile forwarded to the event console... * 2283 cisco_srst_call_legs cisco_srst_phones cisco_srst_state: New checks for monitoring Cisco SRST routers * 1246 blade_bays, blade_blades, blade_blowers, blade_health, blade_mediatray: Checks now support IBM Flex Bladecenter + * 2274 windows agent: "check_mk_agent.exe test" now also outputs stderr of plugins... * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... diff --git a/agents/windows/build_version b/agents/windows/build_version index 91b629b..4c5c807 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -156 +158 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 250c6b7..3e24442 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 88273ab..6bd1285 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 ff245e9..6ed2410 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -285,6 +285,7 @@ script_async_execution g_default_script_async_execution = SEQUENTIAL; bool verbose_mode = false; bool g_crash_debug = false; bool do_tcp = false; +bool with_stderr = false; bool force_tcp_output = false; // if true, send socket data immediately bool do_file = false; static FILE* fileout; @@ -2869,7 +2870,11 @@ int launch_program(script_container* cont) secattr.lpSecurityDescriptor = NULL; secattr.bInheritHandle = TRUE; HANDLE hnul = CreateFile("NUL", GENERIC_WRITE, 0, &secattr, OPEN_EXISTING, 0, NULL); - si.hStdError = hnul; + + if (with_stderr) + si.hStdError = newstdout; + else + si.hStdError = hnul; // spawn the child process if (!CreateProcess(NULL,cont->path,NULL,NULL,TRUE,CREATE_NEW_CONSOLE, @@ -2950,7 +2955,9 @@ int launch_program(script_container* cont) CloseHandle(pi.hProcess); CloseHandle(newstdout); CloseHandle(read_stdout); - CloseHandle(hnul); + if (!with_stderr) + CloseHandle(hnul); + return exit_code; } @@ -4603,9 +4610,10 @@ void do_debug() } -void do_test() +void do_test(bool output_stderr) { - do_tcp = false; + do_tcp = false; + with_stderr = output_stderr; SOCKET dummy; open_crash_log(); crash_log("Started in test mode."); @@ -5091,7 +5099,7 @@ int main(int argc, char **argv) else if (argc <= 1) RunService(); else if (!strcmp(argv[1], "test")) - do_test(); + do_test(true); else if (!strcmp(argv[1], "file")) { if (argc < 3) { fprintf(stderr, "Please specify the name of an output file.\n"); @@ -5103,7 +5111,7 @@ int main(int argc, char **argv) exit(1); } do_file = true; - do_test(); + do_test(false); fclose(fileout); } else if (!strcmp(argv[1], "adhoc")) diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 24cd874..77655d9 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 3ad8ba1..e55928a 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 74d61a7..d10fb2d 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 c1d35b6..b7b9dc7 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ

9 years, 1 month

Check_MK Git: check_mk: fixed typo: include -> includes

by Andreas Boesl

Module: check_mk Branch: master Commit: b1b37bcb25bed7b3901b53d98748b316b6600697 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b1b37bcb25bed7… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue May 19 10:02:11 2015 +0200 fixed typo: include -> includes --- checks/fortigate_cpu_base | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/fortigate_cpu_base b/checks/fortigate_cpu_base index 13301f3..e198863 100644 --- a/checks/fortigate_cpu_base +++ b/checks/fortigate_cpu_base @@ -55,6 +55,6 @@ check_info["fortigate_cpu_base"] = { "snmp_scan_function" : lambda oid: ".1.3.6.1.4.1.12356.101.1" in oid(".1.3.6.1.2.1.1.2.0") and\ oid(".1.3.6.1.4.1.12356.101.4.1.3.0"), "snmp_info" : ( ".1.3.6.1.4.1.12356.101.4.1", [ 3 ]), - "include" : [ "cpu_util.include" ], + "includes" : [ "cpu_util.include" ], }

9 years, 1 month

Check_MK Git: check_mk: fixed syntax error..

by Andreas Boesl

Module: check_mk Branch: master Commit: 368a94879a62bb9db963d205e1b695736d404ab7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=368a94879a62bb… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue May 19 09:18:42 2015 +0200 fixed syntax error.. --- checks/mrpe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/mrpe b/checks/mrpe index 08ba534..c649f92 100644 --- a/checks/mrpe +++ b/checks/mrpe @@ -59,7 +59,7 @@ def check_mrpe(item, params, info): if line[0] == item: try: state = int(line[1]) - else: + except: state = None # convert to original format by joining and replacing \1 back with \n

9 years, 1 month

Check_MK Git: check_mk: New page for displaying all check plugins - not yet finished

by Mathias Kettner

Module: check_mk Branch: master Commit: ecf64e0557ce6fee3bc4d91cba09982b718ae8ff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ecf64e0557ce6f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 18 17:59:16 2015 +0200 New page for displaying all check plugins - not yet finished --- checkman/mq_queues | 2 +- checkman/plesk_backups | 2 +- checkman/plesk_domains | 2 +- checkman/winperf_ts_sessions | 2 +- modules/automation.py | 32 +++++++++++++--- modules/catalog.py | 4 +- modules/check_mk.py | 2 +- web/htdocs/images/icon_check_plugins.png | Bin 0 -> 2981 bytes web/htdocs/wato.css | 15 ++++++++ web/htdocs/wato.py | 59 +++++++++++++++++++++++++++--- web/plugins/sidebar/wato.py | 4 +- web/plugins/wato/builtin_modules.py | 7 +++- 12 files changed, 109 insertions(+), 22 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ecf64e0557…

9 years, 1 month

Check_MK Git: check_mk: #2273 New multisite filter: Start of downtime

by Andreas Boesl

Module: check_mk Branch: master Commit: 6eeb0c1255e7f51368893287139a06b320e36303 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6eeb0c1255e7f5… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon May 18 17:41:10 2015 +0200 #2273 New multisite filter: Start of downtime The existing filter "Time when downtime was created" did not show the time when the downtime should actually start, but its creation time. --- .werks/2273 | 10 ++++++++++ ChangeLog | 1 + web/plugins/visuals/filters.py | 2 ++ 3 files changed, 13 insertions(+) diff --git a/.werks/2273 b/.werks/2273 new file mode 100644 index 0000000..5e707fd --- /dev/null +++ b/.werks/2273 @@ -0,0 +1,10 @@ +Title: New multisite filter: Start of downtime +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.7i1 +Date: 1431963542 +Class: feature + +The existing filter "Time when downtime was created" did not show the +time when the downtime should actually start, but its creation time. diff --git a/ChangeLog b/ChangeLog index fa42469..6d1ccd4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -387,6 +387,7 @@ * 2181 Admins can now delete views/dashboards/reports created by other users * 2249 Builtin icon visibility can now be configured... * 2228 New matrix views for displaying performance data of service in a matrix table... + * 2273 New multisite filter: Start of downtime... * 1781 FIX: Fix broken grouping by host/service group in availability * 1783 FIX: Finish the view "History of Scheduled Downtimes"... * 1206 FIX: Hostname not longer shown as column in host views diff --git a/web/plugins/visuals/filters.py b/web/plugins/visuals/filters.py index 1dc2404..a6bc303 100644 --- a/web/plugins/visuals/filters.py +++ b/web/plugins/visuals/filters.py @@ -691,6 +691,8 @@ declare_filter(251, FilterTime("host", "host_last_check", _("Last host check"), declare_filter(253, FilterTime("comment", "comment_entry_time", _("Time of comment"), "comment_entry_time" )) declare_filter(253, FilterTime("downtime", "downtime_entry_time", _("Time when downtime was created"), "downtime_entry_time" )) declare_filter(254, FilterText("downtime_comment", _("Downtime comment"), "downtime", "downtime_comment", "downtime_comment", "~")) +declare_filter(255, FilterTime("downtime", "downtime_start_time", _("Start of downtime"), "downtime_start_time" )) + # _ # | | ___ __ _ # | | / _ \ / _` |

9 years, 1 month

Check_MK Git: check_mk: #2272 FIX mrpe: made UNKNOWN message more clear in case of an invalid state char

by Andreas Boesl

Module: check_mk Branch: master Commit: 865bb2b15e38df5d98dc60285b139eca601e0918 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=865bb2b15e38df… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon May 18 17:10:08 2015 +0200 #2272 FIX mrpe: made UNKNOWN message more clear in case of an invalid state char --- .werks/2272 | 9 +++++++++ ChangeLog | 1 + checks/mrpe | 17 ++++++++++------- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/.werks/2272 b/.werks/2272 new file mode 100644 index 0000000..dbe4b7e --- /dev/null +++ b/.werks/2272 @@ -0,0 +1,9 @@ +Title: mrpe: made UNKNOWN message more clear in case of an invalid state char +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1431961754 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 0ff2f45..fa42469 100644 --- a/ChangeLog +++ b/ChangeLog @@ -364,6 +364,7 @@ * 2266 FIX: windows agent: fixed invalid agent output if system memory exceeds 2TB RAM... * 2267 FIX: mk_db2.aix agent plugin: no longer throws an error when a db2 profile is not set up properly... * 2268 FIX: db2_tablespaces: no longer throws exception in checks when complete db2 instance vanishes + * 2272 FIX: mrpe: made UNKNOWN message more clear in case of an invalid state char Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/mrpe b/checks/mrpe index 2e63037..08ba534 100644 --- a/checks/mrpe +++ b/checks/mrpe @@ -57,7 +57,10 @@ def check_mrpe(item, params, info): else: check_name = None if line[0] == item: - state = int(line[1]) + try: + state = int(line[1]) + else: + state = None # convert to original format by joining and replacing \1 back with \n rest = " ".join(line[2:]).replace("\1", "\n") @@ -66,8 +69,8 @@ def check_mrpe(item, params, info): # First line: OUTPUT|PERFDATA parts = lines[0].split("|", 1) output = [parts[0].strip()] - if state not in [ 0, 1, 2, 3]: - output[0] = "Invalid plugin status %d. Output is: %s" % (state, output[0]) + if state == None or state not in [0, 1, 2, 3]: + output[0] = "Invalid plugin status %s. Output is: %s" % (state, output[0]) state = 3 if len(parts) > 1: perfdata = parts[1].strip().split() @@ -100,14 +103,14 @@ def check_mrpe(item, params, info): # name of check command needed for PNP to choose the correct template if check_name: perf_parsed.append(check_name) - best_result = state, "\\n".join(output), perf_parsed - best_state = state + best_result = state, "\\n".join(output), perf_parsed + best_state = state if best_state == None: - return (3, "Check output not found in output of MRPE") + return (3, "Check output not found in output of MRPE") else: - return best_result + return best_result check_info["mrpe"] = {

9 years, 1 month

← Newer
1
...
7
8
9
10
11
12
13
...
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2015