Checkmk git commits April 2011

checkmk-commits@lists.checkmk.com

2 participants
103 discussions

Check_MK Git: check_mk: Made smart agent plugin executable

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: badf00f259464718974f55127ee01a27d88afdf6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=badf00f2594647… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 13 12:52:58 2011 +0200 Made smart agent plugin executable --- 0 files changed, 0 insertions(+), 0 deletions(-) diff --git a/agents/plugins/smart b/agents/plugins/smart old mode 100644 new mode 100755

13 years, 5 months

Check_MK Git: check_mk: smart.stats: Changed default level format

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 24dd75c6df32f47a953c81faf3ca64948574d493 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=24dd75c6df32f4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 13 12:29:29 2011 +0200 smart.stats: Changed default level format --- checks/smart | 33 ++++++++++++--------------------- 1 files changed, 12 insertions(+), 21 deletions(-) diff --git a/checks/smart b/checks/smart index c79490c..087e624 100644 --- a/checks/smart +++ b/checks/smart @@ -47,22 +47,15 @@ smart_temp_default_values = (35, 40) smart_stats_default_values = { - 'realloc_events_warn': 1, - 'realloc_events_crit': 1, - 'realloc_sectors_warn': 1, - 'realloc_sectors_crit': 1, - 'spin_retries_warn': 1, - 'spin_retries_crit': 1, - 'pending_retries_warn': 1, - 'pending_retries_crit': 1, - 'cmd_timeouts_warn': 5, - 'cmd_timeouts_crit': 10, - 'end_to_end_warn': 1, - 'end_to_end_crit': 1, - 'uncorr_errs_warn': 1, - 'uncorr_errs_crit': 1, - 'udma_crcs_warn': 1, - 'udma_crcs_crit': 1, + 'realloc_events': (1, 1), + 'realloc_sectors': (1, 1), + 'spin_retries': (1, 1), + 'pending_retries': (1, 1), + 'pending_sectors': (1, 1), + 'cmd_timeouts': (5, 10), + 'e2e_errs': (1, 1), + 'uncorr_errs': (1, 1), + 'udma_crcs': (1, 1), } @@ -109,16 +102,14 @@ def check_smart_stats(item, params, info): if line[4] == lab: warn, crit, cur_status, thresh_out = None, None, 0, '' - if thresh and thresh + '_crit' in params and value >= params[thresh + '_crit']: - crit = params[thresh + '_crit'] + if thresh and thresh + '_crit' in params and value >= params[thresh][1]: cur_status = 2 thresh_out = ' (CRIT)' - elif thresh and thresh + '_warn' in params and value >= params[thresh + '_warn']: - warn = params[thresh + '_warn'] + elif thresh and thresh + '_warn' in params and value >= params[thresh][0]: cur_status = 1 thresh_out = ' (WARN)' - perfdata.append((lab, val, warn, crit)) + perfdata.append((lab, val, thresh and params[thresh][0] or None, thresh and params[thresh][1] or None)) output.append('%s: %d%s%s' % (txt, val, uom, thresh_out)) status = max(status, cur_status)

13 years, 5 months

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

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: aa38c51901523440afe1f5e386970e98800c690a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aa38c519015234… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 13 19:00:47 2011 +0200 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk Conflicts: ChangeLog ---

13 years, 5 months

Check_MK Git: check_mk: Added new check: smart for monitoring HDD health

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: dbbb8bdfc9103f8fa56e0101e5ca0ee226ecc85a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dbbb8bdfc9103f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 13 12:04:14 2011 +0200 Added new check: smart for monitoring HDD health --- agents/plugins/smart | 12 +++ checkman/cmctc.temp | 2 +- checkman/smart.temp | 33 +++++++ checks/smart | 151 ++++++++++++++++++++++++++++++ pnp-rraconf/check_mk-smart.stats.rra.cfg | 1 + pnp-rraconf/check_mk-smart.temp.rra.cfg | 1 + pnp-templates/check_mk-smart.temp.php | 1 + 7 files changed, 200 insertions(+), 1 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=dbbb8bdfc9…

