Module: check_mk
Branch: master
Commit: 59dd42a1716d390e47c02bccf1059bdee67eaf11
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=59dd42a1716d39…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Wed Jan 22 12:37:51 2014 +0100
FIX df_netapp32 / df_netapp: Fixed bug with negative size in check output
The df_netapp and df_netapp32 checks tried to determine 64 bit counters by checking
the existance of the oid .1.3.6.1.4.1.789.1.5.4.1.29.1 (df64TotalKBytes).
Unfortunately not all netapp interfaces start at .1, so some netapp devices where wrongly
inventorized as df_netapp32 checks.
---
.werks/261 | 14 ++++++++++++++
ChangeLog | 1 +
checks/df_netapp | 2 +-
checks/df_netapp32 | 2 +-
4 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/.werks/261 b/.werks/261
new file mode 100644
index 0000000..ba33d8b
--- /dev/null
+++ b/.werks/261
@@ -0,0 +1,14 @@
+Title: df_netapp32 / df_netapp: Fixed bug with negative size in check output
+Level: 1
+Component: checks
+Class: fix
+State: unknown
+Version: 1.2.5i1
+Date: 1390390390
+
+The df_netapp and df_netapp32 checks tried to determine 64 bit counters by checking
+the existance of the oid .1.3.6.1.4.1.789.1.5.4.1.29.1 (df64TotalKBytes).
+Depending on the 64 Bit counter a df_netapp check is created, otherwise df_netapp32 is
used.
+Unfortunately not all netapp interfaces start at .1, so some netapp devices where
wrongly
+inventorized as df_netapp32 checks. <br>
+Those checks reported negative volume sizes whenever the 32 bit counter overflowed.
diff --git a/ChangeLog b/ChangeLog
index e0257f1..939aafd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -124,6 +124,7 @@
* 0120 FIX: stulz_humidity, apc_humidity: Fixed bug while processing check params...
* 0460 FIX: endless waiting for printer queues fixed...
* 0260 FIX: Fixed incorrect formatting of checks with long output...
+ * 0261 FIX: df_netapp32 / df_netapp: Fixed bug with negative size in check output...
Multisite:
* 0371 Added log class filter to hostsvcevents view
diff --git a/checks/df_netapp b/checks/df_netapp
index 29e1a63..055ed7c 100644
--- a/checks/df_netapp
+++ b/checks/df_netapp
@@ -36,7 +36,7 @@ check_info["df_netapp"] = {
'has_perfdata': True,
'snmp_info': ('.1.3.6.1.4.1.789.1.5.4.1', [2, 29,
30]),
'snmp_scan_function': \
- lambda oid: is_netapp_filer(oid) and
oid(".1.3.6.1.4.1.789.1.5.4.1.29.1"),
+ lambda oid: is_netapp_filer(oid) and
oid(".1.3.6.1.4.1.789.1.5.4.1.29.*"),
'group': 'filesystem',
'default_levels_variable': 'filesystem_default_levels',
}
diff --git a/checks/df_netapp32 b/checks/df_netapp32
index 6d6da91..51c07f3 100644
--- a/checks/df_netapp32
+++ b/checks/df_netapp32
@@ -36,7 +36,7 @@ check_info["df_netapp32"] = {
'has_perfdata': True,
'snmp_info': ('.1.3.6.1.4.1.789.1.5.4.1', [2, 3, 4]),
'snmp_scan_function': \
- lambda oid: is_netapp_filer(oid) and not
oid(".1.3.6.1.4.1.789.1.5.4.1.29.1"),
+ lambda oid: is_netapp_filer(oid) and not
oid(".1.3.6.1.4.1.789.1.5.4.1.29.*"),
'group': 'filesystem',
'default_levels_variable': 'filesystem_default_levels',
}