Checkmk git commits November 2015

checkmk-commits@lists.checkmk.com

8 participants
303 discussions

windows agent: better crash-log reporting if plugins/local checks fail

by Sebastian Herbord

Module: check_mk Branch: master Commit: 8fe77ca9f05b45750eb95e7e6e3af15701a0e253 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8fe77ca9f05b45… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Nov 2 15:38:28 2015 +0100 windows agent: better crash-log reporting if plugins/local checks fail --- agents/windows/check_mk_agent.cc | 20 +++++++++++++------- agents/windows/types.h | 1 + 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 85d086e..8eee31b 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -2361,7 +2361,6 @@ int launch_program(script_container* cont) AssignProcessToJobObject(cont->job_object, pi.hProcess); AssignProcessToJobObject(g_workers_job_object, pi.hProcess); - unsigned long exit=0; // process exit code unsigned long bread; // bytes read unsigned long avail; // bytes available @@ -2381,16 +2380,16 @@ int launch_program(script_container* cont) break; } - GetExitCodeProcess(pi.hProcess, &exit); // while the process is running + GetExitCodeProcess(pi.hProcess, &cont->exit_code); // while the process is running while (!buffer_full) { if (!with_stderr) { - PeekNamedPipe(read_stderr, buf, sizeof(buf), &bread, &avail, NULL); + PeekNamedPipe(read_stderr, buf, BUFFER_SIZE, &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); + ReadFile(read_stderr, buf, BUFFER_SIZE - 1, &bread, NULL); } - PeekNamedPipe(read_stdout, buf, sizeof(buf), &bread, &avail, NULL); + PeekNamedPipe(read_stdout, buf, BUFFER_SIZE, &bread, &avail, NULL); if (avail == 0) break; @@ -2417,12 +2416,13 @@ int launch_program(script_container* cont) } } if (buffer_full) { + crash_log("plugin produced more than 2MB output -> dropped"); // Buffer full -> delete incomplete data exit_code = 1; break; } - if (exit != STILL_ACTIVE) + if (cont->exit_code != STILL_ACTIVE) break; Sleep(10); @@ -2490,8 +2490,10 @@ void run_script_container(script_container *cont) // Return if this script is no longer present // However, the script container is preserved - if (!script_exists(cont)) + if (!script_exists(cont)) { + crash_log("script %s no longer exists", cont->script_path); return; + } time_t now = time(0); if (now - cont->buffer_time >= cont->max_age) { @@ -2505,6 +2507,7 @@ void run_script_container(script_container *cont) if (cont->worker_thread != INVALID_HANDLE_VALUE) CloseHandle(cont->worker_thread); + crash_log("invoke script %s", cont->script_path); cont->worker_thread = CreateThread( NULL, // default security attributes 0, // use default stack size @@ -2516,6 +2519,8 @@ void run_script_container(script_container *cont) if (cont->execution_mode == SYNC || (cont->execution_mode == ASYNC && g_config->defaultScriptAsyncExecution() == SEQUENTIAL)) WaitForSingleObject(cont->worker_thread, INFINITE); + + crash_log("finished with status %d (exit code %" PRIudword ")", cont->status, cont->exit_code); } } @@ -2528,6 +2533,7 @@ void output_external_programs(SOCKET &out, script_type type) { cont = it_cont->second; if (!script_exists(cont)) { + crash_log("script %s missing", cont->script_path); it_cont++; continue; } diff --git a/agents/windows/types.h b/agents/windows/types.h index 5249832..8fae8d4 100644 --- a/agents/windows/types.h +++ b/agents/windows/types.h @@ -142,6 +142,7 @@ struct script_container { volatile bool should_terminate; HANDLE worker_thread; HANDLE job_object; + DWORD exit_code; }; struct retry_config{

8 years, 8 months

windows agent: reliable utf-8 encoding of service names

by Sebastian Herbord

Module: check_mk Branch: master Commit: b9533d5b8ec34098d938cf36865660027e863475 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b9533d5b8ec340… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Nov 2 15:40:05 2015 +0100 windows agent: reliable utf-8 encoding of service names --- agents/windows/check_mk_agent.cc | 14 +++++++------- agents/windows/stringutil.cc | 25 +++++++++++++++++++++++++ agents/windows/stringutil.h | 2 ++ agents/windows/wmiHelper.cc | 22 ---------------------- 4 files changed, 34 insertions(+), 29 deletions(-) diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 8eee31b..6e57734 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -488,13 +488,13 @@ void section_df(SOCKET &out) // Determine the start type of a service. Unbelievable how much // code is needed for that... -const char *service_start_type(SC_HANDLE scm, LPCTSTR service_name) +const char *service_start_type(SC_HANDLE scm, LPCWSTR service_name) { // Query the start type of the service const char *start_type = "invalid1"; SC_HANDLE schService; LPQUERY_SERVICE_CONFIG lpsc; - schService = OpenService(scm, service_name, SERVICE_QUERY_CONFIG); + schService = OpenServiceW(scm, service_name, SERVICE_QUERY_CONFIG); if (schService) { start_type = "invalid2"; DWORD dwBytesNeeded, cbBufSize; @@ -533,16 +533,16 @@ void section_services(SOCKET &out) DWORD bytes_needed = 0; DWORD num_services = 0; // first determine number of bytes needed - EnumServicesStatusEx(scm, SC_ENUM_PROCESS_INFO, SERVICE_WIN32, SERVICE_STATE_ALL, + EnumServicesStatusExW(scm, SC_ENUM_PROCESS_INFO, SERVICE_WIN32, SERVICE_STATE_ALL, NULL, 0, &bytes_needed, &num_services, 0, 0); if (GetLastError() == ERROR_MORE_DATA && bytes_needed > 0) { BYTE *buffer = (BYTE *)malloc(bytes_needed); if (buffer) { - if (EnumServicesStatusEx(scm, SC_ENUM_PROCESS_INFO, SERVICE_WIN32, SERVICE_STATE_ALL, + if (EnumServicesStatusExW(scm, SC_ENUM_PROCESS_INFO, SERVICE_WIN32, SERVICE_STATE_ALL, buffer, bytes_needed, &bytes_needed, &num_services, 0, 0)) { - ENUM_SERVICE_STATUS_PROCESS *service = (ENUM_SERVICE_STATUS_PROCESS *)buffer; + ENUM_SERVICE_STATUS_PROCESSW *service = (ENUM_SERVICE_STATUS_PROCESSW*)buffer; for (unsigned i=0; i<num_services; i++) { DWORD state = service->ServiceStatusProcess.dwCurrentState; const char *state_name = "unknown"; @@ -567,9 +567,9 @@ void section_services(SOCKET &out) *w = '_'; } - output(out, "%s %s/%s %s\n", + output(out, "%ls %s/%s %s\n", service->lpServiceName, state_name, start_type, - service->lpDisplayName); + to_utf8(service->lpDisplayName).c_str()); service ++; } } diff --git a/agents/windows/stringutil.cc b/agents/windows/stringutil.cc index f6b0eef..04efb36 100644 --- a/agents/windows/stringutil.cc +++ b/agents/windows/stringutil.cc @@ -9,6 +9,9 @@ #endif +using std::string; + + char *lstrip(char *s) { while (isspace(*s)) @@ -151,6 +154,28 @@ int parse_boolean(char *value) } +string to_utf8(const wchar_t *input) +{ + string result; + // preflight: how many bytes to we need? + int required_size = WideCharToMultiByte(CP_UTF8, 0, input, -1, NULL, 0, NULL, NULL); + if (required_size == 0) { + // conversion failure. What to do? + return string(); + } + result.resize(required_size); + + // real conversion + WideCharToMultiByte(CP_UTF8, 0, input, -1, &result[0], required_size, NULL, NULL); + + // strip away the zero termination. This is necessary, otherwise the stored string length + // in the string is wrong + result.resize(required_size - 1); + + return result; +} + + bool ci_compare_pred(unsigned char lhs, unsigned char rhs) { return std::tolower(lhs) == std::tolower(rhs); diff --git a/agents/windows/stringutil.h b/agents/windows/stringutil.h index b000eb0..8c4376a 100644 --- a/agents/windows/stringutil.h +++ b/agents/windows/stringutil.h @@ -55,6 +55,8 @@ void lowercase(char *s); int parse_boolean(char *value); +std::string to_utf8(const wchar_t *input); + // case insensitive compare bool ci_equal(const std::string &lhs, const std::string &rhs); diff --git a/agents/windows/wmiHelper.cc b/agents/windows/wmiHelper.cc index 0b7fde5..f63067f 100644 --- a/agents/windows/wmiHelper.cc +++ b/agents/windows/wmiHelper.cc @@ -257,28 +257,6 @@ bool Result::next() } -string to_utf8(const wchar_t *input) -{ - string result; - // preflight: how many bytes to we need? - int required_size = WideCharToMultiByte(CP_UTF8, 0, input, -1, NULL, 0, NULL, NULL); - if (required_size == 0) { - // conversion failure. What to do? - return string(); - } - result.resize(required_size); - - // real conversion - WideCharToMultiByte(CP_UTF8, 0, input, -1, &result[0], required_size, NULL, NULL); - - // strip away the zero termination. This is necessary, otherwise the stored string length - // in the string is wrong - result.resize(required_size - 1); - - return result; -} - - template <> int Variant::get() { switch (_value.vt) {

