Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64670 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: e9a787fe7f231377a23a09a98cd4745ccdd637fc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e9a787fe7f2313… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 5 14:25:51 2014 +0100 Testcommit --- checkman/df | 1 - 1 file changed, 1 deletion(-) diff --git a/checkman/df b/checkman/df index 4f1858b..c1209fe 100644 --- a/checkman/df +++ b/checkman/df @@ -1,4 +1,3 @@ - title: Used space in filesystems agents: linux, windows, aix, solaris, openvms, hpux, freebsd, netbsd, openbsd, macosx catalog: os/storage

9 years, 11 months

Check_MK Git: check_mk: do not catch manpage parsing errors in debug mode

by Lars Michelsen

Module: check_mk Branch: master Commit: c1190822b171aca85ba88c46e89706b51967e3bc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c1190822b171ac… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 5 14:10:15 2014 +0100 do not catch manpage parsing errors in debug mode --- modules/check_mk.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/check_mk.py b/modules/check_mk.py index 8fe621e..4b0eb4b 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3608,12 +3608,16 @@ def read_manpage_catalog(): try: parsed = parse_man_header(checkname, path) except Exception, e: + if opt_debug: + raise sys.stderr.write('ERROR: Skipping invalid manpage: %s: %s\n' % (checkname, e)) continue try: cat = parsed["catalog"] except KeyError: + if opt_debug: + raise sys.stderr.write('ERROR: Skipping invalid manpage: %s (Catalog info missing)\n' % checkname) continue

9 years, 11 months

Check_MK Git: check_mk: Testcommit

by Lars Michelsen

Module: check_mk Branch: master Commit: db44ae5538d611245cc431b80218c07903c267b9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=db44ae5538d611… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 5 14:24:36 2014 +0100 Testcommit --- checkman/df | 1 + 1 file changed, 1 insertion(+) diff --git a/checkman/df b/checkman/df index c1209fe..4f1858b 100644 --- a/checkman/df +++ b/checkman/df @@ -1,3 +1,4 @@ + title: Used space in filesystems agents: linux, windows, aix, solaris, openvms, hpux, freebsd, netbsd, openbsd, macosx catalog: os/storage

9 years, 11 months

Check_MK Git: check_mk: #1507 New optional parse_function for check API

by Mathias Kettner

Module: check_mk Branch: master Commit: 7811ad93c493b5057ad033ed1557f19a2876aaa3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7811ad93c493b5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 5 14:23:33 2014 +0100 #1507 New optional parse_function for check API When developing your own checks you sometimes need to deal with more complex agent output that needs first to be parsed before that actual inventory or check logic can begin to do its works. Many checks therefore have something like a parse function. Now you can define a <tt>"parse_function"</tt> in the <tt>check_info</tt>. If you do that, then all agent output (the parameter <tt>info</tt>) will always be processed by that function before it is passed to the inventory or check function. Note: this is also a performance benefit since the parsing needs now only be done once and not again for each single check item. Please refer to the developer documentation for more details. --- .werks/1507 | 24 ++++++++++++++++++++++++ ChangeLog | 1 + checks/multipath | 24 +++++++++++++++--------- modules/check_mk.py | 9 +++++++++ modules/check_mk_base.py | 43 ++++++++++++++++++++++++++++++------------- 5 files changed, 79 insertions(+), 22 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7811ad93c4…

9 years, 11 months

Check_MK Git: check_mk: Reserved 10 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: 7ffc5d1dd37400963bc52d14548c0dd68356b50b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ffc5d1dd37400… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 5 14:19:13 2014 +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 a222952..522e1e9 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -1507 +1517

9 years, 11 months

Check_MK Git: check_mk: cisco_sensor_item: Added another case of items

by Bastian Kuhn

Module: check_mk Branch: master Commit: 8df9db02bd9f7b85a6ddb72961bf4c082abc5a44 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8df9db02bd9f7b… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Nov 5 14:11:51 2014 +0100 cisco_sensor_item: Added another case of items --- checks/cisco_sensor_item.include | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/checks/cisco_sensor_item.include b/checks/cisco_sensor_item.include index 717feb8..b188f94 100644 --- a/checks/cisco_sensor_item.include +++ b/checks/cisco_sensor_item.include @@ -31,15 +31,26 @@ def cisco_sensor_item(trial_string, fall_back): # A string seperated by commas with status information # -> Depends on the device model try: - splited = trial_string.split(',') - if len(splited) == 1: - return trial_string # Try to handle all cases found in mkzeug/walks - if '#' in splited[-1] or 'Power' in splited[-1]: - return " ".join([ x.strip() for x in splited]).replace('#',' ') - if splited[-2].startswith(" Status"): - return " ".join([ x.strip() for x in splited[:-2]]).replace('#',' ') - return " ".join([ x.strip() for x in splited[:-1]]).replace('#',' ') + splited = [ x.strip for x in trial_string.split(',')] + if len(splited) == 1: + item = trial_string + # If the last part contains # or Power, take the complete string + elif '#' in splited[-1] or 'Power' in splited[-1]: + item = " ".join(splited) + # If second last part start with Status, remove that part + elif splited[-2].startswith(" Status"): + item = " ".join(splited[:-2]) + # Take anything, but without last part + else: + item = " ".join(splited[:-1]) + # Maye there a multiple Items, but always the same string. + # Try to prevent that by adding the fall_back number to the end + if not item[-1].isdigit(): + item += " "+ fall_back + # Replace unwanted chars and return + return item.replace('#',' ') except: return fall_back +

