Yuvipanda has uploaded a new change for review. https://gerrit.wikimedia.org/r/303716
Change subject: tools: Don't send per-tool http version stats ...................................................................... tools: Don't send per-tool http version stats Isn't very useful, and adds load on labmon Change-Id: I73c9983a40d177e7a30fa6ec01f89f122c6d7a47 --- M modules/toollabs/files/toolsweblogster.py 1 file changed, 2 insertions(+), 11 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/16/303716/1 diff --git a/modules/toollabs/files/toolsweblogster.py b/modules/toollabs/files/toolsweblogster.py index 40ebc07..6285ba0 100644 --- a/modules/toollabs/files/toolsweblogster.py +++ b/modules/toollabs/files/toolsweblogster.py @@ -11,7 +11,8 @@ It sends metrics of the form: raw.{firstsegment}.status.{status} -> For statuses! - raw.{firstsegment}.httpversion.{version} -> For HTTP versions used + +It also sends combined metrics on a per status and per-http version basis. """ import re from collections import defaultdict @@ -26,7 +27,6 @@ '''Initialize any data structures or variables needed for keeping track of the tasty bits we find in the log we are parsing.''' self.status_stats = {} - self.httpver_stats = {} self.combined_status = defaultdict(int) self.combined_httpver = defaultdict(int) @@ -62,9 +62,6 @@ self.status_stats[firstsegment] = statuses self.combined_status[status] += 1 - httpversions = self.httpver_stats.get(firstsegment, {httpversion: 0}) - httpversions[httpversion] = httpversions.get(httpversion, 0) + 1 - self.httpver_stats[firstsegment] = httpversions self.combined_httpver[httpversion] += 1 else: raise LogsterParsingException("regmatch failed to match") @@ -94,12 +91,6 @@ for status, count in statuses.items(): metric_name = 'raw.{firstsegment}.status.{status}'.format( firstsegment=firstsegment, status=status - ) - metrics.append(MetricObject(metric_name, count, 'Responses')) - for firstsegment, httpversions in self.httpver_stats.items(): - for httpver, count in httpversions.items(): - metric_name = 'raw.{firstsegment}.httpver.{httpver}'.format( - firstsegment=firstsegment, httpver=httpver ) metrics.append(MetricObject(metric_name, count, 'Responses')) -- To view, visit https://gerrit.wikimedia.org/r/303716 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I73c9983a40d177e7a30fa6ec01f89f122c6d7a47 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Yuvipanda <yuvipa...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits