Ori.livneh has submitted this change and it was merged.
Change subject: route navtiming stats directly to statsd instance on tungsten
......................................................................
route navtiming stats directly to statsd instance on tungsten
hafnium has a public IP, so listening on all interfaces for metrics won't do,
obviously. I'll decom.
Change-Id: I5a753d36f21d405224d4cdef0d1b5523643bc7dd
---
M manifests/role/txstatsd.pp
M manifests/role/webperf.pp
2 files changed, 7 insertions(+), 4 deletions(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
diff --git a/manifests/role/txstatsd.pp b/manifests/role/txstatsd.pp
index c9bee06..da41681 100644
--- a/manifests/role/txstatsd.pp
+++ b/manifests/role/txstatsd.pp
@@ -8,7 +8,7 @@
class { '::txstatsd':
settings => {
statsd => {
- 'carbon-cache-host' => 'tungsten.eqiad.wmnet',
+ 'carbon-cache-host' => 'localhost',
'carbon-cache-port' => 2003,
'listen-port' => 8125,
'listen-tcp-port' => 8125,
diff --git a/manifests/role/webperf.pp b/manifests/role/webperf.pp
index 4273404..acb6170 100644
--- a/manifests/role/webperf.pp
+++ b/manifests/role/webperf.pp
@@ -4,17 +4,20 @@
# into StatsD.
#
class role::webperf {
- include ::role::txstatsd
+ $statsd_host = 'tungsten.eqiad.wmnet'
# Aggregate client-side latency measurements collected via the
# NavigationTiming MediaWiki extension and send them to Graphite.
# See <https://www.mediawiki.org/wiki/Extension:NavigationTiming>
class { '::webperf::navtiming':
- endpoint => 'tcp://vanadium.eqiad.wmnet:8600',
+ endpoint => 'tcp://vanadium.eqiad.wmnet:8600',
+ statsd_host => $statsd_host,
}
# Provisions a service which gather stats about static assets count
# and size using a headless browser instance. Stats are forwarded to
# Ganglia using gmetric.
- class { '::webperf::asset_check': }
+ class { '::webperf::asset_check':
+ statsd_host => $statsd_host,
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/108904
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5a753d36f21d405224d4cdef0d1b5523643bc7dd
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
