Checkmk git commits December 2017

checkmk-commits@lists.checkmk.com

10 participants
219 discussions

test_statgrab_cpu_check: Improve test data

by Konstantin Büttner

Module: check_mk Branch: master Commit: 0bd6847acd58f62614f9b6f3b00de2fe53e66f4c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0bd6847acd58f6… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Dec 18 16:46:26 2017 +0100 test_statgrab_cpu_check: Improve test data Change-Id: I6e0d65b29d08f679a558bd458fd3f1fea981cf37 --- tests/checks/test_statgrab_cpu_check.py | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/tests/checks/test_statgrab_cpu_check.py b/tests/checks/test_statgrab_cpu_check.py index ed41637..1e4026d 100644 --- a/tests/checks/test_statgrab_cpu_check.py +++ b/tests/checks/test_statgrab_cpu_check.py @@ -6,22 +6,17 @@ import checktestlib pytestmark = pytest.mark.checks +info_statgrab_cpu_hpux = lambda t: [[u'idle', u'%d' % int(t*5)], + [u'iowait', u'%d' % int(t*10)], + [u'kernel', u'%d' % int(t*10)], + [u'nice', u'%d' % int(t*20)], + [u'swap', u'0'], + [u'systime', u'%d' % int(t*25)], + [u'total', u'%d' % int(t*100)], + [u'user', u'%d' % int(t*30)]] + @pytest.mark.parametrize("time_to_info,params,expected_result", [ -(lambda t: [[u'ctxsw', u'%d' % int(t*50)], - [u'idle', u'%d' % int(t*50)], - [u'intrs', u'%d' % int(t*50)], - [u'iowait', u'%d' % int(t*50)], - [u'kernel', u'%d' % int(t*50)], - [u'nice', u'%d' % int(t*50)], - [u'nvctxsw', u'%d' % int(t*50)], - [u'softintrs', u'%d' % int(t*50)], - [u'swap', u'%d' % int(t*50)], - [u'syscalls', u'%d' % int(t*50)], - [u'systime', u'%d' % int(t*50)], - [u'total', u'%d' % int(t*50)], - [u'user', u'%d' % int(t*50)], - [u'vctxsw', u'%d' % int(t*50)]], - {}, {}), +(info_statgrab_cpu_hpux, {}, {}), ]) def test_statgrab_cpu_check(check_manager, monkeypatch, time_to_info, params, expected_result): import time

6 years, 6 months

5416 FIX Prevent MS Exchange checks from crashing upon WMI timeout

by Jukka Aro

Module: check_mk Branch: master Commit: 1b7f4f9768e0119fd2261e07034275bc60d7834e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1b7f4f9768e011… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Dec 15 16:17:37 2017 +0100 5416 FIX Prevent MS Exchange checks from crashing upon WMI timeout Werk #5411 introduced the identification and handling of WMI timeouts. Some of nested subsections, at least those of MS Exchange, may under certain circumstances produce an unprecedented order of output lines suddenly ending in a WMI timeout. This scenario was not expected when preparing #5411, causing the parsing of some MS Exchange subsections to fail and the corresponding check to crash. This fix ensures that a WMI timeout is properly parsed regardless of where it appears in a subsection output. The corresponding checks no longer crash but issue a PENDING/UNKNOWN result. Change-Id: Ic43050a153a1dcb05286564d4a5478934b74fdd4 --- .werks/5416 | 19 +++++++++++++++++++ checks/wmi.include | 19 ++++++++++++------- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/.werks/5416 b/.werks/5416 new file mode 100644 index 0000000..7b579e1 --- /dev/null +++ b/.werks/5416 @@ -0,0 +1,19 @@ +Title: Prevent MS Exchange checks from crashing upon WMI timeout +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i2 +Date: 1513609941 +Class: fix + +Werk #5411 introduced the identification and handling of WMI timeouts. +Some of nested subsections, at least those of MS Exchange, may under +certain circumstances produce an unprecedented order of output lines +suddenly ending in a WMI timeout. This scenario was not expected when +preparing #5411, causing the parsing of some MS Exchange subsections +to fail and the corresponding check to crash. + +This fix ensures that a WMI timeout is properly parsed regardless of +where it appears in a subsection output. The corresponding checks no +longer crash but issue a PENDING/UNKNOWN result. diff --git a/checks/wmi.include b/checks/wmi.include index 5d88176..bdc7703 100644 --- a/checks/wmi.include +++ b/checks/wmi.include @@ -147,10 +147,11 @@ def parse_wmi_table(info, key="Name"): timestamp = int(line[1]) frequency = int(line[2]) line = info_iter.next() - elif line[0] == "WMItimeout": - # main section got WMI timeout - raise MKCounterWrapped("WMI query timed out") + else: + # Did main section get WMI timeout? + check_wmi_timeout(line) while line is not None: + check_wmi_timeout(line) current = None if len(line) == 1 and line[0].startswith("["): # multi-table input @@ -158,9 +159,8 @@ def parse_wmi_table(info, key="Name"): res = {} tablename = regex("\[(.*)\]").search(line[0]).group(1) line = info_iter.next() - if line[0] == "WMItimeout": - # subsection got WMI timeout - raise MKCounterWrapped("WMI query timed out") + # Did subsection get WMI timeout? + check_wmi_timeout(line) if tablename in res: # known table, append to it current = res[tablename] @@ -175,9 +175,9 @@ def parse_wmi_table(info, key="Name"): # read table content line = info_iter.next() while line is not None and not line[0].startswith("["): + check_wmi_timeout(line) current.add_row(line) line = info_iter.next() - except StopIteration: # regular end of block pass @@ -185,6 +185,11 @@ def parse_wmi_table(info, key="Name"): return res +def check_wmi_timeout(line): + if line[0] == "WMItimeout": + raise MKCounterWrapped("WMI query timed out") + + #. # .--Filters-------------------------------------------------------------. # | _____ _ _ _ |

6 years, 6 months

Windows agent: use RAII in SectionLogwatch

by Jukka Aro

Module: check_mk Branch: master Commit: cf0742abfa7eaff28f5c98f49a3c6d6434c8507e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf0742abfa7eaf… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Mon Dec 18 14:09:08 2017 +0100 Windows agent: use RAII in SectionLogwatch * Use file stream objects for file input and output. * Wrap search handle. Additionally, define standalone functions in anonymous namespace. Change-Id: Ib4f8585f88a00ed49b61b3f2f189da03efe0b19d --- agents/windows/build_version | 2 +- agents/windows/sections/SectionLogwatch.cc | 234 +++++++++++++++-------------- agents/windows/sections/SectionLogwatch.h | 7 +- 3 files changed, 129 insertions(+), 114 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=cf0742abfa…

6 years, 6 months

Check tests: Base infotext assertions on expecting a string to be contained instead of matching exactly

by Konstantin Büttner

Module: check_mk Branch: master Commit: b31c24813be362895f4448b9900f6e29322357a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b31c24813be362… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Dec 18 10:13:47 2017 +0100 Check tests: Base infotext assertions on expecting a string to be contained instead of matching exactly Change-Id: I89d1d948e2b92b15897980e1dc09c0d0a747a75b --- tests/checks/checktestlib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/checks/checktestlib.py b/tests/checks/checktestlib.py index f7618d1..32cad5d 100644 --- a/tests/checks/checktestlib.py +++ b/tests/checks/checktestlib.py @@ -42,7 +42,7 @@ class BasicCheckResult(object): if "status" in expected_result: assert result.status == expected_result["status"] if "infotext" in expected_result: - assert result.infotext == expected_result["infotext"] + assert expected_result["infotext"] in result.infotext if "perfdata" in expected_result: assert result.perfdata == expected_result["perfdata"]

6 years, 6 months

Add docstrings

by Konstantin Büttner

Module: check_mk Branch: master Commit: 3d1f794bbfe7b027046354dc026616eb7fc3c84d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d1f794bbfe7b0… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Dec 18 10:05:44 2017 +0100 Add docstrings Change-Id: I38d6183d217772a046d4839bd5906035042a40d7 --- tests/checks/checktestlib.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/checks/checktestlib.py b/tests/checks/checktestlib.py index 39a0b98..f7618d1 100644 --- a/tests/checks/checktestlib.py +++ b/tests/checks/checktestlib.py @@ -8,6 +8,7 @@ class BasicCheckResult(object): def __init__(self, status, infotext, perfdata=None): """We perform some basic consistency checks during initialization""" + assert status in [0,1,2,3] assert type(infotext) == str assert "\n" not in infotext @@ -31,6 +32,13 @@ class BasicCheckResult(object): self.perfdata = perfdata def assert_result(self, expected_result): + """Assert that a result matches certain criteria + + expected_result is a Dictionary defining the criteria, allowing to not + rigidly define every detail about the check result, but only what we + really want to test. + """ + if "status" in expected_result: assert result.status == expected_result["status"] if "infotext" in expected_result: @@ -43,6 +51,8 @@ class CompoundCheckResult(object): """A check result consisting of multiple subresults, as returned by yield-style checks""" def __init__(self, result): + """Initializes a list of subresults using BasicCheckResult""" + self.subresults = [] for subresult in result: self.subresults.append(BasicCheckResult(*subresult))

6 years, 6 months

CompoundCheckResult: Provide a way to check for the existence of a matching subresult

by Konstantin Büttner

Module: check_mk Branch: master Commit: 0652c935f9763a654b894de2387c479647535af9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0652c935f9763a… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Dec 18 12:24:51 2017 +0100 CompoundCheckResult: Provide a way to check for the existence of a matching subresult Change-Id: I7ea505752c1168da4784375330b38429c13c88ed --- tests/checks/checktestlib.py | 31 +++++++++++++++++++++++++++++-- tests/checks/test_statgrab_cpu_check.py | 3 ++- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/tests/checks/checktestlib.py b/tests/checks/checktestlib.py index 221ce7b..d785241 100644 --- a/tests/checks/checktestlib.py +++ b/tests/checks/checktestlib.py @@ -42,14 +42,28 @@ class BasicCheckResult(object): """Check whether this result's perfdata matches a given value. Exact match.""" return expected_perfdata == self.perfdata - def assert_result(self, expected_result): - """Assert that a result matches certain criteria + def match(self, expected_result): + """Check whether a result matches certain criteria expected_result is a Dictionary defining the criteria, allowing to not rigidly define every detail about the check result, but only what we really want to test. Unset fields mean we don't care. """ + if "status" in expected_result and not match_status(expected_result["status"]): + return False + if "infotext" in expected_result and not match_infotext(expected_result["infotext"]): + return False + if "perfdata" in expected_result and not match_perfdata(expected_result["perfdata"]): + return False + return True + + def assert_result(self, expected_result): + """Assert that a result matches certain criteria + + expected_result works as in match_result + """ + if "status" in expected_result: assert match_status(expected_result["status"]) if "infotext" in expected_result: @@ -67,3 +81,16 @@ class CompoundCheckResult(object): self.subresults = [] for subresult in result: self.subresults.append(BasicCheckResult(*subresult)) + + def match_subresult(self, expected_result): + """Checks whether a subresult matching certain criteria is contained in this compound result""" + + for subresult in self.subresults: + if subresult.match(expected_result): + return True + return False + + def assert_result(self, expected_result): + """Assert that a subresult matching certain criteria is contained in this compound result""" + + assert self.match_subresult(expected_result) diff --git a/tests/checks/test_statgrab_cpu_check.py b/tests/checks/test_statgrab_cpu_check.py index 446aa27..ed41637 100644 --- a/tests/checks/test_statgrab_cpu_check.py +++ b/tests/checks/test_statgrab_cpu_check.py @@ -21,7 +21,7 @@ pytestmark = pytest.mark.checks [u'total', u'%d' % int(t*50)], [u'user', u'%d' % int(t*50)], [u'vctxsw', u'%d' % int(t*50)]], - {}, None), + {}, {}), ]) def test_statgrab_cpu_check(check_manager, monkeypatch, time_to_info, params, expected_result): import time @@ -32,3 +32,4 @@ def test_statgrab_cpu_check(check_manager, monkeypatch, time_to_info, params, ex pass monkeypatch.setattr("time.time", lambda: 60) result = checktestlib.CompoundCheckResult(check.run_check(None, params, time_to_info(60))) + result.assert_result(expected_result)

6 years, 6 months

BasicCheckResult: Extract logic for matching status, infotext and perfdata into individual methods

by Konstantin Büttner

Module: check_mk Branch: master Commit: e26a935dca2eccec5e00939352f87d4c3a03ff0d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e26a935dca2ecc… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Dec 18 11:44:50 2017 +0100 BasicCheckResult: Extract logic for matching status, infotext and perfdata into individual methods Change-Id: I8840a7679ea43a57974d63c93cb973791060e548 --- tests/checks/checktestlib.py | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/tests/checks/checktestlib.py b/tests/checks/checktestlib.py index 32cad5d..221ce7b 100644 --- a/tests/checks/checktestlib.py +++ b/tests/checks/checktestlib.py @@ -1,4 +1,3 @@ - class BasicCheckResult(object): """A basic check result @@ -31,20 +30,32 @@ class BasicCheckResult(object): assert all(type(value) in [int, float, type(None)] for value in entry[2:]) self.perfdata = perfdata + def match_status(self, expected_status): + """Check if this result's status matches a given value. Exact match.""" + return self.status == expected_status + + def match_infotext(self, expected_infotext): + """Check whether this result's infotext contains a given string. Case-sensitive.""" + return expected_infotext in self.infotext + + def match_perfdata(self, expected_perfdata): + """Check whether this result's perfdata matches a given value. Exact match.""" + return expected_perfdata == self.perfdata + def assert_result(self, expected_result): """Assert that a result matches certain criteria expected_result is a Dictionary defining the criteria, allowing to not rigidly define every detail about the check result, but only what we - really want to test. + really want to test. Unset fields mean we don't care. """ if "status" in expected_result: - assert result.status == expected_result["status"] + assert match_status(expected_result["status"]) if "infotext" in expected_result: - assert expected_result["infotext"] in result.infotext + assert match_infotext(expected_result["infotext"]) if "perfdata" in expected_result: - assert result.perfdata == expected_result["perfdata"] + assert match_perfdata(expected_result["perfdata"]) class CompoundCheckResult(object):

6 years, 6 months

5456 FIX mk_oracle, mk_oracle.aix: Fixed excluding all sections for any SID which contains invalid characters in the related variable name

by Simon Betz

Module: check_mk Branch: master Commit: 16b0955947f72aabc17ae330c59a468e80e4e284 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=16b0955947f72a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Dec 18 12:03:29 2017 +0100 5456 FIX mk_oracle, mk_oracle.aix: Fixed excluding all sections for any SID which contains invalid characters in the related variable name Change-Id: I2e362d4c70796913e6d443fe3a0c8d724642e1ff --- .werks/5456 | 11 +++++++++++ agents/plugins/mk_oracle | 14 +++++++++----- agents/plugins/mk_oracle.aix | 14 +++++++++----- 3 files changed, 29 insertions(+), 10 deletions(-) diff --git a/.werks/5456 b/.werks/5456 new file mode 100644 index 0000000..57f46bd --- /dev/null +++ b/.werks/5456 @@ -0,0 +1,11 @@ +Title: mk_oracle, mk_oracle.aix: Fixed excluding all sections for any SID which contains invalid characters in the related variable name +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i2 +Date: 1513594845 + + diff --git a/agents/plugins/mk_oracle b/agents/plugins/mk_oracle index c06679b..26f658b 100755 --- a/agents/plugins/mk_oracle +++ b/agents/plugins/mk_oracle @@ -1297,12 +1297,16 @@ do if [ "$SKIP" ] ; then continue ; fi fi - # Handle explicit exclusion of instances EXCLUDE=EXCLUDE_$SID - EXCLUDE=${!EXCLUDE} - # SID filtered totally? - if [ "$EXCLUDE" = "ALL" ]; then - continue + if [[ "$EXCLUDE" =~ ^[a-zA-Z][a-zA-Z0-9_]*$ ]] + then + # Handle explicit exclusion of instances + # but not for +ASM + EXCLUDE=${!EXCLUDE} + # SID filtered totally? + if [ "$EXCLUDE" = "ALL" ]; then + continue + fi fi get_oraversion $SID diff --git a/agents/plugins/mk_oracle.aix b/agents/plugins/mk_oracle.aix index 74ebdc2..5c60e7a 100755 --- a/agents/plugins/mk_oracle.aix +++ b/agents/plugins/mk_oracle.aix @@ -1093,12 +1093,16 @@ do if [ "$SKIP" ] ; then continue ; fi fi - # Handle explicit exclusion of instances EXCLUDE=EXCLUDE_$SID - EXCLUDE=${!EXCLUDE} - # SID filtered totally? - if [ "$EXCLUDE" = "ALL" ]; then - continue + if [[ "$EXCLUDE" =~ ^[a-zA-Z][a-zA-Z0-9_]*$ ]] + then + # Handle explicit exclusion of instances + # but not for +ASM + EXCLUDE=${!EXCLUDE} + # SID filtered totally? + if [ "$EXCLUDE" = "ALL" ]; then + continue + fi fi if [ ${SID:0:1} = '+' ] ; then

6 years, 6 months

Windows agent: Refactor use of OpenHardwareMonitor

by Jukka Aro

Module: check_mk Branch: master Commit: 6f4f60e1c40d01a05c96a3a0456f3f08b394ecd0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6f4f60e1c40d01… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Dec 15 11:58:33 2017 +0100 Windows agent: Refactor use of OpenHardwareMonitor * Wrap all raw handles to managing classes. * Avoid unnecessary use of unique_ptr. * Use more descriptive names. * Increase const correctness. Change-Id: I0cd635340ab28ac91c00c7e9c211bdcb458297a3 --- agents/windows/OHMMonitor.cc | 74 +++++++++++++---------------------- agents/windows/OHMMonitor.h | 35 ++++++++++++----- agents/windows/build_version | 2 +- agents/windows/sections/SectionOHM.cc | 9 ++--- agents/windows/sections/SectionOHM.h | 3 +- 5 files changed, 59 insertions(+), 64 deletions(-) diff --git a/agents/windows/OHMMonitor.cc b/agents/windows/OHMMonitor.cc index af14903..1b782a0 100644 --- a/agents/windows/OHMMonitor.cc +++ b/agents/windows/OHMMonitor.cc @@ -27,83 +27,65 @@ #include "WinApiAdaptor.h" #include "types.h" -OHMMonitor::OHMMonitor(const std::string &bin_path, Logger *logger, - const WinApiAdaptor &winapi) - : _exe_path(bin_path + "\\OpenHardwareMonitorCLI.exe") - , _logger(logger) - , _winapi(winapi) { - _available = (_winapi.GetFileAttributes(_exe_path.c_str()) != - INVALID_FILE_ATTRIBUTES); -} - -OHMMonitor::~OHMMonitor() { - if (_current_process != INVALID_HANDLE_VALUE) { - DWORD exitCode = 0; - if (!_winapi.GetExitCodeProcess(_current_process, &exitCode)) { - // invalid handle - _winapi.CloseHandle(_current_process); - } else { - if (exitCode == STILL_ACTIVE) { - // shut down ohm process - _winapi.TerminateProcess(_current_process, 0); - } - _winapi.CloseHandle(_current_process); - } - } -} +namespace { HANDLE dev_null(const WinApiAdaptor &winapi) { - SECURITY_ATTRIBUTES secattr = {}; - secattr.nLength = sizeof(SECURITY_ATTRIBUTES); - secattr.lpSecurityDescriptor = NULL; - secattr.bInheritHandle = TRUE; + SECURITY_ATTRIBUTES secattr{sizeof(SECURITY_ATTRIBUTES), nullptr, TRUE}; return winapi.CreateFile("nul:", GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, &secattr, OPEN_EXISTING, 0, nullptr); } -bool OHMMonitor::checkAvailabe() { +} // namespace + +OHMMonitor::OHMMonitor(const std::string &bin_path, Logger *logger, + const WinApiAdaptor &winapi) + : _exe_path(bin_path + "\\OpenHardwareMonitorCLI.exe") + , _available(winapi.GetFileAttributes(_exe_path.c_str()) != + INVALID_FILE_ATTRIBUTES) + , _current_process(winapi) + , _logger(logger) + , _winapi(winapi) {} + +OHMMonitor::~OHMMonitor() {} + +bool OHMMonitor::startProcess() { if (!_available) { return false; } - if (_current_process != INVALID_HANDLE_VALUE) { - DWORD exitCode = 0; - if (!_winapi.GetExitCodeProcess(_current_process, &exitCode)) { - // handle invalid??? - Debug(_logger) << "ohm process handle invalid"; - _winapi.CloseHandle(_current_process); - _current_process = INVALID_HANDLE_VALUE; - } else { + if (_current_process) { + DWORD exitCode = STILL_ACTIVE; + if (!_winapi.GetExitCodeProcess(_current_process.get(), &exitCode) || + exitCode != STILL_ACTIVE) { if (exitCode != STILL_ACTIVE) { Debug(_logger) << "OHM process ended with exit code " << exitCode; - _winapi.CloseHandle(_current_process); - _current_process = INVALID_HANDLE_VALUE; } + _current_process = {INVALID_HANDLE_VALUE, _winapi}; } } - if (_current_process == INVALID_HANDLE_VALUE) { - STARTUPINFO si = {}; + if (!_current_process) { + STARTUPINFO si{0}; si.cb = sizeof(STARTUPINFO); si.dwFlags |= STARTF_USESTDHANDLES; si.hStdOutput = si.hStdError = dev_null(_winapi); + WrappedHandle<InvalidHandleTraits> fileHandle{si.hStdOutput, _winapi}; - OnScopeExit close_stdout([&]() { _winapi.CloseHandle(si.hStdOutput); }); - - PROCESS_INFORMATION pi = {}; + PROCESS_INFORMATION pi{0}; if (!_winapi.CreateProcess(_exe_path.c_str(), nullptr, nullptr, nullptr, TRUE, 0, nullptr, nullptr, &si, &pi)) { Error(_logger) << "failed to run %s" << _exe_path; return false; } else { - _current_process = pi.hProcess; + _current_process = {pi.hProcess, _winapi}; Debug(_logger) << "started " << _exe_path << " (pid " << pi.dwProcessId << ")"; - _winapi.CloseHandle(pi.hThread); + WrappedHandle<NullHandleTraits> threadHandle{pi.hThread, _winapi}; } } + return true; } diff --git a/agents/windows/OHMMonitor.h b/agents/windows/OHMMonitor.h index 84cb39e..cb6ebed 100644 --- a/agents/windows/OHMMonitor.h +++ b/agents/windows/OHMMonitor.h @@ -27,17 +27,32 @@ #include <winsock2.h> #include <windows.h> #include <string> +#include "types.h" class Logger; class WinApiAdaptor; -/** - * Ensure the Open Hardware Monitor is running (if it's available) - **/ +struct OhmProcessHandleTraits { + using HandleT = HANDLE; + static HandleT invalidValue() { return INVALID_HANDLE_VALUE; } + + static void closeHandle(HandleT value, const WinApiAdaptor &winapi) { + DWORD exitCode = 0; + if (winapi.GetExitCodeProcess(value, &exitCode) && + exitCode == STILL_ACTIVE) { + // shut down ohm process + winapi.TerminateProcess(value, 0); + } + winapi.CloseHandle(value); + } +}; + +using OhmProcessHandle = WrappedHandle<OhmProcessHandleTraits>; + class OHMMonitor { - std::string _exe_path; - bool _available; - HANDLE _current_process{INVALID_HANDLE_VALUE}; + const std::string _exe_path; + const bool _available; + OhmProcessHandle _current_process; Logger *_logger; const WinApiAdaptor &_winapi; @@ -46,7 +61,9 @@ public: const WinApiAdaptor &winapi); ~OHMMonitor(); - // this call actually starts OHM if necessary and returns - // true if it was already running or was successfully started - bool checkAvailabe(); + /** + * Ensure the Open Hardware Monitor is running (if it's available). + * Return true if it was already running or was successfully started. + **/ + bool startProcess(); }; diff --git a/agents/windows/build_version b/agents/windows/build_version index 95a3b3e..be8773d 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3026 +3028 diff --git a/agents/windows/sections/SectionOHM.cc b/agents/windows/sections/SectionOHM.cc index d85d24f..703f447 100644 --- a/agents/windows/sections/SectionOHM.cc +++ b/agents/windows/sections/SectionOHM.cc @@ -33,16 +33,13 @@ SectionOHM::SectionOHM(Configuration &config, Logger *logger, const WinApiAdaptor &winapi) : SectionWMI("openhardwaremonitor", "openhardwaremonitor", config.getEnvironment(), logger, winapi) - , _bin_path(_env.binDirectory()) { + , _ohm_monitor(_env.binDirectory(), _logger, _winapi) { withNamespace(L"Root\\OpenHardwareMonitor"); withObject(L"Sensor"); } void SectionOHM::startIfAsync() { - if (_ohm_monitor.get() == nullptr) { - _ohm_monitor.reset(new OHMMonitor(_bin_path, _logger, _winapi)); - _ohm_monitor->checkAvailabe(); - } + _ohm_monitor.startProcess(); } bool SectionOHM::produceOutputInner(std::ostream &out) { @@ -54,7 +51,7 @@ bool SectionOHM::produceOutputInner(std::ostream &out) { Debug(_logger) << "ComException: " << e.what(); res = false; } - if (!res && !_ohm_monitor->checkAvailabe()) { + if (!res && !_ohm_monitor.startProcess()) { Debug(_logger) << "ohm not installed or not runnable -> section disabled"; suspend(3600); diff --git a/agents/windows/sections/SectionOHM.h b/agents/windows/sections/SectionOHM.h index 8b594b1..8b37671 100644 --- a/agents/windows/sections/SectionOHM.h +++ b/agents/windows/sections/SectionOHM.h @@ -42,8 +42,7 @@ protected: virtual bool produceOutputInner(std::ostream &out) override; private: - std::unique_ptr<OHMMonitor> _ohm_monitor; - std::string _bin_path; + OHMMonitor _ohm_monitor; }; #endif // SectionOHM_h

6 years, 6 months

Consistently use Object::isCurrentStateOK.

by Sven Panne

Module: check_mk Branch: master Commit: 36943f30aa5c344ff89ddbf06fbf59ba215bce9b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36943f30aa5c34… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Dec 18 11:09:21 2017 +0100 Consistently use Object::isCurrentStateOK. Change-Id: I7c0a70ffde7a7c4e5bda0c53a220c994444507a6 --- livestatus/src/HostSpecialIntColumn.cc | 11 +++++------ livestatus/src/ServiceSpecialIntColumn.cc | 11 +++++------ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/livestatus/src/HostSpecialIntColumn.cc b/livestatus/src/HostSpecialIntColumn.cc index 127aa1e..b23321b 100644 --- a/livestatus/src/HostSpecialIntColumn.cc +++ b/livestatus/src/HostSpecialIntColumn.cc @@ -46,14 +46,13 @@ int32_t HostSpecialIntColumn::getValue(Row row, if (auto object = columnData<Object>(row)) { switch (_type) { case Type::real_hard_state: { - auto state = object->state(); - if (state->_current_state == 0) { + if (object->isCurrentStateOK()) { return 0; } - if (state->_state_type == StateType::hard) { - return state->_current_state; - } - return state->_last_hard_state; + auto state = object->state(); + return state->_state_type == StateType::hard + ? state->_current_state + : state->_last_hard_state; } case Type::pnp_graph_present: return _mc->impl<Core>() diff --git a/livestatus/src/ServiceSpecialIntColumn.cc b/livestatus/src/ServiceSpecialIntColumn.cc index 0b92005..cf043a5 100644 --- a/livestatus/src/ServiceSpecialIntColumn.cc +++ b/livestatus/src/ServiceSpecialIntColumn.cc @@ -44,14 +44,13 @@ int32_t ServiceSpecialIntColumn::getValue( if (auto object = columnData<Object>(row)) { switch (_type) { case Type::real_hard_state: { - auto state = object->state(); - if (state->_current_state == 0) { + if (object->isCurrentStateOK()) { return 0; } - if (state->_state_type == StateType::hard) { - return state->_current_state; - } - return state->_last_hard_state; + auto state = object->state(); + return state->_state_type == StateType::hard + ? state->_current_state + : state->_last_hard_state; } case Type::pnp_graph_present: return _mc->impl<Core>()

6 years, 6 months

← Newer
1
...
4
5
6
7
8
9
10
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2017