Ori.livneh has submitted this change and it was merged.
Change subject: log scap timing to graphite; parametrize statsd host/port
......................................................................
log scap timing to graphite; parametrize statsd host/port
Make deploy2graphite take an optional second parameter, specifying the deploy
duration in seconds.
Change-Id: I4aa4d5881f31a9add137642d3a825850de6b1d3e
---
M files/misc/scripts/deploy2graphite
M files/scap/scap
M manifests/misc/deployment.pp
M templates/misc/mw-deployment-vars.erb
4 files changed, 17 insertions(+), 7 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/misc/scripts/deploy2graphite
b/files/misc/scripts/deploy2graphite
index 0897796..d6add57 100755
--- a/files/misc/scripts/deploy2graphite
+++ b/files/misc/scripts/deploy2graphite
@@ -1,7 +1,9 @@
#! /bin/bash
-usage() {
- echo "Usage: $0 deploytype"
+. /usr/local/lib/mw-deployment-vars.sh
+
+usage() {
+ echo "Usage: $0 deploy_type [deploy_duration_seconds]"
echo "$0 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."
@@ -15,12 +17,12 @@
[ "${1/-h}" != "$1" ] && usage
if [ -z $DOLOGMSGNOLOG ]; then
- if [ "$1" ] && [ -z "$2" ] ; then
+ if [ "$1" ] ; then
utime="$(date +%s)"
- echo "deploy.$1 1 $utime" | nc -w1 -q0 professor.pmtpa.wmnet
2003 || /bin/true
- echo "deploy.any 1 $utime" | nc -w1 -q0 professor.pmtpa.wmnet
2003 || /bin/true
+ echo "deploy.$1 1 $utime" | nc -w1 -q0 $MW_STATSD_HOST
$MW_STATSD_PORT || /bin/true
+ echo "deploy.any 1 $utime" | nc -w1 -q0 $MW_STATSD_HOST
$MW_STATSD_PORT || /bin/true
+ test -n "$2" && echo "deploy.${1}.timing:${2}000|ms" | nc -w1
-q0 $MW_STATSD_HOST $MW_STATSD_PORT || /bin/true
else
usage
fi
fi
-
diff --git a/files/scap/scap b/files/scap/scap
index c4480a2..4158b80 100755
--- a/files/scap/scap
+++ b/files/scap/scap
@@ -91,7 +91,7 @@
export DOLOGMSGNOLOG=""
$BINDIR/dologmsg "!log $USER finished scap${*:+: }$*"
-$BINDIR/deploy2graphite scap
+$BINDIR/deploy2graphite scap $DIFF
cleanup
exit 0
diff --git a/manifests/misc/deployment.pp b/manifests/misc/deployment.pp
index 55dbbbb..15f125a 100644
--- a/manifests/misc/deployment.pp
+++ b/manifests/misc/deployment.pp
@@ -366,6 +366,9 @@
if $::realm == 'production' {
$mw_rsync_host = 'tin.eqiad.wmnet'
+ $mw_statsd_host = 'professor.pmtpa.wmnet'
+ $mw_statsd_port = 2003
+
file { $mw_common_source:
ensure => directory,
replace => false, # FIXME: /a/common is a symlink on
some systems
@@ -376,6 +379,9 @@
} else {
$mw_rsync_host = 'deployment-bastion.pmtpa.wmflabs'
+ $mw_statsd_host = 'deployment-bastion.pmtpa.wmflabs'
+ $mw_statsd_port = 2003
+
file { '/data/project/apache':
ensure => directory,
owner => mwdeploy,
diff --git a/templates/misc/mw-deployment-vars.erb
b/templates/misc/mw-deployment-vars.erb
index 957e51a..0258475 100644
--- a/templates/misc/mw-deployment-vars.erb
+++ b/templates/misc/mw-deployment-vars.erb
@@ -6,3 +6,5 @@
MW_RSYNC_HOST=<%= mw_rsync_host %>
MW_DSH_ARGS=('-cM' '-g' 'mediawiki-installation' '-o' '-oSetupTimeout=30'
'-F30')
MW_RSYNC_ARGS=('-a' '--delay-updates' '--compress' '--delete'
'--exclude=**/.svn/lock' '--exclude=**/.git/objects'
'--exclude=**/.git/**/objects' '--no-perms')
+MW_STATSD_HOST=<%= mw_statsd_host %>
+MW_STATSD_PORT=<%= mw_statsd_port %>
--
To view, visit https://gerrit.wikimedia.org/r/96891
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4aa4d5881f31a9add137642d3a825850de6b1d3e
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
