Checkmk git commits July 2014

checkmk-commits@lists.checkmk.com

7 participants
221 discussions

Check_MK Git: check_mk: Updated bug entries #2158

by Mathias Kettner

Module: check_mk Branch: master Commit: 680d3dd0737c80f11df27562a0bf9a4968bd9b71 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=680d3dd0737c80… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 21 15:38:53 2014 +0200 Updated bug entries #2158 --- .bugs/2158 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.bugs/2158 b/.bugs/2158 new file mode 100644 index 0000000..ae57849 --- /dev/null +++ b/.bugs/2158 @@ -0,0 +1,8 @@ +Title: Change all levels of all checks and use always value >= crit, not value > crit +Component: checks +State: open +Date: 2014-07-21 15:38:03 +Targetversion: future +Class: nastiness + +The behaviour of all checks needs to be consistent!

10 years, 1 month

Check_MK Git: check_mk: Removed link to nagios doku

by Mathias Kettner

Module: check_mk Branch: master Commit: 9ef4544ef971d206e1c9a2b88bc5525eb7e2f165 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ef4544ef971d2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 21 15:21:58 2014 +0200 Removed link to nagios doku --- web/htdocs/wato.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 84854b5..ddc6157 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9335,12 +9335,9 @@ def mode_edit_timeperiod(phase): html.write("</table>") # Exceptions - nagurl = "../nagios/docs/objectdefinitions.html#timeperiod" forms.section(_("Exceptions")) html.help(_("Here you can specify exceptional time ranges for certain " - "relative or absolute dates. Please consult the " - "<a target='_blank' href='%s'>Nagios documentation about " - "timeperiods</a> for examples." % nagurl)) + "dates in the form YYYY-MM-DD.")) exceptions = [] for k in timeperiod:

10 years, 1 month

Check_MK Git: check_mk: MegaCli: Agent now also supports the 64bit version (Thanks to Philipp Lemke)

by Bastian Kuhn

Module: check_mk Branch: master Commit: 555cbb5825f4852c6fdfb35b882536eec7b7a922 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=555cbb5825f485… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Jul 21 15:17:45 2014 +0200 MegaCli: Agent now also supports the 64bit version (Thanks to Philipp Lemke) --- .werks/182 | 8 ++++++++ ChangeLog | 1 + agents/check_mk_agent.linux | 16 ++++++++++++---- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/.werks/182 b/.werks/182 new file mode 100644 index 0000000..6f5aff3 --- /dev/null +++ b/.werks/182 @@ -0,0 +1,8 @@ +Title: MegaCli: Agent now also supports the 64bit version (Thanks to Philipp Lemke) +Level: 1 +Component: checks +Version: 1.2.5i5 +Date: 1405948589 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 97e98c0..11664c2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -33,6 +33,7 @@ * 0637 jolokia_metrics.gc, jolokia_metrics.tp, jolokia_info: two new subchecks for the jolokia_metrics checks and better error handling for jolokia_info... * 1000 qlogic_sanbox.temp: New Check for temperature sensors in QLogic SANbox Fibre Channel Switches * 1001 qlogic_sanbox.psu: New Check for power supplies in QLogic SANbox Fibre Channel Switches + * 0182 MegaCli: Agent now also supports the 64bit version (Thanks to Philipp Lemke) * 0994 FIX: agent plugin smart: fixed syntax error * 0989 FIX: logwatch.ec: Fix forwarding multiple messages via syslog/TCP... * 0943 FIX: if.include: fixed incorrect traffic percentage values in the check output of if checks... diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index afb5de4..63b5a1a 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -317,19 +317,27 @@ fi # http://www.lsi.com/downloads/Public/MegaRAID%20Common%20Files/8.02.16_MegaC… if type MegaCli >/dev/null ; then + MegaCli_bin="MegaCli" +elif type MegaCli64 >/dev/null ; then + MegaCli_bin="MegaCli64" +else + MegaCli_bin="unknown" +fi + +if [ "$MegaCli_bin" != "unknown" ]; then echo '<<<megaraid_pdisks>>>' - for part in $(MegaCli -EncInfo -aALL -NoLog < /dev/null \ + for part in $($MegaCli_bin -EncInfo -aALL -NoLog < /dev/null \ | sed -rn 's/:/ /g; s/[[:space:]]+/ /g; s/^ //; s/ $//; s/Number of enclosures on adapter ([0-9]+).*/adapter \1/g; /^(Enclosure|Device ID|adapter) [0-9]+$/ p'); do [ $part = adapter ] && echo "" [ $part = 'Enclosure' ] && echo -ne "\ndev2enc" echo -n " $part" done echo - MegaCli -PDList -aALL -NoLog < /dev/null | egrep 'Enclosure|Raw Size|Slot Number|Device Id|Firmware state|Inquiry|Adapter' + $MegaCli_bin -PDList -aALL -NoLog < /dev/null | egrep 'Enclosure|Raw Size|Slot Number|Device Id|Firmware state|Inquiry|Adapter' echo '<<<megaraid_ldisks>>>' - MegaCli -LDInfo -Lall -aALL -NoLog < /dev/null | egrep 'Size|State|Number|Adapter|Virtual' + $MegaCli_bin -LDInfo -Lall -aALL -NoLog < /dev/null | egrep 'Size|State|Number|Adapter|Virtual' echo '<<<megaraid_bbu>>>' - MegaCli -AdpBbuCmd -GetBbuStatus -aALL -NoLog < /dev/null | grep -v Exit + $MegaCli_bin -AdpBbuCmd -GetBbuStatus -aALL -NoLog < /dev/null | grep -v Exit fi # 3WARE disk controller (by Radoslaw Bak)

