Checkmk git commits June 2016

checkmk-commits@lists.checkmk.com

8 participants
185 discussions

windows agent: minor fixed to memory management

by Sebastian Herbord

Module: check_mk Branch: master Commit: e9b2f05f1a2f5db462d8c21319641f5ec9a021d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e9b2f05f1a2f5d… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Jun 15 14:42:32 2016 +0200 windows agent: minor fixed to memory management --- agents/windows/Configuration.cc | 12 +++++++++++- agents/windows/Configuration.h | 1 + agents/windows/ExternalCmd.cc | 9 ++++++--- agents/windows/PerfCounter.cc | 2 +- agents/windows/check_mk_agent.cc | 20 ++++++++++++++++++-- agents/windows/types.h | 11 +++++++++++ 6 files changed, 48 insertions(+), 7 deletions(-) diff --git a/agents/windows/Configuration.cc b/agents/windows/Configuration.cc index 18de0a8..fd40b98 100644 --- a/agents/windows/Configuration.cc +++ b/agents/windows/Configuration.cc @@ -54,7 +54,9 @@ Configuration::Configuration(const Environment &env) , _encrypted_rt(true) , _environment(env) , _ps_use_wmi(false) - , _ps_full_path(false) { + , _ps_full_path(false) + , _eventlog_vista_api(false) +{ _logwatch_globlines.setGroupFunction(&Configuration::addConditionPattern); CollectorRegistry::instance().startFile(); @@ -69,6 +71,14 @@ Configuration::Configuration(const Environment &env) postProcessOnlyFrom(); } +Configuration::~Configuration() +{ + for (const auto &textfile : *_logwatch_textfiles) { + delete textfile; + } + _logwatch_textfiles.clear(); +} + unsigned long Configuration::enabledSections() const { return _enabled_sections; } diff --git a/agents/windows/Configuration.h b/agents/windows/Configuration.h index 78561fb..99322e8 100644 --- a/agents/windows/Configuration.h +++ b/agents/windows/Configuration.h @@ -61,6 +61,7 @@ check = MEM mrpe/check_mem -w 10 -c 20 class Configuration { public: Configuration(const Environment &env); + ~Configuration(); unsigned long enabledSections() const; unsigned long realtimeSections() const; diff --git a/agents/windows/ExternalCmd.cc b/agents/windows/ExternalCmd.cc index 7f32358..4239057 100644 --- a/agents/windows/ExternalCmd.cc +++ b/agents/windows/ExternalCmd.cc @@ -48,10 +48,10 @@ ExternalCmd::ExternalCmd(const char *cmdline) { // child process needs to be able to inherit the pipe handles security_attributes.bInheritHandle = true; - HANDLE script_stdout; - HANDLE script_stderr; + HANDLE script_stdout { INVALID_HANDLE_VALUE }; + HANDLE script_stderr { INVALID_HANDLE_VALUE }; - OnScopeExit release_handles([&]() { + OnScopeExit release_handles([script_stdout, script_stderr]() { ::CloseHandle(script_stdout); ::CloseHandle(script_stderr); }); @@ -68,6 +68,8 @@ ExternalCmd::ExternalCmd(const char *cmdline) { // base new process statup info on current process STARTUPINFO si; + ZeroMemory(&si, sizeof(STARTUPINFO)); + si.cb = sizeof(STARTUPINFO); GetStartupInfo(&si); si.dwFlags = STARTF_USESTDHANDLES | STARTF_USESHOWWINDOW; si.wShowWindow = SW_HIDE; @@ -75,6 +77,7 @@ ExternalCmd::ExternalCmd(const char *cmdline) { si.hStdError = with_stderr ? script_stdout : script_stderr; PROCESS_INFORMATION pi; + ZeroMemory(&pi, sizeof(PROCESS_INFORMATION)); std::unique_ptr<char[], decltype(free) *> cmdline_buf(strdup(cmdline), free); if (!CreateProcess(nullptr, cmdline_buf.get(), nullptr, nullptr, TRUE, diff --git a/agents/windows/PerfCounter.cc b/agents/windows/PerfCounter.cc index b2e6c69..b4268eb 100644 --- a/agents/windows/PerfCounter.cc +++ b/agents/windows/PerfCounter.cc @@ -172,7 +172,7 @@ std::vector<BYTE> PerfCounterObject::retrieveCounterData( result.resize(DEFAULT_BUFFER_SIZE); DWORD buffer_size = result.size(); - DWORD type; + DWORD type {0}; DWORD ret; while ((ret = RegQueryValueExW(HKEY_PERFORMANCE_DATA, counterList, nullptr, diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index a98e9a1..3e9de18 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -202,6 +202,7 @@ bool g_found_crash = false; std::unique_ptr<OHMMonitor> g_ohmMonitor; + class WMILookup { public: static wmi::Helper &get(const std::wstring &path = L"Root\\Cimv2") { @@ -2075,8 +2076,12 @@ int launch_program(script_container *cont) { memset(buf, 0, BUFFER_SIZE); time_t process_start = time(0); + if (cont->buffer_work != NULL) { + HeapFree(GetProcessHeap(), 0, cont->buffer_work); + } cont->buffer_work = (char *)HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, HEAP_BUFFER_DEFAULT); + unsigned long current_heap_size = HeapSize(GetProcessHeap(), 0, cont->buffer_work); @@ -2347,7 +2352,6 @@ void output_external_programs(OutputProxy &out, script_type type) { HeapFree(GetProcessHeap(), 0, cont->buffer_work); cont->buffer = cache_buffer; } - cont->buffer_work = NULL; cont->status = SCRIPT_IDLE; } else if (cont->retry_count < 0 && cont->buffer != NULL) { @@ -2908,7 +2912,7 @@ void stop_threads() { // just check the script_container status int sizedt = script_containers.size(); HANDLE hThreadArray[sizedt]; - int active_thread_count = 0; + DWORD active_thread_count = 0; script_containers_t::iterator it_cont = script_containers.begin(); while (it_cont != script_containers.end()) { @@ -3505,6 +3509,18 @@ void cleanup() { cleanup_logwatch(); } + + for (auto ptr : g_eventlog_hints) { + free(ptr->name); + delete ptr; + } + g_eventlog_hints.clear(); + + for (auto kv : script_containers) { + delete kv.second; + } + script_containers.clear(); + CloseHandle(g_collection_thread); } void show_version() { printf("Check_MK_Agent version %s\n", check_mk_version); } diff --git a/agents/windows/types.h b/agents/windows/types.h index 5b330f3..1c02718 100644 --- a/agents/windows/types.h +++ b/agents/windows/types.h @@ -143,6 +143,17 @@ struct runas_include { }; struct script_container { + ~script_container() { + if (worker_thread != INVALID_HANDLE_VALUE) { + CloseHandle(worker_thread); + } + // allocated with strdup + free(path); + free(script_path); + // allocated with HeapAlloc (may be null) + HeapFree(GetProcessHeap(), 0, buffer); + HeapFree(GetProcessHeap(), 0, buffer_work); + } char *path; // full path with interpreter, cscript, etc. char *script_path; // path of script int max_age;

8 years

3143 FIX windows agent: fixed some minor memory and handle leaks

by Sebastian Herbord

Module: check_mk Branch: master Commit: 9184cff2c6094dd937e998ede7c5e6ceda3f650e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9184cff2c6094d… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Jun 15 14:34:41 2016 +0200 3143 FIX windows agent: fixed some minor memory and handle leaks --- .werks/3143 | 10 ++++++++++ ChangeLog | 1 + agents/windows/ExternalCmd.cc | 2 ++ agents/windows/ListenSocket.cc | 18 +++++++++--------- agents/windows/SettingsCollector.h | 10 ++++------ agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1270784 -> 1270784 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1270784 -> 1270784 bytes agents/windows/check_mk_agent.cc | 17 ++++++++++++++--- agents/windows/check_mk_agent.exe | Bin 1238528 -> 1239552 bytes agents/windows/check_mk_agent.msi | Bin 2778112 -> 248320 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1238528 -> 1239552 bytes agents/windows/install_agent-64.exe | Bin 566235 -> 566335 bytes agents/windows/install_agent.exe | Bin 560412 -> 560642 bytes agents/windows/wmiHelper.cc | 2 ++ agents/windows/wmiHelper.h | 12 +++++------- 16 files changed, 48 insertions(+), 26 deletions(-) diff --git a/.werks/3143 b/.werks/3143 new file mode 100644 index 0000000..d351b1c --- /dev/null +++ b/.werks/3143 @@ -0,0 +1,10 @@ +Title: windows agent: fixed some minor memory and handle leaks +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1465993766 + + diff --git a/ChangeLog b/ChangeLog index 1956125..dde3338 100644 --- a/ChangeLog +++ b/ChangeLog @@ -271,6 +271,7 @@ * 3142 FIX: windows agent: fixed rare crash when wmi query for uptime fails... * 3637 FIX: ipmi_sensors: fixed sensor discovery if sensor is unknown and perfdata handling * 3545 FIX: netapp_api_vs_traffic: fixed crash when NFSv4.1 information was available + * 3143 FIX: windows agent: fixed some minor memory and handle leaks Multisite: * 3187 notification view: new filter for log command via regex diff --git a/agents/windows/ExternalCmd.cc b/agents/windows/ExternalCmd.cc index 8dbab5e..7f32358 100644 --- a/agents/windows/ExternalCmd.cc +++ b/agents/windows/ExternalCmd.cc @@ -97,12 +97,14 @@ ExternalCmd::~ExternalCmd() { ::CloseHandle(_stderr); if (_job_object != INVALID_HANDLE_VALUE) { ::TerminateJobObject(_job_object, 1); + ::CloseHandle(_job_object); } ::CloseHandle(_process); } void ExternalCmd::terminateJob(DWORD exit_code) { ::TerminateJobObject(_job_object, exit_code); + ::CloseHandle(_job_object); _job_object = INVALID_HANDLE_VALUE; } diff --git a/agents/windows/ListenSocket.cc b/agents/windows/ListenSocket.cc index c520df2..2d07e6e 100644 --- a/agents/windows/ListenSocket.cc +++ b/agents/windows/ListenSocket.cc @@ -27,6 +27,7 @@ #include <ws2ipdef.h> #include <cassert> #include <cstring> +#include <memory> #include "logging.h" #include "stringutil.h" @@ -122,13 +123,13 @@ SOCKET ListenSocket::init_listen_socket(int port) { SOCKET s = RemoveSocketInheritance(tmp_s); int addr_size = 0; - SOCKADDR *addr = create_sockaddr(&addr_size); + std::unique_ptr<SOCKADDR> addr(create_sockaddr(&addr_size)); int optval = 1; setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (const char *)&optval, sizeof(optval)); if (_use_ipv6) { - ((SOCKADDR_IN6 *)addr)->sin6_port = htons(port); + ((SOCKADDR_IN6 *)addr.get())->sin6_port = htons(port); int v6only = 0; if (setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, (char *)&v6only, @@ -137,11 +138,11 @@ SOCKET ListenSocket::init_listen_socket(int port) { _supports_ipv4 = false; } } else { - ((SOCKADDR_IN *)addr)->sin_port = htons(port); - ((SOCKADDR_IN *)addr)->sin_addr.s_addr = ADDR_ANY; + ((SOCKADDR_IN *)addr.get())->sin_port = htons(port); + ((SOCKADDR_IN *)addr.get())->sin_addr.s_addr = ADDR_ANY; } - if (SOCKET_ERROR == bind(s, addr, addr_size)) { + if (SOCKET_ERROR == bind(s, addr.get(), addr_size)) { int error_id = ::WSAGetLastError(); fprintf(stderr, "Cannot bind socket to port %d: %s (%d)\n", port, get_win_error_as_string(error_id).c_str(), error_id); @@ -221,12 +222,11 @@ SOCKET ListenSocket::acceptConnection() { // never return while (1 == select(1, &fds, NULL, NULL, &timeout)) { int addr_len = 0; - sockaddr *remote_addr = create_sockaddr(&addr_len); - connection = accept(_socket, remote_addr, &addr_len); + std::unique_ptr<sockaddr> remote_addr(create_sockaddr(&addr_len)); + connection = accept(_socket, remote_addr.get(), &addr_len); connection = RemoveSocketInheritance(connection); if (connection != INVALID_SOCKET) { - bool allowed = check_only_from(remote_addr); - delete remote_addr; + bool allowed = check_only_from(remote_addr.get()); if (allowed) { return connection; diff --git a/agents/windows/SettingsCollector.h b/agents/windows/SettingsCollector.h index da2d449..0464fa8 100644 --- a/agents/windows/SettingsCollector.h +++ b/agents/windows/SettingsCollector.h @@ -171,12 +171,10 @@ public: const ContainerT &operator*() const { return _values; } public: // only valid with a grouping adder. it's important to understand that - // due to how templates in C++ work, - // these functions are not compiled for template-instantiations where they - // aren't used so - // even though they wouldn't comple with non-grouping adders, this is not a - // problem. - + // due to how templates in C++ work, these functions are not compiled + // for template-instantiations where they aren't used so even though + // they wouldn't comple with non-grouping adders, this is not a + // problem. void setGroupFunction(typename AddMode::PriorityAppendGrouped< ContainerT>::GroupFunction function) { _add_mode.setGroupFunction(function); diff --git a/agents/windows/build_version b/agents/windows/build_version index ca06b0e..4f5ed40 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -1761 +1763 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 94c67ad..6cfd91a 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 5a2a8fa..5c6c901 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 a12206c..a98e9a1 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -1203,10 +1203,19 @@ void update_script_statistics() { // Remove missing files from list void cleanup_logwatch_textfiles() { logwatch_textfiles_t &textfiles = g_config->logwatchTextfiles(); - textfiles.erase( + + // remove_if puts the missing textfiles to the end of the list, it doesn't + // actually remove anything + auto first_missing = std::remove_if(textfiles.begin(), textfiles.end(), - [](logwatch_textfile *file) { return file->missing; }), - textfiles.end()); + [](logwatch_textfile *file) { return file->missing; }); + + for (logwatch_textfiles_t::iterator iter = first_missing; + iter != textfiles.end(); ++iter) { + delete *iter; + } + + textfiles.erase(first_missing, textfiles.end()); } // Called on program exit @@ -2910,8 +2919,10 @@ void stop_threads() { } it_cont++; } + WaitForMultipleObjects(active_thread_count, hThreadArray, TRUE, 5000); TerminateJobObject(g_workers_job_object, 0); + ::CloseHandle(g_workers_job_object); } // .----------------------------------------------------------------------. diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 75bac1e..60e0615 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 31ce86c..b59d1c6 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 8e71be7..77a1c2a 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 d9bcddf..2ee5ca7 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 6e50880..e07f73c 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/wmiHelper.cc b/agents/windows/wmiHelper.cc index 3fbe910..2baa7a4 100644 --- a/agents/windows/wmiHelper.cc +++ b/agents/windows/wmiHelper.cc @@ -348,6 +348,8 @@ public: private: COMManager() { + // Dr.Memory reports a memory leak here, despite the fact CoUninitialize + // does get called. Am I doing something wrong? HRESULT res = CoInitializeEx(0, COINIT_MULTITHREADED); if (FAILED(res)) { throw ComException("Failed to initialize COM", res); diff --git a/agents/windows/wmiHelper.h b/agents/windows/wmiHelper.h index 9ecb5fd..5abe581 100644 --- a/agents/windows/wmiHelper.h +++ b/agents/windows/wmiHelper.h @@ -137,13 +137,11 @@ public: std::vector<std::wstring> names() const; - // proceed to the next element. - // returns true on success, false if there are no more elements. An - // exception - // is thrown if an error happens (i.e. timeout in the query). - // unless true is returned, the current element is not changed, to once the - // end - // of the result has been reached, the iterator stays there. + // proceed to the next element. returns true on success, false if there are + // no more elements. An exception is thrown if an error happens (i.e. + // timeout in the query). unless true is returned, the current element is + // not changed, to once the end of the result has been reached, the iterator + // stays there. bool next(); // return true if this is a valid result. Please note that

8 years

3545 FIX netapp_api_vs_traffic: fixed crash when NFSv4.1 information was available

by Andreas Boesl

Module: check_mk Branch: master Commit: 4cb5f8e4b8d5bc29372f9e63f5b23fd487f4c6bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4cb5f8e4b8d5bc… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jun 15 14:20:49 2016 +0200 3545 FIX netapp_api_vs_traffic: fixed crash when NFSv4.1 information was available --- .werks/3545 | 9 +++++++++ ChangeLog | 1 + checks/netapp_api_vs_traffic | 4 +--- web/plugins/metrics/check_mk.py | 14 +++++++++----- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/.werks/3545 b/.werks/3545 new file mode 100644 index 0000000..c60f409 --- /dev/null +++ b/.werks/3545 @@ -0,0 +1,9 @@ +Title: netapp_api_vs_traffic: fixed crash when NFSv4.1 information was available +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1465993111 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index e727497..1956125 100644 --- a/ChangeLog +++ b/ChangeLog @@ -270,6 +270,7 @@ * 3636 FIX: juniper_fru: fixed present state handling * 3142 FIX: windows agent: fixed rare crash when wmi query for uptime fails... * 3637 FIX: ipmi_sensors: fixed sensor discovery if sensor is unknown and perfdata handling + * 3545 FIX: netapp_api_vs_traffic: fixed crash when NFSv4.1 information was available Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/netapp_api_vs_traffic b/checks/netapp_api_vs_traffic index 4fd48b2..4a23ace 100644 --- a/checks/netapp_api_vs_traffic +++ b/checks/netapp_api_vs_traffic @@ -73,10 +73,8 @@ def check_netapp_api_vs_traffic(item, _no_params, parsed): [ ("nfsv4_read_ops", "nfsv4_read_ios", "read OPs", 1, int), ("nfsv4_write_ops", "nfsv4_write_ios", "write OPs", 1, int)]), - # Untested: This value might be wrong "nfsv4_1": ("NFSv4.1", - [ ("nfsv4_1_read_ops", "nfsv4_1_read_ios", "read OPs", 1, int), - ("nfsv4_1_write_ops", "nfsv4_1_write_ios", "write OPs", 1, int)]), + [ ("nfsv4_1_ops", "nfsv4_1_ios", "OPs", 1, int) ]) } vserver = item.split(" ", 3) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index d2fc2e3..82e2a63 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -2756,25 +2756,29 @@ metric_info["http_bandwidth"] = { "color" : "53/b", } -# netapp api volumes - -for volume_info in [ "NFS", "NFSv4", "NFSv4_1", "CIFS", "SAN", "FCP", "ISCSI" ]: +for volume_info in [ "NFS", "NFSv4", "CIFS", "SAN", "FCP", "ISCSI" ]: for what, unit in [ ("data", "bytes"), ("latency", "s"), ("ios", "1/s") ]: volume = volume_info.lower() - metric_info[ "%s_read_%s" % (volume, what) ] = { + metric_info["%s_read_%s" % (volume, what)] = { "title" : _( "%s read %s" % (volume_info, what) ), "unit" : unit, "color" : "31/a", } - metric_info[ "%s_write_%s" % (volume, what) ] = { + metric_info["%s_write_%s" % (volume, what)] = { "title" : _( "%s write %s" % (volume_info, what) ), "unit" : unit, "color" : "44/a", } +metric_info["nfsv4_1_ios"] = { + "title" : _( "NFSv4.1 operations"), + "unit" : "1/s", + "color" : "31/a", +} + metric_info["harddrive_power_cycles"] = { "title" : _("Harddrive power cycles"), "unit" : "count",

8 years

3637 FIX ipmi_sensors: fixed sensor discovery if sensor is unknown and perfdata handling

by Simon Betz

Module: check_mk Branch: master Commit: 54f37269432cdb7018ca07c4a2674e1dbf9b3f24 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=54f37269432cdb… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jun 15 13:48:56 2016 +0200 3637 FIX ipmi_sensors: fixed sensor discovery if sensor is unknown and perfdata handling --- .werks/3637 | 10 ++++++++++ ChangeLog | 1 + checks/ipmi_sensors | 31 ++++++++++++++++++++++++++----- 3 files changed, 37 insertions(+), 5 deletions(-) diff --git a/.werks/3637 b/.werks/3637 new file mode 100644 index 0000000..711d24c --- /dev/null +++ b/.werks/3637 @@ -0,0 +1,10 @@ +Title: ipmi_sensors: fixed sensor discovery if sensor is unknown and perfdata handling +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1465991282 + + diff --git a/ChangeLog b/ChangeLog index 0cbba11..e727497 100644 --- a/ChangeLog +++ b/ChangeLog @@ -269,6 +269,7 @@ * 3653 FIX: fileinfo.groups: Fixed UNKNOWN shown in WATO discovery when configured as manual check * 3636 FIX: juniper_fru: fixed present state handling * 3142 FIX: windows agent: fixed rare crash when wmi query for uptime fails... + * 3637 FIX: ipmi_sensors: fixed sensor discovery if sensor is unknown and perfdata handling Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/ipmi_sensors b/checks/ipmi_sensors index 0169171..43a8412 100644 --- a/checks/ipmi_sensors +++ b/checks/ipmi_sensors @@ -59,8 +59,29 @@ # 3616 Fan_FAN_PSU1 6840.00_RPM_(2760.00/NA) [OK] # 3680 Fan_FAN_PSU2 0.00_RPM_(2760.00/NA) [OK] +# <<<ipmi_sensors>>> +# 4 Temperature_System_Temp 23.00_C_(NA/NA) [OK] +# 71 Temperature_Peripheral_Temp 29.00_C_(NA/NA) [OK] +# 138 OEM_Reserved_CPU_Temp NA_NA_(NA/NA) [OEM_Event_=_0000h] <= unknown sensor state, we do not discover +# 205 Fan_FAN 3225.00_RPM_(NA/NA) [OK] +# 272 Voltage_Vcore 0.68_V_(NA/NA) [OK] +# 339 Voltage_3.3VCC 3.33_V_(NA/NA) [OK] +# 406 Voltage_12V 12.08_V_(NA/NA) [OK] +# 473 Voltage_VDIMM 1.50_V_(NA/NA) [OK] +# 540 Voltage_5VCC 5.12_V_(NA/NA) [OK] +# 607 Voltage_VCC_PCH 1.06_V_(NA/NA) [OK] +# 674 Voltage_VBAT 3.17_V_(NA/NA) [OK] +# 741 Voltage_VSB 3.33_V_(NA/NA) [OK] +# 808 Voltage_AVCC 3.33_V_(NA/NA) [OK] +# 875 Power_Supply_PS_Status NA_NA_(NA/NA) [Presence_detected] + + + def inventory_freeipmi(info): - return [ (line[1], "", None) for line in info if line[-1] not in ( '[Unknown]', '[NA]' ) ] + return [ (line[1], "", None) for line in info + if not ( line[-1] in ['[Unknown]', '[NA]'] or + "_=_" in line[-1] )] + def check_freeipmi(item, _no_params, info): for line in info: @@ -104,10 +125,11 @@ def check_freeipmi(item, _no_params, info): # Do not save performance data for FANs. This produces # much data and is - in my opinion - useless. - if item.startswith("Fan_"): - perfdata = [] - else: + if "temperature" in item.lower(): perfdata = [ ("value", current, None, crit) ] + else: + perfdata = [] + infotext = "Current value %.1f%s%s" % (current, unit, levelstext) if status == "OK" \ or status == "Entity_Present" \ @@ -123,7 +145,6 @@ def check_freeipmi(item, _no_params, info): return (3, "item %s not found" % item) - check_info["ipmi_sensors"] = { 'check_function': check_freeipmi, 'inventory_function': inventory_freeipmi,

8 years

3142 FIX windows agent: fixed rare crash when wmi query for uptime fails

by Sebastian Herbord

Module: check_mk Branch: master Commit: c3ffb9f1a1bc7f24d816f2234a69ca33f67f370b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c3ffb9f1a1bc7f… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Jun 15 13:38:21 2016 +0200 3142 FIX windows agent: fixed rare crash when wmi query for uptime fails This crash could only occur on windows versions older than windows server 2008 R2 --- .werks/3142 | 10 ++++++++++ ChangeLog | 1 + agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1270784 -> 1270784 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1270784 -> 1270784 bytes agents/windows/check_mk_agent.exe | Bin 1238528 -> 1238528 bytes agents/windows/check_mk_agent.msi | Bin 248320 -> 2778112 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1238528 -> 1238528 bytes agents/windows/install_agent-64.exe | Bin 566221 -> 566235 bytes agents/windows/install_agent.exe | Bin 560357 -> 560412 bytes 10 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3142 b/.werks/3142 new file mode 100644 index 0000000..e6eed45 --- /dev/null +++ b/.werks/3142 @@ -0,0 +1,10 @@ +Title: windows agent: fixed rare crash when wmi query for uptime fails +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1465977006 + +This crash could only occur on windows versions older than windows server 2008 R2 diff --git a/ChangeLog b/ChangeLog index 0f0eb64..0cbba11 100644 --- a/ChangeLog +++ b/ChangeLog @@ -268,6 +268,7 @@ * 3635 FIX: get_average: fixed overflow error * 3653 FIX: fileinfo.groups: Fixed UNKNOWN shown in WATO discovery when configured as manual check * 3636 FIX: juniper_fru: fixed present state handling + * 3142 FIX: windows agent: fixed rare crash when wmi query for uptime fails... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/agents/windows/build_version b/agents/windows/build_version index 5b9849f..ca06b0e 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -1759 +1761 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 26ee934..94c67ad 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 e9ab6d2..5a2a8fa 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.exe b/agents/windows/check_mk_agent.exe index 83fbfb9..75bac1e 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 fdca5cc..31ce86c 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 173de0d..8e71be7 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 605906f..d9bcddf 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 0a6d7ba..6e50880 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

8 years

3544 The edit host and diagnostic page are now able to handle SNMPv3 credentials

by Andreas Boesl

Module: check_mk Branch: master Commit: 7901477a5a5a07abe60f2849f912f9471d4abf74 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7901477a5a5a07… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jun 15 13:27:46 2016 +0200 3544 The edit host and diagnostic page are now able to handle SNMPv3 credentials You can now set SNMPv3 credentials explicitly in the edit host page. Furthermore the host diagnostic page now also supports the input of custom SNMPv3 credentials. Please note that the SNMPv3 option <i>Credentials for SNMPv3 without authentication and privacy (noAuthNoPriv)</i> is currently broken and will return no valid information. This will be fixed soon. --- .werks/3544 | 13 ++++ ChangeLog | 1 + modules/automation.py | 45 ++++++++++-- web/htdocs/js/wato.js | 24 ++++++- web/htdocs/wato.py | 72 ++++++++++++++++--- web/plugins/wato/builtin_attributes.py | 105 +++++++++++++++++++++++++--- web/plugins/wato/check_mk_configuration.py | 75 -------------------- 7 files changed, 234 insertions(+), 101 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7901477a5a…

8 years

fixed possible crash in windows agent if wmi query to uptime fails and cleanup in wmi code

by Sebastian Herbord

Module: check_mk Branch: master Commit: 6afa1089fbfdad5231b58f08b6402177278f6646 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6afa1089fbfdad… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Jun 15 09:41:43 2016 +0200 fixed possible crash in windows agent if wmi query to uptime fails and cleanup in wmi code --- agents/windows/Makefile | 6 +- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1269760 -> 1270784 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1269760 -> 1270784 bytes agents/windows/check_mk_agent.cc | 38 +++++--- agents/windows/check_mk_agent.exe | Bin 1238016 -> 1238528 bytes agents/windows/check_mk_agent.msi | Bin 2776576 -> 248320 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1238016 -> 1238528 bytes agents/windows/install_agent-64.exe | Bin 565681 -> 566221 bytes agents/windows/install_agent.exe | Bin 560119 -> 560357 bytes agents/windows/wmiHelper.cc | 104 +++++++++++----------- agents/windows/wmiHelper.h | 7 +- 12 files changed, 85 insertions(+), 72 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6afa1089fb…

8 years

fixed broken escaping of " and \ in livestatus results

by Sebastian Herbord

Module: check_mk Branch: master Commit: e363eec18af8827c36b4b177c25f75b4896cbb5c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e363eec18af882… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Jun 14 16:58:53 2016 +0200 fixed broken escaping of " and \ in livestatus results --- livestatus/src/Query.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index c5fc65c..63cc145 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -1088,7 +1088,10 @@ void Query::outputString(const char *value, int len) { // Output ASCII characters unencoded else if (*r >= 32 || len >= 0) { - add((*r == '"' || *r == '\\') ? "\\" : string(r, 1)); + if (*r == '"' || *r == '\\') { + add("\\"); + } + add(string(r, 1)); } // interprete two-Byte UTF-8 sequences in mode 'utf8' and 'mixed'

8 years

don't throw away the most interesting part of an exception

by Sebastian Herbord

Module: check_mk Branch: master Commit: 294bdfa3eb35ed05ca0a24bf7dc63de87dfb91b9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=294bdfa3eb35ed… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Jun 14 15:41:49 2016 +0200 don't throw away the most interesting part of an exception --- web/htdocs/sidebar.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index d0c7c87..e35e325 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -370,12 +370,9 @@ def render_snapin(name, state): return refresh_url def snapin_exception(e): - if config.debug: - raise e - else: - html.write("<div class=snapinexception>\n" - "<h2>%s</h2>\n" - "<p>%s</p></div>" % (_('Error'), e)) + html.write("<div class=snapinexception>\n" + "<h2>%s</h2>\n" + "<p>%s</p></div>" % (_('Error'), e)) def ajax_fold(): config = load_user_config() @@ -430,6 +427,8 @@ def ajax_snapin(): try: snapin["render"]() except Exception, e: + if config.debug: + raise snapin_exception(e) snapin_code.append(html.drain())

8 years

fixed permissions

by Andreas Boesl

Module: check_mk Branch: master Commit: a799a1bcaaecd60bac433b74e698def682125231 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a799a1bcaaecd6… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jun 13 16:27:31 2016 +0200 fixed permissions --- 0 files changed diff --git a/agents/plugins/mk_inotify b/agents/plugins/mk_inotify old mode 100644 new mode 100755

8 years

← Newer
1
...
5
6
7
8
9
10
11
...
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2016