8 years, 8 months

#2707 winperf_processor: can now be configured to warn if a single cpu core exceeds a utilization threshold for a while

by Sebastian Herbord

Module: check_mk Branch: master Commit: bbdeba4940607bea9bebeb3338d283e5651a5fe5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bbdeba4940607b… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Nov 2 14:44:34 2015 +0100 #2707 winperf_processor: can now be configured to warn if a single cpu core exceeds a utilization threshold for a while This is the same feature as werk #2529, now for windows hosts. --- .werks/2707 | 9 ++++++ ChangeLog | 1 + agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 829952 -> 830464 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 829952 -> 830464 bytes agents/windows/check_mk_agent.cc | 19 ++++++++----- agents/windows/check_mk_agent.exe | Bin 748032 -> 748544 bytes agents/windows/check_mk_agent.msi | Bin 1835520 -> 1837056 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 748032 -> 748544 bytes agents/windows/install_agent-64.exe | Bin 383088 -> 383220 bytes agents/windows/install_agent.exe | Bin 373956 -> 374150 bytes agents/windows/plugins/mk_dhcp_enabled.bat | 6 ++-- agents/windows/wmiHelper.cc | 32 ++++++++++++++++++++++ agents/windows/wmiHelper.h | 4 +++ checks/cpu_util.include | 19 ++++++++++++- checks/winperf_processor | 2 +- web/plugins/wato/check_parameters.py | 15 ++++++++++ 17 files changed, 96 insertions(+), 13 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=bbdeba4940…

8 years, 8 months

Fixed exception when switching to localized GUI

by Lars Michelsen

Module: check_mk Branch: master Commit: f9c68951cd196739479c3b41c21f3276778b3ccc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f9c68951cd1967… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 2 14:31:25 2015 +0100 Fixed exception when switching to localized GUI --- web/htdocs/i18n.py | 2 +- web/htdocs/wato.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/htdocs/i18n.py b/web/htdocs/i18n.py index 1fedc7c..cef85e8 100644 --- a/web/htdocs/i18n.py +++ b/web/htdocs/i18n.py @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import __builtin__, os +import __builtin__, os, gettext import defaults #. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 8778a59..9ae4a62 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -120,7 +120,7 @@ from hashlib import sha256 from lib import * from valuespec import * import forms -import modules +import modules as multisite_modules class MKAutomationException(Exception): @@ -16865,7 +16865,7 @@ def page_user_profile(change_pw=False): # load the new language i18n.localize(config.get_language()) - modules.load_all_plugins() + multisite_modules.load_all_plugins() user = users.get(config.user_id) if config.may('general.edit_notifications') and user.get("notifications_enabled"):

8 years, 8 months

Fixed ancient bug caused by typo.

by Sven Panne

