28 Jul
2015
28 Jul
'15
6:46 a.m.
Module: check_mk
Branch: master
Commit: 4705c1e61a9b4f73f69d6450205b8321f517d4a1
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4705c1e61a9b4f…
Author: Simon Betz <si(a)mathias-kettner.de>
Date: Tue Jul 28 13:45:32 2015 +0200
new metric definitions, graphs and perfometers
---
web/plugins/metrics/check_mk.py | 87 ++++++++++++++++++++++++++++++++++++++-
1 file changed, 86 insertions(+), 1 deletion(-)
diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py
index d936c76..246115b 100644
--- a/web/plugins/metrics/check_mk.py
+++ b/web/plugins/metrics/check_mk.py
@@ -1112,6 +1112,12 @@ metric_info["signal_noise"] = {
"color" : "#aadd66",
}
+metric_info["noise_floor"] = {
+ "title" : _("Noise floor"),
+ "unit" : "dbm",
+ "color" : "11/a",
+}
+
metric_info["codewords_corrected"] = {
"title" : _("Corrected codewords"),
"unit" : "ratio",
@@ -1392,6 +1398,12 @@ metric_info["if_in_octets"] = {
"color" : "#00e060",
}
+metric_info["if_in_pkts"] = {
+ "title" : _("Input Packets"),
+ "unit" : "1/s",
+ "color" : "#00e060",
+}
+
metric_info["if_out_octets"] = {
"title" : _("Output Octets"),
"unit" : "bytes/s",
@@ -1411,7 +1423,7 @@ metric_info["if_in_errors"] = {
}
metric_info["if_out_discards"] = {
- "title" : _("Output Dicards"),
+ "title" : _("Output Discards"),
"unit" : "1/s",
"color" : "#ff8080",
}
@@ -1440,12 +1452,42 @@ metric_info["if_out_unicast"] = {
"color" : "#00c0ff",
}
+metric_info["if_out_unicast_octets"] = {
+ "title" : _("Output unicast oackets"),
+ "unit" : "bytes/s",
+ "color" : "#00c0ff",
+}
+
metric_info["if_out_non_unicast"] = {
"title" : _("Output non-unicast packets"),
"unit" : "1/s",
"color" : "#0080c0",
}
+metric_info["if_out_non_unicast_octets"] = {
+ "title" : _("Output non-unicast octets"),
+ "unit" : "bytes/s",
+ "color" : "#0080c0",
+}
+
+metric_info["wlan_physical_errors"] = {
+ "title" : "WLAN physical errors",
+ "unit" : "1/s",
+ "color" : "14/a",
+}
+
+metric_info["wlan_resets"] = {
+ "title" : "WLAN Reset operations",
+ "unit" : "1/s",
+ "color" : "21/a",
+}
+
+metric_info["wlan_retries"] = {
+ "title" : "WLAN transmission retries",
+ "unit" : "1/s",
+ "color" : "24/a",
+}
+
metric_info["read_blocks"] = {
"title" : _("Read blocks per second"),
"unit" : "1/s",
@@ -3664,6 +3706,21 @@ perfometer_info.append(("dual", [
perfometer_info.append(("dual", [
{
"type" : "logarithmic",
+ "metric" :
"if_out_unicast_octets,if_out_non_unicast_octets,+",
+ "half_value" : 5000000,
+ "exponent" : 5,
+ },
+ {
+ "type" : "logarithmic",
+ "metric" : "if_in_octets",
+ "half_value" : 5000000,
+ "exponent" : 5,
+ }
+]))
+
+perfometer_info.append(("dual", [
+ {
+ "type" : "logarithmic",
"metric" : "read_blocks",
"half_value" : 50000000,
"exponent" : 2,
@@ -4720,6 +4777,34 @@ graph_info.append({
],
})
+graph_info.append({
+ "title" : _("Packets"),
+ "metrics" : [
+ ( "if_in_pkts", "area" ),
+ ( "if_out_non_unicast", "-area" ),
+ ( "if_out_unicast", "-stack" ),
+ ],
+})
+
+graph_info.append({
+ "title" : _("Traffic"),
+ "metrics" : [
+ ( "if_in_octets", "area" ),
+ ( "if_out_non_unicast_octets", "-area" ),
+ ( "if_out_unicast_octets", "-stack" ),
+ ],
+})
+
+graph_info.append({
+ "title" : _("WLAN errors, reset operations and transmission
retries"),
+ "metrics" : [
+ ( "wlan_physical_errors", "area" ),
+ ( "wlan_resets", "stack" ),
+ ( "wlan_retries", "stack" ),
+ ],
+})
+
+
# TODO: show this graph instead of Bandwidth if this is configured
# in the check's parameters. But is this really a good solution?
# We could use a condition on if_in_octets:min. But if this value