Checkmk git commits March 2011

checkmk-commits@lists.checkmk.com

3 participants
205 discussions

Check_MK Git: check_mk: Commiting new reverved bug ids now

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 50a040455ae05082b32c056342cebd691d55b836 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=50a040455ae050… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 4 15:20:15 2011 +0100 Commiting new reverved bug ids now --- gb | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/gb b/gb index dd33017..6df115e 100755 --- a/gb +++ b/gb @@ -484,6 +484,11 @@ def main_fetch_ids(args): sys.stdout.write('Reserved %d additional IDs now. You have %d reserved IDs now.\n' % (num, len(my_ids))) + if 0 == os.system("git commit -m 'Reserved %d bug ids' ." % num): + sys.stdout.write("--> Successfully committed reserved bug ids. Please push it soon!\n") + else: + bail_out("Cannot commit.") + # _ # _ __ ___ __ _(_)_ __

13 years, 4 months

Check_MK Git: check_mk: new option --snmpget

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e88e934a311a70bca9918b2dd6f7f6bd24a59e96 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e88e934a311a70… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 4 14:39:37 2011 +0100 new option --snmpget --- modules/check_mk.py | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 6039187..0a7a2cb 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2757,6 +2757,18 @@ def do_snmpwalk_on(hostname, filename): if opt_verbose: sys.stdout.write("Successfully Wrote %s%s%s.\n" % (tty_bold, filename, tty_normal)) +def do_snmpget(oid, hostnames): + if len(hostnames) == 0: + for host in all_active_hosts(): + if is_snmp_host(host): + hostnames.append(host) + + for host in hostnames: + ip = lookup_ipaddress(host) + value = get_single_oid(host, ip, oid) + sys.stdout.write("%s (%s): %r\n" % (host, ip, value)) + + def show_paths(): inst = 1 conf = 2 @@ -2976,6 +2988,7 @@ def usage(): check_mk --flush [HOST1 HOST2...] flush all data of some or all hosts check_mk --donate Email data of configured hosts to MK check_mk --snmpwalk HOST1 HOST2 ... Do snmpwalk on host + check_mk --snmpget OID HOST1 HOST2 ... Fetch single OIDs and output them check_mk --scan-parents [HOST1 HOST2...] autoscan parents, create conf.d/parents.mk check_mk -P, --package COMMAND do package operations check_mk -V, --version print version @@ -3924,6 +3937,7 @@ if __name__ == "__main__": "list-checks", "list-hosts", "list-tag", "no-tcp", "cache", "flush", "package", "donate", "snmpwalk", "usewalk", "scan-parents", "procs=", "automation=", + "snmpget=", "no-cache", "update", "restart", "reload", "dump", "fake-dns=", "man", "nowiki", "config-check", "backup=", "restore=", "check-inventory=", "paths", "cleanup-autochecks", "checks=" ] @@ -4029,6 +4043,9 @@ if __name__ == "__main__": elif o == '--snmpwalk': do_snmpwalk(args) done = True + elif o == '--snmpget': + do_snmpget(a, args) + done = True elif o in [ '-M', '--man' ]: if len(args) > 0: show_check_manual(args[0])

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: 96968981ef733eafbff1c7c94d35c71163962f2a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96968981ef733e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 4 14:39:12 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years, 4 months

Check_MK Git: check_mk: snmp scan: drop quotes from strings

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 50cd682183038040ac07204639168435d81c068e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=50cd6821830380… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 4 14:38:53 2011 +0100 snmp scan: drop quotes from strings --- .bugs/178 | 10 +++++++--- modules/check_mk.py | 3 +++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.bugs/178 b/.bugs/178 index 09358cc..b4fb54f 100644 --- a/.bugs/178 +++ b/.bugs/178 @@ -1,12 +1,16 @@ Title: get_single_oid should drop quotes on strings Component: core +State: done +Class: bug +Date: 2011-03-04 14:30:38 Benefit: 1 -State: open Cost: 1 -Date: 2011-03-04 14:30:38 -Class: bug +Fun: 0 The snmp scan function uses get_single_oid(). That function does not strip the quotes from strings. This is a bug. Some scan functions depend on the quotes, so fix them as well. + +2011-03-04 14:38:49: changed state open -> done +Done. Strings are stripped if existing. diff --git a/modules/check_mk.py b/modules/check_mk.py index 31aef25..6039187 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -632,6 +632,9 @@ def get_single_oid(hostname, ipaddress, oid): or value.startswith('No Such Object available') or value.startswith('No Such Instance currently exists'): value = None + # Strip quotes + if value.startswith('"') and value.endswith('"'): + value = value[1:-1] # try to remove text, only keep number # value_num = value_text.split(" ")[0] # value_num = value_num.lstrip("+")

13 years, 4 months

Check_MK Git: check_mk: Merge branch 'lars-tmp'

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 326c7cc82db412c9b80a09adfab91f96a137391a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=326c7cc82db412… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 4 14:38:43 2011 +0100 Merge branch 'lars-tmp' Conflicts: ChangeLog ---

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: 81e95fe1b1cda8d825eee530e01dd3cbde36d215 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=81e95fe1b1cda8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 4 14:39:14 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: Added snmp_uptime check

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3102db8606771ff54584dfc29cc5b0ba2bb3c166 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3102db8606771f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 3 09:44:04 2011 +0100 Added snmp_uptime check --- ChangeLog | 4 ++++ checks/snmp_uptime | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index c6a7fa7..9f84e5a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Checks & Agents: + * Added SNMP uptime check which behaves identical to the agent base uptime + check + 1.1.10b1: Core, Setup, etc.: * FIX: do not assume 127.0.0.1 as IP address for usewalk_hosts if diff --git a/checks/snmp_uptime b/checks/snmp_uptime new file mode 100644 index 0000000..cd874e7 --- /dev/null +++ b/checks/snmp_uptime @@ -0,0 +1,51 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2010 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +# Author: Lars Michelsen <lm(a)mathias-kettner.de> + +def inventory_snmp_uptime(checktype, info): + if len(info[0]) >= 1: + return [ (None, None, None) ] + +def check_snmp_uptime(checktype, params, info): + if len(info[0]) >= 1: + ticks = info[0][0] + uptime = saveint(ticks[:-2]) + days, rest = divmod(uptime, 60*60*24) + hours, rest = divmod(rest, 60*60) + minutes, seconds = divmod(rest, 60) + now = int(time.time()) + since = time.strftime("%c", time.localtime(now - uptime)) + return (0, "OK - up since %s (%dd %02d:%02d:%02d)" % + (since, days, hours, minutes, seconds), [ ("uptime", uptime) ]) + else: + return (3, "UNKNOWN - No data retrieved") + +check_info['snmp_uptime'] = (check_snmp_uptime, "Uptime", 1, inventory_snmp_uptime) +snmp_info['snmp_uptime'] = ( ".1.3.6.1.2.1.1", [ '3.0' ] ) # DISMAN-EVENT-MIB::sysUpTime + +# Do not use this check per default +snmp_scan_functions['snmp_uptime'] = lambda oid: False

13 years, 4 months

Check_MK Git: check_mk: Added missing manpage/rra/ template for snmp_uptime check

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: b3ef75e451f88dc4ca0dff9e54bb6bec417956a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b3ef75e451f88d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 4 14:37:52 2011 +0100 Added missing manpage/rra/template for snmp_uptime check --- checkman/snmp_uptime | 17 +++++++++++++++++ checks/snmp_info | 2 +- checks/snmp_uptime | 2 +- pnp-rraconf/check_mk-snmp_uptime.rra.cfg | 1 + pnp-templates/check_mk-snmp_uptime.php | 1 + 5 files changed, 21 insertions(+), 2 deletions(-) diff --git a/checkman/snmp_uptime b/checkman/snmp_uptime new file mode 100644 index 0000000..c6c64ca --- /dev/null +++ b/checkman/snmp_uptime @@ -0,0 +1,17 @@ +title: Monitor uptime of SNMP hosts +agents: snmp +author: Lars Michelsen <lm(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + This check is always OK and simply outputs the uptime of the target + systems (when the last boot was and how much time has elapsed since). + The check is always OK. + + The check uses the SNMP OID {DISMAN-EVENT-MIB::sysUpTime}. + +perfdata: + The uptime in seconds. + +inventory: + One check per system is created if the host provides that information. diff --git a/checks/snmp_info b/checks/snmp_info index 49b2c83..635d241 100644 --- a/checks/snmp_info +++ b/checks/snmp_info @@ -26,7 +26,7 @@ def inventory_snmp_info(checktype, info): if len(info[0]) >= 4: - return [ (None, None, None) ] + return [ (None, None) ] def check_snmp_info(checktype, params, info): if len(info[0]) >= 4: diff --git a/checks/snmp_uptime b/checks/snmp_uptime index cd874e7..70e7aea 100644 --- a/checks/snmp_uptime +++ b/checks/snmp_uptime @@ -28,7 +28,7 @@ def inventory_snmp_uptime(checktype, info): if len(info[0]) >= 1: - return [ (None, None, None) ] + return [ (None, None) ] def check_snmp_uptime(checktype, params, info): if len(info[0]) >= 1: diff --git a/pnp-rraconf/check_mk-snmp_uptime.rra.cfg b/pnp-rraconf/check_mk-snmp_uptime.rra.cfg new file mode 120000 index 0000000..1fe221c --- /dev/null +++ b/pnp-rraconf/check_mk-snmp_uptime.rra.cfg @@ -0,0 +1 @@ +check_mk-uptime.rra.cfg \ No newline at end of file diff --git a/pnp-templates/check_mk-snmp_uptime.php b/pnp-templates/check_mk-snmp_uptime.php new file mode 120000 index 0000000..6119b85 --- /dev/null +++ b/pnp-templates/check_mk-snmp_uptime.php @@ -0,0 +1 @@ +check_mk-uptime.php \ No newline at end of file

13 years, 4 months

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e5e231ff1c3af24df311662e28f7eb4fb3e42366 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e5e231ff1c3af2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 4 14:33:27 2011 +0100 Updated bug entries --- .bugs/178 | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/.bugs/178 b/.bugs/178 new file mode 100644 index 0000000..09358cc --- /dev/null +++ b/.bugs/178 @@ -0,0 +1,12 @@ +Title: get_single_oid should drop quotes on strings +Component: core +Benefit: 1 +State: open +Cost: 1 +Date: 2011-03-04 14:30:38 +Class: bug + +The snmp scan function uses get_single_oid(). That function +does not strip the quotes from strings. This is a bug. +Some scan functions depend on the quotes, so fix them as +well.

13 years, 4 months

Check_MK Git: check_mk: fixed indentation

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 032cf437868fe0b24a19055429ba093232775073 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=032cf437868fe0… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri Mar 4 14:14:41 2011 +0100 fixed indentation --- checks/h3c_lanswitch_cpu | 20 +++++++++----------- checks/h3c_lanswitch_sensors | 26 +++++++++++++------------- checks/superstack3_sensors | 14 +++++++------- 3 files changed, 29 insertions(+), 31 deletions(-) diff --git a/checks/h3c_lanswitch_cpu b/checks/h3c_lanswitch_cpu index bb634c3..280f5fc 100644 --- a/checks/h3c_lanswitch_cpu +++ b/checks/h3c_lanswitch_cpu @@ -26,7 +26,7 @@ # Example output of multi-unit stack (SS5500-EL, etc): # SNMPv2-SMI::enterprises.43.45.1.6.1.1.1.3.65536 = Gauge32: 11 -# +# # Example outpout of multi-slot switche (SS8800 etc): # SNMPv2-SMI::enterprises.43.45.1.6.1.1.1.3.0 = Gauge32: 11 # [...] @@ -39,7 +39,7 @@ switch_cpu_default_levels = (50, 75) # We do not want to use the end OID as item since. # We prefer "Switch 1 CPU 1" over "65537"... -def h3c_lanswitch_cpu_genitem(item): +def h3c_lanswitch_cpu_genitem(item): # decide switch class here (stacked or standalone/modular) cpuid = int(item) @@ -75,26 +75,24 @@ def check_h3c_lanswitch_cpu(item, params, info): infotext = (" - average usage was %d%% over last 5 minutes." % util) perfdata = [ ( "usage", util, warn, crit, 0, 100) ] - if util > crit: + if util > crit: return (2, "CRIT" + infotext, perfdata) elif util > warn: return (1, "WARN" + infotext, perfdata) - else: + else: return (0, "OK" + infotext, perfdata) return (3, "UNKNOWN - %s not found" % item) - check_info["h3c_lanswitch_cpu"] = (check_h3c_lanswitch_cpu, "CPU Utilization %s", 1, inventory_h3c_lanswitch_cpu ) snmp_info["h3c_lanswitch_cpu"] = \ - ( "1.3.6.1.4.1.43.45.1.6.1.1.1", [ - OID_END, - "3" # 5-min average load. - ]) + ( "1.3.6.1.4.1.43.45.1.6.1.1.1", [ + OID_END, + "3" # 5-min average load. + ]) -# just a rough match that will handle most devices. +# just a rough match that will handle most devices. snmp_scan_functions["h3c_lanswitch_cpu"] = \ lambda oid: oid(".1.3.6.1.2.1.1.1.0").lower().startswith('3com s') - diff --git a/checks/h3c_lanswitch_sensors b/checks/h3c_lanswitch_sensors index 125fb77..64c18b8 100644 --- a/checks/h3c_lanswitch_sensors +++ b/checks/h3c_lanswitch_sensors @@ -33,35 +33,35 @@ def check_h3c_lanswitch_sensors(item, params, info): # the values are: active (1), deactive (2), not-install (3), unsupport (4) for (endoid, status) in info: if h3c_lanswitch_genitem(endoid) == item: - if status == "2": + if status == "2": return (2, "CRIT - Sensor %s status is %s" % (item, status)) elif status == "1": return (0, "OK - Sensor %s status is %s" % (item, status)) else: return (1, "WARN - Sensor % status is %s" % (item, status)) - return (3, "UNKNOWN - Sensor %s not found" % item ) + return (3, "UNKNOWN - Sensor %s not found" % item ) check_info["h3c_lanswitch_sensors"] = (check_h3c_lanswitch_sensors, "%s", 0, inventory_h3c_lanswitch_sensors ) def h3c_lanswitch_genitem(endoid): - deviceclass, one, id = endoid.split(".") + deviceclass, one, id = endoid.split(".") # print ("%s %s %s" % (deviceclass, one, id)) - if deviceclass == "1": - hwLswdev = "Fan" - else: - hwLswdev = "Powersupply" - unitid = int(id) / 65536 - num = int(id) % 65536 - return "Unit %d %s %d" % (unitid, hwLswdev, num) - + if deviceclass == "1": + hwLswdev = "Fan" + else: + hwLswdev = "Powersupply" + unitid = int(id) / 65536 + num = int(id) % 65536 + return "Unit %d %s %d" % (unitid, hwLswdev, num) + # mib: A3COM-HUAWEI-LswDEVM-MIB # fan table: A3COM-HUAWEI-OID-MIB::lswCommon.9.1.1.1.1.65536 = INTEGER: 65536 # fan status: A3COM-HUAWEI-OID-MIB::lswCommon.9.1.1.1.2.65536 = INTEGER: 1 # hwdevMPowerStatusTable ( hwDevMPowerNum, hwDevMPowerStatus ) # hwdevMFanStatusTable -# +# # # finally,just check fan status snmp_info["h3c_lanswitch_sensors"] = \ @@ -69,4 +69,4 @@ snmp_info["h3c_lanswitch_sensors"] = \ snmp_scan_functions["h3c_lanswitch_sensors"] = \ - lambda oid: "3com switch 5500" in oid (".1.3.6.1.2.1.1.1.0").lower() + lambda oid: "3com switch 5500" in oid (".1.3.6.1.2.1.1.1.0").lower() diff --git a/checks/superstack3_sensors b/checks/superstack3_sensors index b6a354e..37bbe51 100644 --- a/checks/superstack3_sensors +++ b/checks/superstack3_sensors @@ -30,20 +30,20 @@ def inventory_superstack3_sensors(checkname, info): def check_superstack3_sensors(item, params, info): for name, state in info: if name == item: - if state == "failure": - return (2, "CRIT - status is %s" % state ) - elif state == "operational": - return (0, "OK - status is %s" % state ) + if state == "failure": + return (2, "CRIT - status is %s" % state ) + elif state == "operational": + return (0, "OK - status is %s" % state ) else: return (1, "WARN - status is %s" % state ) - return (3, "UNKOWN - sensor not found") + return (3, "UNKOWN - sensor not found") check_info["superstack3_sensors"] = (check_superstack3_sensors, "%s", 0, inventory_superstack3_sensors ) snmp_info["superstack3_sensors"] = \ - ( "1.3.6.1.4.1.43.43.1.1", [ "7", "10" ] ) + ( "1.3.6.1.4.1.43.43.1.1", [ "7", "10" ] ) snmp_scan_functions["superstack3_sensors"] = \ - lambda oid: "3com superstack 3" in oid (".1.3.6.1.2.1.1.1.0").lower() + lambda oid: "3com superstack 3" in oid (".1.3.6.1.2.1.1.1.0").lower()

13 years, 4 months

← Newer
1
...
12
13
14
15
16
17
18
...
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2011