Module: check_mk
Branch: master
Commit: d18cffd23a5cf469e4a71a406fac8147a85e63fa
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d18cffd23a5cf4…
Author: Simon Betz <si(a)mathias-kettner.de>
Date: Wed Mar 8 14:04:07 2017 +0100
4488 netapp_api_if: Now monitors received and sent packets
Change-Id: I49288d3db817880bfd71e94c433c61b28552f377
---
.werks/4488 | 10 ++++++++++
agents/special/agent_netapp | 6 ++++--
checks/netapp_api_if | 4 ++--
3 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/.werks/4488 b/.werks/4488
new file mode 100644
index 0000000..bcdc7f9
--- /dev/null
+++ b/.werks/4488
@@ -0,0 +1,10 @@
+Title: netapp_api_if: Now monitors received and sent packets
+Level: 1
+Component: checks
+Compatible: compat
+Edition: cre
+Version: 1.5.0i1
+Date: 1488978140
+Class: feature
+
+
diff --git a/agents/special/agent_netapp b/agents/special/agent_netapp
index 3bd1b79..dabdfb9 100755
--- a/agents/special/agent_netapp
+++ b/agents/special/agent_netapp
@@ -938,7 +938,8 @@ try:
extra_info_report = [ "recv_data",
"send_data",
"recv_mcasts",
"send_mcasts",
"recv_errors",
"send_errors",
- "instance_name",
"link-status", "operational-speed"])
+ "instance_name",
"link-status", "operational-speed",
+ "recv_packet",
"send_packet", ])
# Fibrechannels
@@ -1200,7 +1201,8 @@ try:
extra_info = create_dict(if_counters), extra_info_report
= [ "recv_data", "send_data",
"recv_mcasts", "send_mcasts",
"recv_errors", "send_errors",
-
"instance_name", "mediatype"])
+
"instance_name", "mediatype",
+
"recv_packet", "send_packet" ])
# TODO: Fibrechannel interfaces
diff --git a/checks/netapp_api_if b/checks/netapp_api_if
index 3e7f6f7..9d3393c 100644
--- a/checks/netapp_api_if
+++ b/checks/netapp_api_if
@@ -131,14 +131,14 @@ def netapp_convert_to_if64(info):
nic[4] = state # Status
# IN
nic[5] = values.get("recv_data", 0) # inoctets
- nic[6] = 0 # inucast
+ nic[6] = values.get("recv_packet", 0) # inucast
nic[7] = values.get("recv_mcasts", 0) # inmcast
nic[8] = 0 # ibcast
nic[9] = 0 # indiscards
nic[10] = values.get("recv_errors", 0) # inerrors
# OUT
nic[11] = values.get("send_data", 0) # outoctets
- nic[12] = 0 # outucast
+ nic[12] = values.get("send_packet", 0) # outucast
nic[13] = values.get("send_mcasts", 0) # outmcast
nic[14] = 0 # outbcast
nic[15] = 0 # outdiscards