Module: check_mk
Branch: master
Commit: 520e40e3e03b0d6dac2363b25050ed68c68f9249
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=520e40e3e03b0d…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Feb 11 09:54:15 2016 +0100
HW/SW-Inventory: Fixed rendering of hz between 10 and 100
---
mkeventd/web/plugins/sidebar/mkeventd.py | 1 -
modules/discovery.py | 1 -
web/plugins/views/inventory.py | 2 +-
3 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/mkeventd/web/plugins/sidebar/mkeventd.py
b/mkeventd/web/plugins/sidebar/mkeventd.py
index f8529b3..49de079 100644
--- a/mkeventd/web/plugins/sidebar/mkeventd.py
+++ b/mkeventd/web/plugins/sidebar/mkeventd.py
@@ -63,7 +63,6 @@ def render_mkeventd_performance():
data["status_average_rule_trie_rate"] * 100))
except: # division by zero
write_line(_("Rule hit ratio"), _("-.-- %"))
- pass
# Time columns
time_columns = [
diff --git a/modules/discovery.py b/modules/discovery.py
index 60cf4ce..f498930 100644
--- a/modules/discovery.py
+++ b/modules/discovery.py
@@ -711,7 +711,6 @@ def snmp_scan(hostname, ipaddress, on_error = "ignore",
for_inv=False):
warning(" Exception in SNMP scan function of %s" %
check_type)
elif on_error == "raise":
raise
- pass
else:
found.append(check_type)
default_found.append(check_type)
diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py
index de41272..93e57b3 100644
--- a/web/plugins/views/inventory.py
+++ b/web/plugins/views/inventory.py
@@ -381,7 +381,7 @@ def inv_paint_hz(hz):
if hz < 10:
return "number", "%.2f" % hz
elif hz < 100:
- return "number", "%.11" % hz
+ return "number", "%.1f" % hz
elif hz < 1500:
return "number", "%.0f" % hz
elif hz < 1000000: