Module: check_mk
Branch: master
Commit: 7706a7b478cd7d5f3bbe9a2364147f2f823bb61b
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7706a7b478cd7d…
Author: Götz Golla <gg(a)mathias-kettner.de>
Date: Fri Mar 21 12:04:00 2014 +0100
commit cleanup
---
checks/if.include | 56 +++++++++++++++++---------------------------------
checks/if64 | 43 +++++++++++++++++++-------------------
checks/printer_pages | 2 +-
3 files changed, 41 insertions(+), 60 deletions(-)
diff --git a/checks/if.include b/checks/if.include
index eb2da81..897fb12 100644
--- a/checks/if.include
+++ b/checks/if.include
@@ -105,9 +105,9 @@ def if_pad_with_zeroes(info, ifIndex, has_nodeinfo):
def inventory_if_common(info, has_nodeinfo = False):
if has_nodeinfo:
- length = 22
- else:
length = 21
+ else:
+ length = 20
if len(info) == 0 or len(info[0]) != length:
return []
@@ -140,7 +140,7 @@ def inventory_if_common(info, has_nodeinfo = False):
ifIndex, ifDescr, ifType, ifSpeed, ifOperStatus, ifInOctets, \
inucast, inmcast, inbcast, ifInDiscards, ifInErrors, ifOutOctets, \
outucast, outmcast, outbcast, ifOutDiscards, ifOutErrors, \
- ifOutQLen, ifAlias, ifPhysAddress, ifRxSignal = line
+ ifOutQLen, ifAlias, ifPhysAddress = line
ifDescr = cleanup_if_strings(ifDescr)
ifAlias = cleanup_if_strings(ifAlias)
@@ -240,7 +240,7 @@ def check_if_common(item, params, info, has_nodeinfo = False):
ifIndex, ifDescr, ifType, ifSpeed, ifOperStatus, ifInOctets, \
inucast, inmcast, inbcast, ifInDiscards, ifInErrors, ifOutOctets, \
outucast, outmcast, outbcast, ifOutDiscards, ifOutErrors, \
- ifOutQLen, ifAlias, ifPhysAddress, ifRxSignal = line
+ ifOutQLen, ifAlias, ifPhysAddress = line
if if_inventory_uses_description and ifDescr:
group_item = ifDescr
elif if_inventory_uses_alias and ifAlias:
@@ -355,17 +355,9 @@ def check_if_common_single(item, params, info, force_counter_wrap =
False, has_n
ifIndex, ifDescr, ifType, ifSpeed, ifOperStatus, ifInOctets, \
inucast, inmcast, inbcast, ifInDiscards, ifInErrors, ifOutOctets, \
outucast, outmcast, outbcast, ifOutDiscards, ifOutErrors, \
- ifOutQLen, ifAlias, ifPhysAddress, ifRxSignal = line
+ ifOutQLen, ifAlias, ifPhysAddress = line
ifDescr = cleanup_if_strings(ifDescr)
ifAlias = cleanup_if_strings(ifAlias)
- try:
- ifRxSignal_tmp = re.sub(' dBm:','', ifRxSignal)
- ifRxSignal, RxSignalState = ifRxSignal_tmp.split(' ')
- ifRxSignal = float(ifRxSignal)
- except:
- ifRxSignal = 0.0
- RxSignalState = ""
-
if item.lstrip("0") == ifIndex \
or (item == "0" * len(item) and saveint(ifIndex) == 0) \
@@ -506,26 +498,22 @@ def check_if_common_single(item, params, info, force_counter_wrap =
False, has_n
( "outucast", outucast, None, None, None, None),
( "outnucast", saveint(outmcast) + saveint(outbcast), None,
None, None, None),
( "outdisc", ifOutDiscards, None, None, None, None),
- ( "rxsignal", ifRxSignal, None, None, None, None),
( "outerr", ifOutErrors, err_warn, err_crit, None, None) ]:
- if name != "rxsignal":
- try:
- if node == None:
- timedif, rate = get_counter("if.%s.%s" % (name,
item), this_time, saveint(counter))
- if force_counter_wrap:
- raise MKCounterWrapped("if.%s.%s" % (name,
item), "Forced counter wrap")
- else: # clustered check needs one counter per variable, item AND
NODE
- timedif, rate = get_counter("if.%s.%s.%s" % (node,
name, item), this_time, saveint(counter))
- if force_counter_wrap:
- raise MKCounterWrapped("if.%s.%s.%s" % (node,
name, item), "Forced counter wrap")
- rates.append(rate)
- perfdata.append( (name, rate, warn, crit, mmin, mmax) )
- except MKCounterWrapped:
- wrapped = True
- # continue, other counters might wrap as well
- else:
- perfdata.append( (name, counter, warn, crit, mmin, mmax) )
+ try:
+ if node == None:
+ timedif, rate = get_counter("if.%s.%s" % (name, item),
this_time, saveint(counter))
+ if force_counter_wrap:
+ raise MKCounterWrapped("if.%s.%s" % (name, item),
"Forced counter wrap")
+ else: # clustered check needs one counter per variable, item AND
NODE
+ timedif, rate = get_counter("if.%s.%s.%s" % (node,
name, item), this_time, saveint(counter))
+ if force_counter_wrap:
+ raise MKCounterWrapped("if.%s.%s.%s" % (node, name,
item), "Forced counter wrap")
+ rates.append(rate)
+ perfdata.append( (name, rate, warn, crit, mmin, mmax) )
+ except MKCounterWrapped:
+ wrapped = True
+ # continue, other counters might wrap as well
# if at least one counter wrapped, we do not handle the counters at all
if wrapped:
@@ -572,12 +560,6 @@ def check_if_common_single(item, params, info, force_counter_wrap =
False, has_n
state = max(state, 1)
infotext += ' (!) >= ' + format_value(bw_warn)
- if RxSignalState != "":
- infotext += ", RxSignalState: %s" % RxSignalState
- if RxSignalState != "Normal":
- state = max(state, 1)
- infotext += ' (!)'
-
pacrate = okrate + errorrate
if pacrate > 0.0: # any packets transmitted?
errperc = 100.0 * errorrate / (okrate + errorrate)
diff --git a/checks/if64 b/checks/if64
index dbf86a1..f842658 100644
--- a/checks/if64
+++ b/checks/if64
@@ -67,28 +67,27 @@ check_info["if64"] = {
'service_description': 'Interface %s',
'has_perfdata': True,
'includes': [ 'if.include' ],
- 'snmp_info': ( ".1.3.6.1", [
- "2.1.2.2.1.1", # ifIndex 0
- "2.1.2.2.1.2", # ifDescr 1
- "2.1.2.2.1.3", # ifType 2
- "2.1.31.1.1.1.15", # ifHighSpeed .. 1000 means 1GBit
- "2.1.2.2.1.8", # ifOperStatus 4
- "2.1.31.1.1.1.6", # ifHCInOctets 5
- "2.1.31.1.1.1.7", # ifHCInUcastPkts 6
- "2.1.31.1.1.1.8", # ifHCInMulticastPkts 7
- "2.1.31.1.1.1.9", # ifHCInBroadcastPkts 8
- "2.1.2.2.1.13", # ifInDiscards 9
- "2.1.2.2.1.14", # ifInErrors 10
- "2.1.31.1.1.1.10", # ifHCOutOctets 11
- "2.1.31.1.1.1.11", # ifHCOutUcastPkts 12
- "2.1.31.1.1.1.12", # ifHCOutMulticastPkts 13
- "2.1.31.1.1.1.13", # ifHCOutBroadcastPkts 14
- "2.1.2.2.1.19", # ifOutDiscards 15
- "2.1.2.2.1.20", # ifOutErrors 16
- "2.1.2.2.1.21", # ifOutQLen 17
- "2.1.31.1.1.1.18", # ifAlias 18
- "2.1.2.2.1.6", # ifPhysAddress 19
- "4.1.1991.1.1.3.3.6.1.3", # rx signal 20
+ 'snmp_info': ( ".1.3.6.1.2.1", [
+ "2.2.1.1", # ifIndex 0
+ "2.2.1.2", # ifDescr 1
+ "2.2.1.3", # ifType 2
+ "31.1.1.1.15", # ifHighSpeed .. 1000 means 1GBit
+ "2.2.1.8", # ifOperStatus 4
+ "31.1.1.1.6", # ifHCInOctets 5
+ "31.1.1.1.7", # ifHCInUcastPkts 6
+ "31.1.1.1.8", # ifHCInMulticastPkts 7
+ "31.1.1.1.9", # ifHCInBroadcastPkts 8
+ "2.2.1.13", # ifInDiscards 9
+ "2.2.1.14", # ifInErrors 10
+ "31.1.1.1.10", # ifHCOutOctets 11
+ "31.1.1.1.11", # ifHCOutUcastPkts 12
+ "31.1.1.1.12", # ifHCOutMulticastPkts 13
+ "31.1.1.1.13", # ifHCOutBroadcastPkts 14
+ "2.2.1.19", # ifOutDiscards 15
+ "2.2.1.20", # ifOutErrors 16
+ "2.2.1.21", # ifOutQLen 17
+ "31.1.1.1.18", # ifAlias 18
+ "2.2.1.6", # ifPhysAddress 19
]),
'snmp_scan_function' : if64_scan_function,
'group' : 'if',
diff --git a/checks/printer_pages b/checks/printer_pages
index 3046e72..81d21bc 100644
--- a/checks/printer_pages
+++ b/checks/printer_pages
@@ -38,7 +38,7 @@ check_info["printer_pages"] = {
'inventory_function': inventory_printer_pages,
'service_description': 'Pages',
'has_perfdata': True,
- 'snmp_info': ('.1.3.6.1.2.1.43.10.2.1.4', [
"1" ]),
+ 'snmp_info': ('.1.3.6.1.2.1.43.10.2.1.4.1', [ 1 ]),
'snmp_scan_function': \
lambda oid: oid(".1.3.6.1.2.1.43.10.2.1.4.1.1") != None,
}