Checkmk git commits March 2011

checkmk-commits@lists.checkmk.com

3 participants
205 discussions

Check_MK Git: check_mk: Added item section to wmic_process man page

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ecb649887120ca89c41050ceb9d1bdacd622927c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ecb649887120ca… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 1 18:03:06 2011 +0100 Added item section to wmic_process man page --- .bugs/154 | 11 ++++++++--- checkman/wmic_process | 5 +++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.bugs/154 b/.bugs/154 index 3f2d123..03c2161 100644 --- a/.bugs/154 +++ b/.bugs/154 @@ -1,8 +1,13 @@ Title: wmic_process manpage misses ITEM section Component: checks +State: closed +Class: bug +Date: 2011-02-18 11:13:15 Benefit: 1 -State: open Cost: 1 -Date: 2011-02-18 11:13:15 -Class: bug +Fun: 0 + + +2011-03-01 18:02:40: changed state open -> done +2011-03-01 18:02:46: changed state done -> closed diff --git a/checkman/wmic_process b/checkman/wmic_process index b7e2610..1e60562 100644 --- a/checkman/wmic_process +++ b/checkman/wmic_process @@ -18,6 +18,11 @@ description: If no matching process is found running, then the check is always OK (since no ressources are consumed). +item: + A user definable string that is used as part of the service description. + If you choose {"APACHE"} as item, for example, then the check will be + named {proc_APACHE}. + perfdata: Four value are sent: (1) The memory usage in MB, (2) The page file usage in MB, (3) The CPU usage in user mode in %, (4) The CPU usage in kernel mode in %.

13 years, 4 months

Check_MK Git: check_mk: Fixed PNP template for Check_MK execution time

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 24caf33ebbc9b7b1c7db23d8324dfddaec127346 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=24caf33ebbc9b7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 1 16:37:25 2011 +0100 Fixed PNP template for Check_MK execution time --- ChangeLog | 1 + pnp-templates/check-mk.php | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7ccea6a..8cc6762 100644 --- a/ChangeLog +++ b/ChangeLog @@ -34,6 +34,7 @@ * FIX: cisco_temp_perf: fix return state in case of WARNING (was 0 = OK) * FIX: repair PNP template for df when using trends * FIX: cisco_qos: fix WATO exception (was due to print command in check) + * FIX: check_mk check: fixed template for execution time Multisite: * FIX: fix json/python Webservice diff --git a/pnp-templates/check-mk.php b/pnp-templates/check-mk.php index 0adcd59..537a434 100644 --- a/pnp-templates/check-mk.php +++ b/pnp-templates/check-mk.php @@ -25,11 +25,11 @@ $range = $CRIT[1]; -$opt[1] = "--vertical-label 'time (s)' -l 0 -u 10 --title '$hostname: Check_MK check execution time' "; +$opt[1] = "--vertical-label 'time (s)' -l 0 --title '$hostname: Check_MK check execution time' "; $def[1] = "DEF:extime=$RRDFILE[1]:$DS[1]:MAX "; -$def[1] .= "AREA:extime#4080ff:\"time offset \" "; -$def[1] .= "LINE1:extime#2060d0: "; +$def[1] .= "AREA:extime#d080af:\"execution time \" "; +$def[1] .= "LINE1:extime#d020a0: "; $def[1] .= "GPRINT:extime:LAST:\"current\: %.2lf s\" "; $def[1] .= "GPRINT:extime:MAX:\"max(+/-)\: %.2lf s \" "; $def[1] .= "GPRINT:extime:AVERAGE:\"avg(+/-)\: %.2lf s\" ";

13 years, 4 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ee5bea8820bb09c27b2687f26fe5b1af7701aab8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ee5bea8820bb09… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 1 18:12:55 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk Conflicts: .bugs/163 ChangeLog ---

