Checkmk git commits February 2011

checkmk-commits@lists.checkmk.com

3 participants
186 discussions

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

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: e3eeaeac5acb510ab4704d0c7987414d949b7d47 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e3eeaeac5acb51… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 25 11:37:26 2011 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk Conflicts: README.writing_checks ---

13 years, 4 months

Check_MK Git: check_mk: check conventions: Added some other thoughts

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3d3956714b4c77cfb74539d77ef7c91c264b118d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d3956714b4c77… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 25 11:25:38 2011 +0100 check conventions: Added some other thoughts --- README.writing_checks | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.writing_checks b/README.writing_checks index 2705f88..0d09944 100644 --- a/README.writing_checks +++ b/README.writing_checks @@ -1,10 +1,11 @@ This file will help you to write *good* checks for Check_MK. Check Naming: -* +* In case of SNMP checks you might use the name of the MIB you fetch data from as + part of check name Header notes: -* Add lincense notes +* Add licence notes * Add author notes. At least a contact mail address.

13 years, 4 months

Check_MK Git: check_mk: validate_checks: Added linelength check

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 33d0f7ae4701d1149a4f39f557dc2121fcb604e8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=33d0f7ae4701d1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 25 11:23:35 2011 +0100 validate_checks: Added linelength check --- doc/helpers/validate_checks | 37 +++++++++++++++++++++++++++---------- 1 files changed, 27 insertions(+), 10 deletions(-) diff --git a/doc/helpers/validate_checks b/doc/helpers/validate_checks index 8f6590a..68bba37 100755 --- a/doc/helpers/validate_checks +++ b/doc/helpers/validate_checks @@ -147,20 +147,33 @@ for check in get_checks(): global_vars[check] += [ name ] SCORE_START = 10 + C_OK = 1 C_FAILED = 2 C_INVALID = 3 -TESTS = { 'manpage': C_OK, - 'snmp_scan': C_OK, - 'pnp_tmpl': C_OK, - 'pnp_rra': C_OK, - 'snmp_scan': C_OK, - 'reindent': C_OK, - 'global_vars': C_OK, + +LINELENGTH_LIMIT = 100 + +TESTS = { + 'manpage': C_OK, + 'snmp_scan': C_OK, + 'pnp_tmpl': C_OK, + 'pnp_rra': C_OK, + 'snmp_scan': C_OK, + 'reindent': C_OK, + 'global_vars': C_OK, + 'linelength': C_OK, +} + +WEIGHT = { + 'manpage': 2, + 'global_vars': 2, + 'reindent': 2, + 'linelength': 2, } -WEIGHT = { 'manpage': 2, 'global_vars': 2, 'reindent': 2 } -manpage = {} +manpage = {} +checkfiles = {} # ############################################################################# # Check definitions @@ -221,7 +234,11 @@ def is_valid_linelength(check): return True def verify_linelength(check): - + """ Read the checkfile and compare all lines with the maximum line length """ + for line in get_checkfile(check).split("\n"): + if len(line) > LINELENGTH_LIMIT: + return False + return True # Manpage: # - Does the check have a manpage?

13 years, 4 months

Check_MK Git: check_mk: check conventions: Added some other thoughts

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 764c37a03240dd699ae171f570f499352d30579b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=764c37a03240dd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 25 11:10:20 2011 +0100 check conventions: Added some other thoughts --- README.writing_checks | 18 +++++++++++++++++- doc/helpers/validate_checks | 17 +++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletions(-) diff --git a/README.writing_checks b/README.writing_checks index 3490073..2705f88 100644 --- a/README.writing_checks +++ b/README.writing_checks @@ -3,10 +3,24 @@ This file will help you to write *good* checks for Check_MK. Check Naming: * -Code styling: +Header notes: +* Add lincense notes + +* Add author notes. At least a contact mail address. + +Coding styling: +* Avoid long lines. In an optimal case your lines don't exceed 80 chars. + 100 chars. + * Use four spaces for intending your code. Just don't use tab chars. And if you relly can't life without tabs set the tab width to 8 spaces. +* Variable naming. Use lower case variable names where the keywords are splitted by _ signs. + +* Creating nagios state strings: There is a dictionary named 'nagios_state_names'. + You can use it to get nagios state string from nagios return codes. e.g.: + nagios_state_names[0] gives you 'OK'. + Manpages: * @@ -31,3 +45,5 @@ Agent based checks: by your check. -> That makes the code more easy to understand and help not to break something if someone changes something in the check's parser. + In an optimal case you include several code examples of different + states. diff --git a/doc/helpers/validate_checks b/doc/helpers/validate_checks index 7f9ade4..8f6590a 100755 --- a/doc/helpers/validate_checks +++ b/doc/helpers/validate_checks @@ -90,6 +90,14 @@ def get_manpage(check): manpage[check] = "" return manpage[check] +def get_checkfile(check): + if not check in checkfiles: + try: + checkfiles[check] = open('checks/%s' % check.split('.')[0]).read() + except IOError, e: + checkfiles[check] = "" + return checkfiles[check] + def grep_manpage(check, match, section = None): manpage = get_manpage(check) if section is None: @@ -206,6 +214,15 @@ def verify_reindent(check): f.close() return not r.run() +# Toooo long lines: +# - Are there too long lines in the check? + +def is_valid_linelength(check): + return True + +def verify_linelength(check): + + # Manpage: # - Does the check have a manpage?

13 years, 4 months

Check_MK Git: check_mk: Removed shebang in the middle of file

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 679135ef57fc0900ce618fa2edd3bdcd595c6ccc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=679135ef57fc09… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 25 10:52:54 2011 +0100 Removed shebang in the middle of file --- README.writing_checks | 6 ++++++ doc/helpers/df_magic_number.py | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/README.writing_checks b/README.writing_checks index feaffd1..3490073 100644 --- a/README.writing_checks +++ b/README.writing_checks @@ -1,5 +1,8 @@ This file will help you to write *good* checks for Check_MK. +Check Naming: +* + Code styling: * Use four spaces for intending your code. Just don't use tab chars. And if you relly can't life without tabs set the tab width to 8 spaces. @@ -8,6 +11,9 @@ Manpages: * Performance data: +* Only set perfdata flag when the check really produces performance data + output. + * All performance data checks need to provide a pnp template * pnp rra configuration diff --git a/doc/helpers/df_magic_number.py b/doc/helpers/df_magic_number.py index 8efe220..13b3ec9 100755 --- a/doc/helpers/df_magic_number.py +++ b/doc/helpers/df_magic_number.py @@ -24,8 +24,6 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -#!/usr/bin/python - normsize = 20.0 import sys

13 years, 4 months

Check_MK Git: check_mk: Code formating - fixed too long line

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4aa7dcb7341b8d7447d0972727ec500aee3c0338 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4aa7dcb7341b8d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 25 11:05:30 2011 +0100 Code formating - fixed too long line --- checks/3ware_disks | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/checks/3ware_disks b/checks/3ware_disks index 2b8761b..2d6f81d 100644 --- a/checks/3ware_disks +++ b/checks/3ware_disks @@ -70,7 +70,8 @@ def check_3ware_disks(item, params, info): size_type = line[4] disk_type = line[5] model = line[-1] - infotext = "%s (unit: %s, size: %s,%s, type: %s, model: %s)" % (status, unit_type, size, size_type, disk_type, model) + infotext = "%s (unit: %s, size: %s,%s, type: %s, model: %s)" % \ + (status, unit_type, size, size_type, disk_type, model) if status == "OK": return (0, "OK - disk status is " + infotext) else:

13 years, 4 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: 2e48cc46ac5b625dbeaafcf35753de92259ae737 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e48cc46ac5b62… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 25 11:05:42 2011 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

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: 7f48c12b00137e393434ab0f812847569658a40f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f48c12b00137e… Author: Florian Heigl <floh(a)Klappstuhl.(none)> Date: Fri Feb 25 10:21:55 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

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: d00148c3716024d761fd4b4331003f141b8c0d5e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d00148c3716024… Author: Florian Heigl <floh(a)Klappstuhl.(none)> Date: Fri Feb 25 11:01:13 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years, 4 months

Check_MK Git: check_mk: updated manual

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1628efc2c36dbce1e03af6bce3f5b287705f0800 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1628efc2c36dbc… Author: Florian Heigl <floh(a)Klappstuhl.(none)> Date: Fri Feb 25 09:51:30 2011 +0100 updated manual --- checkman/h3c_lanswitch_cpu | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/checkman/h3c_lanswitch_cpu b/checkman/h3c_lanswitch_cpu index b7256a4..3c742c0 100644 --- a/checkman/h3c_lanswitch_cpu +++ b/checkman/h3c_lanswitch_cpu @@ -1,11 +1,19 @@ -title: Check 3Com SuperStack 4 CPU Utilization +title: Check CPU Utilization of 3COM and H3C switches. agents: snmp author: Florian Heigl <fh(a)mathias-kettner.de> license: GPL distribution: check_mk description: - This Check queries the CPU utilization for SuperStack 4 switches, either standalone or that of the CPUs of all units in the stack. Note these switches don't handle snmp well and you should lower the frequence of SNMP based checks with them. - The CPU usage ratio returned by the check is the average load of the last 60 seconds. +This Check queries the CPU utilization for various LAN switches that are supporting the MIB for H3C lan switches. +These are: +Newer 3Com switches (Superstack 4 and later), H3C branded switches and now for example the HP "A-Series" Networking gear. The same switches from the original maker Huawei are not supporting the MIB. These also only support cpu stats, whereas the H3C Mib also gives Memory stats and Fabric status etc. +The check should correctly label the CPU in your switch / stack / core switch module slots. + +Note some of these switches don't handle snmp well and might generate up to 90% cpu load while queried. +To accomodate for this you should lower the frequency of SNMP based checks with them. +The CPU usage ratio returned by the check is the average load of the last 5 minutes. + + inventory: @@ -18,13 +26,14 @@ critical (int): the percentage of 1-minute average load at which the switch is c [configuration] -superstack4_cpu_default_levels (int, int): the warn and critical levels for the checkl. +h3c_lanswitch_cpu_default_levels (int, int): the warn and critical levels for the check. They are set to default to 50% for "WARN" and 75% for "CRIT". + If you expect heavy load (i.e. running full BGP tables) then you might want to adjust these. item: - The CPU found by inventory (it's OID is a multiple of 65536 and will be divided to come to a sane value) + The CPU found by inventory (it's OID is a multiple of 65536 for stackable switches, or the slot Id it resides at for multicontroller switches and will be divided to come to a sane value). Later multicore CPU switches should be supported already. perfdata: - It does not generate any performance data yet. + It does generate performance data (the 5min average CPU load)

13 years, 4 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2011