Ottomata has submitted this change and it was merged.
Change subject: Fixing PacketLossLogtailer all_roles metric, also limiting the
number of roles reported to ganglia via rolematcher.py
......................................................................
Fixing PacketLossLogtailer all_roles metric, also limiting the number of roles
reported to ganglia via rolematcher.py
Change-Id: I805ddffca823d5d82e48e6f4370371b6a7416c0d
---
M files/misc/PacketLossLogtailer.py
M files/misc/rolematcher.py
2 files changed, 2 insertions(+), 1 deletion(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
Diederik: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/files/misc/PacketLossLogtailer.py
b/files/misc/PacketLossLogtailer.py
index 78c62dd..00bc2a3 100644
--- a/files/misc/PacketLossLogtailer.py
+++ b/files/misc/PacketLossLogtailer.py
@@ -73,6 +73,7 @@
# filtering out HTTPS/IP6 traffic as the packetloss
numbers
# are inaccurate.
if role != 'https':
+ self.percentloss_dict.setdefault('all_roles', [])
self.percentloss_dict['all_roles'].append(percentloss)
else:
raise LogtailerParsingException("regmatch failed to match")
diff --git a/files/misc/rolematcher.py b/files/misc/rolematcher.py
index fe97efa..dc089b6 100644
--- a/files/misc/rolematcher.py
+++ b/files/misc/rolematcher.py
@@ -58,7 +58,7 @@
return False
def get_role(self):
- return self.__str__()
+ return self.role
def manual_init():
--
To view, visit https://gerrit.wikimedia.org/r/71817
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I805ddffca823d5d82e48e6f4370371b6a7416c0d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <o...@wikimedia.org>
Gerrit-Reviewer: Diederik <dvanli...@wikimedia.org>
Gerrit-Reviewer: Ottomata <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
