Krinkle has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/338929 )
Change subject: webperf: Remove unused deprecate.py ...................................................................... webperf: Remove unused deprecate.py This schema hasn't been used since mid-2016 per df0c90f67 in WikimediaEvents changed the producer to log to statsd directly (via statsv) instead of via EventLogging. Change-Id: Id3b4de6651f0cb2e825cc3e48742e22683646396 --- D modules/webperf/files/deprecate.py D modules/webperf/manifests/deprecate.pp 2 files changed, 0 insertions(+), 79 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/29/338929/1 diff --git a/modules/webperf/files/deprecate.py b/modules/webperf/files/deprecate.py deleted file mode 100644 index ae56170..0000000 --- a/modules/webperf/files/deprecate.py +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -from __future__ import unicode_literals -import sys -reload(sys) -sys.setdefaultencoding("utf-8") - -import argparse -import socket -import re - -import zmq - - -ap = argparse.ArgumentParser(description='StatsD module for mw-js-deprecate') -ap.add_argument('endpoint', help='URI of EventLogging endpoint') -ap.add_argument('--statsd-host', default='localhost', - type=socket.gethostbyname) -ap.add_argument('--statsd-port', default=8125, type=int) -args = ap.parse_args() - -ctx = zmq.Context() -zsock = ctx.socket(zmq.SUB) -zsock.hwm = 3000 -zsock.linger = 0 -zsock.connect(args.endpoint) -zsock.subscribe = b'' - -addr = args.statsd_host, args.statsd_port -sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) - -for meta in iter(zsock.recv_json, ''): - if meta['schema'] == 'DeprecatedUsage': - key = re.sub(r'\W+', '_', meta['event']['method']) - stat = 'mw.js.deprecate.%s:1|c' % key - sock.sendto(stat.encode('utf-8'), addr) diff --git a/modules/webperf/manifests/deprecate.pp b/modules/webperf/manifests/deprecate.pp deleted file mode 100644 index 2283040..0000000 --- a/modules/webperf/manifests/deprecate.pp +++ /dev/null @@ -1,43 +0,0 @@ -# == Class: webperf::deprecate -# -# Captures mw.log.deprecate data and sends it to StatsD. -# -# See https://meta.wikimedia.org/wiki/Schema:DeprecatedUsage. -# -# === Parameters -# -# [*endpoint*] -# URI of EventLogging event publisher to subscribe to. -# Example: 'tcp://eventlogging.corp.org:8600'. -# -# [*statsd_host*] -# Write stats to this StatsD instance. Default: '127.0.0.1'. -# -# [*statsd_port*] -# Write stats to this StatsD instance. Default: 8125. -# -class webperf::deprecate( - $endpoint, - $statsd_host = '127.0.0.1', - $statsd_port = 8125, -) { - include ::webperf - - file { '/srv/webperf/deprecate.py': - source => 'puppet:///modules/webperf/deprecate.py', - owner => 'www-data', - group => 'www-data', - mode => '0755', - notify => Service['statsd-mw-js-deprecate'], - } - - file { '/lib/systemd/system/statsd-mw-js-deprecate.service': - content => template('webperf/deprecate.systemd.erb'), - notify => Service['statsd-mw-js-deprecate'], - } - - service { 'statsd-mw-js-deprecate': - ensure => running, - provider => systemd, - } -} -- To view, visit https://gerrit.wikimedia.org/r/338929 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id3b4de6651f0cb2e825cc3e48742e22683646396 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Krinkle <krinklem...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits