Checkmk git commits August 2015

checkmk-commits@lists.checkmk.com

7 participants
211 discussions

Check_MK Git: check_mk: Code cleanup in check counter handling ( now called item state)

by Mathias Kettner

Module: check_mk Branch: master Commit: 238106576c63745bd9821906f1b8637bb1edbe78 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=238106576c6374… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Aug 19 12:53:20 2015 +0200 Code cleanup in check counter handling (now called item state) --- modules/check_mk.py | 4 +- modules/check_mk_base.py | 184 ++++++++++++++++++++++++---------------------- 2 files changed, 100 insertions(+), 88 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=238106576c…

8 years, 10 months

Check_MK Git: check_mk: mem.linux, WATO rule hardware corrupted error: changed ValueSpec to MonitoringState

by Simon Betz

Module: check_mk Branch: master Commit: efaecde8e248d2ecab6ace5809976a22e0458f70 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=efaecde8e248d2… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Aug 19 11:59:46 2015 +0200 mem.linux, WATO rule hardware corrupted error: changed ValueSpec to MonitoringState --- checks/mem | 6 +----- web/plugins/wato/check_parameters.py | 12 +++--------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/checks/mem b/checks/mem index 5a66733..aead0f1 100644 --- a/checks/mem +++ b/checks/mem @@ -335,11 +335,7 @@ def check_mem_linux(_no_item, params, info): # HardwareCorrupted hwc = meminfo.get("HardwareCorrupted") if hwc: - if "handle_hw_corrupted_error" in params: - if params["handle_hw_corrupted_error"] != 3: - yield params["handle_hw_corrupted_error"], "Hardware defect of %s" % get_bytes_human_readable(hwc) - else: - yield 2, "Hardware defect of %s" % get_bytes_human_readable(hwc) + yield params.get("handle_hw_corrupted_error", 2), "Hardware defect of %s" % get_bytes_human_readable(hwc) # Now send performance data. We simply output *all* fields of meminfo # except for a few really useless values diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 2931c69..dde6392 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -3596,15 +3596,9 @@ register_check_parameters( ( "levels_committed", UpperMemoryLevels(_("Committed memory"), (100.0, 150.0), _("RAM + Swap"))), ( "levels_commitlimit", LowerMemoryLevels(_("Commit Limit"), ( 20.0, 10.0), _("RAM + Swap"))), ( "levels_vmalloc", LowerMemoryLevels(_("Largest Free VMalloc Chunk"))), - ( "handle_hw_corrupted_error", DropdownChoice( - title = _("Handle Hardware Corrupted Error"), - choices = [ - (0, _("Set state to OK")), - (1, _("Set state to WARN")), - (2, _("Set state to CRIT (Default)")), - (3, _("Ignore this error")), - ], - default_value = 2, + ( "handle_hw_corrupted_error", MonitoringState( + title = _("Handle Hardware Corrupted Error"), + default_value = 2, )), ], ),

8 years, 10 months

Check_MK Git: check_mk: #2517 mem.linux: Now able to handle hardware corrupted error via WATO rule

by Simon Betz

Module: check_mk Branch: master Commit: 71752068d64eea96981232d1abbcaaaf201369e2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=71752068d64eea… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Aug 18 17:10:01 2015 +0200 #2517 mem.linux: Now able to handle hardware corrupted error via WATO rule This version allows you to downgrade the hardware corrupted error state. --- .werks/2517 | 9 +++++++++ ChangeLog | 1 + checks/mem | 6 +++++- web/plugins/wato/check_parameters.py | 10 ++++++++++ 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/.werks/2517 b/.werks/2517 new file mode 100644 index 0000000..6b86899 --- /dev/null +++ b/.werks/2517 @@ -0,0 +1,9 @@ +Title: mem.linux: Now able to handle hardware corrupted error via WATO rule +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1439910466 +Class: feature + +This version allows you to downgrade the hardware corrupted error state. diff --git a/ChangeLog b/ChangeLog index 02ac85d..943a5ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -50,6 +50,7 @@ * 2528 emc_isilon_cpu, emc_isilon_ifs: New checks for cpu utilization and the combined cluster storage on EMC Isilon data storage devices * 2529 kernel.util can now be configured to warn if a single cpu core exceeds a utilization threshold for a while * 2419 windows agent: is now downward compatible to win2k + * 2517 mem.linux: Now able to handle hardware corrupted error via WATO rule... * 2315 FIX: windows agent: BOM replacement, fixed incorrect byte offset... * 2316 FIX: windows agent: fix garbled output of cached agent plugins... * 2358 FIX: check_mk_agent.solaris: more correct computation of zfs used space... diff --git a/checks/mem b/checks/mem index 0f58e11..5a66733 100644 --- a/checks/mem +++ b/checks/mem @@ -335,7 +335,11 @@ def check_mem_linux(_no_item, params, info): # HardwareCorrupted hwc = meminfo.get("HardwareCorrupted") if hwc: - yield 2, "Hardware defect of %s" % get_bytes_human_readable(hwc) + if "handle_hw_corrupted_error" in params: + if params["handle_hw_corrupted_error"] != 3: + yield params["handle_hw_corrupted_error"], "Hardware defect of %s" % get_bytes_human_readable(hwc) + else: + yield 2, "Hardware defect of %s" % get_bytes_human_readable(hwc) # Now send performance data. We simply output *all* fields of meminfo # except for a few really useless values diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index bd9f86a..2931c69 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -3596,6 +3596,16 @@ register_check_parameters( ( "levels_committed", UpperMemoryLevels(_("Committed memory"), (100.0, 150.0), _("RAM + Swap"))), ( "levels_commitlimit", LowerMemoryLevels(_("Commit Limit"), ( 20.0, 10.0), _("RAM + Swap"))), ( "levels_vmalloc", LowerMemoryLevels(_("Largest Free VMalloc Chunk"))), + ( "handle_hw_corrupted_error", DropdownChoice( + title = _("Handle Hardware Corrupted Error"), + choices = [ + (0, _("Set state to OK")), + (1, _("Set state to WARN")), + (2, _("Set state to CRIT (Default)")), + (3, _("Ignore this error")), + ], + default_value = 2, + )), ], ), None,

8 years, 10 months

Check_MK Git: check_mk: get_counter and get_average now use the new API to store state instead of accessing g_counters directly

by Sebastian Herbord

Module: check_mk Branch: master Commit: f8f11dc36a8056948bcf865bc5cc9a78c0811c51 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f8f11dc36a8056… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Aug 18 16:59:45 2015 +0200 get_counter and get_average now use the new API to store state instead of accessing g_counters directly --- modules/check_mk_base.py | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 980222a..f789784 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1016,18 +1016,19 @@ def clear_counters(pattern, older_than): # Store arbitrary values until the next execution of a check -def get_item_state(itemname, default=None): - return g_counters.get(itemname, default) - - def set_item_state(itemname, state): g_counters[itemname] = state +def get_item_state(itemname, default=None): + return g_counters.get(itemname, default) + + def clear_item_state(itemname): if itemname in g_counters: del g_counters[itemname] + # Idea (1): We could keep global variables for the name of the checktype and item # during a check and that way "countername" would need to be unique only # within one checked item. So e.g. you could use "bcast" as name and not "if.%s.bcast" % item @@ -1050,30 +1051,25 @@ def get_rate(countername, this_time, this_val, allow_negative=False, onwrap=SKIP # Legacy. Do not use this function in checks directly any more! def get_counter(countername, this_time, this_val, allow_negative=False, is_rate=False): - global g_counters + old_state = get_item_state(countername, None) + set_item_state(countername, (this_time, this_val)) # First time we see this counter? Do not return # any data! - if not countername in g_counters: - g_counters[countername] = (this_time, this_val) + if old_state is None: # Do not suppress this check on check_mk -nv if opt_dont_submit: return 1.0, 0.0 raise MKCounterWrapped('Counter initialization') - last_time, last_val = g_counters.get(countername) + last_time, last_val = old_state timedif = this_time - last_time if timedif <= 0: # do not update counter - # Reset counter to a (hopefully) reasonable value - g_counters[countername] = (this_time, this_val) # Do not suppress this check on check_mk -nv if opt_dont_submit: return 1.0, 0.0 raise MKCounterWrapped('No time difference') - # update counter for next time - g_counters[countername] = (this_time, this_val) - if not is_rate: valuedif = this_val - last_val else: @@ -1099,16 +1095,17 @@ def get_counter(countername, this_time, this_val, allow_negative=False, is_rate= # backlog: averaging horizon in minutes # initialize_zero: assume average of 0.0 when now previous average is stored def get_average(itemname, this_time, this_val, backlog_minutes, initialize_zero = True): + old_state = get_item_state(itemname, None) # first call: take current value as average or assume 0.0 - if not itemname in g_counters: + if old_state is None: if initialize_zero: this_val = 0 - g_counters[itemname] = (this_time, this_val) + set_item_state(itemname, (this_time, this_val)) return this_val # avoid time diff of 0.0 -> avoid division by zero # Get previous value and time difference - last_time, last_val = g_counters.get(itemname) + last_time, last_val = old_state timedif = this_time - last_time # Gracefully handle time-anomaly of target systems. We lose @@ -1131,7 +1128,7 @@ def get_average(itemname, this_time, this_val, backlog_minutes, initialize_zero new_val = last_val * weight + this_val * (1 - weight) - g_counters[itemname] = (this_time, new_val) + set_item_state(itemname, (this_time, new_val)) return new_val

8 years, 10 months

Check_MK Git: check_mk: cpu_util configuration now uses standardised time-unit widget

by Sebastian Herbord

Module: check_mk Branch: master Commit: b09c57492b1272738118e1c1e17dbdc95087b767 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b09c57492b1272… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Aug 18 16:45:38 2015 +0200 cpu_util configuration now uses standardised time-unit widget --- checks/cpu_util.include | 6 +++--- web/plugins/wato/check_parameters.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/checks/cpu_util.include b/checks/cpu_util.include index 13fcbd3..55c16ff 100644 --- a/checks/cpu_util.include +++ b/checks/cpu_util.include @@ -178,15 +178,15 @@ def check_cpu_util_unix(values, params, cores = None): threshold, warn_core, crit_core = params["core_util_time"] if total_perc > threshold: timestamp = get_item_state(core_state_name, 0) - high_load_duration = (this_time - timestamp) / 60 + high_load_duration = (this_time - timestamp) if timestamp == 0: set_item_state(core_state_name, this_time) elif high_load_duration > crit_core: yield 2, "%s is under high load for %s minutes (warn/crit at %s/%s minutes)" %\ - (core, high_load_duration, warn_core, crit_core) + (core, high_load_duration / 60, warn_core / 60, crit_core / 60) elif high_load_duration > warn_core: yield 1, "%s is under high load for %s minutes (warn/crit at %s/%s minutes)" %\ - (core, high_load_duration, warn_core, crit_core) + (core, high_load_duration / 60, warn_core / 60, crit_core / 60) else: clear_item_state(core_state_name) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index d336eee..bd9f86a 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -4305,8 +4305,8 @@ register_check_parameters( title = _("Alert on high utilization over an extended time period on a single core"), elements = [ Percentage(title = _("High utilization at "), default_value = 100.0), - Integer(title = _("Warning after "), default_value = 5, unit = "min"), - Integer(title = _("Critical after "), default_value = 15, unit = "min"), + Age(title = _("Warning after "), default_value = 5 * 60), + Age(title = _("Critical after "), default_value = 15 * 60), ], help = _("A single thread fully utilizing a single core (potentially due to a bug) " "may go unnoticed when only monitoring the total utilization of the CPU. "

8 years, 10 months

Check_MK Git: check_mk: #2419 windows agent: is now downward compatible to win2k

by Andreas Boesl

Module: check_mk Branch: master Commit: ab0a25bcdee012b9a3613a0023df449158c37c57 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab0a25bcdee012… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Aug 18 16:11:23 2015 +0200 #2419 windows agent: is now downward compatible to win2k --- .werks/2419 | 10 +++++++++ ChangeLog | 1 + agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 302080 -> 302080 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 302080 -> 302080 bytes agents/windows/check_mk_agent.cc | 26 ++++++++++++++++++---- agents/windows/check_mk_agent.exe | Bin 183808 -> 183808 bytes agents/windows/check_mk_agent.msi | Bin 734720 -> 734720 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 183808 -> 183808 bytes agents/windows/install_agent-64.exe | Bin 179051 -> 179073 bytes agents/windows/install_agent.exe | Bin 160025 -> 160059 bytes 11 files changed, 34 insertions(+), 5 deletions(-) diff --git a/.werks/2419 b/.werks/2419 new file mode 100644 index 0000000..4140477 --- /dev/null +++ b/.werks/2419 @@ -0,0 +1,10 @@ +Title: windows agent: is now downward compatible to win2k +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1439907013 +Class: feature + + + diff --git a/ChangeLog b/ChangeLog index 03c206c..02ac85d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -49,6 +49,7 @@ * 2527 emc_isilon_power, emc_isilon_quota: New checks for power supply and fs quotas on EMC Isilon data storage devices * 2528 emc_isilon_cpu, emc_isilon_ifs: New checks for cpu utilization and the combined cluster storage on EMC Isilon data storage devices * 2529 kernel.util can now be configured to warn if a single cpu core exceeds a utilization threshold for a while + * 2419 windows agent: is now downward compatible to win2k * 2315 FIX: windows agent: BOM replacement, fixed incorrect byte offset... * 2316 FIX: windows agent: fix garbled output of cached agent plugins... * 2358 FIX: check_mk_agent.solaris: more correct computation of zfs used space... diff --git a/agents/windows/build_version b/agents/windows/build_version index 08839f6..b35cfaf 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -200 +206 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index b1cb3c3..08362a2 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 3edfd78..b102f51 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 ab6bc48..1b1d936 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -549,6 +549,21 @@ void debug_script_container( script_container* container ) } + +template <typename FuncT> FuncT dynamic_func(LPCWSTR dllName, LPCSTR funcName) { + HMODULE mod = LoadLibraryW(dllName); + if (mod != NULL) { + FARPROC proc = GetProcAddress(mod, funcName); + if (proc != NULL) { + return (FuncT)proc; + } + } + return NULL; +} + +#define DYNAMIC_FUNC(func, dllName) func ## _type func ## _dyn = dynamic_func<func ## _type>(dllName, #func) +// GetProcessHandleCount_type GetProcessHandleCount_dyn = dynamic_func<GetProcessHandleCount_type>(L"kernel32.dll", "GetProcessHandleCount"); + // .----------------------------------------------------------------------. // | ______ _ _ _ ______ | // | / / / /___ _ _ ___| |_ ___ _ __ ___ | |_(_)_ __ ___ ___\ \ \ \ | @@ -1670,11 +1685,14 @@ void section_ps(SOCKET &out) usermodetime.HighPart = userTime.dwHighDateTime; } - // GetProcessHandleCount is only available winxp upwards - // Win2k reports 0 handles DWORD processHandleCount = 0; - if (osv.dwMajorVersion > 5 || (osv.dwMajorVersion == 5 && osv.dwMinorVersion > 0)) - GetProcessHandleCount(hProcess, &processHandleCount); + + // GetProcessHandleCount is only available winxp upwards + typedef BOOL (*GetProcessHandleCount_type)(HANDLE, PDWORD); + DYNAMIC_FUNC(GetProcessHandleCount, L"kernel32.dll"); + if (GetProcessHandleCount_dyn != NULL) { + GetProcessHandleCount_dyn(hProcess, &processHandleCount); + } // Process owner ExtractProcessOwner(hProcess, user); diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 3d39d84..1f755a2 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 e212db8..30b5357 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 9ad9f0c..c264215 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 0e27d75..8f70c4a 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 dd1d83e..49e7b49 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

8 years, 10 months

Check_MK Git: check_mk: esx_vsphere_counters and siemens_plc now use the new API to store state

by Sebastian Herbord

Module: check_mk Branch: master Commit: b96dacaa484c334e620b443e893c46cd404549f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b96dacaa484c33… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Aug 18 15:47:37 2015 +0200 esx_vsphere_counters and siemens_plc now use the new API to store state --- checks/esx_vsphere_counters | 6 +++--- checks/siemens_plc | 17 +++++++---------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/checks/esx_vsphere_counters b/checks/esx_vsphere_counters index 60a1ae6..28631ce 100644 --- a/checks/esx_vsphere_counters +++ b/checks/esx_vsphere_counters @@ -296,14 +296,14 @@ def convert_esx_counters_if(parsed): if ctr_name.startswith("bytes"): ctr_value *= 1024 countername = "vmnic." + name + "." + ctr_name - if countername in g_counters: - last_time, last_value = g_counters[countername] + last_time, last_value = get_item_state(countername, (None, None)) + if last_time or last_value: new_value = last_value + ((this_time - last_time) * ctr_value) else: last_time = this_time - 60 last_value = 0 new_value = ctr_value * 60 - g_counters[countername] = (this_time, new_value) + set_item_state(countername, (this_time, new_value)) entry[ti] = str(int(new_value)) return converted diff --git a/checks/siemens_plc b/checks/siemens_plc index 56eb9d9..3c44729 100644 --- a/checks/siemens_plc +++ b/checks/siemens_plc @@ -147,13 +147,12 @@ def check_siemens_plc_duration(item, params, info): perfdata = [(line[1], seconds)] key = 'siemens_plc.duration.%s' % item - if key in g_counters and g_counters[key] > seconds: - old_seconds = g_counters[key] - g_counters[key] = seconds + old_seconds = get_item_state(key, None) + if old_seconds is not None and old_seconds > seconds: return 2, 'Reduced from %s to %s' % (get_age_human_readable(old_seconds), get_age_human_readable(seconds)), perfdata - else: - g_counters[key] = seconds + + set_item_state(key, seconds) state = 0 warn, crit = params.get('duration', (None, None)) @@ -196,12 +195,10 @@ def check_siemens_plc_counter(item, params, info): perfdata = [(line[1], value)] key = 'siemens_plc.counter.%s' % item - if key in g_counters and g_counters[key] > value: - old_value = g_counters[key] - g_counters[key] = value + old_value = get_item_state(key, None) + if old_value is not None and old_value > value: return 2, 'Reduced from %s to %s' % (old_value, value), perfdata - else: - g_counters[key] = value + set_item_state(key, value) state = 0 warn, crit = params.get('levels', (None, None))

8 years, 10 months

Check_MK Git: check_mk: #2529 kernel.util can now be configured to warn if a single cpu core exceeds a utilization threshold for a while

by Sebastian Herbord

Module: check_mk Branch: master Commit: e2f8ca955436c2e9b920990b24eb88517a251cdf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e2f8ca955436c2… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Aug 18 15:58:11 2015 +0200 #2529 kernel.util can now be configured to warn if a single cpu core exceeds a utilization threshold for a while --- .werks/2529 | 9 +++++++++ ChangeLog | 1 + checks/cpu_util.include | 35 ++++++++++++++++++++++++++++++---- checks/kernel | 28 +++++++++++++++++---------- web/plugins/wato/check_parameters.py | 14 ++++++++++++++ 5 files changed, 73 insertions(+), 14 deletions(-) diff --git a/.werks/2529 b/.werks/2529 new file mode 100644 index 0000000..fa1048d --- /dev/null +++ b/.werks/2529 @@ -0,0 +1,9 @@ +Title: kernel.util can now be configured to warn if a single cpu core exceeds a utilization threshold for a while +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1439906081 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index b035920..03c206c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -48,6 +48,7 @@ * 2536 emc_isilon_fans, emc_isilon_temp, emc_isilon_temp.cpu: New checks for fans and temperatures of EMC Isilon * 2527 emc_isilon_power, emc_isilon_quota: New checks for power supply and fs quotas on EMC Isilon data storage devices * 2528 emc_isilon_cpu, emc_isilon_ifs: New checks for cpu utilization and the combined cluster storage on EMC Isilon data storage devices + * 2529 kernel.util can now be configured to warn if a single cpu core exceeds a utilization threshold for a while * 2315 FIX: windows agent: BOM replacement, fixed incorrect byte offset... * 2316 FIX: windows agent: fix garbled output of cached agent plugins... * 2358 FIX: check_mk_agent.solaris: more correct computation of zfs used space... diff --git a/checks/cpu_util.include b/checks/cpu_util.include index efb4ea3..13fcbd3 100644 --- a/checks/cpu_util.include +++ b/checks/cpu_util.include @@ -89,18 +89,17 @@ def check_cpu_util(util, params, this_time = None): # - 7 - steal: involuntary wait # - 8 - guest: time spent in guest OK # - 9 - guest_nice: time spent in niced guest OK -def check_cpu_util_unix(values, params): +def check_cpu_util_unix(values, params, cores = None): this_time = int(time.time()) # Compute jiffi-differences of all relevant counters diff_values = [] n = 0 - global g_counters for v in values: n += 1 countername = "cpu.util.%d" % n - last_time, last_val = g_counters.get(countername, (0, 0)) + last_time, last_val = get_item_state(countername, (0, 0)) diff_values.append(v - last_val) - g_counters[countername] = (this_time, v) + set_item_state(countername, (this_time, v)) sum_jiffies = sum(diff_values) # do not account for steal! if sum_jiffies == 0: @@ -163,3 +162,31 @@ def check_cpu_util_unix(values, params): levelstext = " (warn/crit at %.1f%%/%.1f%%)" % (warn, crit) yield state, "total: %.1f%%" % util_total_perc + levelstext + + if cores and "core_util_time" in params: + for core, user, nice, system, idle, iowait,\ + irq, softirq, steal, guest, guest_nice in cores: + + core_state_name = "cpu.util.core.high.%s" % core + total = user + nice + system + iowait + irq + softirq + steal + guest + guest_nice + + prev_total = get_item_state("cpu.util.%s.total" % core, 0) + total_diff = total - prev_total + set_item_state("cpu.util.%s.total" % core, total) + + total_perc = (100.0 * total_diff) / sum_jiffies + threshold, warn_core, crit_core = params["core_util_time"] + if total_perc > threshold: + timestamp = get_item_state(core_state_name, 0) + high_load_duration = (this_time - timestamp) / 60 + if timestamp == 0: + set_item_state(core_state_name, this_time) + elif high_load_duration > crit_core: + yield 2, "%s is under high load for %s minutes (warn/crit at %s/%s minutes)" %\ + (core, high_load_duration, warn_core, crit_core) + elif high_load_duration > warn_core: + yield 1, "%s is under high load for %s minutes (warn/crit at %s/%s minutes)" %\ + (core, high_load_duration, warn_core, crit_core) + else: + clear_item_state(core_state_name) + diff --git a/checks/kernel b/checks/kernel index 9305bc9..9a7d25f 100644 --- a/checks/kernel +++ b/checks/kernel @@ -111,6 +111,13 @@ def inventory_cpu_utilization(info): if len(x) > 0 and x[0] == 'cpu': return [(None, {})] + +def transform_cpu_info(element): + if len(element) < 8: + element += ['0', '0', '0', '0'] # needed for Linux 2.4 + + return [element[0]] + [int(x) for x in element[1:]] + # Columns of cpu usage /proc/stat: # - cpuX: number of CPU or only 'cpu' for aggregation # - user: normal processes executing in user mode @@ -130,20 +137,21 @@ def kernel_check_cpu_utilization(item, params, info): if type(params) != dict: params = { "iowait": params } - # Look for entry beginning with "cpu" - f = [ l for l in info if l[0] == "cpu" ] - if len(f) != 1: - return 3, "More than one line with CPU info found. This check is not cluster-enabled." + # Look for entry matching "cpu" (this is the combined load of all cores) + total = [transform_cpu_info(line) + for line in info + if line[0] == "cpu"] - line = f[0] - if len(line) < 8: - line = line + ['0', '0', '0', '0'] # needed for Linux 2.4 + if len(total) != 1: + return 3, "More than one line with CPU info found. This check is not cluster-enabled." - # line contains now the following columns: + cores = [transform_cpu_info(line) + for line in info + if line[0].startswith("cpu") and len(line[0]) > 3] + # total contains now the following columns: # 'cpu' user nice system idle wait hw-int sw-int (steal ...) # convert number to int - values = [ int(x) for x in line[1:] ] - return check_cpu_util_unix(values, params) + return check_cpu_util_unix(total[0][1:], params, cores) check_info["kernel.util"] = { 'check_function': kernel_check_cpu_utilization, diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 7a88b1b..d336eee 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -4300,6 +4300,20 @@ register_check_parameters( "the the bottleneck of your server is IO. Please note that depending on the " "applications being run this might or might not be totally normal.")), ), + ( "core_util_time", + Tuple( + title = _("Alert on high utilization over an extended time period on a single core"), + elements = [ + Percentage(title = _("High utilization at "), default_value = 100.0), + Integer(title = _("Warning after "), default_value = 5, unit = "min"), + Integer(title = _("Critical after "), default_value = 15, unit = "min"), + ], + help = _("A single thread fully utilizing a single core (potentially due to a bug) " + "may go unnoticed when only monitoring the total utilization of the CPU. " + "With this configuration, check_mk will alert if a single core is " + "exceeding a utilization threshold over an extended period of time.") + ) + ), ] ), forth = lambda old: type(old) != dict and { "iowait" : old } or old,

8 years, 10 months

Check_MK Git: check_mk: Prepare new check API functions for remembering a state

by Mathias Kettner

Module: check_mk Branch: master Commit: 16fdd7d0b8f23b9d042300f01144bfd2cee0aacf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=16fdd7d0b8f23b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Aug 18 12:01:07 2015 +0200 Prepare new check API functions for remembering a state --- modules/check_mk_base.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index cd0132e..980222a 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1015,6 +1015,19 @@ def clear_counters(pattern, older_than): del g_counters[name] +# Store arbitrary values until the next execution of a check +def get_item_state(itemname, default=None): + return g_counters.get(itemname, default) + + +def set_item_state(itemname, state): + g_counters[itemname] = state + + +def clear_item_state(itemname): + if itemname in g_counters: + del g_counters[itemname] + # Idea (1): We could keep global variables for the name of the checktype and item # during a check and that way "countername" would need to be unique only # within one checked item. So e.g. you could use "bcast" as name and not "if.%s.bcast" % item @@ -1122,7 +1135,6 @@ def get_average(itemname, this_time, this_val, backlog_minutes, initialize_zero return new_val - #. # .--Checking------------------------------------------------------------. # | ____ _ _ _ |

8 years, 10 months

Check_MK Git: check_mk: emc_isilon_diskstatus: slight code cleanup

by Sebastian Herbord

Module: check_mk Branch: master Commit: 049b8ecc06f3f35305307045471622dbd5580d0f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=049b8ecc06f3f3… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Aug 18 09:56:21 2015 +0200 emc_isilon_diskstatus: slight code cleanup --- checks/emc_isilon_diskstatus | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/checks/emc_isilon_diskstatus b/checks/emc_isilon_diskstatus index bae16ba..f16cca1 100644 --- a/checks/emc_isilon_diskstatus +++ b/checks/emc_isilon_diskstatus @@ -24,11 +24,11 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. + def inventory_emc_isilon_diskstatus(info): - inventory = [] for disk_id, name, disk_status, serial in info: - inventory.append( (disk_id, None) ) - return inventory + yield disk_id, None + def check_emc_isilon_diskstatus(item, _no_params, info): for disk_id, name, disk_status, serial in info: @@ -39,7 +39,7 @@ def check_emc_isilon_diskstatus(item, _no_params, info): else: status = 2 return status, message - return 3, "Disk %s not found" % item + check_info["emc_isilon_diskstatus"] = { "check_function" : check_emc_isilon_diskstatus,

8 years, 10 months

← Newer
1
...
8
9
10
11
12
13
14
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2015