Checkmk git commits December 2015

checkmk-commits@lists.checkmk.com

8 participants
193 discussions

windows agent: made realtime port configurable

by Sebastian Herbord

Module: check_mk Branch: master Commit: b3196b156e5866c94da5439fafa1cd93d0b4de56 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b3196b156e5866… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Dec 17 08:42:39 2015 +0100 windows agent: made realtime port configurable --- agents/windows/Configuration.cc | 6 ++++++ agents/windows/Configuration.h | 2 ++ agents/windows/check_mk_agent.cc | 9 +++++---- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/agents/windows/Configuration.cc b/agents/windows/Configuration.cc index 9065f9c..0ecf790 100644 --- a/agents/windows/Configuration.cc +++ b/agents/windows/Configuration.cc @@ -36,12 +36,14 @@ static const int CHECK_MK_AGENT_PORT = 6556; +static const int REALTIME_DEFAULT_PORT = 6559; Configuration::Configuration(const Environment &env) : _enabled_sections(0xffffffff) , _realtime_sections(0x0) , _port(CHECK_MK_AGENT_PORT) + , _realtime_port(REALTIME_DEFAULT_PORT) , _default_script_execution_mode(SYNC) , _default_script_async_execution(SEQUENTIAL) , _passphrase() @@ -118,6 +120,10 @@ bool Configuration::handleGlobalConfigVariable(char *var, char *value) _port = atoi(value); return true; } + else if (!strcmp(var, "realtime_port")) { + _realtime_port = atoi(value); + return true; + } else if (!strcmp(var, "ipv6")) { int s = parse_boolean(value); _support_ipv6 = s != 0; diff --git a/agents/windows/Configuration.h b/agents/windows/Configuration.h index 474e22b..171b041 100644 --- a/agents/windows/Configuration.h +++ b/agents/windows/Configuration.h @@ -70,6 +70,7 @@ public: unsigned long realtimeSections(); int port() const { return _port; } + int realtimePort() const { return _realtime_port; } bool crashDebug() const { return _crash_debug; } bool logwatchSendInitialEntries() const { return _logwatch_send_initial_entries; } @@ -169,6 +170,7 @@ private: unsigned long _realtime_sections; int _port; + int _realtime_port; script_execution_mode _default_script_execution_mode; script_async_execution _default_script_async_execution; diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 948c560..d600bbe 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -3143,6 +3143,7 @@ struct ThreadData { Mutex mutex; }; + DWORD WINAPI realtime_check_func(void *data_in) { ThreadData *data = (ThreadData*)data_in; @@ -3175,14 +3176,14 @@ DWORD WINAPI realtime_check_func(void *data_in) if (current_address.ss_family != 0) { current_socket = socket(current_address.ss_family, SOCK_DGRAM, IPPROTO_UDP); if (current_socket == INVALID_SOCKET) { - printf("failed to establish socket: %d\n", (int)::WSAGetLastError()); + crash_log("failed to establish socket: %d", (int)::WSAGetLastError()); return 1; } int sockaddr_size = 0; if (current_address.ss_family == AF_INET) { sockaddr_in *addrv4 = (sockaddr_in*)&current_address; - addrv4->sin_port = htons(6558); + addrv4->sin_port = htons(g_config->realtimePort()); sockaddr_size = sizeof(sockaddr_in); } else { sockaddr_in6 *addrv6 = (sockaddr_in6*)&current_address; @@ -3195,14 +3196,14 @@ DWORD WINAPI realtime_check_func(void *data_in) addrv6->sin6_addr.u.Byte[i + 1] = temp; } - addrv6->sin6_port = htons(6558); + addrv6->sin6_port = htons(g_config->realtimePort()); sockaddr_size = sizeof(sockaddr_in6); } current_ip = ListenSocket::readableIP(&current_address); if (connect(current_socket, (const sockaddr*)&current_address, sockaddr_size) == SOCKET_ERROR) { - crash_log("failed to connect: %d\n", (int)::WSAGetLastError()); + crash_log("failed to connect: %d", (int)::WSAGetLastError()); closesocket(current_socket); current_socket = INVALID_SOCKET; }

8 years, 9 months

windows agent: each section can now be flushed to socket individually

by Sebastian Herbord

Module: check_mk Branch: master Commit: b01536a45b5847e4db50b39658c5afbd1a3f167b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b01536a45b5847… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Dec 17 09:12:04 2015 +0100 windows agent: each section can now be flushed to socket individually and crash_log remains open between requests so that realtime updates can log as well. --- agents/windows/Configuration.cc | 16 +++++ agents/windows/check_mk_agent.cc | 135 ++++++++++++++++++++++++-------------- agents/windows/logging.cc | 18 ++--- 3 files changed, 113 insertions(+), 56 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b01536a45b…

8 years, 9 months

windows agent: a few bugfixes to realtime updating and added section ids for the now individual winperf sections

by Sebastian Herbord

Module: check_mk Branch: master Commit: 8225e3daba7d8acbb1d66efd7e7725e40b195369 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8225e3daba7d8a… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Dec 17 09:19:34 2015 +0100 windows agent: a few bugfixes to realtime updating and added section ids for the now individual winperf sections --- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 885248 -> 886784 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 885248 -> 886784 bytes agents/windows/check_mk_agent.cc | 22 +++++++--- agents/windows/check_mk_agent.exe | Bin 806400 -> 808448 bytes agents/windows/check_mk_agent.msi | Bin 1950720 -> 1954304 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 806400 -> 808448 bytes agents/windows/install_agent-64.exe | Bin 405382 -> 406153 bytes agents/windows/install_agent.exe | Bin 396250 -> 396979 bytes agents/windows/types.h | 50 +++++++++++++--------- 10 files changed, 45 insertions(+), 29 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index a6905f8..e3c00fd 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -999 +1042 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index ae7e1e9..d638b86 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 aa111b2..f1783a4 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 5fca2d5..0e81382 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -65,6 +65,7 @@ #include <vector> #include <string> #include <algorithm> +#include <sys/time.h> #include "stringutil.h" #include "Environment.h" #include "Configuration.h" @@ -91,7 +92,7 @@ const char *check_mk_version = CHECK_MK_VERSION; -static const char RT_PROTOCOL_VERSION[2] = { 0x00, 0x00 }; +static const char RT_PROTOCOL_VERSION[2] = { '0', '0' }; #define SERVICE_NAME "Check_MK_Agent" #define KiloByte 1024 @@ -3145,15 +3146,21 @@ DWORD WINAPI realtime_check_func(void *data_in) static const size_t TARGET_DATAGRAM_SIZE = 65507L - 1000L; EncryptingBufferedSocketProxy out(INVALID_SOCKET, g_config->passphrase(), TARGET_DATAGRAM_SIZE); - time_t before = time(NULL); + timeval before; + gettimeofday(&before, 0); while (!data->terminate) { - // wait for 1 second minus the time the last iteration took - // do we need a more precise time here? - ::Sleep(1000 - (time(NULL) - before)); - before = time(NULL); + timeval now; + gettimeofday(&now, 0); + long duration = (now.tv_sec - before.tv_sec) * 1000 + + (now.tv_usec - before.tv_usec) / 1000; + if (duration < 1000) { + ::Sleep(1000 - duration); + } + gettimeofday(&before, 0); + MutexLock guard(data->mutex); // adhere to the configured timeout - if (before < data->push_until) { + if (time(NULL) < data->push_until) { // if a new request was made, reestablish the connection if (data->new_request) { data->new_request = false; @@ -3270,6 +3277,7 @@ void do_adhoc(const Environment &env) : "inactive"); if (g_config->useRealtimeMonitoring() != 0) { + thread_data.terminate = false; realtime_checker.start(); } diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 6ac44f2..c6776a6 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 bf36970..3845bca 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 b2b9b19..d6fa563 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 d5252b6..31c305e 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 9089dfe..bcfe2f4 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/types.h b/agents/windows/types.h index 300b8ce..af9e241 100644 --- a/agents/windows/types.h +++ b/agents/windows/types.h @@ -48,31 +48,39 @@ #endif -static const unsigned int SECTION_CHECK_MK = 0x00000001; -static const unsigned int SECTION_UPTIME = 0x00000002; -static const unsigned int SECTION_DF = 0x00000004; -static const unsigned int SECTION_PS = 0x00000008; -static const unsigned int SECTION_MEM = 0x00000010; -static const unsigned int SECTION_SERVICES = 0x00000020; -static const unsigned int SECTION_WINPERF = 0x00000040; -static const unsigned int SECTION_LOGWATCH = 0x00000080; -static const unsigned int SECTION_SYSTEMTIME = 0x00000100; -static const unsigned int SECTION_PLUGINS = 0x00000200; -static const unsigned int SECTION_LOCAL = 0x00000400; -static const unsigned int SECTION_SPOOL = 0x00000800; -static const unsigned int SECTION_MRPE = 0x00001000; -static const unsigned int SECTION_FILEINFO = 0x00002000; -static const unsigned int SECTION_LOGFILES = 0x00004000; -static const unsigned int SECTION_CRASHLOG = 0x00008000; -static const unsigned int SECTION_CPU = 0x00010000; -static const unsigned int SECTION_EXCHANGE = 0x00020000; -static const unsigned int SECTION_WEBSERVICES = 0x00040000; -static const unsigned int SECTION_DOTNET = 0x00080000; +static const unsigned int SECTION_CHECK_MK = 0x00000001; +static const unsigned int SECTION_UPTIME = 0x00000002; +static const unsigned int SECTION_DF = 0x00000004; +static const unsigned int SECTION_PS = 0x00000008; +static const unsigned int SECTION_MEM = 0x00000010; +static const unsigned int SECTION_SERVICES = 0x00000020; +// 0x40 up for grabs +static const unsigned int SECTION_LOGWATCH = 0x00000080; +static const unsigned int SECTION_SYSTEMTIME = 0x00000100; +static const unsigned int SECTION_PLUGINS = 0x00000200; +static const unsigned int SECTION_LOCAL = 0x00000400; +static const unsigned int SECTION_SPOOL = 0x00000800; +static const unsigned int SECTION_MRPE = 0x00001000; +static const unsigned int SECTION_FILEINFO = 0x00002000; +static const unsigned int SECTION_LOGFILES = 0x00004000; +static const unsigned int SECTION_CRASHLOG = 0x00008000; +static const unsigned int SECTION_CPU = 0x00010000; +static const unsigned int SECTION_EXCHANGE = 0x00020000; +static const unsigned int SECTION_WEBSERVICES = 0x00040000; +static const unsigned int SECTION_DOTNET = 0x00080000; +static const unsigned int SECTION_WINPERF_IF = 0x00100000; +static const unsigned int SECTION_WINPERF_CPU = 0x00200000; +static const unsigned int SECTION_WINPERF_PHYDISK = 0x00400000; +static const unsigned int SECTION_WINPERF_CONFIG = 0x00800000; +static const unsigned int SECTION_WINPERF = SECTION_WINPERF_IF + | SECTION_WINPERF_CPU + | SECTION_WINPERF_PHYDISK + | SECTION_WINPERF_CONFIG; static const unsigned int VALID_REALTIME_SECTIONS = SECTION_MEM | SECTION_DF - | SECTION_WINPERF; + | SECTION_WINPERF_CPU; // Needed for only_from struct ipspec {

8 years, 9 months

ibm_imm_temp: Not longer add sensors without reading

by Bastian Kuhn

Module: check_mk Branch: master Commit: c95d5edbcc8f53e6845453a368bb33250e681595 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c95d5edbcc8f53… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Dec 16 16:08:51 2015 +0100 ibm_imm_temp: Not longer add sensors without reading --- checks/ibm_imm_temp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/checks/ibm_imm_temp b/checks/ibm_imm_temp index 32efd1c..e62ef02 100644 --- a/checks/ibm_imm_temp +++ b/checks/ibm_imm_temp @@ -26,7 +26,8 @@ def inventory_ibm_imm_temp(info): for line in info: - yield line[0], {} + if line[1] != '0': + yield line[0], {} def check_ibm_imm_temp(item, params, info): for line in info:

8 years, 9 months

#2817 cmc_temp: New temperature check for Rittal devices using the CMC MIB

by Andreas Boesl

Module: check_mk Branch: master Commit: ec4d9b1aaae1abdd58bf07b2160e986bacd7465b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec4d9b1aaae1ab… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Dec 16 16:00:54 2015 +0100 #2817 cmc_temp: New temperature check for Rittal devices using the CMC MIB --- .werks/2817 | 9 +++++++++ ChangeLog | 1 + checkman/cmc_temp | 19 ++++++++++++++++++ checks/cmc_temp | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 86 insertions(+) diff --git a/.werks/2817 b/.werks/2817 new file mode 100644 index 0000000..bc8f20f --- /dev/null +++ b/.werks/2817 @@ -0,0 +1,9 @@ +Title: cmc_temp: New temperature check for Rittal devices using the CMC MIB +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1450278026 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index cf852c5..57fc82e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -66,6 +66,7 @@ * 2812 Avaya Series 88xx / 45xx: New temperature, fan and CPU utilization checks... * 2870 dotnet_clrmemory, wmi_cpuload, wmi_webservices, msexch_activesync, msexch_autodiscovery, msexch_availability, msexch_isstore, msexch_owa, msexch_rpcclientaccess: a whole slew of new checks relating to monitoring MS Exchange... * 2816 check_mail_loop: now supports STARTTLS for IMAP authentification + * 2817 cmc_temp: New temperature check for Rittal devices using the CMC MIB * 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/checkman/cmc_temp b/checkman/cmc_temp new file mode 100644 index 0000000..2d171bc --- /dev/null +++ b/checkman/cmc_temp @@ -0,0 +1,19 @@ +title: Rittal CMC: Temperature +agents: snmp +catalog: hw/environment/rittal +license: GPL +distribution: check_mk +description: + This check monitors the temperature levels of Rittal devices + supporting the CMC MIB. The temperature levels can be configured (default to 45, 50). + The configured levels on the device can also get taken into account. + +item: + The sensor number: "1" or "2". + +perfdata: + One variable: the current temperature in degrees celsius. + +inventory: + There are always two temperature sensors detected. Creates one service for each sensor. + diff --git a/checks/cmc_temp b/checks/cmc_temp new file mode 100644 index 0000000..cf02e5f --- /dev/null +++ b/checks/cmc_temp @@ -0,0 +1,57 @@ +#!/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. + + +# [[[u'26', u'26']], [[u'45', u'15', u'45', u'15']]] + +factory_settings["cmc_temp_default_levels"] = { + "levels" : (45, 50), +} + +def inventory_cmc_temp(info): + # There are always two sensors + return [("1", {}), ("2", {})] + +def check_cmc_temp(item, params, info): + offset = int(item) - 1 + current_temp = int(info[0][0][offset]) + dev_high, dev_low = map(int, info[1][0][offset * 2:][:2]) + return check_temperature(current_temp, params, dev_levels = (dev_high, dev_high), + dev_levels_lower = (dev_low, dev_low)) + +check_info['cmc_temp'] = { + "inventory_function" : inventory_cmc_temp, + "check_function" : check_cmc_temp, + "has_perfdata" : True, + "group" : "temperature", + "default_levels_variable": "cmc_temp_default_levels", + "service_description" : "Temperature Sensor %s", + "snmp_scan_function" : lambda oid: ".1.3.6.1.4.1.2606.1" in oid(".1.3.6.1.2.1.1.2.0"), + # valueTemperature1, valueTemperature2 + "snmp_info" : [(".1.3.6.1.4.1.2606.1.1", [ 1, 2 ]), + # setpointHighTemperature1, setpointLowTemperature1, setpointHighTemperature2, setpointLowTemperature2 + (".1.3.6.1.4.1.2606.1.4", [4, 5, 6, 7])] +}

8 years, 9 months

#2816 check_mail_loop: now supports STARTTLS for IMAP authentification

by Andreas Boesl

Module: check_mk Branch: master Commit: 4fb090fa0f2c617c42a0509c9593f70ac856d6a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4fb090fa0f2c61… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Dec 16 15:25:16 2015 +0100 #2816 check_mail_loop: now supports STARTTLS for IMAP authentification --- .werks/2816 | 9 ++++++++ ChangeLog | 1 + checks/check_mail_loop | 3 +++ doc/treasures/active_checks/check_mail_loop | 33 +++++++++++++++++++++++++-- web/plugins/wato/active_checks.py | 6 ++++- 5 files changed, 49 insertions(+), 3 deletions(-) diff --git a/.werks/2816 b/.werks/2816 new file mode 100644 index 0000000..0c13af0 --- /dev/null +++ b/.werks/2816 @@ -0,0 +1,9 @@ +Title: check_mail_loop: now supports STARTTLS for IMAP authentification +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1450275857 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 63416cd..cf852c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -65,6 +65,7 @@ * 2885 cisco_hsrp: now reports the HSRP state... * 2812 Avaya Series 88xx / 45xx: New temperature, fan and CPU utilization checks... * 2870 dotnet_clrmemory, wmi_cpuload, wmi_webservices, msexch_activesync, msexch_autodiscovery, msexch_availability, msexch_isstore, msexch_owa, msexch_rpcclientaccess: a whole slew of new checks relating to monitoring MS Exchange... + * 2816 check_mail_loop: now supports STARTTLS for IMAP authentification * 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/checks/check_mail_loop b/checks/check_mail_loop index 5bdedd3..d8bb23b 100644 --- a/checks/check_mail_loop +++ b/checks/check_mail_loop @@ -32,6 +32,9 @@ def check_mail_loop_arguments(params): else: args += ' --smtp-server=$HOSTADDRESS$' + if 'imap_tls' in params: + args += ' --imap-tls' + if 'smtp_tls' in params: args += ' --smtp-tls' diff --git a/doc/treasures/active_checks/check_mail_loop b/doc/treasures/active_checks/check_mail_loop index 2f677de..6c635b5 100755 --- a/doc/treasures/active_checks/check_mail_loop +++ b/doc/treasures/active_checks/check_mail_loop @@ -51,6 +51,7 @@ OPTIONS: (leave empty for anonymous SMTP) --smtp-password PW Password to authenticate SMTP --smtp-tls Use TLS over SMTP (disabled by default) + --imap-tls Use TLS for IMAP authentification (disabled by default) --fetch-protocol PROTO Set to "IMAP" or "POP3", depending on your mailserver (defaults to IMAP) @@ -92,7 +93,7 @@ OPTIONS: short_options = 'dh' long_options = ['smtp-server=', 'smtp-port=', 'smtp-username=', 'smtp-password=', - 'smtp-tls', 'fetch-protocol=', 'fetch-server=', 'fetch-port=', 'fetch-username=', + 'smtp-tls', 'fetch-tls', 'fetch-protocol=', 'fetch-server=', 'fetch-port=', 'fetch-username=', 'fetch-password=', 'fetch-ssl', 'mail-from=', 'mail-to=', 'warning=', 'critical=', 'connect-timeout=', 'delete-messages', 'help', 'status-dir=', 'status-suffix=', "debug", ] @@ -119,6 +120,7 @@ fetch_port = None fetch_user = None fetch_pass = None fetch_ssl = False +imap_tls = False mail_from = None mail_to = None warning = None @@ -153,6 +155,8 @@ for o,a in opts: fetch_user = a elif o == '--fetch-password': fetch_pass = a + elif o == '--imap-tls': + imap_tls = True elif o == '--fetch-ssl': fetch_ssl = True elif o == '--mail-from': @@ -220,6 +224,22 @@ def save_expected_mails(): lines.append('%d %s' % (ts, key)) file(status_path, 'w').write('\n'.join(lines) + '\n') +def add_starttls_support(self, keyfile = None, certfile = None): + import ssl + name = "STARTTLS" + typ, dat = self._simple_command(name) + if typ != 'OK': + raise self.error(dat[-1]) + + self.sock = ssl.wrap_socket(self.sock) + self.file = self.sock.makefile() + + cap = 'CAPABILITY' + self._simple_command(cap) + if not cap in self.untagged_responses: + raise self.error('no CAPABILITY response from server') + self.capabilities = tuple(self.untagged_responses[cap][-1].upper().split()) + def fetch_mails(): global g_M if not g_expected: @@ -244,7 +264,16 @@ def fetch_mails(): else: # Get mails from IMAP mailbox fetch_class = fetch_ssl and imaplib.IMAP4_SSL or imaplib.IMAP4 - g_M = fetch_class(fetch_server, fetch_port) + + if imap_tls: + # starttls in imaplib is only available with python >= 3.2 + # we are going to implement our own version + imaplib.Commands.update({"STARTTLS": ("NONAUTH")}) + g_M = imaplib.IMAP4(fetch_server, fetch_port) + add_starttls_support(g_M) + else: + g_M = fetch_class(fetch_server, fetch_port) + g_M.login(fetch_user, fetch_pass) g_M.select('INBOX', readonly=False) # select INBOX retcode, messages = g_M.search(None, 'NOT', 'DELETED') diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 8f798f7..b8554f7 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -1744,7 +1744,7 @@ register_rule(group, 'the SMTP protocol and then tries to receive these mails back by querying the ' 'inbox of a IMAP or POP3 mailbox. With this check you can verify that your whole ' 'mail delivery progress is working.'), - optional_keys = ['smtp_server', 'smtp_tls', 'smtp_port', 'smtp_auth', 'connect_timeout', 'delete_messages', 'duration'], + optional_keys = ['smtp_server', 'smtp_tls', 'smtp_port', 'smtp_auth', 'imap_tls', 'connect_timeout', 'delete_messages', 'duration'], elements = [ ('item', TextUnicode( title = _('Name'), @@ -1761,6 +1761,10 @@ register_rule(group, title = _('Use TLS over SMTP'), totext = _('Encrypt SMTP communication using TLS'), )), + ('imap_tls', FixedValue(True, + title = _('Use TLS for IMAP authentification'), + totext = _('IMAP authentification uses TLS'), + )), ('smtp_port', Integer( title = _('SMTP TCP Port to connect to'), help = _('The TCP Port the SMTP server is listening on. Defaulting to <tt>25</tt>.'),

8 years, 9 months

New valuespec for Check_MK version numbers

by Mathias Kettner

Module: check_mk Branch: master Commit: 080cc2641fad78a599ab23859d8f4789be80f27f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=080cc2641fad78… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 16 14:48:15 2015 +0100 New valuespec for Check_MK version numbers --- web/htdocs/valuespec.py | 21 ++++++++++++++++----- web/htdocs/wato.py | 27 +++++++++++++++++---------- 2 files changed, 33 insertions(+), 15 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index b52d3e9..82532a8 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -622,18 +622,20 @@ class AbsoluteDirname(TextAscii): self._regex_error = _("Please enter a valid absolut pathname with / as a path separator.") -# Valuespec for a HTTP Url (not HTTPS), that -# automatically adds http:// to the value +# Valuespec for a HTTP or HTTPS Url, that +# automatically adds http:// to the value if no protocol has +# been specified class HTTPUrl(TextAscii): def __init__(self, **kwargs): + kwargs.setdefault("size", 64) TextAscii.__init__(self, **kwargs) self._target = kwargs.get("target") def validate_value(self, value, varprefix): TextAscii.validate_value(self, value, varprefix) if value: - if not value.startswith("http://"): - raise MKUserError(varprefix, _("The URL must begin with http://")) + if not value.startswith("http://") and not value.startswith("https://"): + raise MKUserError(varprefix, _("The URL must begin with http:// or https://")) ValueSpec.custom_validate(self, value, varprefix) def from_html_vars(self, varprefix): @@ -644,7 +646,7 @@ class HTTPUrl(TextAscii): return value def value_to_text(self, url): - if not url.startswith("http://"): + if not url.startswith("http://") and not value.startswith("https://"): url = "http://" + url try: parts = urlparse.urlparse(url) @@ -661,6 +663,15 @@ class HTTPUrl(TextAscii): (self._target and 'target="%s" ' % self._target or ""), html.attrencode(url), html.attrencode(text)) +def CheckMKVersion(**args): + args = args.copy() + regex_unstable = "(1\.[1234]\.(1|3|5|7|9|11|13|15)i[1-9](p[0-9]+)?)" + regex_stable = "(1\.[1234]\.(0|2|4|6|8|10|12|14)([bp][1-9]?[0-9]+)?)" + args["regex"] = "(" + regex_unstable + "|" + regex_stable + ")" + args["regex_error"] = _("This is not a valid Check_MK version number") + return TextAscii(**args) + + class TextAreaUnicode(TextUnicode): def __init__(self, **kwargs): TextUnicode.__init__(self, **kwargs) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ac46a43..6cc74b7 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -141,15 +141,7 @@ def page_handler(): raise MKGeneralException(_("WATO is disabled. Please set <tt>wato_enabled = True</tt>" " in your <tt>multisite.mk</tt> if you want to use WATO.")) current_mode = html.var("mode") or "main" - modeperms, modefunc = modes.get(current_mode, ([], None)) - if type(modefunc) != type(lambda: None): - mode_class = modefunc - modefunc = mode_class.create_mode_function() - - - if modeperms != None and not config.may("wato.use"): - raise MKAuthException(_("You are not allowed to use WATO.")) - + modeperms, modefunc = get_mode_function(current_mode) # If we do an action, we aquire an exclusive lock on the complete # WATO. @@ -212,7 +204,7 @@ def page_handler(): html.write("</div>") html.footer() return - modeperms, modefunc = modes.get(newmode) + modeperms, modefunc = get_mode_function(newmode) current_mode = newmode html.set_var("mode", newmode) # will be used by makeuri @@ -285,6 +277,21 @@ def page_handler(): html.footer() +def get_mode_function(mode): + modeperms, modefunc = modes.get(mode, ([], None)) + if modefunc == None: + raise MKGeneralException(_("No such WATO module '<tt>%s</tt>'") % html.attrencode(mode)) + + if type(modefunc) != type(lambda: None): + mode_class = modefunc + modefunc = mode_class.create_mode_function() + + if modeperms != None and not config.may("wato.use"): + raise MKAuthException(_("You are not allowed to use WATO.")) + + return modeperms, modefunc + + def ensure_mode_permissions(modeperms): for pname in modeperms: if '.' not in pname:

8 years, 9 months

added a sample implementation of querying performance counters through PDH

by Sebastian Herbord

Module: check_mk Branch: master Commit: 43204b79087fb5901f21d9db38f8eb2c534e386c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=43204b79087fb5… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Dec 16 13:53:56 2015 +0100 added a sample implementation of querying performance counters through PDH this was implemented with the expectation to retrieve some elusive exchange counters. Unfortunately to no avail. Since this code is nicer than the current approach used in the agent, it may still be prudent to use this in the future. --- agents/windows/PerfCounterPdh.cc | 399 ++++++++++++++++++++++++++++++++++++++ agents/windows/PerfCounterPdh.h | 85 ++++++++ agents/windows/pdhtest.cc | 63 ++++++ 3 files changed, 547 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=43204b7908…

8 years, 9 months

slight fixes to wmi helper and added a way to retrieve whole classes without a query

by Sebastian Herbord

Module: check_mk Branch: master Commit: 3839190d1fe16a256c15ccda24c0a4f9cac18944 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3839190d1fe16a… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Dec 16 13:58:07 2015 +0100 slight fixes to wmi helper and added a way to retrieve whole classes without a query --- agents/windows/wmiHelper.cc | 47 ++++++++++++++++++++++++++++++++++--------- agents/windows/wmiHelper.h | 25 ++++++++++++++--------- 2 files changed, 52 insertions(+), 20 deletions(-) diff --git a/agents/windows/wmiHelper.cc b/agents/windows/wmiHelper.cc index 58251da..fad09ea 100644 --- a/agents/windows/wmiHelper.cc +++ b/agents/windows/wmiHelper.cc @@ -161,7 +161,6 @@ Result::Result(const Result &reference) : ObjectWrapper(NULL) , _enumerator(reference._enumerator) { - next(); } @@ -169,7 +168,13 @@ Result::Result(IEnumWbemClassObject *enumerator) : ObjectWrapper(NULL) , _enumerator(enumerator, releaseInterface) { - next(); + if (!next()) { + // if the first enumeration fails the result is empty + // we abstract away two possible reasons: + // a) The class doesn't exist at all + // b) The result is indeed empty + _enumerator = NULL; + } } @@ -241,7 +246,8 @@ bool Result::next() if (FAILED(res)) { // in this case the "current" object isn't changed to guarantee that the // Result remains valid - throw ComException("Failed to retrieve element", res); + //throw ComException("Failed to retrieve element", res); + return false; } if (numReturned == 0) { @@ -255,7 +261,7 @@ bool Result::next() } -template <> int Variant::get() +template <> int Variant::get() const { switch (_value.vt) { case VT_I1: return _value.bVal; @@ -269,7 +275,7 @@ template <> int Variant::get() } -template <> bool Variant::get() +template <> bool Variant::get() const { switch (_value.vt) { case VT_BOOL: return _value.boolVal; @@ -278,7 +284,7 @@ template <> bool Variant::get() } -template <> ULONG Variant::get() +template <> ULONG Variant::get() const { switch (_value.vt) { case VT_UI1: return _value.cVal; @@ -289,7 +295,7 @@ template <> ULONG Variant::get() } -template <> ULONGLONG Variant::get() +template <> ULONGLONG Variant::get() const { switch (_value.vt) { case VT_UI8: return _value.ullVal; @@ -298,7 +304,7 @@ template <> ULONGLONG Variant::get() } -template <> string Variant::get() +template <> string Variant::get() const { switch (_value.vt) { case VT_BSTR: return to_utf8(_value.bstrVal); @@ -307,7 +313,13 @@ template <> string Variant::get() } -template <> wstring Variant::get() +VARTYPE Variant::type() const +{ + return _value.vt; +} + + +template <> wstring Variant::get() const { if (_value.vt & VT_ARRAY) { return L"<array>"; @@ -322,10 +334,11 @@ template <> wstring Variant::get() case VT_I1: case VT_I2: case VT_I4: + return std::to_wstring(get<int>()); case VT_UI1: case VT_UI2: case VT_UI4: - return std::to_wstring(get<int>()); + return std::to_wstring(get<ULONG>()); case VT_UI8: return std::to_wstring(get<ULONGLONG>()); case VT_BOOL: @@ -472,6 +485,20 @@ Result Helper::query(LPCWSTR query) return Result(enumerator); } +extern void crash_log(const char *format, ...) __attribute__ ((format (gnu_printf, 1, 2))); + +Result Helper::getClass(LPCWSTR className) +{ + IEnumWbemClassObject *enumerator = NULL; + HRESULT res = _services->CreateInstanceEnum(_bstr_t(className), + WBEM_FLAG_FORWARD_ONLY | WBEM_FLAG_RETURN_IMMEDIATELY, + NULL, &enumerator); + if (FAILED(res)) { + throw ComException(string("Failed to enum class \"") + to_utf8(className) + "\"", res); + } + return Result(enumerator); +} + ObjectWrapper Helper::call(ObjectWrapper &result, LPCWSTR method) { diff --git a/agents/windows/wmiHelper.h b/agents/windows/wmiHelper.h index 4695bd1..c1cbff0 100644 --- a/agents/windows/wmiHelper.h +++ b/agents/windows/wmiHelper.h @@ -32,6 +32,7 @@ #include <wbemidl.h> #include <vector> #include <memory> +#include <sstream> std::string to_utf8(const wchar_t *string); @@ -42,9 +43,9 @@ namespace wmi { struct ComException : public std::runtime_error { ComException(const std::string &message, HRESULT result); + static std::string resolveError(HRESULT result); private: - std::string resolveError(HRESULT result); - IErrorInfo *getErrorInfo(); + static IErrorInfo *getErrorInfo(); std::string toStringHex(HRESULT res); }; @@ -64,18 +65,20 @@ public: Variant(const VARIANT &val); ~Variant(); - template <typename T> T get(); + template <typename T> T get() const; + + VARTYPE type() const; private: }; -template <> int Variant::get(); -template <> bool Variant::get(); -template <> ULONG Variant::get(); -template <> ULONGLONG Variant::get(); -template <> std::string Variant::get(); -template <> std::wstring Variant::get(); +template <> int Variant::get() const; +template <> bool Variant::get() const; +template <> ULONG Variant::get() const; +template <> ULONGLONG Variant::get() const; +template <> std::string Variant::get() const; +template <> std::wstring Variant::get() const; class ObjectWrapper { @@ -128,7 +131,7 @@ template <typename T> T ObjectWrapper::get(const wchar_t *key) const class Result : public ObjectWrapper { - std::shared_ptr<IEnumWbemClassObject> _enumerator; + std::shared_ptr<IEnumWbemClassObject> _enumerator { NULL }; public: @@ -169,6 +172,8 @@ public: ~Helper(); Result query(LPCWSTR query); + Result getClass(LPCWSTR className); + ObjectWrapper call(ObjectWrapper &result, LPCWSTR method);

8 years, 9 months

#2870 dotnet_clrmemory, wmi_cpuload, wmi_webservices, msexch_activesync, msexch_autodiscovery, msexch_availability, msexch_isstore, msexch_owa, msexch_rpcclientaccess: a whole slew of new checks relating to monitoring MS Exchange

by Sebastian Herbord

Module: check_mk Branch: master Commit: 8b33a5a105ed48c9987c9b26489dd47d405f0252 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b33a5a105ed48… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Dec 16 14:04:10 2015 +0100 #2870 dotnet_clrmemory, wmi_cpuload, wmi_webservices, msexch_activesync, msexch_autodiscovery, msexch_availability, msexch_isstore, msexch_owa, msexch_rpcclientaccess: a whole slew of new checks relating to monitoring MS Exchange All checks are mostly concerned with monitoring Exchange (and other related services) performance, not with the discovery of failures. The necessary performance values are automatically generated by the windows agent via wmi if they are available. Please note that for many of these there are no levels yet, so they are only informative. --- .werks/2870 | 13 ++ ChangeLog | 1 + agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 879104 -> 885248 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 879104 -> 885248 bytes agents/windows/check_mk_agent.cc | 103 ++++++++- agents/windows/check_mk_agent.exe | Bin 799744 -> 806400 bytes agents/windows/check_mk_agent.msi | Bin 1937920 -> 1950720 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 799744 -> 806400 bytes agents/windows/install_agent-64.exe | Bin 402341 -> 405382 bytes agents/windows/install_agent.exe | Bin 393176 -> 396250 bytes agents/windows/types.h | 5 +- checkman/dotnet_clrmemory | 15 ++ checkman/msexch_activesync | 13 ++ checkman/msexch_autodiscovery | 14 ++ checkman/msexch_availability | 14 ++ checkman/msexch_isclienttype | 16 ++ checkman/msexch_isstore | 14 ++ checkman/msexch_owa | 14 ++ checkman/msexch_rpcclientaccess | 14 ++ checkman/wmi_cpuload | 21 ++ checkman/wmi_webservices | 13 ++ checks/dotnet_clrmemory | 51 +++++ checks/msexch_activesync | 41 ++++ checks/msexch_autodiscovery | 41 ++++ checks/msexch_availability | 41 ++++ checks/msexch_isstore | 87 ++++++++ checks/msexch_owa | 44 ++++ checks/msexch_rpcclientaccess | 68 ++++++ checks/wmi.include | 252 ++++++++++++++++++++++ checks/wmi_cpuload | 55 +++++ checks/wmi_webservices | 41 ++++ web/plugins/metrics/check_mk.py | 17 ++ web/plugins/wato/check_parameters.py | 76 +++++++ 34 files changed, 1077 insertions(+), 9 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8b33a5a105…

8 years, 9 months

← Newer
1
2
3
4
5
6
7
8
9
...
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