13 years, 5 months

Check_MK Git: check_mk: Added man page for smart.stats check

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3712e575a4474fe7fa7786296b6141d455852a1f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3712e575a4474f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 13 12:25:06 2011 +0200 Added man page for smart.stats check --- checkman/smart.stats | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/checkman/smart.stats b/checkman/smart.stats new file mode 100644 index 0000000..dd76728 --- /dev/null +++ b/checkman/smart.stats @@ -0,0 +1,42 @@ +title: Monitor HDD health statistics using S.M.A.R.T +agents: linux +author: Lars Michelsen <lm(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + This check monitors health statistics like error counters of HDDs using the + information reported by S.M.A.R.T. This check works only for HDDs which + report the value {Temperature_Celsius} via {smartctl -A <device>}. + + The check uses information provided by the Check_MK linux agent which are + available when the agent has been extended with the {smart} agent plugin. + +perfdata: + One variable for each of the known state counters. + +inventory: + If there is at least one supported value available for a HDD one service is + inventorized. + +examples: + # These are the default thresholds of the check. + smart_stats_default_values = { + 'realloc_events': (1, 1), + 'realloc_sectors': (1, 1), + 'spin_retries': (1, 1), + 'pending_retries': (1, 1), + 'cmd_timeouts': (5, 10), + 'end_to_end': (1, 1), + 'uncorr_errs': (1, 1), + 'udma_crcs': (1, 1), + } + + +[parameters] +params(dict from string to (int, int)): A python dictionary which contains + tuples of two integers which represent the WARNING and the CRITICAL + threshold threshold for each supported value. + +[configuration] +smart_stats_default_values (dict from string to (int, int)): default levels + used for all inventorized checks.

13 years, 5 months

Check_MK Git: check_mk: Updated changelog

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 07d12fa4561b7e2b514170a6fd6fe547ced62624 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=07d12fa4561b7e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 13 12:26:50 2011 +0200 Updated changelog --- ChangeLog | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3be9e57..08d6ced 100644 --- a/ChangeLog +++ b/ChangeLog @@ -66,6 +66,8 @@ * if/if64: also show perf-o-meter if speed is unknown * f5_bigip_pool: status of F5 BIP/ip load balancing pools * f5_bigip_vserver: status of F5 BIP/ip virtual servers + * smart.temp/smart.stats: added new check for monitoring health of HDDs + using S.M.A.R.T 1.1.10:

13 years, 5 months

Check_MK Git: check_mk: Windows: new implementation of performance counters

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8b43f7674ae4cdea3d3d2fd42159c90efcc617c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b43f7674ae4cd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 13 17:10:31 2011 +0200 Windows: new implementation of performance counters --- ChangeLog | 5 +- agents/windows/check_mk.ini | 9 +- agents/windows/check_mk_agent.cc | 165 +- agents/windows/check_mk_agent.exe | Bin 95744 -> 96768 bytes checkman/winperf_msx_queues | 59 + checkman/winperf_processor.util | 31 + checkman/winperf_system.diskio | 26 + checks/winperf | 5 - checks/winperf_msx_queues | 85 + checks/winperf_processor | 76 + checks/winperf_system | 64 + doc/windows/README.lodctr | 8 + doc/windows/counters.ini |13063 +++++++++++++++++++++++ pnp-rraconf/check_mk-winperf_msx_queues.rra.cfg | 1 + pnp-templates/check_mk-winperf_msx_queues.php | 35 + web/plugins/perfometer/check_mk.py | 13 + 16 files changed, 13603 insertions(+), 42 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8b43f7674a…

13 years, 5 months

Check_MK Git: check_mk: ipmi: Linux agent now (asynchronously) caches output of ipmitool for 20 minutes

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 74b1be33c697cbad86b9097f6f5b1b3f847c4d16 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=74b1be33c697cb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 12 17:31:22 2011 +0200 ipmi: Linux agent now (asynchronously) caches output of ipmitool for 20 minutes --- ChangeLog | 1 + agents/check_mk_agent.linux | 35 +++++++++++++++++++++++++++-------- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index fccfa61..a464543 100644 --- a/ChangeLog +++ b/ChangeLog @@ -75,6 +75,7 @@ * f5_bigip_vserver: status of F5 BIP/ip virtual servers * ipmi: new configuration variable ipmi_ignored_sensors (see man page) * hp_procurve_cpu: rename services description to CPU utilization + * ipmi: Linux agent now (asynchronously) caches output of ipmitool for 20 minutes 1.1.10: diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index c40821f..336579f 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -182,20 +182,39 @@ echo '<<<netctr>>>' date +%s sed -e 1,2d -e 's/:/ /g' < /proc/net/dev -# IPMI-Daten (Luefter, CPU, Temperatur, etc) -if which ipmitool >/dev/null ; then + +if which ipmitool >/dev/null +then echo '<<<ipmi>>>' - # Transform output from |-separated into ' '-separated, - # drop lines with no data (e.g. from non-present CPUs) - # Columns: name value status unrec_low crit_low noncrit_low noncrit_high crit_high unrec_high - # Status: ok, nc (NonCritical=Warning), ?? - ipmitool sensor list \ - | grep -v 'command failed' \ + IPMI_FILE=$MK_CONFDIR/ipmitool_sensors.cache + # Use cache file after 20 minutes + IPMI_MAXAGE=1200 + + # Check if file exists and recent enough + if [ -s $IPMI_FILE ] + then + NOW=$(date +%s) + MTIME=$(stat -c %Y $IPMI_FILE) + if [ $((NOW - MTIME)) -le $IPMI_MAXAGE ] ; then + USE_IPMI_FILE=1 + fi + fi + + if [ -s "$IPMI_FILE" ] + then + grep -v 'command failed' "$IPMI_FILE" \ | sed -e 's/ *| */|/g' -e "s/ /_/g" -e 's/_*$//' -e 's/|/ /g' \ | egrep -v '^[^ ]+ na ' \ | grep -v ' discrete ' + fi + + if [ -z "$USE_IPMI_FILE" -a ! -e "$IPMI_FILE.new" ] + then + setsid bash -c "set -o noclobber ; ipmitool sensor list > $IPMI_FILE.new && mv $IPMI_FILE.new $IPMI_FILE || rm -f $IPMI_FILE*" & + fi fi + # IPMI data via ipmi-sensors (of freeipmi). Please make sure, that if you # have installed freeipmi that IPMI is really support by your hardware. # The agent tries to avoid hanging forever by setting a limit of 300 seconds

13 years, 5 months

Check_MK Git: check_mk: FIX: if/if64: always generate unique items ( in case ifAlias is used)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: cd8c20dd1d6482f4efbf02032d131a4c1a589c03 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd8c20dd1d6482… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 12 16:31:40 2011 +0200 FIX: if/if64: always generate unique items (in case ifAlias is used) --- ChangeLog | 1 + checks/if.include | 27 ++++++++++++++++++++++++--- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 35e91de..fccfa61 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,7 @@ * Allow moving hosts from one to another config file Checks & Agents: + * FIX: if/if64: always generate unique items (in case ifAlias is used) * FIX: ipmi: fix ugly ouput in case of warning and error * FIX: vms_df: fix, was completely broken due to conversion to df.include * FIX: blade_bays: add missing SNMP OIDs (check was always UNKNOWN) diff --git a/checks/if.include b/checks/if.include index 01429f5..d3d7d92 100644 --- a/checks/if.include +++ b/checks/if.include @@ -67,7 +67,7 @@ def if_statename(st): def inventory_if_common(info): if len(info) == 0 or len(info[0]) != 19: return [] - inventory = [] + pre_inventory = [] for ifIndex, ifDescr, ifType, ifSpeed, ifOperStatus, ifInOctets, inucast, inmcast, inbcast, ifInDiscards, \ ifInErrors, ifOutOctets, outucast, outmcast, outbcast, ifOutDiscards, ifOutErrors, ifOutQLen, ifAlias in info: @@ -92,7 +92,23 @@ def inventory_if_common(info): if ifSpeed != "" and if_inventory_monitor_speed: paramstring += ', "speed" : %d' % int(ifSpeed) paramstring += "}" - inventory.append( (item, paramstring) ) + pre_inventory.append( (item, paramstring, int(ifIndex)) ) + + # Check for duplicate items (e.g. when using Alias as item and the alias is not unique) + seen_items = set([]) + duplicate = set([]) + for item, params, index in pre_inventory: + if item in seen_items: # duplicate + duplicate.add(item) + seen_items.add(item) + + inventory = [] + for item, params, index in pre_inventory: + if item in duplicate: + new_item = "%s %d" % (item, index) + else: + new_item = item + inventory.append((new_item, params)) return inventory @@ -126,13 +142,18 @@ def check_if_common(item, params, info): ifDescr = cleanup_if_strings(ifDescr) ifAlias = cleanup_if_strings(ifAlias) - if item == ifIndex or item == ifAlias or item == ifDescr: + if item == ifIndex \ + or item == ifAlias \ + or item == ifDescr \ + or item == "%s %s" % (ifAlias, ifIndex): # Display port number or alias in infotext if that is not part # of the service description anyway if item == ifIndex and (item == ifAlias or ifAlias == '') \ and (item == ifDescr or ifDescr == ''): # description trivial infotext = "" + elif item == "%s %s" % (ifAlias, ifIndex) and ifDescr != '': # non-unique Alias + infotext = "[%s/%s]" % (ifAlias, ifDescr) elif item != ifAlias and ifAlias != '': # alias useful infotext = "[%s] " % ifAlias elif item != ifDescr and ifDescr != '': # description useful

13 years, 5 months

Check_MK Git: check_mk: hp_procurve_cpu: rename services description to CPU utilization

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b940ac7055dd8c96ede7a266d21630201f299f65 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b940ac7055dd8c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 12 14:37:52 2011 +0200 hp_procurve_cpu: rename services description to CPU utilization --- ChangeLog | 1 + checks/hp_procurve_cpu | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index d9b7fc8..9eafd03 100644 --- a/ChangeLog +++ b/ChangeLog @@ -72,6 +72,7 @@ * f5_bigip_pool: status of F5 BIP/ip load balancing pools * f5_bigip_vserver: status of F5 BIP/ip virtual servers * ipmi: new configuration variable ipmi_ignored_sensors (see man page) + * hp_procurve_cpu: rename services description to CPU utilization 1.1.10: diff --git a/checks/hp_procurve_cpu b/checks/hp_procurve_cpu index 32073b1..40a3541 100644 --- a/checks/hp_procurve_cpu +++ b/checks/hp_procurve_cpu @@ -55,7 +55,7 @@ def check_hp_procurve_cpu(item, params, info): return (3, "UNKNOWN - Invalid information in snmp data") -check_info['hp_procurve_cpu'] = (check_hp_procurve_cpu, "CPU", 1, inventory_hp_procurve_cpu) +check_info['hp_procurve_cpu'] = (check_hp_procurve_cpu, "CPU utilization", 1, inventory_hp_procurve_cpu) snmp_info['hp_procurve_cpu'] = ( ".1.3.6.1.4.1.11.2.14.11.5.1.9.6", [ "1" ] ) snmp_scan_functions['hp_procurve_cpu'] = \ lambda oid: ".11.2.3.7.11" in oid(".1.3.6.1.2.1.1.2.0")

13 years, 5 months

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2011