Module: check_mk Branch: master Commit: 73ab1fff7fd0caad7b05e09d33ed7b35230138db URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=73ab1fff7fd0ca… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Nov 2 14:21:40 2015 +0100 Fixed ancient bug caused by typo. --- livestatus/src/ServicelistColumnFilter.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/livestatus/src/ServicelistColumnFilter.cc b/livestatus/src/ServicelistColumnFilter.cc index ce7a8b2..4883ceb 100644 --- a/livestatus/src/ServicelistColumnFilter.cc +++ b/livestatus/src/ServicelistColumnFilter.cc @@ -57,7 +57,7 @@ bool ServicelistColumnFilter::accepts(void *data) servicesmember *mem = _servicelist_column->getMembers(data); // test for empty list - if (abs(_opid == OP_EQUAL) && _ref_host == "") + if (abs(_opid) == OP_EQUAL && _ref_host == "") return (mem == 0) == (_opid == OP_EQUAL); bool is_member = false;

8 years, 8 months

Removed/ifdef'd unused private fields.

by Sven Panne

Module: check_mk Branch: master Commit: cb0d96a4ad2fbf904c8d0f440b826b2c90808446 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb0d96a4ad2fbf… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Nov 2 14:06:13 2015 +0100 Removed/ifdef'd unused private fields. --- livestatus/src/Logfile.cc | 3 ++- livestatus/src/Logfile.h | 4 ++-- livestatus/src/OffsetStringMacroColumn.h | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/livestatus/src/Logfile.cc b/livestatus/src/Logfile.cc index 86fb5bb..055c0c8 100644 --- a/livestatus/src/Logfile.cc +++ b/livestatus/src/Logfile.cc @@ -46,9 +46,10 @@ Logfile::Logfile(const char *path, bool watch) : _path(strdup(path)) , _since(0) , _watch(watch) - , _inode(0) , _lineno(0) +#ifdef CMC , _world(0) +#endif , _logclasses_read(0) { int fd = open(path, O_RDONLY); diff --git a/livestatus/src/Logfile.h b/livestatus/src/Logfile.h index 74803d9..3b77213 100644 --- a/livestatus/src/Logfile.h +++ b/livestatus/src/Logfile.h @@ -47,14 +47,14 @@ private: char *_path; time_t _since; // time of first entry bool _watch; // true only for current logfile - ino_t _inode; // needed to detect switching fpos_t _read_pos; // read until this position uint32_t _lineno; // read until this line logfile_entries_t _entries; char _linebuffer[MAX_LOGLINE]; +#ifdef CMC World *_world; // CMC: world our references point into - +#endif public: Logfile(const char *path, bool watch); diff --git a/livestatus/src/OffsetStringMacroColumn.h b/livestatus/src/OffsetStringMacroColumn.h index 341f3da..8c218ae 100644 --- a/livestatus/src/OffsetStringMacroColumn.h +++ b/livestatus/src/OffsetStringMacroColumn.h @@ -30,7 +30,6 @@ class OffsetStringMacroColumn : public OffsetStringColumn { - int _offset; public: OffsetStringMacroColumn(string name, string description, int offset, int indirect_offset = -1) : OffsetStringColumn(name, description, offset, indirect_offset) {}

8 years, 8 months

The struct/class tags should better match...

by Sven Panne

Module: check_mk Branch: master Commit: 8964cfedfa4db9165ed3eadd62c2278658edfc36 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8964cfedfa4db9… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Nov 2 13:53:54 2015 +0100 The struct/class tags should better match... --- livestatus/src/Logfile.h | 2 +- livestatus/src/TableDownComm.h | 2 +- livestatus/src/TableStateHistory.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/livestatus/src/Logfile.h b/livestatus/src/Logfile.h index bc2d7a1..74803d9 100644 --- a/livestatus/src/Logfile.h +++ b/livestatus/src/Logfile.h @@ -34,7 +34,7 @@ using namespace std; #define MAX_LOGLINE 65536 -class LogEntry; +struct LogEntry; class Query; class LogCache; class World; diff --git a/livestatus/src/TableDownComm.h b/livestatus/src/TableDownComm.h index 0b40d29..9cbb3ca 100644 --- a/livestatus/src/TableDownComm.h +++ b/livestatus/src/TableDownComm.h @@ -31,7 +31,7 @@ #include "Table.h" #include "nagios.h" -class DowntimeOrComment; +struct DowntimeOrComment; class TableHosts; class TableContacts; class TableServices; diff --git a/livestatus/src/TableStateHistory.h b/livestatus/src/TableStateHistory.h index 3cdcdcf..50ad2a5 100644 --- a/livestatus/src/TableStateHistory.h +++ b/livestatus/src/TableStateHistory.h @@ -37,7 +37,7 @@ #define CLASSMASK_STATEHIST 0xC6 -class HostServiceState; +struct HostServiceState; class TableStateHistory : public Table {