13 years, 4 months

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 88dac9f785d64f2b445fc864f9f0f1078c6e9f20 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=88dac9f785d64f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 1 18:10:02 2011 +0100 Updated bug entries --- .bugs/128 | 4 ++-- .bugs/144 | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.bugs/128 b/.bugs/128 index e093fa5..e09c2f6 100644 --- a/.bugs/128 +++ b/.bugs/128 @@ -1,8 +1,8 @@ Title: df trends: Peak values after changing the levels_range param Component: checks -Benefit: 5 +Benefit: 1 State: open -Cost: 4 +Cost: 2 Date: 2011-02-10 09:45:24 Class: bug diff --git a/.bugs/144 b/.bugs/144 index a603c03..587f6d7 100644 --- a/.bugs/144 +++ b/.bugs/144 @@ -1,10 +1,14 @@ Title: WATO services does not display manually configured checks Component: wato +State: done +Class: bug +Date: 2011-02-16 16:26:02 Benefit: 1 -State: open Cost: 1 -Date: 2011-02-16 16:26:02 -Class: bug +Fun: 0 If you add checks with checks +=, then WATO should display them, but does not. Problem seems to ly in check_mk --automation try-inventory. + +2011-03-01 18:09:24: changed state open -> done +Works for me. Cannot reproduce this bug.

13 years, 4 months

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1e82a852a61163bb387b3ce78d143992b1731fe6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e82a852a61163… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 1 11:25:54 2011 +0100 Updated bug entries --- .bugs/161 | 4 +++- .bugs/164 | 13 +++++++++++++ 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/.bugs/161 b/.bugs/161 index 4a16a46..5a18aab 100644 --- a/.bugs/161 +++ b/.bugs/161 @@ -6,7 +6,7 @@ Cost: 1 Date: 2011-02-27 14:08:10 Class: feature -This avoids problem on some devices. Might other introduce new ones. +This avoids problem on some devices. But Might also introduce new ones. So I'm not sure what to do here. From the manpage of snmpwalk: -Cc Do not check whether the returned OIDs are increasing. Some agents @@ -16,3 +16,5 @@ snmpwalk to loop indefinitely. By default, snmpwalk tries to detect this behavior and warns you when it hits an agent acting illegally. Use -Cc to turn off this check. +I think we simply enable this option in 1.1.11i1 and see what +happens... diff --git a/.bugs/164 b/.bugs/164 new file mode 100644 index 0000000..488bdad --- /dev/null +++ b/.bugs/164 @@ -0,0 +1,13 @@ +Title: PNP template for local check should support multiple values +Component: checks +Benefit: 1 +State: open +Cost: 2 +Date: 2011-03-01 11:21:46 +Class: bug + +Currently only one value is painted. The best way would be probably +to call the PNP default template in case no special local template +is existent. + +Beware: we must look in all template dirs for the default template.

13 years, 4 months

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6a789f0860b18dc9cb0b30438a50fbf3e3041327 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6a789f0860b18d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 1 18:14:18 2011 +0100 Updated bug entries --- .bugs/163 | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/.bugs/163 b/.bugs/163 index 7534aa9..247510f 100644 --- a/.bugs/163 +++ b/.bugs/163 @@ -75,4 +75,3 @@ index 135b1ed..6a870d1 100644 html.write('<tr class="data %s%d">' % (trclass, state)) for p in painters: ->>>>>>> 5eed47a670da84b7bea45e2e63e9441120d9d13a

13 years, 4 months

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 38531dfcee6133ab09bbf84101042dfa3c74c2f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=38531dfcee6133… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 1 11:00:14 2011 +0100 Updated bug entries --- .bugs/163 | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/.bugs/163 b/.bugs/163 new file mode 100644 index 0000000..6fbed81 --- /dev/null +++ b/.bugs/163 @@ -0,0 +1,24 @@ +Title: Automatic detection of host tags +Component: core +Benefit: 5 +State: open +Cost: 3 +Date: 2011-03-01 09:33:42 +Class: feature + +A quite new idea: during inventory we could allow check types +to make hints for host tags. The way we could set automatic +host tags which would be saved in var/check_mk/autotags/$HOST +(or maybe a global file for all hosts together)? + +Also the SNMP scan could set an auto tag after trying if +SNMPv2c is possible. That way the manual configuration +of bulkwalk hosts would be neccessary only in a few +rare situtations. + +Possible examples for autotags: + +- Type of Agent (snmp, linux, windows, hpux, etc.) +- Operating System (sles10) +- Architecture (x86_64, ppc, etc.) +- Type of device (host, switch, appliance, ?)

13 years, 4 months

Check_MK Git: check_mk: FIX: netapp_volumes: The check handled 64-bit aggregates correctly

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5eed47a670da84b7bea45e2e63e9441120d9d13a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5eed47a670da84… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 1 16:37:57 2011 +0100 FIX: netapp_volumes: The check handled 64-bit aggregates correctly FIX: netapp_volumes: Fixed snmp scan function FIX: blade_*: Fixed snmp scan function --- ChangeLog | 3 +++ checks/blade_bays | 2 +- checks/blade_blades | 2 +- checks/blade_blowers | 2 +- checks/blade_health | 2 +- checks/blade_mediatray | 2 +- checks/blade_powerfan | 2 +- checks/blade_powermod | 2 +- checks/netapp_volumes | 4 ++-- 9 files changed, 12 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 68705fd..1f7d2b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -34,6 +34,9 @@ * FIX: cisco_temp_perf: fix return state in case of WARNING (was 0 = OK) * FIX: repair PNP template for df when using trends * FIX: blade_health, fc_brocade_port_detailed removed debug outputs + * FIX: netapp_volumes: The check handled 64-bit aggregates correctly + * FIX: netapp_volumes: Fixed snmp scan function + * FIX: blade_*: Fixed snmp scan function Multisite: * FIX: fix json/python Webservice diff --git a/checks/blade_bays b/checks/blade_bays index 672f423..521d71c 100644 --- a/checks/blade_bays +++ b/checks/blade_bays @@ -55,4 +55,4 @@ check_info['blade_bays'] = (check_blade_bays, "BAY %s", 0, inventory_blade_bays snmp_info['blade_bays'] = ( "1.3.6.1.4.1.2.3.51.2.2.10.2.1.1", [ 5, 6 ] ) # BLADE-MIB snmp_scan_functions['blade_bays'] = \ - lambda oid: oid("1.3.6.1.2.1.1.1.0") == '"BladeCenter Management Module"' + lambda oid: oid("1.3.6.1.2.1.1.1.0") == 'BladeCenter Management Module' diff --git a/checks/blade_blades b/checks/blade_blades index 1f7dcf0..9987737 100644 --- a/checks/blade_blades +++ b/checks/blade_blades @@ -74,4 +74,4 @@ snmp_info['blade_blades'] = ( "1.3.6.1.4.1.2.3.51.2.22.1.5.1.1", [ # BLADE-MIB ]) snmp_scan_functions['blade_blades'] = \ - lambda oid: oid("1.3.6.1.2.1.1.1.0") == '"BladeCenter Management Module"' + lambda oid: oid("1.3.6.1.2.1.1.1.0") == 'BladeCenter Management Module' diff --git a/checks/blade_blowers b/checks/blade_blowers index 0060bb5..fc936e0 100644 --- a/checks/blade_blowers +++ b/checks/blade_blowers @@ -101,4 +101,4 @@ check_info['blade_blowers'] = ( check_blade_blowers, "Blower %s", 1, inventory_b snmp_info['blade_blowers'] = ( "1.3.6.1.4.1.2.3.51.2.2", [3] ) snmp_scan_functions['blade_blowers'] = \ - lambda oid: oid("1.3.6.1.2.1.1.1.0") == '"BladeCenter Management Module"' + lambda oid: oid("1.3.6.1.2.1.1.1.0") == 'BladeCenter Management Module' diff --git a/checks/blade_health b/checks/blade_health index a7421a6..eec8a27 100644 --- a/checks/blade_health +++ b/checks/blade_health @@ -51,4 +51,4 @@ check_info['blade_health'] = ( check_blade_health, "Summary health state", 0, in snmp_info['blade_health'] = ( "1.3.6.1.4.1.2.3.51.2.2.7", [ '1', '2.1.3.1' ]) snmp_scan_functions['blade_health'] = \ - lambda oid: oid("1.3.6.1.2.1.1.1.0") == '"BladeCenter Management Module"' + lambda oid: oid("1.3.6.1.2.1.1.1.0") == 'BladeCenter Management Module' diff --git a/checks/blade_mediatray b/checks/blade_mediatray index 4dfd806..4ee551a 100644 --- a/checks/blade_mediatray +++ b/checks/blade_mediatray @@ -46,4 +46,4 @@ check_info['blade_mediatray'] = ( check_blade_mediatray, "Media tray", 0, invent snmp_info['blade_mediatray'] = ( "1.3.6.1.4.1.2.3.51.2.2.5.2", [74, 75]) snmp_scan_functions['blade_mediatray'] = \ - lambda oid: oid("1.3.6.1.2.1.1.1.0") == '"BladeCenter Management Module"' + lambda oid: oid("1.3.6.1.2.1.1.1.0") == 'BladeCenter Management Module' diff --git a/checks/blade_powerfan b/checks/blade_powerfan index 542d390..817b981 100644 --- a/checks/blade_powerfan +++ b/checks/blade_powerfan @@ -54,4 +54,4 @@ check_info['blade_powerfan'] = (check_blade_powerfan, "Power Module Cooling Devi snmp_info['blade_powerfan'] = ( "1.3.6.1.4.1.2.3.51.2.2.6.1.1", [ 1, 2, 3, 4, 5, 6, 7 ] ) # BLADE-MIB snmp_scan_functions['blade_powerfan'] = \ - lambda oid: oid("1.3.6.1.2.1.1.1.0") == '"BladeCenter Management Module"' + lambda oid: oid("1.3.6.1.2.1.1.1.0") == 'BladeCenter Management Module' diff --git a/checks/blade_powermod b/checks/blade_powermod index f585035..674d1c2 100644 --- a/checks/blade_powermod +++ b/checks/blade_powermod @@ -45,4 +45,4 @@ check_info['blade_powermod'] = (check_blade_powermod, "Power Module %s", 0, inve snmp_info['blade_powermod'] = ( "1.3.6.1.4.1.2.3.51.2.2.4.1.1", [ 1, 2, 3, 4 ]) # BLADE-MIB snmp_scan_functions['blade_powermod'] = \ - lambda oid: oid("1.3.6.1.2.1.1.1.0") == '"BladeCenter Management Module"' + lambda oid: oid("1.3.6.1.2.1.1.1.0") == 'BladeCenter Management Module' diff --git a/checks/netapp_volumes b/checks/netapp_volumes index 7a365c1..a218f4e 100644 --- a/checks/netapp_volumes +++ b/checks/netapp_volumes @@ -95,7 +95,7 @@ def check_netapp_volumes(item, _not_used, info): if status == 'reconstructing': ret_state = 1 output += ' (WARN)' - elif status not in [ 'normal', 'raid_dp', 'raid0', 'raid0, mirrored' ]: + elif status.split(',')[0] not in [ 'normal', 'raid_dp', 'raid0', 'raid0, mirrored' ]: ret_state = 2 output += ' (CRIT)' @@ -110,4 +110,4 @@ snmp_info["netapp_volumes"] = ( ".1.3.6.1.4.1.789.1.5.8.1", ["2", # volName ] ) snmp_scan_functions['netapp_volumes'] = \ - lambda oid: oid("1.3.6.1.2.1.1.1.0").startswith('"NetApp Release') + lambda oid: oid("1.3.6.1.2.1.1.1.0").startswith('NetApp Release')

13 years, 4 months

Check_MK Git: check_mk: FIX: blade_health, fc_brocade_port_detailed removed debug outputs

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5018570219306ad5d9c21ac9b99ccd01aead1705 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5018570219306a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 1 15:12:20 2011 +0100 FIX: blade_health, fc_brocade_port_detailed removed debug outputs --- ChangeLog | 1 + checks/blade_health | 1 - checks/fc_brocade_port_detailed | 2 -- 3 files changed, 1 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 06a904e..68705fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -33,6 +33,7 @@ * hp_proliant_*: improve scan function (now just looks for "proliant") * FIX: cisco_temp_perf: fix return state in case of WARNING (was 0 = OK) * FIX: repair PNP template for df when using trends + * FIX: blade_health, fc_brocade_port_detailed removed debug outputs Multisite: * FIX: fix json/python Webservice diff --git a/checks/blade_health b/checks/blade_health index 0dfff86..a7421a6 100644 --- a/checks/blade_health +++ b/checks/blade_health @@ -31,7 +31,6 @@ def inventory_blade_health(checkname, info): def check_blade_health(_no_item, _no_params, info): state = info[0][0] descr = '' - print info if len(info) > 1: descr = ': %s' % info[1][1] diff --git a/checks/fc_brocade_port_detailed b/checks/fc_brocade_port_detailed index 5d205f8..b03b30f 100644 --- a/checks/fc_brocade_port_detailed +++ b/checks/fc_brocade_port_detailed @@ -37,7 +37,6 @@ fc_brocade_port_detailed_default_levels = ( (1, 0.1), (1, 0.1), (1, 0.1), (2, 16 def inventory_brocade_port(checkname, info): porttable, isltable = info inventory = [] - print for index, phystate, opstate, txwords, rxwords, txframes, rxframes, crcerrors, encout, c3discards in porttable: state = (int(phystate), int(opstate)) if state == (4,2): @@ -117,7 +116,6 @@ def check_brocade_port(portno, params, info): if (phy,op) == (phystate, opstate): nagioscode = ncode break - print phystate, len(brocade_phystate_names) return (nagioscode, "%s - physical state %s(%d), opstate %s(%d)" % ( nagios_state_names[nagioscode], (len(brocade_phystate_names) > phystate and brocade_phystate_names[phystate] or 'UNHANDLED'),

13 years, 4 months

Check_MK Git: check_mk: validator: added new check for catching development debug statements like prints

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: ef38929cc70c4c5ab0408cb4a0999c92c2c01385 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ef38929cc70c4c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 1 15:04:25 2011 +0100 validator: added new check for catching development debug statements like prints --- doc/helpers/validate_checks | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/doc/helpers/validate_checks b/doc/helpers/validate_checks index 68bba37..2aa0978 100755 --- a/doc/helpers/validate_checks +++ b/doc/helpers/validate_checks @@ -163,6 +163,7 @@ TESTS = { 'reindent': C_OK, 'global_vars': C_OK, 'linelength': C_OK, + 'debug': C_OK, } WEIGHT = { @@ -170,6 +171,7 @@ WEIGHT = { 'global_vars': 2, 'reindent': 2, 'linelength': 2, + 'debug': 10, } manpage = {} @@ -227,6 +229,26 @@ def verify_reindent(check): f.close() return not r.run() +# Debug: +# - are there 'print' statements in the code? +# - are there 'sys.*.write' statements? + +def is_valid_debug(check): + return True + +def verify_debug(check): + f = open('checks/%s' % check.split('.')[0]) + for l in f.read().split("\n"): + l = l.strip() + if l.startswith('print ') or l.startswith('print('): + return False + elif l.startswith('sys.stdout.write'): + return False + elif l.startswith('sys.stderr.write'): + return False + f.close() + return True + # Toooo long lines: # - Are there too long lines in the check?

13 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2011