Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
65210 discussions

Check_MK Git: check_mk: Merge branch 'master' of git@mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c0a8f75d533a9104592913480c4be8a05990338a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c0a8f75d533a91… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Nov 6 14:49:51 2010 +0100 Merge branch 'master' of git@mathias-kettner.de:check_mk ---

13 years, 12 months

Check_MK Git: check_mk: New ok states for netapp_volumes

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5806aa421c820cebda7246446c340240e8e2a7d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5806aa421c820c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Nov 6 14:49:43 2010 +0100 New ok states for netapp_volumes --- checks/netapp_volumes | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/checks/netapp_volumes b/checks/netapp_volumes index c56d323..7a365c1 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' ]: + elif status not in [ 'normal', 'raid_dp', 'raid0', 'raid0, mirrored' ]: ret_state = 2 output += ' (CRIT)'

13 years, 12 months

Check_MK Git: check_mk: Updated internal doku

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f7a0cfead68647ed7b0227db7bc999fbf0780e7a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f7a0cfead68647… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Nov 6 13:34:53 2010 +0100 Updated internal doku --- LIESMICH.zutun | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/LIESMICH.zutun b/LIESMICH.zutun index da47ea0..4202b3f 100644 --- a/LIESMICH.zutun +++ b/LIESMICH.zutun @@ -85,6 +85,11 @@ Icons. Host- und Serviceicons (icon_image) anzeigen. +Aliasse einbauen (Wrappen in bin/): + cmk = check_mk + mkp = check_mk -P + + -------------------------------------------------------------------------------- ab 1.1.11i1 @@ -172,11 +177,6 @@ check_mk -C soll Liste von Hosts bekommen können. Bei Hosts, die kein keine Services haben, eine andere Host-Schablone nehmen, die den Hostcheck nur on-demand ausführt. -Multisite: man kann bei Comments keine Umlaute eingeben. Diese sind aktuell -verboten, weil Python sonst Exceptions wirft. Komischerweise kann man -in den Filtern problemlos Umlaute eingeben. Keine Ahnung, wo hier der -Unterschied liegt. - Multisite: ein Filter für Hosts, der dann zuschlägt, wenn ein Host einen bestimmten Service hat (geht das auch mit Substrings?)

13 years, 12 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: 7f2eb70f10c04d48585b0996c08948e3ca0ab6ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f2eb70f10c04d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Nov 6 13:24:31 2010 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years, 12 months

Check_MK Git: check_mk: Fixed several syntacical error in checks

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 768de354023d76f9ba374e6e35e62454f4e3ddab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=768de354023d76… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Nov 6 13:24:08 2010 +0100 Fixed several syntacical error in checks --- checks/bluecoat_diskcpu | 2 +- checks/decru_cpu | 4 +++- checks/fjdarye60_disks | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/checks/bluecoat_diskcpu b/checks/bluecoat_diskcpu index 0ff747f..2ca5945 100644 --- a/checks/bluecoat_diskcpu +++ b/checks/bluecoat_diskcpu @@ -47,4 +47,4 @@ check_info['bluecoat_diskcpu'] = ( snmp_info['bluecoat_diskcpu'] = ( "1.3.6.1.4.1.3417.2.4.1.1.1", - [ 3, 4, 6 ]), # BLUECOAT disk und CPU-Tabelle + [ 3, 4, 6 ]) # BLUECOAT disk und CPU-Tabelle diff --git a/checks/decru_cpu b/checks/decru_cpu index 1f55565..f463078 100644 --- a/checks/decru_cpu +++ b/checks/decru_cpu @@ -26,7 +26,9 @@ def inventory_decru_cpu(checkname, info): if len(info) == 5: - return [ (None, "", None) ] + return [ (None, None) ] + else: + return [] def check_decru_cpu(item, params, info): user, nice, system, interrupt, idle = map(lambda x:float(x[0]) / 10.0, info) diff --git a/checks/fjdarye60_disks b/checks/fjdarye60_disks index 5864aad..446f4b8 100644 --- a/checks/fjdarye60_disks +++ b/checks/fjdarye60_disks @@ -47,6 +47,8 @@ def inventory_fjdarye60_disks_summary(checkname, info): current_state = fjdary60_disks_summary(info) if len(current_state) > 0: return [ (None, '', current_state) ] + else: + return [] def fjdarye60_disks_printstates(state): return ", ".join(["%s: %s" % (s,c) for (s,c) in state.items()])

13 years, 12 months

Check_MK Git: check_mk: check_mk -I snmp will try all checks without scan function

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: fd0f7d1d19982e8d53b384e1bd847cf8d0a1415b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fd0f7d1d19982e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Nov 6 13:31:23 2010 +0100 check_mk -I snmp will try all checks without scan function --- ChangeLog | 2 ++ LIESMICH.zutun | 3 --- checks/ifoperstatus | 5 ++--- checks/snmp_info | 3 +++ modules/check_mk.py | 15 ++++++++++++++- 5 files changed, 21 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8be561a..815e857 100644 --- a/ChangeLog +++ b/ChangeLog @@ -33,6 +33,8 @@ make Nagios reject the configuration. * --snmpwalk: do not translate anymore, use numbers. All checks work with numbers now anyway. + * check_mk -I snmp will now try all checktypes not having an snmp scan + function. That way all possible checks should be inventorized. Checks & Agents: * megaraid_pdisks: Using the real enclosure number as check item now diff --git a/LIESMICH.zutun b/LIESMICH.zutun index 48f8913..da47ea0 100644 --- a/LIESMICH.zutun +++ b/LIESMICH.zutun @@ -80,9 +80,6 @@ getrennte Checks für Memory and Pagefile. ------------------------------------------------------------------------------- ab 1.1.9i1: -------------------------------------------------------------------------------- -IDEE: Scan-Modus: Wenn man einen Host per SNMP scannt und *keine* -Antwort kommt, dann probiert man einfach alle SNMP-Checks aus. - PNP4Nagios-Popups automatisch einbauen, mit eigenen intelligenten Icons. diff --git a/checks/ifoperstatus b/checks/ifoperstatus index 4861ee9..5241fd6 100644 --- a/checks/ifoperstatus +++ b/checks/ifoperstatus @@ -59,6 +59,5 @@ def check_ifoperstatus(item, targetstate, info): check_info['ifoperstatus'] = (check_ifoperstatus, "Interface %s", 0, inventory_ifoperstatus) snmp_info['ifoperstatus'] = ( ".1.3.6.1.2.1.2.2.1", [ 2, 3, 8 ] ) -# check if number of network interfaces (IF-MIB::ifNumber.0) is at least 2 -# snmp_scan_functions['ifoperstatus'] = \ -# lambda oid: int(oid(".1.3.6.1.2.1.2.1.0")) >= 2 +# Never inventorize automatically. let if/if64 be the default +snmp_scan_functions['ifoperstatus'] = lambda oid: False diff --git a/checks/snmp_info b/checks/snmp_info index 4577f7d..62b5b47 100644 --- a/checks/snmp_info +++ b/checks/snmp_info @@ -38,3 +38,6 @@ def check_snmp_info(checktype, params, info): check_info['snmp_info'] = (check_snmp_info, "SNMP Info", 0, inventory_snmp_info) snmp_info_single['snmp_info'] = ( None, ".1.3.6.1.2.1.1", [ "1.0", "4.0", "5.0", "6.0" ] ) + +# Do not use this check per default +snmp_scan_functions['snmp_info'] = lambda oid: False diff --git a/modules/check_mk.py b/modules/check_mk.py index b77d01f..8472556 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -665,10 +665,21 @@ def snmp_scan(hostname, ipaddress): try: if detect_function(lambda oid: get_single_oid(hostname, ipaddress, oid)): found.append(checktype) - sys.stdout.write("%s " % checktype) + sys.stdout.write(tty_green + tty_bold + checktype + " " + tty_normal) sys.stdout.flush() except: pass + + # Now try all checks not having a scan function + for checktype in check_info.keys(): + datatype = checktype.split('.')[0] + if datatype not in snmp_info: + continue # no snmp check + if checktype not in snmp_scan_functions: + sys.stdout.write(tty_blue + tty_bold + checktype + tty_normal + " ") + sys.stdout.flush() + found.append(checktype) + if found == []: sys.stdout.write("nothing detected.\n") else: @@ -1583,6 +1594,8 @@ def do_snmp_scan(hostnamelist): continue checknames = snmp_scan(hostname, ipaddress) for checkname in checknames: + if opt_debug: + sys.stdout.write("Trying inventory for %s on %s\n" % (checkname, hostname)) make_inventory(checkname, [hostname])

13 years, 12 months

Check_MK Git: check_mk: netapp_volumes: raid0 status is also a "good" state

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9804d502d3498c338a0eb168f2b6f6d4a0d9aed4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9804d502d3498c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Nov 6 13:05:07 2010 +0100 netapp_volumes: raid0 status is also a "good" state --- checks/netapp_volumes | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/checks/netapp_volumes b/checks/netapp_volumes index e8c0b81..c56d323 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' ]: + elif status not in [ 'normal', 'raid_dp', 'raid0' ]: ret_state = 2 output += ' (CRIT)'

13 years, 12 months

Check_MK Git: check_mk: Fixed rra cfg detection

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 60eabaef55b16393a5b83e1515679d852b318929 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=60eabaef55b163… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 5 20:12:32 2010 +0100 Fixed rra cfg detection --- validate_checks | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/validate_checks b/validate_checks index e0e46c0..f8ab960 100755 --- a/validate_checks +++ b/validate_checks @@ -105,7 +105,7 @@ def is_valid_pnp_rra(check): return check_has_perfdata(check) def verify_pnp_rra(check): - return os.path.exists('pnp-rraconf/check_mk-%s.rra.php' % check) + return os.path.exists('pnp-rraconf/check_mk-%s.rra.cfg' % check) # # 1) Perform checks

13 years, 12 months

Check_MK Git: check_mk: Merge branch 'master' of git@mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f5c0c1112e2910fb673816b4b524f92030df574d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f5c0c1112e2910… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Nov 6 13:05:21 2010 +0100 Merge branch 'master' of git@mathias-kettner.de:check_mk ---

13 years, 12 months

Check_MK Git: check_mk: --snmpwalk: do not translate, directly use numeric values

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0bbff761d27d14ec01fb49899b153e82f8e80c18 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0bbff761d27d14… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Nov 6 12:32:52 2010 +0100 --snmpwalk: do not translate, directly use numeric values All checks are now only using numeric values. No mibs are loaded in any case anyway. --- ChangeLog | 2 ++ LIESMICH.zutun | 13 ------------- modules/check_mk.py | 7 +++---- modules/snmp.py | 12 ------------ 4 files changed, 5 insertions(+), 29 deletions(-) diff --git a/ChangeLog b/ChangeLog index cd99896..8be561a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,8 @@ * Make sure, host has no duplicate service - this is possible e.g. by monitoring via agent and snmp in parallel. duplicate services will make Nagios reject the configuration. + * --snmpwalk: do not translate anymore, use numbers. All checks work + with numbers now anyway. Checks & Agents: * megaraid_pdisks: Using the real enclosure number as check item now diff --git a/LIESMICH.zutun b/LIESMICH.zutun index a4f1d1b..48f8913 100644 --- a/LIESMICH.zutun +++ b/LIESMICH.zutun @@ -63,10 +63,6 @@ springt dann immer nach ganz oben. LARS: Im Opera wird sich die aktuelle Scroll-Position der Sidebar nicht korrekt gemerkt. -SNMP-Checks: Es wurde berichtet, dass - wenn die Community falsch ist - -der Check_MK gruen war, aber die Checks unknown. Sollte es dann nicht -genau umgekehrt sein? Wird der Exit-code von snmpwalk ausgewertet? - LARS: Wenn man gerade die Kommandobox auf hat (oder den Filter?) dann sollte kein Refresh stattfinden. Sonst wird man mitten im Tippen abgewürgt. Kann man das mit Javascript hinbekommen? (kann Lars sich hier was überlegen? Man @@ -84,10 +80,6 @@ getrennte Checks für Memory and Pagefile. ------------------------------------------------------------------------------- ab 1.1.9i1: -------------------------------------------------------------------------------- ---snmpwalk: Braucht man das translaten noch? Ich arbeite doch jetzt eh -nur noch ohne MIB-Dateien. Das würde das ganze deutlich vereinfachen! -Direct rrd updates ganz entfernen. - IDEE: Scan-Modus: Wenn man einen Host per SNMP scannt und *keine* Antwort kommt, dann probiert man einfach alle SNMP-Checks aus. @@ -128,11 +120,6 @@ Multisite: Zeitanzeige der Downtimes (ende) zu ungenau. "in 6 hrs" ist blöd. Auch bei Start "19 sec" ist dumm, hier wäre besser (vor 19 sec). Oder bei Downtimes immer absolute Zeiten angeben? Evtl. Zusatzspalte der Duration. -bulkwalk_hosts: Hier ist der Default None und nicht []. Problem dabei -ist, dass dann ein += nicht funktioniert. Kann man nicht non_bulkwalk_hosts -ganz rausschmeissen und bulkwalk_hosts auf [] setzen? Ausserdem gibt -es ja fuer binaere Hostlisten das NEGATE (=> Doku). In 1.2 einbauen. - -------------------------------------------------------------------------------- IDEEN & VERBESSERUNGEN -------------------------------------------------------------------------------- diff --git a/modules/check_mk.py b/modules/check_mk.py index 1558007..b77d01f 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2637,7 +2637,7 @@ def do_snmpwalk_on(hostname, filename): if opt_verbose: sys.stdout.write("%s:\n" % hostname) ip = lookup_ipaddress(hostname) - cmd = snmp_walk_command(hostname) + " -Ob -OQ %s " % ip + cmd = snmp_walk_command(hostname) + " -On -Ob -OQ %s " % ip if opt_debug: print 'Executing: %s' % cmd out = file(filename, "w") @@ -2665,9 +2665,8 @@ def do_snmpwalk_on(hostname, filename): oid = oid[1:] oids.append(oid) values.append(value) - numoids = snmptranslate(oids) - for numoid, value in zip(numoids, values): - out.write("%s %s\n" % (numoid, value.strip())) + for oid, value in zip(oids, values): + out.write("%s %s\n" % (oid, value.strip())) count += 1 if opt_verbose: sys.stdout.write("%d variables.\n" % count) diff --git a/modules/snmp.py b/modules/snmp.py index ea45083..47d9904 100644 --- a/modules/snmp.py +++ b/modules/snmp.py @@ -337,18 +337,6 @@ def check_snmp_fixed(item, targetvalue, info): return (0, "OK - %s" % (value,)) return (3, "Missing item %s in SNMP data" % item) -def snmptranslate(oids): - numoids = [] - while len(oids) > 0: - m = min(len(oids), 100) - cmd = "snmptranslate -On %s 2>/dev/null" % " ".join(["'%s'" % o.strip() for o in oids[:m]]) - n = os.popen(cmd).read().split() - if len(n) != m: - raise MKGeneralException("snmptranslated lost %d out of %d oids" % (m - len(n), m)) - oids = oids[m:] - numoids += n - return numoids - def get_stored_snmpwalk(hostname, oid): if oid.startswith("."): oid = oid[1:]

13 years, 12 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits