Ori.livneh has submitted this change and it was merged.
Change subject: Use statsd service alias where appropriate
......................................................................
Use statsd service alias where appropriate
Replace references to tungsten.eqiad.wmnet as statsd host with the service
alias statsd.eqiad.wmnet.
Included: correction to a metric name in gdash.
Change-Id: I0a3bf99674a1a8e834926b61825ab49fd8bf7d26
---
M files/gdash/dashboards/frontend/6.totalPageLoadTime.mobile.day.graph
M files/misc/scripts/clear-profile
M files/udp2log/sqstat.pl
M manifests/misc/deployment.pp
M manifests/role/webperf.pp
M manifests/role/zuul.pp
M modules/base/manifests/init.pp
M modules/puppet_statsd/README.md
8 files changed, 10 insertions(+), 10 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/files/gdash/dashboards/frontend/6.totalPageLoadTime.mobile.day.graph
b/files/gdash/dashboards/frontend/6.totalPageLoadTime.mobile.day.graph
index 7ed30f0..e534ddc 100644
--- a/files/gdash/dashboards/frontend/6.totalPageLoadTime.mobile.day.graph
+++ b/files/gdash/dashboards/frontend/6.totalPageLoadTime.mobile.day.graph
@@ -1,4 +1,4 @@
-title 'mediaWikiLoadStart to document.onload on mobile sites, last day'
+title 'navigationStart to loadEventEnd on mobile sites, last hour'
linewidth 1
linemode 'connected'
hide_legend 'false'
@@ -7,8 +7,8 @@
field :q2, :color => 'blue',
:alias => 'Median',
- :data =>
'frontend.navtiming.mediaWikiLoadComplete.mobile.overall.median'
+ :data =>
'frontend.navtiming.totalPageLoadTime.mobile.overall.median'
field :q3, :color => 'red',
:alias => '75th percentile',
- :data =>
'frontend.navtiming.mediaWikiLoadComplete.mobile.overall.75percentile'
+ :data =>
'frontend.navtiming.totalPageLoadTime.mobile.overall.75percentile'
diff --git a/files/misc/scripts/clear-profile b/files/misc/scripts/clear-profile
index 79160c0..3826374 100755
--- a/files/misc/scripts/clear-profile
+++ b/files/misc/scripts/clear-profile
@@ -1,3 +1,3 @@
#!/bin/bash
-echo "-truncate" | nc -q0 -u tungsten.eqiad.wmnet 3811
+echo "-truncate" | nc -q0 -u statsd.eqiad.wmnet 3811
/usr/local/bin/dologmsg "!log $USER cleared profiling data"
diff --git a/files/udp2log/sqstat.pl b/files/udp2log/sqstat.pl
index a7ee73f..6834dcd 100755
--- a/files/udp2log/sqstat.pl
+++ b/files/udp2log/sqstat.pl
@@ -42,7 +42,7 @@
$0 = "/usr/local/bin/sqstat";
-my $carbon_server = "tungsten.eqiad.wmnet";
+my $carbon_server = "statsd.eqiad.wmnet";
my $carbon_port = 2003;
my $carbon = IO::Socket::INET->new(
PeerAddr => $carbon_server,
diff --git a/manifests/misc/deployment.pp b/manifests/misc/deployment.pp
index bfe31f7..4a78d4b 100644
--- a/manifests/misc/deployment.pp
+++ b/manifests/misc/deployment.pp
@@ -371,7 +371,7 @@
if $::realm == 'production' {
$mw_rsync_host = 'tin.eqiad.wmnet'
- $mw_carbon_host = 'tungsten.eqiad.wmnet'
+ $mw_carbon_host = 'statsd.eqiad.wmnet'
$mw_carbon_port = 2003
file { $mw_common_source:
diff --git a/manifests/role/webperf.pp b/manifests/role/webperf.pp
index acb6170..38543f4 100644
--- a/manifests/role/webperf.pp
+++ b/manifests/role/webperf.pp
@@ -4,7 +4,7 @@
# into StatsD.
#
class role::webperf {
- $statsd_host = 'tungsten.eqiad.wmnet'
+ $statsd_host = 'statsd.eqiad.wmnet'
# Aggregate client-side latency measurements collected via the
# NavigationTiming MediaWiki extension and send them to Graphite.
diff --git a/manifests/role/zuul.pp b/manifests/role/zuul.pp
index bed033c..8401c44 100644
--- a/manifests/role/zuul.pp
+++ b/manifests/role/zuul.pp
@@ -84,7 +84,7 @@
git_branch => 'master',
git_dir => $role::zuul::configuration::zuul_git_dir,
push_change_refs => false,
- statsd_host => '10.64.0.18', # tungsten.eqiad.wmnet
+ statsd_host => 'statsd.eqiad.wmnet',
}
# Serves Zuul git repositories on git://zuul.eqiad.wmnet/...
diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp
index 37a4c16..2eac31c 100644
--- a/modules/base/manifests/init.pp
+++ b/modules/base/manifests/init.pp
@@ -177,7 +177,7 @@
}
class { 'puppet_statsd':
- statsd_host => 'tungsten.eqiad.wmnet',
+ statsd_host => 'statsd.eqiad.wmnet',
metric_format => 'puppet.<%= metric %>',
}
diff --git a/modules/puppet_statsd/README.md b/modules/puppet_statsd/README.md
index ada6d9f..d2181bd 100644
--- a/modules/puppet_statsd/README.md
+++ b/modules/puppet_statsd/README.md
@@ -23,7 +23,7 @@
```puppet
class { 'puppet_statsd':
- statsd_host => 'tungsten.eqiad.wmnet',
+ statsd_host => 'statsd.eqiad.wmnet',
statsd_port => 8125,
metric_format => 'puppet.<%= metric %>.<%= hostname %>',
}
--
To view, visit https://gerrit.wikimedia.org/r/109465
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0a3bf99674a1a8e834926b61825ab49fd8bf7d26
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <o...@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
