Filippo Giunchedi has submitted this change and it was merged.
Change subject: graphite: move to graphite1001
......................................................................
graphite: move to graphite1001
point relevant graphite producer/consumer to graphite1001. Web-wise, migrate
only graphite.wikimedia.org for now.
Bug: T85909
Change-Id: I63bf225aaf3fa7b4f0537125351c862584e4db8e
---
M manifests/role/cache.pp
M manifests/role/diamond.pp
M modules/puppet_statsd/manifests/init.pp
M templates/varnish/misc.inc.vcl.erb
4 files changed, 6 insertions(+), 10 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 48575d4..aa75cb4 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -1606,6 +1606,7 @@
'gallium.wikimedia.org', # CI server
'ytterbium.wikimedia.org', # Gerrit
'tungsten.eqiad.wmnet',
+ 'graphite1001.eqiad.wmnet',
'zirconium.wikimedia.org',
'ruthenium.eqiad.wmnet', # parsoid rt test server
'logstash1001.eqiad.wmnet',
diff --git a/manifests/role/diamond.pp b/manifests/role/diamond.pp
index 85d3446..c7bbbd6 100644
--- a/manifests/role/diamond.pp
+++ b/manifests/role/diamond.pp
@@ -1,13 +1,6 @@
# role class for diamond
class role::diamond {
- #these are notes just for initial rollout and testing:
- #tungsten: 10.64.0.18
- #(labs) athens graphite server: 10.68.17.73
- #Once https://gerrit.wikimedia.org/r/#/c/131449/ merges
- #start batching in groups of 10 to start, for now current statsd can't
- #accept multiple metrics
-
case $::realm {
'labs': {
$host = '10.64.37.13' # labmon1001
@@ -17,7 +10,7 @@
$service = true
}
default: {
- $host = '10.64.0.18'
+ $host = '10.64.32.155' # graphite1001
$path_prefix = 'servers'
$keep_logs_for = '5'
$service = true
diff --git a/modules/puppet_statsd/manifests/init.pp
b/modules/puppet_statsd/manifests/init.pp
index f9bb6bd..0408cee 100644
--- a/modules/puppet_statsd/manifests/init.pp
+++ b/modules/puppet_statsd/manifests/init.pp
@@ -33,7 +33,7 @@
# ..and include the class:
#
# class { 'puppet_statsd':
-# statsd_host => 'tungsten.eqiad.wmnet',
+# statsd_host => 'statsd.eqiad.wmnet',
# }
#
class puppet_statsd(
diff --git a/templates/varnish/misc.inc.vcl.erb
b/templates/varnish/misc.inc.vcl.erb
index d55a9fa..95ac91b 100644
--- a/templates/varnish/misc.inc.vcl.erb
+++ b/templates/varnish/misc.inc.vcl.erb
@@ -14,8 +14,10 @@
set req.backend = ytterbium;
// No caching
return (pass);
- } elsif (req.http.Host == "gdash.wikimedia.org" || req.http.Host ==
"graphite.wikimedia.org" || req.http.Host == "performance.wikimedia.org") {
+ } elsif (req.http.Host == "gdash.wikimedia.org" || req.http.Host ==
"performance.wikimedia.org") {
set req.backend = tungsten;
+ } elsif (req.http.Host == "graphite.wikimedia.org") {
+ set req.backend = graphite1001;
} elsif (req.http.Host == "logstash.wikimedia.org"){
set req.backend = logstash;
} elsif (req.http.Host == "releases.wikimedia.org") {
--
To view, visit https://gerrit.wikimedia.org/r/188036
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I63bf225aaf3fa7b4f0537125351c862584e4db8e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
