Nuria has uploaded a new change for review.
https://gerrit.wikimedia.org/r/198254
Change subject: Statsd reporter checks format of processor files
......................................................................
Statsd reporter checks format of processor files
We added a new processor of files whose format doesn't exactly abide
to what the statsd reporter is expecting. The new processor format
needs to be added. Now, since reporting of metrics
and thus, alarms are broken in prod this change just fixes the reporter so it
continues to report the pre-existing metrics.
Change-Id: I515d1362e5c3183d61e4b8cf7f129e2f5fca3348
---
M server/bin/eventlogging-reporter
1 file changed, 13 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EventLogging
refs/changes/54/198254/1
diff --git a/server/bin/eventlogging-reporter b/server/bin/eventlogging-reporter
index 37e69a1..387739a 100755
--- a/server/bin/eventlogging-reporter
+++ b/server/bin/eventlogging-reporter
@@ -85,14 +85,23 @@
def iter_pubs(config_dir):
- """Discover local EventLogging publishers."""
+ """Discover local EventLogging publishers. Assumes really a tcp stream """
+ #TODO Kafka client side stream not reported
+
publishers = {}
+ logger = logging.getLogger('Log')
+
for filename in iter_files(config_dir):
+ logger.debug("Reporting metrics for %s", filename)
name = re.sub(r'[^A-Za-z0-9]+', '_', os.path.basename(filename))
+
with open(filename) as f:
- raw, valid = re.findall(r'tcp://[^:]+:(\d+)', f.read())
- publishers[('%s.raw' % name, 'overall.raw')] = raw
- publishers[('%s.valid' % name, 'overall.valid')] = valid
+ matches = re.findall(r'tcp://[^:]+:(\d+)', f.read())
+ if len(matches) > 1:
+ raw = matches[0]
+ valid = matches[1]
+ publishers[('%s.raw' % name, 'overall.raw')] = raw
+ publishers[('%s.valid' % name, 'overall.valid')] = valid
return publishers
--
To view, visit https://gerrit.wikimedia.org/r/198254
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I515d1362e5c3183d61e4b8cf7f129e2f5fca3348
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EventLogging
Gerrit-Branch: master
Gerrit-Owner: Nuria <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
