metrocluster setups)
Message-ID: <57025317.a2E2adU40IodqOCi%ab(a)mathias-kettner.de>
User-Agent: Heirloom mailx 12.5 6/20/10
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Module: check_mk
Branch: master
Commit: 8b4c54723a91b5f152c5c11da942a222ca219799
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b4c54723a91b5…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Mon Apr 4 13:39:20 2016 +0200
3018: netapp_api_disks: ignore disks with raid-state remote (metrocluster setups)
---
.werks/3018 | 9 +++++++++
ChangeLog | 4 +++-
checks/netapp_api_disk | 2 +-
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/.werks/3018 b/.werks/3018
new file mode 100644
index 0000000..275f4db
--- /dev/null
+++ b/.werks/3018
@@ -0,0 +1,9 @@
+Title: netapp_api_disks: ignore disks with raid-state remote (metrocluster setups)
+Level: 1
+Component: checks
+Compatible: compat
+Version: 1.2.9i1
+Date: 1459760250
+Class: fix
+
+Disks with raid-state remote are monitored on the partner system.
diff --git a/ChangeLog b/ChangeLog
index 3b5ff38..34128aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -119,7 +119,9 @@
NOTE: Please refer to the migration notes!
* 3016 FIX: mk-job: scheduled jobs are now always executed despite of any status file
permission problems...
* 3017 FIX: Fixed missing host/vms inventory information when having multiple
datacenters...
- * 3111 FIX: citrix_status: fixed incorrect assignment of piggyback data to host
running the plugin...
+ * 3018 FIX: netapp_api_disks: ignore disks with raid-state remote (metrocluster
setups)...
+ * 3019 FIX: netapp_api_volumes: fixed incorrect metrics (wrong scaling in graphs)
+ * 3020 FIX: netapp_api_volumes: ignore volumes of cluster partner...
Multisite:
* 3187 notification view: new filter for log command via regex
diff --git a/checks/netapp_api_disk b/checks/netapp_api_disk
index 042a53d..3bf3c6e 100644
--- a/checks/netapp_api_disk
+++ b/checks/netapp_api_disk
@@ -49,7 +49,7 @@ def check_netapp_api_disk_summary(_no_item, params, info):
# The device can contain disks who belongs to another filer. We only check the ones
# belonging to this filer.
# TODO Do we need that?
- my_disks = dict([disk for disk in disks.items() if not
disk[1].get("raid-state") == "partner"])
+ my_disks = dict([disk for disk in disks.items() if not
disk[1].get("raid-state") in [ "remote", "partner"] ])
disks_converted = []
for did, disk in my_disks.items():