Checkmk git commits March 2013

checkmk-commits@lists.checkmk.com

3 participants
209 discussions

Check_MK Git: check_mk: wmic_processs: cpucores now being considered when calculating user/kernel percentages

by Andreas Boesl

Module: check_mk Branch: master Commit: 4f9fb74e92e4f20398d3e1949e8c6a982fcf978c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f9fb74e92e4f2… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Mar 13 14:18:55 2013 +0100 wmic_processs: cpucores now being considered when calculating user/kernel percentages --- ChangeLog | 2 ++ agents/windows/plugins/wmicchecks.bat | 2 +- checks/wmic_process | 17 ++++++++++------- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3fc9973..b86d237 100644 --- a/ChangeLog +++ b/ChangeLog @@ -77,6 +77,8 @@ Checks & Agents: * FIX: jolokia_metrics.mem - now able to handle negative/missing max values * ADD: tcp_conn_stats: now additionally uses /proc/net/tcp6 + * ADD: wmic_processs: cpucores now being considered when calculating + user/kernel percentages. (thanks to William Baum) Livestatus: * FIX: possible crash with VERY long downtime comments diff --git a/agents/windows/plugins/wmicchecks.bat b/agents/windows/plugins/wmicchecks.bat index 8f69810..3980217 100644 --- a/agents/windows/plugins/wmicchecks.bat +++ b/agents/windows/plugins/wmicchecks.bat @@ -1,3 +1,3 @@ @echo off echo ^<^<^<wmic_process:sep^(44^)^>^>^> -wmic process get name,pagefileusage,virtualsize,workingsetsize,usermodetime,kernelmodetime /format:csv +wmic process get name,pagefileusage,virtualsize,workingsetsize,usermodetime,kernelmodetime,ThreadCount /format:csv diff --git a/checks/wmic_process b/checks/wmic_process index 7342e26..6e56849 100644 --- a/checks/wmic_process +++ b/checks/wmic_process @@ -28,24 +28,27 @@ def check_wmic_process(item, params, info): name, memwarn, memcrit, pagewarn, pagecrit, cpuwarn, cpucrit = params count, mem, page, userc, kernelc = 0, 0, 0, 0, 0 + cpucores = 1 if len(info) == 0: return (3, "No output from agent in section wmic_process") legend = info[0] for line in info[1:]: psinfo = dict(zip(legend, line)) - if psinfo["Name"].lower() == name.lower(): - count += 1 - mem += int(psinfo["WorkingSetSize"]) - page += int(psinfo["PageFileUsage"]) - userc += int(psinfo["UserModeTime"]) + if "ThreadCount" in legend and psinfo["Name"].lower() == "system idle process": + cpucores = int(psinfo["ThreadCount"]) + elif psinfo["Name"].lower() == name.lower(): + count += 1 + mem += int(psinfo["WorkingSetSize"]) + page += int(psinfo["PageFileUsage"]) + userc += int(psinfo["UserModeTime"]) kernelc += int(psinfo["KernelModeTime"]) mem_mb = mem / 1048576.0 page_mb = page / 1048576.0 timedif, user_per_sec = get_counter("wmic_process.user.%s.%d" % (name, count), time.time(), userc) timedif, kernel_per_sec = get_counter("wmic_process.kernel.%s.%d" % (name, count), time.time(), kernelc) - user_perc = user_per_sec / 100000.0 - kernel_perc = kernel_per_sec / 100000.0 + user_perc = user_per_sec / 100000.0 / cpucores + kernel_perc = kernel_per_sec / 100000.0 / cpucores cpu_perc = user_perc + kernel_perc perfdata = [ ("mem", mem_mb, memwarn, memcrit),

11 years, 3 months

Check_MK Git: check_mk: resolve merge conflict

by Andreas Boesl

Module: check_mk Branch: master Commit: 5f6db1558a99ef3d42593595b1ccf8e2da480832 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5f6db1558a99ef… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Mar 13 13:26:00 2013 +0100 resolve merge conflict --- ChangeLog | 3 ++- agents/check_mk_agent.linux | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f05e66e..3fc9973 100644 --- a/ChangeLog +++ b/ChangeLog @@ -75,7 +75,8 @@ * FIX: livecheck: fixed compilation bug Checks & Agents: - * FIX: jolokia_metrics.mem - now able to handle negative/missing heap values + * FIX: jolokia_metrics.mem - now able to handle negative/missing max values + * ADD: tcp_conn_stats: now additionally uses /proc/net/tcp6 Livestatus: * FIX: possible crash with VERY long downtime comments diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index b5e10aa..a5ee2d8 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -209,7 +209,7 @@ fi echo '<<<tcp_conn_stats>>>' # waitmax 10 netstat -nt | awk ' /^tcp/ { c[$6]++; } END { for (x in c) { print x, c[x]; } }' # New implementation: netstat is very slow for large TCP tables -awk ' /:/ { c[$4]++; } END { for (x in c) { print x, c[x]; } }' < /proc/net/tcp +cat /proc/net/tcp /proc/net/tcp6 2>/dev/null | awk ' /:/ { c[$4]++; } END { for (x in c) { print x, c[x]; } }' # Platten- und RAID-Status von LSI-Controlleren, falls vorhanden if type cfggen > /dev/null ; then

11 years, 3 months

Check_MK Git: check_mk: resolved merge conflict

by Andreas Boesl

Module: check_mk Branch: master Commit: cf5614ba1e24253e7846da3e235f2da94bc31795 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf5614ba1e2425… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Mar 13 13:05:18 2013 +0100 resolved merge conflict --- ChangeLog | 3 ++- livestatus/src/livecheck.c | 1 + 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8ff68c8..f05e66e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -72,7 +72,8 @@ Core: * Checks can now omit the typical "OK - " or "WARN -". This text will be added automatically if missing. - + * FIX: livecheck: fixed compilation bug + Checks & Agents: * FIX: jolokia_metrics.mem - now able to handle negative/missing heap values diff --git a/livestatus/src/livecheck.c b/livestatus/src/livecheck.c index 400f645..de6a790 100644 --- a/livestatus/src/livecheck.c +++ b/livestatus/src/livecheck.c @@ -26,6 +26,7 @@ #include <sys/types.h> #include <sys/wait.h> #include <sys/timeb.h> +#include <sys/resource.h> #include <netinet/ip.h> #include <stdlib.h> #include <fcntl.h>

11 years, 3 months

Check_MK Git: check_mk: move changelog entry

by Andreas Boesl

Module: check_mk Branch: master Commit: d1a6470c9318da8c758302fcbf0f20da9308f8dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d1a6470c9318da… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Mar 13 12:24:42 2013 +0100 move changelog entry --- ChangeLog | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1fc95a1..8ff68c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -48,7 +48,6 @@ when processing of current lines needs more time than max execution time * mounts: ignore multiple occurrances of the same device * Linux agent: allow cached local/plugins checks (see docu) - * jolokia_metrics.mem: now able to handle negative/missing max heap values Livestatus: * Table statehist: Improved detection of vanished hosts and services. @@ -74,6 +73,9 @@ * Checks can now omit the typical "OK - " or "WARN -". This text will be added automatically if missing. + Checks & Agents: + * FIX: jolokia_metrics.mem - now able to handle negative/missing heap values + Livestatus: * FIX: possible crash with VERY long downtime comments

11 years, 3 months

Check_MK Git: check_mk: WATO: new mode ineffective_rules

by Andreas Boesl

Module: check_mk Branch: master Commit: 309a2c582e05edcd59e0118c395385079e4a6755 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=309a2c582e05ed… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Mar 13 11:20:47 2013 +0100 WATO: new mode ineffective_rules --- ChangeLog | 1 + web/htdocs/wato.py | 261 +++++++++++++++++++++++++++++----------------------- 2 files changed, 145 insertions(+), 117 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=309a2c582e…

11 years, 3 months

Check_MK Git: check_mk: FIX: tcp_conn_stats: use /proc/net/ tcp instead of netstat -tn

by Mathias Kettner

Module: check_mk Branch: master Commit: 1b0384c853c7a1d05543d597835c1b5c39898daf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1b0384c853c7a1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Mar 6 17:23:47 2013 +0100 FIX: tcp_conn_stats: use /proc/net/tcp instead of netstat -tn --- ChangeLog | 3 +++ agents/check_mk_agent.linux | 4 +++- checks/tcp_conn_stats | 26 +++++++++++++------------- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1d82059..4f9c7aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -106,6 +106,9 @@ * FIX: hr_mem: fix max value in performance data (thanks to Michaël COQUARD) * FIX: f5_bigip_psu: fix inventory function (returned list instead of tuple) * FIX: mysql.connections: avoid crash on legacy agent output + * FIX: tcp_conn_stats: use /proc/net/tcp instead of netstat -tn. This + should avoid massive performance problems on system with many + connections * Linux agent: limit netstat to 10 seconds * ps: Allow %1, %2, .. instead of %s in process_inventory. That allows reordering of matched groups diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 5eb5e6f..b5e10aa 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -207,7 +207,9 @@ fi # Number of TCP connections in the various states echo '<<<tcp_conn_stats>>>' -waitmax 10 netstat -nt | awk ' /^tcp/ { c[$6]++; } END { for (x in c) { print x, c[x]; } }' +# waitmax 10 netstat -nt | awk ' /^tcp/ { c[$6]++; } END { for (x in c) { print x, c[x]; } }' +# New implementation: netstat is very slow for large TCP tables +awk ' /:/ { c[$4]++; } END { for (x in c) { print x, c[x]; } }' < /proc/net/tcp # Platten- und RAID-Status von LSI-Controlleren, falls vorhanden if type cfggen > /dev/null ; then diff --git a/checks/tcp_conn_stats b/checks/tcp_conn_stats index 5264154..d85b48a 100644 --- a/checks/tcp_conn_stats +++ b/checks/tcp_conn_stats @@ -25,17 +25,17 @@ # Boston, MA 02110-1301 USA. tcp_conn_stats_states = [ -"ESTABLISHED", # connection up and passing data -"SYN_SENT", # session has been requested by us; waiting for reply from remote endpoint -"SYN_RECV", # session has been requested by a remote endpoint for a socket on which we were listening -"LAST_ACK", # our socket is closed; remote endpoint has also shut down; we are waiting for a final acknowledgement -"CLOSE_WAIT", # remote endpoint has shut down; the kernel is waiting for the application to close the socket -"TIME_WAIT", # socket is waiting after closing for any packets left on the network -"CLOSED", # socket is not being used (FIXME. What does mean?) -"CLOSING", # our socket is shut down; remote endpoint is shut down; not all data has been sent -"FIN_WAIT1", # our socket has closed; we are in the process of tearing down the connection -"FIN_WAIT2", # the connection has been closed; our socket is waiting for the remote endpoint to shut down -"BOUND", # Socket did a bound() but TCP stack not yet active (Solaris) + ( "ESTABLISHED", "01"), # connection up and passing data + ( "SYN_SENT", "02"), # session has been requested by us; waiting for reply from remote endpoint + ( "SYN_RECV", "03"), # session has been requested by a remote endpoint for a socket on which we were listening + ( "LAST_ACK", "09"), # our socket is closed; remote endpoint has also shut down; we are waiting for a final acknowledgement + ( "CLOSE_WAIT", "08"), # remote endpoint has shut down; the kernel is waiting for the application to close the socket + ( "TIME_WAIT", "06"), # socket is waiting after closing for any packets left on the network + ( "CLOSED", "07"), # socket is not being used (FIXME. What does mean?) + ( "CLOSING", "0B"), # our socket is shut down; remote endpoint is shut down; not all data has been sent + ( "FIN_WAIT1", "04"), # our socket has closed; we are in the process of tearing down the connection + ( "FIN_WAIT2", "05"), # the connection has been closed; our socket is waiting for the remote endpoint to shut down + ( "BOUND", None), # Socket did a bound() but TCP stack not yet active (Solaris) ] @@ -50,8 +50,8 @@ def check_tcp_conn_stats(item, params, info): worst_state = 0 info = [] perfdata = [] - for state in tcp_conn_stats_states: - num = int(stats.get(state, 0)) + for state, hex in tcp_conn_stats_states: + num = int(stats.get(state, stats.get(hex, 0))) if num > 0: infotext = "%s: %d" % (state, num) else:

11 years, 3 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Mathias Kettner

Module: check_mk Branch: master Commit: 0ae4555afa194199cc8dd590e51db7389f0af9c2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ae4555afa1941… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 12 16:32:17 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 3 months

Check_MK Git: check_mk: Fix two problems in flexible notifications

by Mathias Kettner

Module: check_mk Branch: master Commit: e3ca1a68ea5e6ab054d771822e1263e4bd2175d9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e3ca1a68ea5e6a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 12 16:32:11 2013 +0100 Fix two problems in flexible notifications 1. Notification filters from second channel used settings from first. 2. Do not defer notifictations out of the period 3. Correctly return deferred-flag --- modules/notify.py | 28 ++++++++++++++++------------ 1 files changed, 16 insertions(+), 12 deletions(-) diff --git a/modules/notify.py b/modules/notify.py index 79549ac..b0e5ab3 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -415,18 +415,18 @@ def notify_via_email(context, write_into_spoolfile): # 0 : everything fine -> proceed # 1 : currently not OK -> try to process later on # >=2: invalid -> discard -def check_prerequisite(context, entry): +def should_notify(context, entry): # Check disabling if entry.get("disabled"): notify_log("- Skipping: it is disabled for this user") - return 2 + return False # Check host, if configured if entry.get("only_hosts"): hostname = context.get("HOSTNAME") if hostname not in entry["only_hosts"]: notify_log(" - Skipping: host '%s' matches non of %s" % (hostname, ", ".join(entry["only_hosts"]))) - return 2 + return False # Check service, if configured if entry.get("only_services"): @@ -439,14 +439,14 @@ def check_prerequisite(context, entry): else: notify_log(" - Skipping: service '%s' matches non of %s" % ( servicedesc, ", ".join(entry["only_services"]))) - return 2 + return False # Check notification type event, allowed_events = check_notification_type(context, entry["host_events"], entry["service_events"]) if event not in allowed_events: notify_log(" - Skipping: wrong notification type %s (%s), only %s are allowed" % (event, context["NOTIFICATIONTYPE"], ",".join(allowed_events)) ) - return 2 + return False # Check notification number (in case of repeated notifications/escalations) if "escalation" in entry: @@ -458,34 +458,38 @@ def check_prerequisite(context, entry): if notification_number < from_number or notification_number > to_number: notify_log(" - Skipping: notification number %d does not lie in range %d ... %d" % (notification_number, from_number, to_number)) - return 2 + return False if "timeperiod" in entry: timeperiod = entry["timeperiod"] if timeperiod and timeperiod != "24X7": if not check_timeperiod(timeperiod): notify_log(" - Skipping: time period %s is currently not active" % timeperiod) - return 1 - return 0 + return False + return True def notify_flexible(context, notification_table, write_into_spoolfile): - result = 2 + should_retry = False for entry in notification_table: plugin = entry["plugin"] notify_log("Plugin: %s" % plugin) - result = check_prerequisite(context, notification_table[0]) - if result > 0: + if not should_notify(context, entry): continue if plugin is None: result = notify_via_email(context, write_into_spoolfile) else: result = call_notification_script(plugin, entry.get("parameters", []), context, write_into_spoolfile) + if result == 1: + should_retry = True # The exit_code is only relevant when processing spoolfiles - return result + if should_retry: + return 1 + else: + return 0

11 years, 3 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Andreas Boesl

Module: check_mk Branch: master Commit: 75a50f163baa0b18d0437b88a875dd74f96a4b15 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=75a50f163baa0b… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Mar 12 13:08:46 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 3 months

Check_MK Git: check_mk: jolokia_metrics.mem: now able to handle negative/ missing max heap values

by Andreas Boesl

Module: check_mk Branch: master Commit: b2eb2e3f605343a570ee3193004990f4076029ca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b2eb2e3f605343… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Mar 12 13:08:40 2013 +0100 jolokia_metrics.mem: now able to handle negative/missing max heap values --- ChangeLog | 1 + checks/jolokia_metrics | 35 ++++++++++++++++++++++++++--------- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 15dc4a0..c4fbf4b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -48,6 +48,7 @@ when processing of current lines needs more time than max execution time * mounts: ignore multiple occurrances of the same device * Linux agent: allow cached local/plugins checks (see docu) + * jolokia_metrics.mem: now able to handle negative/missing max heap values Livestatus: * Table statehist: Improved detection of vanished hosts and services. diff --git a/checks/jolokia_metrics b/checks/jolokia_metrics index eff96ad..8a15000 100644 --- a/checks/jolokia_metrics +++ b/checks/jolokia_metrics @@ -178,11 +178,18 @@ def check_jolokia_metrics_mem(item, params, info): d = parsed[item] mb = 1024 * 1024.0 heap = saveint(d["HeapMemoryUsage"]) / mb - heapmax = saveint(d["HeapMemoryMax"]) / mb + heapmax = saveint(d.get("HeapMemoryMax",-1)) / mb nonheap = saveint(d["NonHeapMemoryUsage"]) / mb - nonheapmax = saveint(d["NonHeapMemoryMax"]) / mb + nonheapmax = saveint(d.get("NonHeapMemoryMax",-1)) / mb total = heap + nonheap - totalmax = heapmax + nonheapmax + if heapmax > 0 and nonheapmax > 0: + totalmax = heapmax + nonheapmax + else: + totalmax = "" + if heapmax < 0: + heapmax = "" + if nonheapmax < 0: + nonheapmax = "" state_sign = { 0: "", 1: "(!)", 2: "(!!)" } worst_state = 0 @@ -199,8 +206,12 @@ def check_jolokia_metrics_mem(item, params, info): if params.get(what): if type(params[what][0]) == int: if what != "total": - perfdata.append((what, value, value_max - params[what][0], value_max - params[what][1], "", value_max)) - if value_max - value <= params[what][1]: + warn_level = value_max - params[what][0] if value_max != "" else "" + crit_level = value_max - params[what][1] if value_max != "" else "" + perfdata.append((what, value, warn_level, crit_level, "", value_max)) + if not value_max: + param_state = 0 + elif value_max - value <= params[what][1]: param_state = 2 level_info = "%s(crit at %sMB free)" % (state_sign[2], params[what][1]) elif value_max - value <= params[what][0]: @@ -208,18 +219,24 @@ def check_jolokia_metrics_mem(item, params, info): level_info = "%s(warn at %sMB free)" % (state_sign[1], params[what][0]) else: if what != "total": - perfdata.append((what, value, value_max * params[what][0] / 100.0, value_max * params[what][1] / 100.0, "", value_max)) - if value >= value_max * params[what][1] / 100.0: + warn_level = value_max * params[what][0] / 100.0 if value_max != "" else "" + crit_level = value_max * params[what][1] / 100.0 if value_max != "" else "" + perfdata.append((what, value, warn_level, crit_level, "", value_max)) + if not value_max: + param_state = 0 + elif value >= value_max * params[what][1] / 100.0: param_state = 2 level_info = "%s(crit at %s%%)" % (state_sign[2], params[what][1]) elif value >= value_max * params[what][0] / 100.0: param_state = 1 level_info = "%s(warn at %s%%)" % (state_sign[1], params[what][0]) else: - perfdata.append((what, value, "", "", "", value_max)) + if what != "total": + perfdata.append((what, value, "", "", "", value_max)) - info_list.append("%s: %0.fMB/%.1f%% used%s" % (what.title(), value, value/value_max*100, level_info)) + used_info = "/%.1f%% used" % (value / value_max * 100) if value_max != "" else "" + info_list.append("%s: %0.fMB%s%s" % (what.title(), value, used_info, level_info)) worst_state = max(param_state, worst_state) return (worst_state, ', '.join(info_list), perfdata)

11 years, 3 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2013