Filippo Giunchedi has submitted this change and it was merged.
Change subject: scap: Remove deploy2graphite
......................................................................
scap: Remove deploy2graphite
Best I can tell, l10nupdate-1 uses this but for no real reason. These
syncs are already logged in graphite via scap itself, there's no reason
for us to explicitly use a bridge like this.
Change-Id: I4e93c89bafad50272b21c9118759fd1b80ce2c13
---
D modules/scap/files/deploy2graphite
M modules/scap/files/l10nupdate-1
M modules/scap/manifests/scripts.pp
3 files changed, 0 insertions(+), 48 deletions(-)
Approvals:
BryanDavis: Looks good to me, but someone else must approve
Filippo Giunchedi: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/scap/files/deploy2graphite
b/modules/scap/files/deploy2graphite
deleted file mode 100755
index 9895b76..0000000
--- a/modules/scap/files/deploy2graphite
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-set -e
-set -u
-
-. /usr/local/lib/mw-deployment-vars.sh
-
-me=$(readlink -f "$0")
-deploy_type=${1:-}
-deploy_duration=${2:-}
-dry_run=${DOLOGMSGNOLOG:+no}
-
-usage() {
- echo "Usage: $me deploy_type [deploy_duration_seconds]"
- echo "$me will log an entry at graphite.wikimedia.org indicating that a"
- echo " deploy event of the type indicated has occurred."
- echo " Expected deploy events include sync-common, sync-file, scap, etc."
- echo " These messages can be suppressed by setting an environment variable
\$DOLOGMSGNOLOG."
- echo ""
- echo " IF YOU'RE RUNNING THIS BY HAND, PLEASE STOP."
- echo ""
- exit
-}
-
-statsd_send() {
- echo "$1" | nc -w1 -q0 -u $MW_STATSD_HOST $MW_STATSD_PORT
-}
-
-if [ "$deploy_type" = "-h" ] || [ "$deploy_type" = "" ]; then
- usage
-fi
-
-if [ "$dry_run" != "no" ]; then
- exit 0
-fi
-
-statsd_send "deploy.${deploy_type}:1|c" || true
-statsd_send "deploy.all:1|c" || true
-if [ -n "$deploy_duration" ]; then
- statsd_send "deploy.${deploy_type}.timing:${deploy_duration}000|ms" || true
-fi
diff --git a/modules/scap/files/l10nupdate-1 b/modules/scap/files/l10nupdate-1
index b39a3f2..c0dfa33 100755
--- a/modules/scap/files/l10nupdate-1
+++ b/modules/scap/files/l10nupdate-1
@@ -126,5 +126,4 @@
else
DURATION=$(date -ud @"$LENGTH" +'%-Hh %-Mm %-Ss')
fi
-/usr/local/bin/deploy2graphite l10n $LENGTH
/usr/local/bin/dologmsg "!log $LOGNAME@$HOSTNAME ResourceLoader cache refresh
completed at $(date -ud @$ENDED) (duration $DURATION)"
diff --git a/modules/scap/manifests/scripts.pp
b/modules/scap/manifests/scripts.pp
index 8a22316..424aa8c 100644
--- a/modules/scap/manifests/scripts.pp
+++ b/modules/scap/manifests/scripts.pp
@@ -28,12 +28,6 @@
mode => '0555',
source => 'puppet:///modules/scap/mwgrep',
}
- file { '/usr/local/bin/deploy2graphite':
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///modules/scap/deploy2graphite',
- }
file { '/usr/local/bin/foreachwiki':
owner => 'root',
group => 'root',
--
To view, visit https://gerrit.wikimedia.org/r/321401
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4e93c89bafad50272b21c9118759fd1b80ce2c13
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad <[email protected]>
Gerrit-Reviewer: 20after4 <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Thcipriani <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
