Checkmk git commits September 2017

checkmk-commits@lists.checkmk.com

11 participants
255 discussions

by Konstantin Büttner

Module: check_mk Branch: master Commit: 980119c379e2f5246cd038a8f859ed4cdd3cb14e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=980119c379e2f5… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Sep 22 17:35:24 2017 +0200 Fix typo Change-Id: Ia71e19075804997bbb211b696d93c72ca5fcebf2 --- web/plugins/wato/check_parameters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 885dfbc..4c046c3 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -7658,7 +7658,7 @@ register_check_parameters( )), ("timeout_occured", DropdownChoice( - title = _("Timeout occured occured"), + title = _("Timeout occured"), choices = [ ( "yes", _("yes")), ( "no", _("no")),

6 years, 9 months

Updated timestamp for availability of a wer

by Marcel Arentz

Module: check_mk Branch: master Commit: 3c095561b38ff8d43a8a0f69e2b12da1eb65546c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c095561b38ff8… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Fri Sep 22 17:12:16 2017 +0200 Updated timestamp for availability of a wer Change-Id: I4c935c09c5080b4aab0ebb8728f8fdafb54f88fd --- .werks/5009 | 2 +- .werks/5011 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/5009 b/.werks/5009 index 55f5a7c..5a43b6e 100644 --- a/.werks/5009 +++ b/.werks/5009 @@ -4,7 +4,7 @@ Component: checks Compatible: compat Edition: cre Version: 1.5.0i1 -Date: 1500275762 +Date: 1505920200 Class: feature Check_MK now monitors OTN interfaces including the status, consumed power, diff --git a/.werks/5011 b/.werks/5011 index 9d9d235..cbd554c 100644 --- a/.werks/5011 +++ b/.werks/5011 @@ -4,7 +4,7 @@ Component: checks Compatible: compat Edition: cre Version: 1.5.0i1 -Date: 1500909323 +Date: 1506093019 Class: feature These new checks enable Check_MK to monitor a EMC ScaleIO infrastructure. Take

6 years, 9 months

5223 juniper_alarm, juniper_bgp_state, juniper_cpu, juniper_cpu_util, juniper_fru, juniper_mem: Try discovery also on QFX series devices

by Konstantin Büttner

Module: check_mk Branch: master Commit: d8a0e9e14942b06192722aad02df1bb1e5ddba2d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d8a0e9e14942b0… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Sep 22 16:05:45 2017 +0200 5223 juniper_alarm, juniper_bgp_state, juniper_cpu, juniper_cpu_util, juniper_fru, juniper_mem: Try discovery also on QFX series devices The scan functions of these checks previously were overly restrictive. Thanks to Ricardo Fribeiro for pointing this out! Change-Id: I77cbd65fa5abd389c57d0b3c6d3e7631d581f7ee --- .werks/5223 | 11 +++++++++++ checks/juniper_alarm | 2 +- checks/juniper_bgp_state | 2 +- checks/juniper_cpu | 2 +- checks/juniper_cpu_util | 2 +- checks/juniper_fru | 2 +- checks/juniper_mem | 2 +- 7 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.werks/5223 b/.werks/5223 new file mode 100644 index 0000000..a228dee --- /dev/null +++ b/.werks/5223 @@ -0,0 +1,11 @@ +Title: juniper_alarm, juniper_bgp_state, juniper_cpu, juniper_cpu_util, juniper_fru, juniper_mem: Try discovery also on QFX series devices +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1506089035 +Class: feature + +The scan functions of these checks previously were overly restrictive. +Thanks to Ricardo Fribeiro for pointing this out! diff --git a/checks/juniper_alarm b/checks/juniper_alarm index 8469aa9..760a395 100644 --- a/checks/juniper_alarm +++ b/checks/juniper_alarm @@ -50,7 +50,7 @@ check_info['juniper_alarm'] = { 'inventory_function' : inventory_juniper_alarm, 'check_function' : check_juniper_alarm, 'service_description' : 'Chassis', - 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.2636.1.1.1.2"), + 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.2636.1.1.1"), 'snmp_info' : (".1.3.6.1.4.1.2636.3.1.10.1", [ "8", # jnxLEDState ]), diff --git a/checks/juniper_bgp_state b/checks/juniper_bgp_state index b85588a..2c945c9 100644 --- a/checks/juniper_bgp_state +++ b/checks/juniper_bgp_state @@ -77,5 +77,5 @@ check_info["juniper_bgp_state"] = { 2, # jnxBgpM2PeerState 3 ]), # jnxBgpM2PeerStatus # (like operational status) - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.2636.1.1.1.2"), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.2636.1.1.1"), } diff --git a/checks/juniper_cpu b/checks/juniper_cpu index af9930c..a78fbf0 100644 --- a/checks/juniper_cpu +++ b/checks/juniper_cpu @@ -43,7 +43,7 @@ check_info["juniper_cpu"] = { "inventory_function" : inventory_juniper_cpu, "service_description" : "CPU utilization %s", "has_perfdata" : True, - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.2636.1.1.1.2"), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.2636.1.1.1"), "snmp_info" : (".1.3.6.1.4.1.2636.3.1.13.1",[ 5, #jnxOperatingDescr 20, #jnxOperating1MinLoadAvg diff --git a/checks/juniper_cpu_util b/checks/juniper_cpu_util index a513a46..4902e66 100644 --- a/checks/juniper_cpu_util +++ b/checks/juniper_cpu_util @@ -48,7 +48,7 @@ check_info['juniper_cpu_util'] = { 'group' : 'juniper_cpu_util', 'service_description' : "CPU utilization %s", 'has_perfdata' : True, - 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.2636.1.1.1.2"), + 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.2636.1.1.1"), 'snmp_info' : (".1.3.6.1.4.1.2636.3.1.13.1",[ 5, #jnxOperatingDescr 8, #jnxOperatingCPU diff --git a/checks/juniper_fru b/checks/juniper_fru index 645e294..61b0024 100644 --- a/checks/juniper_fru +++ b/checks/juniper_fru @@ -130,7 +130,7 @@ check_info['juniper_fru'] = { 'inventory_function' : lambda info: inventory_juniper_fru(info, "7"), 'check_function' : check_juniper_fru, 'service_description' : 'Power Supply FRU %s', - 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.2636.1.1.1.2"), + 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.2636.1.1.1"), 'snmp_info' : (".1.3.6.1.4.1.2636.3.1.15.1", [ "5", # jnxFruName "6", # jnxFruType diff --git a/checks/juniper_mem b/checks/juniper_mem index 97b3200..1607837 100644 --- a/checks/juniper_mem +++ b/checks/juniper_mem @@ -57,7 +57,7 @@ check_info['juniper_mem'] = { 'inventory_function' : inventory_juniper_mem, 'check_function' : check_juniper_mem, 'service_description' : 'Memory Utilization %s', - 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.2636.1.1.1.2"), + 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.2636.1.1.1"), 'snmp_info' : (".1.3.6.1.4.1.2636.3.1.13.1", [ "5.9", # jnxOperatingDescr "11.9", # jnxOperatingBuffer

6 years, 9 months

Fix Windows Agent crash with vista_api = yes

by Jukka Aro

Module: check_mk Branch: master Commit: 8649ba5b9b0429f00a187d5067d89c1db2836564 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8649ba5b9b0429… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Sep 22 11:49:54 2017 +0200 Fix Windows Agent crash with vista_api = yes The crash was caused by refactoring the dynamically loaded functions in EvtFunctionMap, done in commit d0e60a30a20ed75349ea192a6200fc0c7501dc1a. The original reason for the problematic change was to try to avoid Windows headers in unit tess. Now that we can use Windows headers in tests through Wine, the problematic change with dynamically loaded functions in EvtFunctionMap can be simply reverted. Change-Id: I4348886989c4f704a5c26c562da7b8b55db9d22b --- agents/windows/EventLogVista.cc | 57 +++++++++-------------- agents/windows/EventLogVista.h | 38 ++++++--------- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1565696 -> 1565696 bytes agents/windows/check_mk_agent-64.unstripped.exe | Bin 22787160 -> 22787160 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1565696 -> 1565696 bytes agents/windows/check_mk_agent.exe | Bin 1548800 -> 1548800 bytes agents/windows/check_mk_agent.msi | Bin 3388416 -> 3388416 bytes agents/windows/check_mk_agent.unstripped.exe | Bin 19628063 -> 19627551 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1548800 -> 1548800 bytes agents/windows/crash.exe | Bin 358864 -> 358864 bytes agents/windows/install_agent-64.exe | Bin 681533 -> 681464 bytes agents/windows/install_agent.exe | Bin 676613 -> 676446 bytes agents/windows/nowin.exe | Bin 361000 -> 361000 bytes agents/windows/plugins/mk_jolokia.exe | Bin 10106814 -> 10106814 bytes 15 files changed, 36 insertions(+), 61 deletions(-) diff --git a/agents/windows/EventLogVista.cc b/agents/windows/EventLogVista.cc index 9b1edbd..2a84699 100644 --- a/agents/windows/EventLogVista.cc +++ b/agents/windows/EventLogVista.cc @@ -241,44 +241,29 @@ EventApiModule::~EventApiModule() { } } -#define getFunc(winapi, hModule, funcType, funcName) \ - hModule ? (funcType)(winapi.GetProcAddress(hModule, funcName)) : nullptr +#define GET_FUNC(func) \ + ((decltype(&func))winapi.GetProcAddress(_mod->get_module(), #func)) EvtFunctionMap::EvtFunctionMap(const WinApiAdaptor &winapi) - : _mod(std::make_unique<EventApiModule>(winapi)) - , openLog(getFunc(winapi, _mod->get_module(), decltype(openLog), - static_cast<LPCSTR>("EvtOpenLog"))) - , query(getFunc(winapi, _mod->get_module(), decltype(query), - static_cast<LPCSTR>("EvtQuery"))) - , close(getFunc(winapi, _mod->get_module(), decltype(close), - static_cast<LPCSTR>("EvtClose"))) - , seek(getFunc(winapi, _mod->get_module(), decltype(seek), - static_cast<LPCSTR>("EvtSeek"))) - , next(getFunc(winapi, _mod->get_module(), decltype(next), - static_cast<LPCSTR>("EvtNext"))) - , createBookmark(getFunc(winapi, _mod->get_module(), - decltype(createBookmark), - static_cast<LPCSTR>("EvtCreateBookmark"))) - , updateBookmark(getFunc(winapi, _mod->get_module(), - decltype(updateBookmark), - static_cast<LPCSTR>("EvtUpdateBookmark"))) - , createRenderContext( - getFunc(winapi, _mod->get_module(), decltype(createRenderContext), - static_cast<LPCSTR>("EvtCreateRenderContext"))) - , render(getFunc(winapi, _mod->get_module(), decltype(render), - static_cast<LPCSTR>("EvtRender"))) - , subscribe(getFunc(winapi, _mod->get_module(), decltype(subscribe), - static_cast<LPCSTR>("EvtSubscribe"))) - , formatMessage(getFunc(winapi, _mod->get_module(), decltype(formatMessage), - static_cast<LPCSTR>("EvtFormatMessage"))) - , getEventMetadataProperty(getFunc( - winapi, _mod->get_module(), decltype(getEventMetadataProperty), - static_cast<LPCSTR>("EvtGetEventMetadataProperty"))) - , openPublisherMetadata( - getFunc(winapi, _mod->get_module(), decltype(openPublisherMetadata), - static_cast<LPCSTR>("EvtOpenPublisherMetadata"))) - , getLogInfo(getFunc(winapi, _mod->get_module(), decltype(getLogInfo), - static_cast<LPCSTR>("EvtGetLogInfo"))) {} + : _mod(std::make_unique<EventApiModule>(winapi)) { + if (_mod->get_module() == nullptr) { + return; + } + this->openLog = GET_FUNC(EvtOpenLog); + this->query = GET_FUNC(EvtQuery); + this->close = GET_FUNC(EvtClose); + this->seek = GET_FUNC(EvtSeek); + this->next = GET_FUNC(EvtNext); + this->createBookmark = GET_FUNC(EvtCreateBookmark); + this->updateBookmark = GET_FUNC(EvtUpdateBookmark); + this->createRenderContext = GET_FUNC(EvtCreateRenderContext); + this->render = GET_FUNC(EvtRender); + this->subscribe = GET_FUNC(EvtSubscribe); + this->formatMessage = GET_FUNC(EvtFormatMessage); + this->getEventMetadataProperty = GET_FUNC(EvtGetEventMetadataProperty); + this->openPublisherMetadata = GET_FUNC(EvtOpenPublisherMetadata); + this->getLogInfo = GET_FUNC(EvtGetLogInfo); +} EventLogVista::EventLogVista(const std::wstring &path, const WinApiAdaptor &winapi) diff --git a/agents/windows/EventLogVista.h b/agents/windows/EventLogVista.h index 5315ee6..60cf67c 100644 --- a/agents/windows/EventLogVista.h +++ b/agents/windows/EventLogVista.h @@ -63,30 +63,20 @@ struct EvtFunctionMap { explicit EvtFunctionMap(const WinApiAdaptor &winapi); std::unique_ptr<EventApiModule> _mod; - const EVT_HANDLE (*openLog)(EVT_HANDLE, LPCWSTR, DWORD); - const EVT_HANDLE (*query)(EVT_HANDLE, LPCWSTR, LPCWSTR, DWORD); - const WINBOOL (*close)(EVT_HANDLE); - const WINBOOL (*seek)(EVT_HANDLE, LONGLONG, EVT_HANDLE, DWORD, DWORD); - const WINBOOL (*next)(EVT_HANDLE, DWORD, EVT_HANDLE *, DWORD, DWORD, - PDWORD); - const EVT_HANDLE (*createBookmark)(LPCWSTR); - const WINBOOL (*updateBookmark)(EVT_HANDLE, EVT_HANDLE); - const EVT_HANDLE (*createRenderContext)(DWORD, LPCWSTR *, DWORD); - const WINBOOL (*render)(EVT_HANDLE, EVT_HANDLE, DWORD, DWORD, PVOID, PDWORD, - PDWORD); - const EVT_HANDLE (*subscribe)(EVT_HANDLE, HANDLE, LPCWSTR, LPCWSTR, - EVT_HANDLE, PVOID, EVT_SUBSCRIBE_CALLBACK, - DWORD); - const WINBOOL (*formatMessage)(EVT_HANDLE, EVT_HANDLE, DWORD, DWORD, - PEVT_VARIANT, DWORD, DWORD, LPWSTR, PDWORD); - const WINBOOL (*getEventMetadataProperty)(EVT_HANDLE, - EVT_EVENT_METADATA_PROPERTY_ID, - DWORD, DWORD, PEVT_VARIANT, - PDWORD); - const EVT_HANDLE (*openPublisherMetadata)(EVT_HANDLE, LPCWSTR, LPCWSTR, - LCID, DWORD); - const WINBOOL (*getLogInfo)(EVT_HANDLE, EVT_LOG_PROPERTY_ID, DWORD, - PEVT_VARIANT, PDWORD); + decltype(&EvtOpenLog) openLog; + decltype(&EvtQuery) query; + decltype(&EvtClose) close; + decltype(&EvtSeek) seek; + decltype(&EvtNext) next; + decltype(&EvtCreateBookmark) createBookmark; + decltype(&EvtUpdateBookmark) updateBookmark; + decltype(&EvtCreateRenderContext) createRenderContext; + decltype(&EvtRender) render; + decltype(&EvtSubscribe) subscribe; + decltype(&EvtFormatMessage) formatMessage; + decltype(&EvtGetEventMetadataProperty) getEventMetadataProperty; + decltype(&EvtOpenPublisherMetadata) openPublisherMetadata; + decltype(&EvtGetLogInfo) getLogInfo; }; class ManagedEventHandle { diff --git a/agents/windows/build_version b/agents/windows/build_version index 537c182..9b0efd1 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -2926 +2928 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 294a317..a292297 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.unstripped.exe b/agents/windows/check_mk_agent-64.unstripped.exe index 82daaa7..dd1dc1b 100755 Binary files a/agents/windows/check_mk_agent-64.unstripped.exe and b/agents/windows/check_mk_agent-64.unstripped.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index a237b3d..5cf4442 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 28303d3..822aae6 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 2b6b73f..2093c92 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.unstripped.exe b/agents/windows/check_mk_agent.unstripped.exe index 0f1363e..a1f58a0 100755 Binary files a/agents/windows/check_mk_agent.unstripped.exe and b/agents/windows/check_mk_agent.unstripped.exe differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 4b506e4..c8698a4 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/crash.exe b/agents/windows/crash.exe index b3f50eb..6069703 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index c9253e4..f2fa75d 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 1f3dfc7..835a251 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe index f7ac67e..de789ac 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ diff --git a/agents/windows/plugins/mk_jolokia.exe b/agents/windows/plugins/mk_jolokia.exe index c8f7106..1245e08 100755 Binary files a/agents/windows/plugins/mk_jolokia.exe and b/agents/windows/plugins/mk_jolokia.exe differ

6 years, 9 months

Added new bug regarding log levels for web.log

by Marcel Arentz

Module: check_mk Branch: master Commit: f007b2d722993151f582d6a12ccb95692a85708e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f007b2d7229931… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Fri Sep 22 10:43:23 2017 +0200 Added new bug regarding log levels for web.log Change-Id: I052890a4c1a545ba39e968bdc034f419faca991a --- .bugs/2970 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.bugs/2970 b/.bugs/2970 new file mode 100644 index 0000000..fa0a97c --- /dev/null +++ b/.bugs/2970 @@ -0,0 +1,9 @@ +Title: Manually defined log level for web.log is not used +Component: wato +State: open +Date: 2017-09-22 10:36:07 +Targetversion: 1.4.0 +Class: bug + +If the log level is set manually in WATO nothing changes in the global.mk. It +seems that the setting is not used at all.

6 years, 9 months

Reserved 20 Werk IDS

by Simon Betz

Module: check_mk Branch: master Commit: 087228fe338e119c2e579a1d7f00d9616c1539a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=087228fe338e11… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Sep 21 16:41:25 2017 +0200 Reserved 20 Werk IDS Change-Id: If1b2cb72230c27627e25e27ecf8e5b80c8dae096 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index d66b838..4390a28 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5308 +5328

6 years, 9 months

5222 FIX mrpe: Fix compatibility of bakery ruleset when updating from 1.2.8*

by Konstantin Büttner

Module: check_mk Branch: master Commit: d9f4b5a97d59ef7529ce55766fbd42736ba48ed8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d9f4b5a97d59ef… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Sep 21 16:02:30 2017 +0200 5222 FIX mrpe: Fix compatibility of bakery ruleset when updating from 1.2.8* A change in the bakelet's parameters introduced in 1.4.0i1 (cf. Werk #3137) led to previously configured rules blocking the baking process as well as leading to errors when searching for rulesets. This has been fixed. Change-Id: Ifebff43630d00ad139db81cd578d0e9a4ee3e898 --- .werks/5222 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.werks/5222 b/.werks/5222 new file mode 100644 index 0000000..dcb6bdf --- /dev/null +++ b/.werks/5222 @@ -0,0 +1,13 @@ +Title: mrpe: Fix compatibility of bakery ruleset when updating from 1.2.8* +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.5.0i1 +Date: 1506002395 + +A change in the bakelet's parameters introduced in 1.4.0i1 (cf. Werk #3137) +led to previously configured rules blocking the baking process as well as +leading to errors when searching for rulesets. This has been fixed.

6 years, 9 months

5011 New Checks for EMC ScaleIO Appliances

by Marcel Arentz

Module: check_mk Branch: master Commit: 64a1e436eeeb0b99db5a3d177e551750d88f4cfd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=64a1e436eeeb0b… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Jul 24 17:15:49 2017 +0200 5011 New Checks for EMC ScaleIO Appliances Change-Id: Iee60c84f34b777b3059a4b67a1f7c81da269b23c --- .werks/5011 | 15 ++++ agents/plugins/mk_scaleio | 88 +++++++++++++++++++++ checkman/scaleio_mdm | 19 +++++ checkman/scaleio_pd | 14 ++++ checkman/scaleio_pd.status | 14 ++++ checkman/scaleio_sds | 14 ++++ checkman/scaleio_sds.status | 16 ++++ checkman/scaleio_storage_pool | 14 ++++ checkman/scaleio_storage_pool.rebalancerw | 15 ++++ checkman/scaleio_storage_pool.totalrw | 14 ++++ checkman/scaleio_system | 15 ++++ checkman/scaleio_volume | 14 ++++ checks/scaleio.include | 86 ++++++++++++++++++++ checks/scaleio_mdm | 127 ++++++++++++++++++++++++++++++ checks/scaleio_pd | 87 ++++++++++++++++++++ checks/scaleio_sds | 94 ++++++++++++++++++++++ checks/scaleio_storage_pool | 120 ++++++++++++++++++++++++++++ checks/scaleio_system | 57 ++++++++++++++ checks/scaleio_volume | 71 +++++++++++++++++ 19 files changed, 894 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=64a1e436ee…

6 years, 9 months

5297 FIX dotnet_clrmemory, msexch_rpcclientaccess, wmi_cpuload: Fixed activate changes because of inconsistent item handling

by Simon Betz

Module: check_mk Branch: master Commit: a06b151c59fd631549772a8d36e125035c18b126 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a06b151c59fd63… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Sep 21 12:48:36 2017 +0200 5297 FIX dotnet_clrmemory, msexch_rpcclientaccess, wmi_cpuload: Fixed activate changes because of inconsistent item handling Change-Id: I4834da06a4a57b8b5d26b27abcf47d981c9992f2 --- .werks/5297 | 21 +++++++++++++++++++++ checks/dotnet_clrmemory | 2 +- checks/wmi.include | 2 +- web/plugins/wato/check_parameters.py | 2 +- 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/.werks/5297 b/.werks/5297 new file mode 100644 index 0000000..134075f --- /dev/null +++ b/.werks/5297 @@ -0,0 +1,21 @@ +Title: dotnet_clrmemory, msexch_rpcclientaccess, wmi_cpuload: Fixed activate changes because of inconsistent item handling +Level: 1 +Component: checks +Class: fix +Compatible: incomp +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1505989362 + +WATO groups, inventory functions in wmi.include and service descriptions +were inconsistent. +<ul> +<li>Werk 4099 changed WATO item type.</li> +<li>Library {{wmi.include}} returned wrong item for {{wmi_cpuload}}.</li> +<li>Check {{dotnet_clrmemory}} had not '%s' in service description (not incomp.).</li> +</ul> +In the first case the existing rules must be discharged and new ones have +to be applied. +Second issue requires a re-discovery on the affected hosts. +Third one is not incompatible; just a cosmetic change. diff --git a/checks/dotnet_clrmemory b/checks/dotnet_clrmemory index 26f9d13..42f0d26 100644 --- a/checks/dotnet_clrmemory +++ b/checks/dotnet_clrmemory @@ -46,7 +46,7 @@ check_info['dotnet_clrmemory'] = { 'check_function' : check_dotnet_clrmemory, 'parse_function' : parse_wmi_table, 'has_perfdata' : True, - 'service_description' : "DotNet Memory Management", + 'service_description' : "DotNet Memory Management %s", 'includes' : ['wmi.include'], 'group' : "clr_memory" } diff --git a/checks/wmi.include b/checks/wmi.include index a87672c..ae744cf 100644 --- a/checks/wmi.include +++ b/checks/wmi.include @@ -221,7 +221,7 @@ def inventory_wmi_table(tables, **kwargs): # 'system_perf' section has only counters and comes together # with 'computer_system' which has table names and intersection # of these tables would be empty. Thus no service is discovered. - potential_instances = [""] + potential_instances = [None] else: # inventarize one item per instance that exists in all tables diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 101f202..885dfbc 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -6718,7 +6718,7 @@ register_check_parameters( ], optional_keys=[] ), - FixedValue("", title=""), + None, match_type = 'dict' )

6 years, 9 months

Fix spelling

by Konstantin Büttner

Module: check_mk Branch: master Commit: d0c1dc86bfcc8aaf26c06e55beaa85d0a0835897 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d0c1dc86bfcc8a… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Sep 20 17:53:31 2017 +0200 Fix spelling Change-Id: I95f64c2b81980014cb5ad546fb7ae512e96355d8 --- web/plugins/wato/check_parameters.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 52d89ea..101f202 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -3849,7 +3849,7 @@ register_check_parameters( allow_empty = False, regex = "^[a-zA-Z_0-9 _./-]*$", regex_error = _("Please use only a-z, A-Z, 0-9, space, underscore, " - "dot, hyphon and slash for your service description"), + "dot, hyphen and slash for your service description"), ), "dict", has_inventory = False, @@ -14761,7 +14761,7 @@ register_check_parameters( allow_empty = False, regex = "^[a-zA-Z_0-9 _.-]*$", regex_error = _("Please use only a-z, A-Z, 0-9, space, underscore, " - "dot and hyphon for your service description"), + "dot and hyphen for your service description"), ), match_type = "dict", has_inventory = False

6 years, 9 months

← Newer
1
...
6
7
8
9
10
11
12
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2017