10 years, 1 month

Check_MK Git: check_mk: Added yield support for inventory functions

by Bastian Kuhn

Module: check_mk Branch: master Commit: 300c23a1cb9759e9199caf99c3cecd76a16cad52 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=300c23a1cb9759… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Jul 21 15:09:54 2014 +0200 Added yield support for inventory functions --- checks/omd_status | 4 +++- modules/check_mk.py | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/checks/omd_status b/checks/omd_status index ce68071..0eb5680 100644 --- a/checks/omd_status +++ b/checks/omd_status @@ -41,7 +41,9 @@ # OVERALL 2 def inventory_omd_status(info): - return [ ( line[0][1:-1], None ) for line in info if line[0][0] == '[' ] + for line in info: + if line[0][0] == '[': + yield line[0][1:-1], None def check_omd_status(item, _no_params, info): active = False diff --git a/modules/check_mk.py b/modules/check_mk.py index acca7d3..c657767 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2966,9 +2966,12 @@ def make_inventory(checkname, hostnamelist, check_only=False, include_state=Fals else: # New preferred style since 1.1.11i3: only one argument: info inventory = inventory_function(info) - if inventory == None: # tolerate if function does no explicit return inventory = [] + + # New yield based api style + if type(inventory) != list: + inventory = list(inventory) except Exception, e: if opt_debug: sys.stderr.write("Exception in inventory function of check type %s\n" % checkname)

10 years, 1 month

Check_MK Git: check_mk: New api: missing perf

by Bastian Kuhn

Module: check_mk Branch: master Commit: a22d6e771abcfde48d77ed5df75e84533ca6c9a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a22d6e771abcfd… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Jul 21 14:58:11 2014 +0200 New api: missing perf --- modules/check_mk_base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 3c9adf7..3ca0383 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1221,7 +1221,7 @@ def do_all_checks_on_host(hostname, ipaddress, only_check_types = None): status = max(return_states) - 1 else: status = max(return_states) - result = status, ", ".join( x[1]+state_markers[x[0]] for x in messages ) + result = status, ", ".join( x[1]+state_markers[x[0]] for x in messages ), perf # handle check implementations that do not yet support the # handling of wrapped counters via exception. Do not submit

10 years, 1 month

Check_MK Git: check_mk: First version of next yield based check api

by Bastian Kuhn

Module: check_mk Branch: master Commit: e2fdab6ddec88ae9cb099cb9f99ce44e25359f07 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e2fdab6ddec88a… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Jul 21 14:55:37 2014 +0200 First version of next yield based check api --- checks/pdu_gude.include | 28 ++++++++++++---------------- modules/check_mk_base.py | 33 +++++++++++++++++++++++++++++++-- 2 files changed, 43 insertions(+), 18 deletions(-) diff --git a/checks/pdu_gude.include b/checks/pdu_gude.include index 054a7de..64fc745 100644 --- a/checks/pdu_gude.include +++ b/checks/pdu_gude.include @@ -38,7 +38,8 @@ def check_pdu_gude(item, params, info): try: values = info[item - 1] except ValueError: - return (3, "Item not found") + yield 3, "Item not found" + return units = { 0 : ("kWh", 1000), @@ -48,32 +49,27 @@ def check_pdu_gude(item, params, info): 4 : ("VA",False), } - message = [] - perf = [] - state = 0 for pos, data in units.items(): value = savefloat(values[pos]) unit, div = data if div: value = value / div warn, crit = params.get(unit, (None, None)) - perf.append((unit, value, warn, crit)) - label = "" + perf = unit, value, warn, crit + message = "%.2f%s" % (value, unit) if warn > crit: if value < crit: - state = 2 - label = "(!!)" + yield 2, message, perf elif value < warn: - state = max(state, 1) - label = "(!)" + yield 1, message, perf + else: + yield 0, message, perf else: if crit != None and value > crit: - state = 2 - label = "(!!)" + yield 2, message, perf elif warn != None and value > warn: - state = max(state, 1) - label = "(!)" - message.append("%.2f%s%s" % (value, unit, label)) + yield 1, message, perf + else: + yield 0, message, perf - return(state, ", ".join(message), perf) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index bfea8f7..b165056 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1179,6 +1179,35 @@ def do_all_checks_on_host(hostname, ipaddress, only_check_types = None): try: dont_submit = False result = check_function(item, params, info) + # the new api doesen't return a tuple, + # it's yield based instead. + if type(result) != tuple: + messages = [] + perf = [] + for line in result: + messages.append(( line[0], line[1] )) + if len(line) == 3: + # there can be a single perf value (tuple) + # or a list of multiple perf values + if type(line[2]) == tuple: + perf.append(line[2]) + elif type(line[2]) == list: + perf += list + # Check funktion returns only a single line + if len(messages) == 1: + result = messages[0][0], messages[0][1], perf + else: + # Get the overall status + return_states = [ x[0] for x in messages ] + if 3 in return_states: + if not 2 in return_states and not 1 in return_states: + status = 3 + else: + status = max(return_states) - 1 + else: + status = max(return_states) + result = status, ", ".join( x[1]+state_markers[x[0]] for x in messages ) + # handle check implementations that do not yet support the # handling of wrapped counters via exception. Do not submit # any check result in that case: @@ -1618,8 +1647,8 @@ def get_regex(pattern): # Names of texts usually output by checks nagios_state_names = ["OK", "WARN", "CRIT", "UNKNOWN"] -# Symbolic representations of states -state_markers = ["(.)", "(!)", "(!!)", "(?)"] +# Symbolic representations of states (Needed for new 2.0 check api) +state_markers = ["", "(!)", "(!!)", "(?)"] # int() function that return 0 for strings the # cannot be converted to a number

10 years, 1 month

Check_MK Git: check_mk: Syntax fix

by Goetz Golla

Module: check_mk Branch: master Commit: f494cae4bd94ed1a103c7ee77d216f1f54dcbdab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f494cae4bd94ed… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Mon Jul 21 13:44:24 2014 +0200 Syntax fix --- doc/treasures/host_to_ping_check.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/treasures/host_to_ping_check.sh b/doc/treasures/host_to_ping_check.sh new file mode 100644 index 0000000..277aff2 --- /dev/null +++ b/doc/treasures/host_to_ping_check.sh @@ -0,0 +1 @@ +find . -name _HOST_\* | sed -re 's/(\S*)_HOST_(\S*)/\1_HOST_\2 \1PING\2/' | xargs -n 2 cp

10 years, 1 month

Check_MK Git: check_mk: improved formatting

by Andreas Boesl

Module: check_mk Branch: master Commit: c9346c14c1ed50292468c77186bc12f2becf2d4d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c9346c14c1ed50… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jul 21 12:26:25 2014 +0200 improved formatting --- .werks/1085 | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.werks/1085 b/.werks/1085 index 4cec3c9..c519807 100644 --- a/.werks/1085 +++ b/.werks/1085 @@ -5,15 +5,13 @@ Version: 1.2.5i5 Date: 1405937822 Class: feature -When a quicksearch pattern matched multiple hosts the view hosts was shown. -This view also displayed all services for these hosts, which could lead -to plenty of (unwanted) output in the view. - +When a quicksearch pattern matched multiple hosts the view <tt>hosts</tt> was shown. +This view displayed all services for these hosts, which could lead to plenty of (unwanted) output in the view. The quicksearch feature has been changed in the following way <ul> -<li>If there are multiple host matches the searchhost view is displayed</li> -<li>If there is a single match the hosts view is displayed (this view also contains the services)</li> +<li>If there are multiple host matches the <tt>searchhost</tt> view is displayed</li> +<li>If there is a single match the <tt>hosts</tt> view is displayed (this view also contains the services)</li> </ul> Note: This also applies to special search patterns like <tt>h:localhost h:otherhost</tt>

10 years, 1 month

Check_MK Git: check_mk: quicksearch: multiple hostname matches now lead to the searchhost view instead of the hosts view

by Andreas Boesl

Module: check_mk Branch: master Commit: e18451854725a52859817147c9216a67dd182d6c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e18451854725a5… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jul 21 12:24:29 2014 +0200 quicksearch: multiple hostname matches now lead to the searchhost view instead of the hosts view When a quicksearch pattern matched multiple hosts the view hosts was shown. This view also displayed all services for these hosts, which could lead to plenty of (unwanted) output in the view. The quicksearch feature has been changed in the following way <ul> <li>If there are multiple host matches the searchhost view is displayed</li> <li>If there is a single match the hosts view is displayed (this view also contains the services)</li> </ul> Note: This also applies to special search patterns like <tt>h:localhost h:otherhost</tt> --- .werks/1085 | 19 +++++++++++++++++++ ChangeLog | 1 + web/htdocs/sidebar.py | 2 +- 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/.werks/1085 b/.werks/1085 new file mode 100644 index 0000000..4cec3c9 --- /dev/null +++ b/.werks/1085 @@ -0,0 +1,19 @@ +Title: quicksearch: multiple hostname matches now lead to the searchhost view instead of the hosts view +Level: 1 +Component: multisite +Version: 1.2.5i5 +Date: 1405937822 +Class: feature + +When a quicksearch pattern matched multiple hosts the view hosts was shown. +This view also displayed all services for these hosts, which could lead +to plenty of (unwanted) output in the view. + +The quicksearch feature has been changed in the following way + +<ul> +<li>If there are multiple host matches the searchhost view is displayed</li> +<li>If there is a single match the hosts view is displayed (this view also contains the services)</li> +</ul> + +Note: This also applies to special search patterns like <tt>h:localhost h:otherhost</tt> diff --git a/ChangeLog b/ChangeLog index a09e7ae..97e98c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -66,6 +66,7 @@ * 1033 New Mutisite filter for the number of services a host has... * 0949 quicksearch: now able to search for multiple hosts at once... * 1052 SEC: index start URL can not be used to redirect to absolute URLs anymore... + * 1085 quicksearch: multiple hostname matches now lead to the searchhost view instead of the hosts view... * 0945 FIX: Sidebar snapin "Problem hosts": Now excludes hosts and services in downtime * 1036 FIX: doc/treasures/downtime: fix --url option, better error output * 1074 FIX: Fix Virtual Host Tree snapin... diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 13786b4..91ba1c1 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -769,7 +769,7 @@ def search_url_tmpl(used_filters, row, exact = True): # Default search templates ty = plugin.get("dftl_url_tmpl", plugin.get("id")) if ty == 'hosts': - return 'view.py?view_name=hosts&host=%(name)s' + return 'view.py?view_name=searchhost&host=%(name)s&filled_in=filter' elif ty == 'hostgroups': return 'view.py?view_name=hostgroups&hostgroup_name=%(name)s&site=%(site)s' elif ty == 'servicegroups':

10 years, 1 month

Check_MK Git: check_mk: FIX ps: now able to handle bigger process groups without constant MKCounterWrapped Exceptions

by Andreas Boesl

Module: check_mk Branch: master Commit: bc791f016dd14689a6cc71782be19db3322ea689 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc791f016dd146… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jul 21 11:54:15 2014 +0200 FIX ps: now able to handle bigger process groups without constant MKCounterWrapped Exceptions When a monitored process group got to many volatile processes (process spawn/despawn) the ps check had troubles to run through because there were multiple MKCounterWrapped Exceptions for each new process. This has been fixed. A newly detected process starts with usertime and kerneltime delta-values of 0. --- .werks/1084 | 12 ++++++++++++ ChangeLog | 3 ++- checks/ps | 34 ++++++++++++++++++++++++++++------ modules/check_mk_base.py | 15 +++++++++++++++ 4 files changed, 57 insertions(+), 7 deletions(-) diff --git a/.werks/1084 b/.werks/1084 new file mode 100644 index 0000000..7353c87 --- /dev/null +++ b/.werks/1084 @@ -0,0 +1,12 @@ +Title: ps: now able to handle bigger process groups without constant MKCounterWrapped Exceptions +Level: 1 +Component: checks +Version: 1.2.5i5 +Date: 1405935795 +Class: fix + +When a monitored process group got to many volatile processes (processes spawn/despawn) +the ps check had troubles to run through because there were multiple MKCounterWrapped Exceptions +for each new process. + +This has been fixed. A newly detected process starts with usertime and kerneltime delta-values of 0. diff --git a/ChangeLog b/ChangeLog index 6842fd8..a09e7ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -57,8 +57,9 @@ * 0634 FIX: Max Bandwidth for PNP-Graphs of Interface checks corrected... * 0635 FIX: fc_port: the check no longer inventorizes ports with administrative state of 'unknown' or 'offline' * 0636 FIX: fc_port: do not inventorize if brocade fibre channel mib is also supported on the device... - * 0638 FIX: windows_updates: agent plugin now always sends section header, even if no update information provided... * 1083 FIX: ad_replication.bat: does not return data if the server is no DC + * 0638 FIX: windows_updates: agent plugin now always sends section header, even if no update information provided... + * 1084 FIX: ps: now able to handle bigger process groups without constant MKCounterWrapped Exceptions... Multisite: * 1013 Sort host names naturally, e.g. foobar11 comes after foobar2... diff --git a/checks/ps b/checks/ps index 1c6f2be..596998b 100644 --- a/checks/ps +++ b/checks/ps @@ -323,7 +323,7 @@ def process_matches(ps, procname, l_user): # "okmax" : 1, # "warnmax" : 1, # } -def check_procs(item, params, info, with_perfdata): +def check_ps(item, params, info, with_perfdata): now = time.time() cpu_cores, info = ps_parse_info(info) # parse windows wmic information @@ -351,6 +351,11 @@ def check_procs(item, params, info, with_perfdata): percent_cpu = 0.0 extended_perfdata = False + # The counter names for the ps check are quite volatile, because there is + # dynamic part (the pid) in the name. Therefore we clear any counters + # older than one day. Affected are ps_wmic.user, ps_wmic.kernel, ps_stat.pcpu + clear_counters("ps_", 86400) + running_on = set([]) # collect information about nodes the processes run on for line in info: node_name = line[0] @@ -366,8 +371,21 @@ def check_procs(item, params, info, with_perfdata): 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]) - timedif, user_per_sec = get_counter("ps_wmic.user.%d" % pid, now, user_c) - timedif, kernel_per_sec = get_counter("ps_wmic.kernel.%d" % pid, now, kernel_c) + counter_wrapped = False + try: + timedif, user_per_sec = get_counter("ps_wmic.user.%d" % pid, now, user_c) + except MKCounterWrapped, e: + counter_wrapped = True + + try: + timedif, kernel_per_sec = get_counter("ps_wmic.kernel.%d" % pid, now, kernel_c) + except MKCounterWrapped, e: + counter_wrapped = True + + if counter_wrapped: + user_per_sec = 0 + kernel_per_sec = 0 + user_perc = user_per_sec / 100000.0 / cpu_cores kernel_perc = kernel_per_sec / 100000.0 / cpu_cores percent_cpu += user_perc + kernel_perc @@ -383,7 +401,11 @@ def check_procs(item, params, info, with_perfdata): pid = addinfo[4] hours, minutes, seconds = map(int, addinfo[3].split(":")) total_seconds = 86400 * days + 3600 * hours + 60 * minutes + seconds - timedif, cputime = get_counter("ps_stat.pcpu.%s" % pid, now, total_seconds) + try: + timedif, cputime = get_counter("ps_stat.pcpu.%s" % pid, now, total_seconds) + except MKCounterWrapped, e: + cputime = 0 + pcpu = cputime * 100 else: pcpu = savefloat(addinfo[3]) @@ -471,7 +493,7 @@ def check_procs(item, params, info, with_perfdata): return state, infotext, perfdata check_info['ps'] = { - "check_function" : lambda i,p,n: check_procs(i,p,n,False), + "check_function" : lambda i,p,n: check_ps(i,p,n,False), "inventory_function" : inventory_ps, "service_description" : "proc_%s", "has_perfdata" : False, @@ -480,7 +502,7 @@ check_info['ps'] = { } check_info['ps.perf'] = { - "check_function" : lambda i,p,n: check_procs(i,p,n,True), + "check_function" : lambda i,p,n: check_ps(i,p,n,True), "inventory_function" : inventory_ps_perf, "service_description" : "proc_%s", "has_perfdata" : True, diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index bfea8f7..9237853 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -836,6 +836,21 @@ def load_counters(hostname): except: g_counters = {} + +# Deletes counters from g_counters matching the given pattern and are older_than x seconds +def clear_counters(pattern, older_than): + global g_counters + counters_to_delete = [] + now = time.time() + + for name, (timestamp, value) in g_counters.items(): + if name.startswith(pattern): + if now > timestamp + older_than: + counters_to_delete.append(name) + + for name in counters_to_delete: + del g_counters[name] + def get_counter(countername, this_time, this_val, allow_negative=False): global g_counters

10 years, 1 month

← Newer
1
...
7
8
9
10
11
12
13
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2014