Module: check_mk
Branch: master
Commit: 7b4d7b64214034b33936ddd522db944876d6ef87
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b4d7b64214034…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Oct 25 17:14:03 2010 +0200
Improved cisco_power check
---
ChangeLog | 5 +++--
LIESMICH.zutun | 2 ++
checks/cisco_power | 13 ++++++++++---
3 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 5a8ab9a..42177c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,8 +5,9 @@
* wut_webtherm: handle more variants of WuT Webtherms (thanks to Lefty)
* blade_bays: Also inventorizes standby blades and has a little more
verbose output.
- * blade_blowers: Can handle responses without rpm values now. Improved output.
- * cisco_fan: Does not inentorize 'notPresent' sensors anymore. Imporved
output.
+ * blade_blowers: Can handle responses without rpm values now. Improved output
+ * cisco_fan: Does not inentorize 'notPresent' sensors anymore. Improved
output
+ * cisco_power: Not using power source as threshold anymore. Improved output
Multisite:
* The custom open/close states of custom links are now stored for each
diff --git a/LIESMICH.zutun b/LIESMICH.zutun
index 3383b0e..27e6ac0 100644
--- a/LIESMICH.zutun
+++ b/LIESMICH.zutun
@@ -45,6 +45,8 @@ man rechts plötzlich ein anderes System. Lösung ist noch nicht in
Sicht.
LARS: Bei Opera kann man kein Snapin nach ganz unten ziehen. Der Indikator
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?
diff --git a/checks/cisco_power b/checks/cisco_power
index 285c790..25efbc1 100644
--- a/checks/cisco_power
+++ b/checks/cisco_power
@@ -24,6 +24,9 @@
# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
# Boston, MA 02110-1301 USA.
+cisco_power_states = ('', 'normal', 'warning',
'critical',
+ 'shutdown', 'notPresent',
'notFunctioning')
+cisco_power_source = ( '', 'unknown', 'ac', 'dc',
'externalPowerSupply', 'internalRedundant')
def inventory_cisco_power(checkname, info):
return [ (line[0], '', '""') for line in info if 'RPS
NotExist' not in line[0]]
@@ -31,10 +34,14 @@ def inventory_cisco_power(checkname, info):
def check_cisco_power(item, params, info):
for line in info:
if line[0] == item:
- if line[1] == "1" and line[2] == "5":
- return (0, "OK")
+ state, source = map(saveint, line[1:3])
+ output = 'State: %s, Source: %s' % (cisco_power_states[state],
cisco_power_source[source])
+ if state == 1:
+ return (0, "OK - %s" % output)
+ elif state == 2:
+ return (1, "WARN - %s" % output)
else:
- return (2, "CRIT - Invalid state %s/%s" % (line[1], line[2]))
+ return (2, "CRIT - %s" % output)
return (3, "UNKNOWN - item not found in snmp data")
check_info['cisco_power'] = (check_cisco_power, "%s", 0,
inventory_cisco_power)