Checkmk git commits January 2015

checkmk-commits@lists.checkmk.com

8 participants
297 discussions

Check_MK Git: check_mk: win_exefiles: fixed really hard to see bug in regex of inventory plugin

by Goetz Golla

Module: check_mk Branch: master Commit: 1502aa1dcaf13decac79aa41c9a775d5f1dc8a87 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1502aa1dcaf13d… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Mon Jan 26 12:34:14 2015 +0100 win_exefiles: fixed really hard to see bug in regex of inventory plugin --- inventory/win_exefiles | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventory/win_exefiles b/inventory/win_exefiles index f533f46..4641532 100644 --- a/inventory/win_exefiles +++ b/inventory/win_exefiles @@ -38,7 +38,7 @@ def inv_win_exefiles(info): # 14.02.2014 23:12:04 if re.match("^\d{2}\.\d{2}\.20\d{2} \d{2}:\d{2}:\d{2}", write_time): install_date = int(time.mktime(time.strptime(write_time, "%d.%m.%Y %H:%M:%S"))) - elif re.match("^\d{1,2}/d{1,2}/20\d{2} \d{1,2}:\d{2}:\d{2} (AM|PM)", write_time): + elif re.match("^\d{1,2}/\d{1,2}/20\d{2} \d{1,2}:\d{2}:\d{2} (AM|PM)", write_time): install_date = int(time.mktime(time.strptime(write_time, "%m/%d/%Y %H:%M:%S %p"))) else: install_date = write_time

9 years, 7 months

Check_MK Git: check_mk: netscaler_tcp_conns: small code cleanup

by Goetz Golla

Module: check_mk Branch: master Commit: ff38acc2baa266a49c22bdc182eab3f7e0e4ac58 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff38acc2baa266… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Mon Jan 26 10:34:10 2015 +0100 netscaler_tcp_conns: small code cleanup --- checks/netscaler_tcp_conns | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/checks/netscaler_tcp_conns b/checks/netscaler_tcp_conns index 7613bfa..0d02c64 100644 --- a/checks/netscaler_tcp_conns +++ b/checks/netscaler_tcp_conns @@ -38,14 +38,13 @@ def inventory_netscaler_tcp_conns(info): return[ (None, {}) ] def check_netscaler_tcp_conns(_no_item, params, info): - tcp_conns_types = { - "server_conns": (0, "Server Connections"), - "client_conns": (1, "Client Connections"), - } - for name, (index, infotext) in tcp_conns_types.iteritems(): + for name, index, infotext in [ + ("server_conns", 0, "Server Connections"), + ("client_conns", 1, "Client Connections"), + ]: value = int(info[0][index]) infotext += ": %d" % value - warn, crit = params.get(name) + warn, crit = params[name] perfdata = [ (name, value, warn, crit, 0) ]

9 years, 7 months

Check_MK Git: check_mk: ibm_svc_array, ibm_svc_portsas: removed obsolete warn/crit symbols

by Goetz Golla

Module: check_mk Branch: master Commit: d81a5a7326ac6f4d5f8d14b15e7de2c4eb0da8ea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d81a5a7326ac6f… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Mon Jan 26 10:24:14 2015 +0100 ibm_svc_array, ibm_svc_portsas: removed obsolete warn/crit symbols --- checks/ibm_svc_array | 2 -- checks/ibm_svc_portsas | 1 - 2 files changed, 3 deletions(-) diff --git a/checks/ibm_svc_array b/checks/ibm_svc_array index cc247b6..225d851 100644 --- a/checks/ibm_svc_array +++ b/checks/ibm_svc_array @@ -50,10 +50,8 @@ def check_ibm_svc_array(item, _no_params, info): status = 0 elif raid_status in ("offline", "degraded"): status = 2 - message += "(!!)" else: status = 1 - message += "(!)" # add information message += ", RAID Level: %s, Tier: %s" % (raid_level, tier) diff --git a/checks/ibm_svc_portsas b/checks/ibm_svc_portsas index 7f3ef62..b4b1b70 100644 --- a/checks/ibm_svc_portsas +++ b/checks/ibm_svc_portsas @@ -42,7 +42,6 @@ def check_ibm_svc_portsas(item, _no_params, info): state = 0 else: state = 2 - infotext += "(!!)" infotext += ", Speed: %s, Type: %s" % (sasport_speed, sasport_type)

9 years, 7 months

Check_MK Git: check_mk: repaired not working kemp_loadmaster_realserver check

by Lutz Helwing

Module: check_mk Branch: master Commit: 70370d5fd63faaa0e23ca79b996b19a1abae68f0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70370d5fd63faa… Author: Lutz Helwing <lh(a)mathias-kettner.de> Date: Fri Jan 23 17:42:50 2015 +0100 repaired not working kemp_loadmaster_realserver check --- checks/kemp_loadmaster_realserver | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/checks/kemp_loadmaster_realserver b/checks/kemp_loadmaster_realserver index 98e144a..e035bb3 100644 --- a/checks/kemp_loadmaster_realserver +++ b/checks/kemp_loadmaster_realserver @@ -26,7 +26,8 @@ def inventory_kemp_loadmaster_realserver(info): - return [ ( x[0], None ) for x in info ] + for line in info: + yield line[0], None def check_kemp_loadmaster_realserver(item, _no_params, info): states = { 1 : 'reachable', @@ -41,21 +42,28 @@ def check_kemp_loadmaster_realserver(item, _no_params, info): for line in info: if line[0] == item: state = int(line[1]) - message = "State: %s" % (states[state]) - if state == 1: + message = "State: %s, IP: %s" % (states[state], line[2]) + + if state in [ 1, 20 ]: return 0, message - if state == 6: + elif state in [ 2, 3, 4 ]: return 1, message - if state in [ 2, 3, 4, 5, 7, 20 ]: + elif state in [ 5, 6, 7 ]: + return 2, message + else: return 3, message + return 3, "Service not found" check_info["kemp_loadmaster_realserver"] = { "check_function" : check_kemp_loadmaster_realserver, "inventory_function" : inventory_kemp_loadmaster_realserver, - "service_description" : "Server %s", - "has_perfdata" : False, - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.12196.250.10", - "snmp_info" : ( ".1.3.6.1.2.1.4.35.1.7.7.1.4", [ OID_END, ''] ), + "service_description" : "Real Server %s", + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [ ".1.3.6.1.4.1.12196.250.10", ".1.3.6.1.4.1.2021.250.10" ], + "snmp_info" : ( ".1.3.6.1.4.1.12196.13.2.1", [ + 2, # ip address: rSip + 5, # id: rSidx + 8, # state: rSstate + ] ), }

9 years, 7 months

Check_MK Git: check_mk: #1919 FIX cmk --snmpwalk: continue if one of the OIDs to walk fails

by Mathias Kettner

Module: check_mk Branch: master Commit: 5127c1378959779bf70de24d7745c2e6177621ef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5127c137895977… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 23 17:06:51 2015 +0100 #1919 FIX cmk --snmpwalk: continue if one of the OIDs to walk fails --- .werks/1919 | 10 ++++++++++ ChangeLog | 1 + modules/check_mk.py | 25 +++++++++++-------------- 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/.werks/1919 b/.werks/1919 new file mode 100644 index 0000000..25e9a66 --- /dev/null +++ b/.werks/1919 @@ -0,0 +1,10 @@ +Title: cmk --snmpwalk: continue if one of the OIDs to walk fails +Level: 1 +Component: core +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1422029191 + + diff --git a/ChangeLog b/ChangeLog index 0f8fa5f..ff04e32 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ * 1808 FIX: Fixed broken nagios config when using RBN without a host defined... * 1842 FIX: Rewrote implementation of service discovery (formerly inventory)... * 1869 FIX: Deleting outdated persisted agent sections now + * 1919 FIX: cmk --snmpwalk: continue if one of the OIDs to walk fails Checks & Agents: * 1665 agent_netapp: New special agent for NetApp monitoring via Web-API... diff --git a/modules/check_mk.py b/modules/check_mk.py index 89a23ac..d3b5aed 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3895,8 +3895,7 @@ def do_snmpwalk(hostnames): raise def do_snmpwalk_on(hostname, filename): - if opt_verbose: - sys.stdout.write("%s:\n" % hostname) + verbose("%s:\n" % hostname) ip = lookup_ipaddress(hostname) out = file(filename, "w") @@ -3908,21 +3907,19 @@ def do_snmpwalk_on(hostname, filename): ] + opt_extra_oids for oid in oids_to_walk: - if opt_verbose: - sys.stdout.write("Walk on \"%s\"..." % oid) - sys.stdout.flush() - - results = snmpwalk_on_suboid(hostname, ip, oid, hex_plain = True) - - for oid, value in results: - out.write("%s %s\n" % (oid, value)) + try: + verbose("Walk on \"%s\"..." % oid) - if opt_verbose: - sys.stdout.write("%d variables.\n" % len(results)) + results = snmpwalk_on_suboid(hostname, ip, oid, hex_plain = True) + for oid, value in results: + out.write("%s %s\n" % (oid, value)) + verbose("%d variables.\n" % len(results)) + except: + if opt_debug: + raise out.close() - if opt_verbose: - sys.stdout.write("Successfully Wrote %s%s%s.\n" % (tty_bold, filename, tty_normal)) + verbose("Successfully Wrote %s%s%s.\n" % (tty_bold, filename, tty_normal)) def do_snmpget(oid, hostnames): if len(hostnames) == 0:

9 years, 7 months

Check_MK Git: check_mk: Fix exception in inventory for diskstat checks

by Mathias Kettner

Module: check_mk Branch: master Commit: d3fad386603f45f3afa2a1392969cc5606c1f0db URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d3fad386603f45… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 23 16:35:48 2015 +0100 Fix exception in inventory for diskstat checks --- modules/check_mk_base.py | 50 +++++++++++++++++----------------------------- modules/discovery.py | 42 +++++++++++++++++++++----------------- 2 files changed, 42 insertions(+), 50 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 5883c98..9071f29 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -257,32 +257,26 @@ class MKCheckTimeout(Exception): # | Functions for getting monitoring data from TCP/SNMP agent. | # '----------------------------------------------------------------------' -# Collect information needed for one check. In case the check uses -# extra sections (new feature since 1.2.7i1) only the main section -# raises exceptions. Error in extra sections are silently ignored -# and the info is replaced with None. -def get_info_with_extra_sections(hostname, ipaddress, section_name, max_cachefile_age, ignore_check_interval, info_func): - if section_name in check_info: - extra_sections = check_info[section_name]["extra_sections"] - if extra_sections: - info = [ info_func(hostname, ipaddress, section_name, max_cachefile_age, ignore_check_interval) ] - for es in extra_sections: - try: - info.append(info_func(hostname, ipaddress, es, max_cachefile_age, ignore_check_interval=False)) - except: - info.append(None) - return info - - return info_func(hostname, ipaddress, section_name, max_cachefile_age, ignore_check_interval) +def apply_parse_function(info, section_name): + # Now some check types define a parse function. In that case the + # info is automatically being parsed by that function - on the fly. + if info != None and section_name in check_info: + parse_function = check_info[section_name]["parse_function"] + if parse_function: + return parse_function(info) + return info def get_info_for_check(hostname, ipaddress, section_name, max_cachefile_age=None, ignore_check_interval=False): - return get_info_with_extra_sections(hostname, ipaddress, section_name, - max_cachefile_age, ignore_check_interval, info_func=get_host_info) + info = apply_parse_function(get_host_info(hostname, ipaddress, section_name, max_cachefile_age, ignore_check_interval), section_name) + if section_name in check_info and check_info[section_name]["extra_sections"]: + info = [ info ] + for es in check_info[section_name]["extra_sections"]: + try: + info.append(apply_parse_function(get_host_info(hostname, ipaddress, es, max_cachefile_age, ignore_check_interval=False), es)) + except: + info.append(None) + return info -def get_info_for_inventory(hostname, ipaddress, section_name, use_caches): - return get_info_with_extra_sections(hostname, ipaddress, section_name, - use_caches and inventory_max_cachefile_age or 0, - ignore_check_interval=True, info_func=get_realhost_info) # This is the main function for getting information needed by a # certain check. It is called once for each check type. For SNMP this @@ -357,14 +351,6 @@ def get_host_info(hostname, ipaddress, checkname, max_cachefile_age=None, ignore add_host = None info = [ [add_host] + line for line in info ] - # Now some check types define a parse function. In that case the - # info is automatically being parsed by that function - on the fly. - if checkname in check_info: # e.g. not the case for cpu (check is cpu.loads) - parse_function = check_info[checkname]["parse_function"] - if parse_function: - parsed = parse_function(info) - return parsed - return info @@ -1370,7 +1356,7 @@ def do_all_checks_on_host(hostname, ipaddress, only_check_types = None): try: if is_tcp_host(hostname): - version_info = get_host_info(hostname, ipaddress, 'check_mk') + version_info = get_info_for_check(hostname, ipaddress, 'check_mk') agent_version = version_info[0][1] else: agent_version = None diff --git a/modules/discovery.py b/modules/discovery.py index ffd5eb0..b6bb015 100644 --- a/modules/discovery.py +++ b/modules/discovery.py @@ -213,6 +213,28 @@ def service_ignored(hostname, check_type, service_description): return False +def get_info_for_discovery(hostname, ipaddress, section_name, use_caches): + def add_nodeinfo(info, s): + if s in check_info and check_info[s]["node_info"]: + return [ [ None ] + l for l in info ] + else: + return info + + max_cachefile_age = use_caches and inventory_max_cachefile_age or 0 + info = apply_parse_function(add_nodeinfo(get_realhost_info(hostname, ipaddress, section_name, max_cachefile_age, ignore_check_interval=True), section_name), section_name) + if section_name in check_info and check_info[section_name]["extra_sections"]: + info = [ info ] + for es in check_info[section_name]["extra_sections"]: + try: + bare_info = get_realhost_info(hostname, ipaddress, es, max_cachefile_age, ignore_check_interval=True) + with_node_info = add_nodeinfo(bare_info, es) + parsed = apply_parse_function(with_node_info, es) + info.append(parsed) + except: + if opt_debug: + raise + info.append(None) + return info #. # .--Discovery-----------------------------------------------------------. @@ -353,7 +375,7 @@ def discover_check_type(hostname, ipaddress, check_type, use_caches): try: info = None # default in case of exception - info = get_info_for_inventory(hostname, ipaddress, section_name, use_caches) + info = get_info_for_discovery(hostname, ipaddress, section_name, use_caches) except MKAgentError, e: if str(e): raise @@ -364,24 +386,8 @@ def discover_check_type(hostname, ipaddress, check_type, use_caches): if info == None: # No data for this check type return [] - # Add information about nodes if check wants this. Note: - # in the node info we always put None, not the name of a node. - # During inventory we behave like a non-cluster. We do not know - # yet if the service is going to be clustered! - if check_info[check_type]["node_info"]: - if check_info[section_name]["extra_sections"]: - info = [ sec and [ [None] + line for line in sec ] or None for sec in info ] - else: - info = [ [None] + line for line in info ] - # Now do the actual inventory try: - # Convert with parse function if available - if section_name in check_info: # parse function must be define for base check - parse_function = check_info[section_name]["parse_function"] - if parse_function: - info = check_info[section_name]["parse_function"](info) - # Check number of arguments of discovery function. Note: This # check for the legacy API will be removed after 1.2.6. if len(inspect.getargspec(discovery_function)[0]) == 2: @@ -613,7 +619,7 @@ def get_check_preview(hostname, use_caches, do_snmp_scan): try: exitcode = None perfdata = [] - info = get_host_info(hostname, ipaddress, infotype) + info = get_info_for_check(hostname, ipaddress, infotype) # Handle cases where agent does not output data except MKAgentError, e: exitcode = 3

9 years, 7 months

Check_MK Git: check_mk: df: added comment for future fix

by Mathias Kettner

Module: check_mk Branch: master Commit: 4ae2b475d847644689aad36bf50c3acd7aa6b34a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ae2b475d84764… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 23 16:34:25 2015 +0100 df: added comment for future fix --- checks/df | 2 ++ 1 file changed, 2 insertions(+) diff --git a/checks/df b/checks/df index cad0b85..23d4398 100644 --- a/checks/df +++ b/checks/df @@ -101,6 +101,8 @@ def check_df(item, params, info): avail_mb = int(line[4]) / 1024.0 fslist_blocks.append((mountpoint, size_mb, avail_mb)) if df_inodes: + # FIXME: if the normal and the inodes section has not the same format + # this will crash! fslist_inodes.append((mountpoint, int(df_inodes[idx][2]), int(df_inodes[idx][4]))) return df_check_filesystem_list(item, params, fslist_blocks, fslist_inodes)

9 years, 7 months

Check_MK Git: check_mk: Reserved 10 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: a2e48ae09d112a90fba5c3d8262428aa2be8819d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2e48ae09d112a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 23 15:37:20 2015 +0100 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 31006eb..348c7c2 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -1918 +1928

9 years, 7 months

Check_MK Git: check_mk: #1918 ps: new option for checking the age of a process (on Linux)

by Mathias Kettner

Module: check_mk Branch: master Commit: ce6e7cff98819ae6bce5587e78bc3886c970f153 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ce6e7cff98819a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 23 15:38:31 2015 +0100 #1918 ps: new option for checking the age of a process (on Linux) The process check now shows the age of processes (the total elapsed time since the start of a process) and also allows to set upper limits on this. Currently this is only implemented in the Linux agent. You need to update that agent if you want to make use of the new feature. --- .werks/1918 | 12 +++++++ ChangeLog | 1 + agents/check_mk_agent.linux | 2 +- checks/ps | 4 ++- checks/ps.include | 60 +++++++++++++++++++++++++++++----- web/plugins/wato/check_parameters.py | 9 +++++ 6 files changed, 77 insertions(+), 11 deletions(-) diff --git a/.werks/1918 b/.werks/1918 new file mode 100644 index 0000000..9a9b3ab --- /dev/null +++ b/.werks/1918 @@ -0,0 +1,12 @@ +Title: ps: new option for checking the age of a process (on Linux) +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1422023842 +Class: feature + +The process check now shows the age of processes (the total elapsed time since +the start of a process) and also allows to set upper limits on this. Currently +this is only implemented in the Linux agent. You need to update that agent if +you want to make use of the new feature. diff --git a/ChangeLog b/ChangeLog index 8921fed..0f8fa5f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -51,6 +51,7 @@ * 1673 netapp_volumes: now able to configure levels by magic factor * 1854 netscaler_tcp_conns: new check to monitor tcp connections on Citrix Netscaler Loadbalancer Appliances * 1857 ibm_svc_portsas: new check and extended special agent for IBM SVC / Storwize V3700 / V7000 devices + * 1918 ps: new option for checking the age of a process (on Linux)... * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 165170e..4d8fc0f 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -196,7 +196,7 @@ grep ^/dev < /proc/mounts # processes including username, without kernel processes echo '<<<ps>>>' -ps ax -o user,vsz,rss,cputime,pid,command --columns 10000 | sed -e 1d -e 's/ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ */(\1,\2,\3,\4,\5) /' +ps ax -o user,vsz,rss,cputime,etime,pid,command --columns 10000 | sed -e 1d -e 's/ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ */(\1,\2,\3,\4\/\5,\6) /' # Memory usage echo '<<<mem>>>' diff --git a/checks/ps b/checks/ps index 8adc9bc..091f7bf 100644 --- a/checks/ps +++ b/checks/ps @@ -37,6 +37,8 @@ # (user, virtual_size, resident_size, %cpu, processID, pagefile_usage, usermodetime, kernelmodetime, openHandles, threadCount) name #(\\KLAPPRECHNER\ab,29284,2948,0,3124,904,400576,901296,35,1) NOTEPAD.EXE +# Sixth generation (>=1.2.7) adds an optional etime, joined by "/" with the CPU time + # The plugin "psperf.bat" is deprecated. As of version 1.2.5 all of this information # is reported by the windows agent itself. However, we still support sections from psperf.bat # if the agent version is lower than 1.2.5. @@ -136,7 +138,7 @@ def ps_parse_info(info): kernelc = int(psinfo["KernelModeTime"]) # do not resolve counter here! handlec = int(psinfo.get("HandleCount", 0)) # Only in newer psperf.bat versions threadc = int(psinfo["ThreadCount"]) # do not resolve counter here! - line[1:1] = [ "(unknown,%d,%d,0,%d,%d,%d,%d,%d,%d)" % + line[1:1] = [ "(unknown,%d,%d,0,%d,%d,%d,%d,%d,%d,)" % (virt, resi, pid, pagefile, userc, kernelc, handlec, threadc) ] info.append(line) return cpu_cores, info diff --git a/checks/ps.include b/checks/ps.include index b3b6a47..450e60d 100644 --- a/checks/ps.include +++ b/checks/ps.include @@ -191,6 +191,24 @@ def process_matches(ps, procname, l_user): # "user" : "foo", # "levels" : (1, 1, 99999, 99999) # } +# Parse time as output by ps into seconds. +# Example 1: "12:17" +# Example 2: "55:12:17" +# Example 3: "7-12:34:59" (with 7 days) +def parse_ps_time(text): + if "-" in text: + tokens = text.split("-") + days = int(tokens[0]) + text = tokens[1] + else: + days = 0 + parts = map(int, text.split(":")) + if len(parts) == 3: + hours, minutes, seconds = parts + else: + hours, minutes, seconds = 0, parts[0], parts[1] + + return 86400 * days + 3600 * hours + 60 * minutes + seconds def check_ps_common(item, params, info, cpu_cores = 1, info_name = "processes" ): now = time.time() @@ -219,6 +237,8 @@ def check_ps_common(item, params, info, cpu_cores = 1, info_name = "processes" ) resident_size = 0 handle_count = 0 percent_cpu = 0.0 + max_elapsed = None + min_elapsed = None extended_perfdata = False # The counter names for the ps check are quite volatile, because there is @@ -240,7 +260,7 @@ def check_ps_common(item, params, info, cpu_cores = 1, info_name = "processes" ) virtual_size += int(addinfo[1]) # kB resident_size += int(addinfo[2]) # kB if len(addinfo) >= 10: # even more data: processId, pagefile_usage, usermodetime, kernelmodetime, threadCount, openHandles - pid, pagefile_usage, user_c, kernel_c, handle_c = map(int, addinfo[4:9]) + pid, pagefile_usage, user_c, kernel_c, handle_c = map(saveint, addinfo[4:9]) counter_wrapped = False try: user_per_sec = get_rate("ps_wmic.user.%d" % pid, now, user_c, onwrap=RAISE) @@ -261,16 +281,22 @@ def check_ps_common(item, params, info, cpu_cores = 1, info_name = "processes" ) percent_cpu += user_perc + kernel_perc handle_count += handle_c else: + # addinfo[3] contains the used CPU time and possibly, separated by /, also + # the total elapsed time since the birth of the process. if ":" in addinfo[3]: - if "-" in addinfo[3]: - tokens = addinfo[3].split("-") - days = int(tokens[0]) - addinfo[3] = tokens[1] + if '/' in addinfo[3]: + pcpu_text, elapsed_text = addinfo[3].split('/') + elapsed = parse_ps_time(elapsed_text) + max_elapsed = max(max_elapsed, elapsed) + if min_elapsed == None: + min_elapsed = elapsed + else: + min_elapsed = min(min_elapsed, elapsed) else: - days = 0 + pcpu_text = addinfo[3] + + total_seconds = parse_ps_time(pcpu_text) pid = addinfo[4] - hours, minutes, seconds = map(int, addinfo[3].split(":")) - total_seconds = 86400 * days + 3600 * hours + 60 * minutes + seconds try: cputime = get_rate("ps_stat.pcpu.%s" % pid, now, total_seconds, onwrap=RAISE) except MKCounterWrapped, e: @@ -280,6 +306,7 @@ def check_ps_common(item, params, info, cpu_cores = 1, info_name = "processes" ) else: pcpu = savefloat(addinfo[3]) percent_cpu += pcpu + extended_perfdata = True if "cpulevels" in params: @@ -287,7 +314,6 @@ def check_ps_common(item, params, info, cpu_cores = 1, info_name = "processes" ) else: warn_cpu, crit_cpu = None, None - warnmin, okmin, okmax, warnmax = params["levels"] perfdata = [ ("count", count, okmax+1, warnmax+1, 0) ] if count == 0 and not extended_perfdata: @@ -306,6 +332,7 @@ def check_ps_common(item, params, info, cpu_cores = 1, info_name = "processes" ) perfdata.append(("pcpu", percent_cpu, warn_cpu, crit_cpu)) infotext = "%d %s" % (count, info_name) + if running_on: infotext += " [running on %s]" % ", ".join(running_on) @@ -359,4 +386,19 @@ def check_ps_common(item, params, info, cpu_cores = 1, info_name = "processes" ) state = max(state, 1) infotext += "(!)" + if min_elapsed != None: + if min_elapsed == max_elapsed: + infotext += ", running for %s" % get_age_human_readable(min_elapsed) + else: + infotext += ", youngest running for %s" % get_age_human_readable(min_elapsed) + infotext += ", oldest running for %s" % get_age_human_readable(max_elapsed) + if "max_age" in params: + warn_age, crit_age = params["max_age"] + if max_elapsed >= crit_age: + state = 2 + infotext += "(!!)" + elif max_elapsed >= crit_age: + state = max(state, 1) + infotext += "(!)" + return state, infotext, perfdata diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 61a3774..adf4487 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -476,6 +476,15 @@ process_level_elements = [ default_value = 15, ) ), + ( "max_age", + Tuple( + title = _("Maximum allowed age"), + help = _("Alarms you if the age of the process (not the consumed CPU time, but the real time) exceed the configured levels."), + elements = [ + Age(title=_("Warning at:"), default_value = 3600,), + Age(title=_("Critical at:"), default_value = 7200), + ] + )), ( "virtual_levels", Tuple( title = _("Virtual memory usage"),

9 years, 7 months

Check_MK Git: check_mk: small skript to migrate rrd Databases when the service description has changed

by Goetz Golla

Module: check_mk Branch: master Commit: c1aa50b1b9e73dcf92462dcf85daf6672d9505d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c1aa50b1b9e73d… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Jan 23 15:11:56 2015 +0100 small skript to migrate rrd Databases when the service description has changed --- doc/treasures/migrate_rrd.sh | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/doc/treasures/migrate_rrd.sh b/doc/treasures/migrate_rrd.sh new file mode 100644 index 0000000..47d98ff --- /dev/null +++ b/doc/treasures/migrate_rrd.sh @@ -0,0 +1,31 @@ +#!/bin/sh +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +ALT=$1 +NEU=$2 + +echo "Copying rrd data for service description $1 to a new name $2 ..." +find ~/var/pnp4nagios/perfdata -name "$ALT"_\*.rrd | sed -re "s,(/\S*/)$ALT\_(\S*).rrd,\1$ALT\_\2.rrd \1$NEU\_\2.rrd," | xargs -n 2 cp +echo "...finished."

9 years, 7 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2015