8 years, 8 months

Updated bug entries #2385

by Mathias Kettner

Module: check_mk Branch: master Commit: 5c8e87c8e0ad162372a1164580beaa4d85ccdaec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c8e87c8e0ad16… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 2 11:11:56 2015 +0100 Updated bug entries #2385 --- .bugs/2385 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.bugs/2385 b/.bugs/2385 new file mode 100644 index 0000000..7135b9f --- /dev/null +++ b/.bugs/2385 @@ -0,0 +1,8 @@ +Title: Resize of sidebar while zooming not working on all versions of Chromium browser +Component: multisite +State: open +Date: 2015-11-02 11:10:57 +Targetversion: future +Class: bug + +This happens on Ubuntu 14.04 with Version 44.0.2403.89 Ubuntu 14.04 (64-bit).

8 years, 8 months

#2445 FIX ibm_svc_disks: fixed crash in case special agent reports too much data columns per line

by Andreas Boesl

Module: check_mk Branch: master Commit: f2e4012fceca89bd3741e8d068482794012df08c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f2e4012fceca89… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Nov 2 10:19:37 2015 +0100 #2445 FIX ibm_svc_disks: fixed crash in case special agent reports too much data columns per line --- .werks/2445 | 9 +++++++++ ChangeLog | 1 + checks/ibm_svc_disks | 9 +++++++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.werks/2445 b/.werks/2445 new file mode 100644 index 0000000..c69cc1e --- /dev/null +++ b/.werks/2445 @@ -0,0 +1,9 @@ +Title: ibm_svc_disks: fixed crash in case special agent reports too much data columns per line +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1446455633 + diff --git a/ChangeLog b/ChangeLog index f9e481b..e8372b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -36,6 +36,7 @@ * 1297 FIX: emcvnx_hba: Prevent old emc versions from inventory... * 2698 FIX: ups_capacity: fixed missing battery time and fuel information * 2672 FIX: mounts: ignore options that are allowed to change on btrfs filesystems... + * 2445 FIX: ibm_svc_disks: fixed crash in case special agent reports too much data columns per line Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/ibm_svc_disks b/checks/ibm_svc_disks index a26ba40..7fb028b 100644 --- a/checks/ibm_svc_disks +++ b/checks/ibm_svc_disks @@ -48,14 +48,19 @@ # 18:online::member:sas_hdd:558.4GB:16:V7BRZ_mdisk19:2:1:6:: # 19:online::member:sas_hdd:558.4GB:16:V7BRZ_mdisk19:1:1:5:: +# newer versions report an additional column +# 0:online::member:sas_hdd:558.4GB:7:V7RZ_mdisk8:4:1:24:::inactive +# 1:online::member:sas_hdd:558.4GB:7:V7RZ_mdisk8:3:1:23:::inactive + def inventory_ibm_svc_disks(info): return [ (None, {}) ] def check_ibm_svc_disks(_no_item, params, info): disks = [] - for did, status, error_sequence_number, use, tech_type,\ + for line in info: + did, status, error_sequence_number, use, tech_type,\ capacity, mdisk_id, mdisk_name, member_id, enclosure_id,\ - slot_id, node_id, node_name in info: + slot_id, node_id, node_name = line[:13] disk = {} disk['identifier'] = "Enclosure: %s, Slot: %s, Type: %s" % ( enclosure_id, slot_id, tech_type ) if capacity.endswith('GB'):

8 years, 8 months

#2720 nullmailer_mailq: New check for monitoring the outgoing mail queue of Nullmailer

by Lars Michelsen

Module: check_mk Branch: master Commit: bd01cab593b7aecf7b7956de4d50729821bd4c39 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd01cab593b7ae… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 2 10:59:49 2015 +0100 #2720 nullmailer_mailq: New check for monitoring the outgoing mail queue of Nullmailer This check monitors the number of mails in the deferred / outgoing mail queue of the Nullmailer daemon. --- .werks/2720 | 10 ++++++ ChangeLog | 1 + agents/check_mk_agent.linux | 12 +++++-- checkman/nullmailer_mailq | 22 ++++++++++++ checks/nullmailer_mailq | 79 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 122 insertions(+), 2 deletions(-) diff --git a/.werks/2720 b/.werks/2720 new file mode 100644 index 0000000..6184753 --- /dev/null +++ b/.werks/2720 @@ -0,0 +1,10 @@ +Title: nullmailer_mailq: New check for monitoring the outgoing mail queue of Nullmailer +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1446458345 +Class: feature + +This check monitors the number of mails in the deferred / outgoing mail queue of +the Nullmailer daemon. diff --git a/ChangeLog b/ChangeLog index f9e481b..feb388e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ NOTE: Please refer to the migration notes! * 2441 NetApp 7Mode: Now able to monitor reserved snapshot space for volumes * 2444 lnx_if: now able to detect interfaces which "break" during runtime... + * 2720 nullmailer_mailq: New check for monitoring the outgoing mail queue of Nullmailer... * 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 d8f2488..84071c8 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -507,8 +507,7 @@ if type cl_status > /dev/null 2>&1; then fi # Postfix mailqueue monitoring -# -# we determine the number of mails and their size in several postfix mail queues +# Determine the number of mails and their size in several postfix mail queues if type postconf >/dev/null ; then postfix_queue_dir=$(postconf -h queue_directory 2>/dev/null) @@ -533,6 +532,15 @@ then qmail-qstat fi +# Nullmailer queue monitoring +if type nullmailer-send >/dev/null && [ -d /var/spool/nullmailer/queue ] +then + echo '<<<nullmailer_mailq>>>' + COUNT=$(find /var/spool/nullmailer/queue -type f | wc -l) + SIZE=$(du -s /var/spool/nullmailer/queue | awk '{print $1 }') + echo "$SIZE $COUNT" +fi + # Check status of OMD sites and Check_MK Notification spooler if type omd >/dev/null then diff --git a/checkman/nullmailer_mailq b/checkman/nullmailer_mailq new file mode 100644 index 0000000..a88fb22 --- /dev/null +++ b/checkman/nullmailer_mailq @@ -0,0 +1,22 @@ +title: Length of the nullmailer mailqueue +agents: linux +catalog: app/nullmailer +license: GPL +distribution: check_mk +description: + + This check monitors the number of deferred mails in the outgoing mail + queue, as sent by the linux agent of Check_MK. + + This check creates one service per host which represents the state + of the outgoing mailqueue. + + The check will result in WARNING/CRITICAL states when the number of items + in the queues have reached the defined thresholds. + +perfdata: + Two variables for each queue: the number of messages and the + total size of the messages in the queue in bytes. + +inventory: + On each system which provides the {nullmailer-send} command one service is created. diff --git a/checks/nullmailer_mailq b/checks/nullmailer_mailq new file mode 100644 index 0000000..7c9f5b2 --- /dev/null +++ b/checks/nullmailer_mailq @@ -0,0 +1,79 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +# Example agent output: +# <<<nullmailer_mailq>>> +# 8 1 + +factory_settings['nullmailer_mailq_default_levels'] = { + "deferred" : (10, 20), +} + +def inventory_nullmailer_mailq(info): + return [(None, {})] + +def check_nullmailer_mailq(_no_item, params, info): + if type(params) != dict: + params = { + "deferred" : params, + } + + if not info: + return + + warn, crit = params["deferred"] + size_bytes, length = map(int, info[0]) + + state = 0 + output = "" + perfdata = [ ("length", length), ("size", size_bytes) ] + + if length == 0: + output = "Mailqueue is empty" + else: + output = "Mailqueue length is %d" % length + + if length >= crit: + state = 2 + elif length >= warn: + state = 1 + if state: + output += " (warn/crit at %d/%d)" % (warn, crit) + + if length != 0: + output += " having a size of %s" % \ + (get_bytes_human_readable(size_bytes)) + + return state, output, perfdata + +check_info["nullmailer_mailq"] = { + 'check_function' : check_nullmailer_mailq, + 'inventory_function' : inventory_nullmailer_mailq, + 'service_description' : 'Nullmailer Queue', + 'default_levels_variable' : 'nullmailer_mailq_default_levels', + 'group' : 'mailqueue_length', + 'has_perfdata' : True, +}

8 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2015