Module: check_mk
Branch: master
Commit: 665dce7e6c9e3f7a1af6884295cc35110e744103
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=665dce7e6c9e3f…
Author: Simon Betz <si(a)mathias-kettner.de>
Date: Fri Jun 17 18:02:47 2016 +0200
added unit, update to werk 3638
---
checks/cisco_qos | 38 +++++++++++++++++++++-----------------
1 file changed, 21 insertions(+), 17 deletions(-)
diff --git a/checks/cisco_qos b/checks/cisco_qos
index e7fa26e..9119cc7 100644
--- a/checks/cisco_qos
+++ b/checks/cisco_qos
@@ -228,23 +228,27 @@ def check_cisco_qos(item, params, info):
for b_key, b_value in parents.items():
if parent_value_cache[class_id] == b_value:
if object_types[b_key] == "4":
- try:
- # 1 kbps
- # 2 percentage
- # 3 percentageRemaining
- # 4 ratioRemaining
- # 5 perThousand
- # 6 perMillion
- qos_unit = int(if_qos_bandwidth_units[config[b_key]])
- qos_bandwidth = saveint(if_qos_bandwidth[config[b_key]])
- if qos_unit == 1:
- speed = qos_bandwidth * 1000
- elif qos_unit == 3:
- remaining = (speed / 100) * qos_bandwidth
- speed = speed - remaining
- break
- except KeyError:
- pass
+ try:
+ # 1 kbps
+ # 2 percentage
+ # 3 percentageRemaining
+ # 4 ratioRemaining
+ # 5 perThousand
+ # 6 perMillion
+ qos_unit = int(if_qos_bandwidth_units[config[b_key]])
+ qos_bandwidth = saveint(if_qos_bandwidth[config[b_key]])
+ if qos_unit == 1:
+ speed = qos_bandwidth * 1000
+
+ elif qos_unit == 2:
+ speed = speed * (qos_bandwidth / 100.0)
+
+ elif qos_unit == 3:
+ remaining = (speed / 100) * qos_bandwidth
+ speed = speed - remaining
+ break
+ except KeyError:
+ pass
# Bandwidth needs to be in bytes for later calculations
bw = speed / 8.0