Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57541
Change subject: Fixing udp_stats.py code to work with prefixed ganglia names
......................................................................
Fixing udp_stats.py code to work with prefixed ganglia names
Change-Id: Ia5cb6701a9e2316214310d8a2b8fb7b8f7395766
---
M files/ganglia/plugins/udp2log_socket.py
M files/ganglia/plugins/udp_stats.py
2 files changed, 15 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/41/57541/1
diff --git a/files/ganglia/plugins/udp2log_socket.py
b/files/ganglia/plugins/udp2log_socket.py
index 37c4019..9a98c4f 100644
--- a/files/ganglia/plugins/udp2log_socket.py
+++ b/files/ganglia/plugins/udp2log_socket.py
@@ -36,7 +36,7 @@
"time_max" : 60,
"format" : "%d",
"value_type" : "uint",
- "groups" : "network,udp",
+ "groups" : "udp2log",
"units" : "bytes"
}
diff --git a/files/ganglia/plugins/udp_stats.py
b/files/ganglia/plugins/udp_stats.py
index e6624d2..256acb4 100644
--- a/files/ganglia/plugins/udp_stats.py
+++ b/files/ganglia/plugins/udp_stats.py
@@ -27,13 +27,16 @@
"units" : "packets"
}
+# Prefix names sent to ganglia with this.
+ganglia_name_prefix = "UDP_"
+
udp_fields = {
- "UDP_InDatagrams" : "UDP Packets Received",
- "UDP_NoPorts" : "UDP Packets to Unknown Port Received",
- "UDP_InErrors" : "UDP Packet Receive Errors",
- "UDP_OutDatagrams" : "UDP Packets Sent",
- "UDP_RcvbufErrors" : "UDP Receive Buffer Errors",
- "UDP_SndbufErrors" : "UDP Send Buffer Errors"
+ "%sInDatagrams" % (ganglia_name_prefix) : "UDP Packets Received",
+ "%sNoPorts" % (ganglia_name_prefix) : "UDP Packets to Unknown Port
Received",
+ "%sInErrors" % (ganglia_name_prefix) : "UDP Packet Receive Errors",
+ "%sOutDatagrams" % (ganglia_name_prefix) : "UDP Packets Sent",
+ "%sRcvbufErrors" % (ganglia_name_prefix) : "UDP Receive Buffer Errors",
+ "%sSndbufErrors" % (ganglia_name_prefix) : "UDP Send Buffer Errors"
}
netstats = {}
@@ -60,8 +63,11 @@
def metric_handler(name):
"""Get value of particular metric; part of Gmond interface"""
- logging.debug('metric_handler(): %s', name)
- return literal_eval(netstats['udp'][name])
+ # The key for this value stored in netstats will not be prefixed
+ # by ganglia_name_prefix. Strip it off of the name.
+ udp_field_key = name.lstrip(ganglia_name_prefix)
+ logging.debug('metric_handler(): %s', udp_field_key)
+ return literal_eval(netstats['udp'][udp_field_key])
def metric_init(params):
--
To view, visit https://gerrit.wikimedia.org/r/57541
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia5cb6701a9e2316214310d8a2b8fb7b8f7395766
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