9 years, 11 months

Check_MK Git: check_mk: check catalog: Is now more robust against damaged man pages

by Lars Michelsen

Module: check_mk Branch: master Commit: 31564f296c6a8cb4d07c00f517210b33dfbfe933 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=31564f296c6a8c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 5 14:01:13 2014 +0100 check catalog: Is now more robust against damaged man pages --- modules/check_mk.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index f6ba3c6..8fe621e 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3605,11 +3605,16 @@ def read_manpage_catalog(): a, filename = os.path.split(path) if filename.startswith("."): continue - parsed = parse_man_header(checkname, path) + try: + parsed = parse_man_header(checkname, path) + except Exception, e: + sys.stderr.write('ERROR: Skipping invalid manpage: %s: %s\n' % (checkname, e)) + continue + try: cat = parsed["catalog"] except KeyError: - sys.stderr.write('ERROR: Invalid manpage: %s (Catalog info missing)\n' % checkname) + sys.stderr.write('ERROR: Skipping invalid manpage: %s (Catalog info missing)\n' % checkname) continue if not cat: @@ -3736,8 +3741,7 @@ def parse_man_header(checkname, path): break if "agents" not in parsed: - sys.stderr.write("Section agents missing in man page of %s\n" % (checkname)) - sys.exit(1) + raise Exception("Section agents missing in man page of %s\n" % (checkname)) else: parsed["agents"] = parsed["agents"].replace(" ","").split(",")

9 years, 11 months

Check_MK Git: check_mk: #1432 agent_vsphere: now able to monitor virtual machines snapshots

by Andreas Boesl

Module: check_mk Branch: master Commit: c80b9ee7c0b2ef6eceabc819702f55051e8beedb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c80b9ee7c0b2ef… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Nov 5 13:14:25 2014 +0100 #1432 agent_vsphere: now able to monitor virtual machines snapshots The snapshot data is piggybacked to the virtual machines and provides the following informations <ul> <li>Number of snapshots</li> <li>Name of the latest snapshot</li> <li>Age of the latest snapshot. Levels can be configured in WATO.</li> <li>Currently powered on snapshot</li> </ul> --- .werks/1432 | 19 ++++++++++ ChangeLog | 1 + agents/special/agent_vsphere | 58 ++++++++++++++++++++--------- checkman/esx_vsphere_vm.snapshots | 20 ++++++++++ checks/esx_vsphere_vm | 68 ++++++++++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 19 ++++++++++ 6 files changed, 167 insertions(+), 18 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c80b9ee7c0…

9 years, 11 months

Check_MK Git: check_mk: removed print statement

by Bastian Kuhn

Module: check_mk Branch: master Commit: e6594dcae5c63d0159385f8f4282511e9d745dc8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e6594dcae5c63d… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Nov 5 11:53:31 2014 +0100 removed print statement --- checks/cisco_cpu | 1 - 1 file changed, 1 deletion(-) diff --git a/checks/cisco_cpu b/checks/cisco_cpu index ac79034..03e41d5 100644 --- a/checks/cisco_cpu +++ b/checks/cisco_cpu @@ -30,7 +30,6 @@ cisco_cpu_default_levels = (80.0, 90.0) def inventory_cisco_cpu(info): - print info if info: return [( None, 'cisco_cpu_default_levels') ]

9 years, 11 months

Check_MK Git: check_mk: cisco_cpu: improved scan function

by Bastian Kuhn

Module: check_mk Branch: master Commit: 7ca532c65fa3d862049e56824f02265e3a239b3c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ca532c65fa3d8… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Nov 5 11:53:01 2014 +0100 cisco_cpu: improved scan function --- checks/cisco_cpu | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/checks/cisco_cpu b/checks/cisco_cpu index 43cc85f..ac79034 100644 --- a/checks/cisco_cpu +++ b/checks/cisco_cpu @@ -29,6 +29,11 @@ cisco_cpu_default_levels = (80.0, 90.0) +def inventory_cisco_cpu(info): + print info + if info: + return [( None, 'cisco_cpu_default_levels') ] + def check_cisco_cpu(item, params, info): if info[0][1]: util = float(info[0][1]) @@ -46,12 +51,12 @@ def check_cisco_cpu(item, params, info): check_info["cisco_cpu"] = { "check_function" : check_cisco_cpu, - "inventory_function" : lambda info: [(None, "cisco_cpu_default_levels")], + "inventory_function" : inventory_cisco_cpu, "service_description" : "CPU utilization", "has_perfdata" : True, "group" : "cpu_utilization", - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.4.1.9.9.109.1.1.1.1.8.1") \ - or oid(".1.3.6.1.4.1.9.9.109.1.1.1.1.5.1"), + "snmp_scan_function" : lambda oid: "cisco" in oid(".1.3.6.1.2.1.1.1.0").lower() \ + and oid(".1.3.6.1.4.1.9.9.109.1.1.1.1.*"), "snmp_info" : ( ".1.3.6.1.4.1.9.9.109.1.1.1.1", [ 5, 8 ]), }

9 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits