Filippo Giunchedi has submitted this change and it was merged.
Change subject: swift: report statsd data to localhost
......................................................................
swift: report statsd data to localhost
this is similar to Ia95564b1b but for the legacy swift puppet module/role in
eqiad and esams
Change-Id: I7801c2748db1a95bdb54cb9e7077218df6b835f0
---
M manifests/role/swift.pp
M manifests/swift.pp
2 files changed, 35 insertions(+), 3 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
Alexandros Kosiaris: Looks good to me, but someone else must approve
diff --git a/manifests/role/swift.pp b/manifests/role/swift.pp
index 55e315b..3cdc702 100644
--- a/manifests/role/swift.pp
+++ b/manifests/role/swift.pp
@@ -84,7 +84,7 @@
}
class proxy inherits role::swift::eqiad-prod {
class { '::swift::proxy':
- statsd_host => 'statsd.eqiad.wmnet',
+ statsd_host => 'localhost',
statsd_metric_prefix => "swift.eqiad-prod.${::hostname}",
bind_port => '80',
proxy_address => 'http://ms-fe.eqiad.wmnet',
@@ -110,6 +110,14 @@
include role::swift::icehouse
include ::swift_new::params
include ::swift_new::container_sync
+
+ class { '::txstatsd':
+ settings => {
+ statsd => {
+ 'carbon-cache-host' => 'graphite-in.eqiad.wmnet',
+ },
+ },
+ }
}
class storage inherits role::swift::eqiad-prod {
include ::swift::storage
@@ -117,6 +125,14 @@
include role::swift::icehouse
include ::swift_new::params
include ::swift_new::container_sync
+
+ class { '::txstatsd':
+ settings => {
+ statsd => {
+ 'carbon-cache-host' => 'graphite-in.eqiad.wmnet',
+ },
+ },
+ }
}
}
class esams-prod inherits role::swift::base {
@@ -195,7 +211,7 @@
}
class proxy inherits role::swift::esams-prod {
class { '::swift::proxy':
- statsd_host => 'statsd.eqiad.wmnet',
+ statsd_host => 'localhost',
statsd_metric_prefix => "swift.esams-prod.${::hostname}",
bind_port => '80',
proxy_address => 'http://ms-fe.esams.wmnet',
@@ -217,11 +233,27 @@
host => 'ms-fe.esams.wmnet',
}
include role::swift::icehouse
+
+ class { '::txstatsd':
+ settings => {
+ statsd => {
+ 'carbon-cache-host' => 'graphite-in.eqiad.wmnet',
+ },
+ },
+ }
}
class storage inherits role::swift::esams-prod {
include ::swift::storage
include ::swift::storage::monitoring
include role::swift::icehouse
+
+ class { '::txstatsd':
+ settings => {
+ statsd => {
+ 'carbon-cache-host' => 'graphite-in.eqiad.wmnet',
+ },
+ },
+ }
}
}
diff --git a/manifests/swift.pp b/manifests/swift.pp
index 84ccb19..13b7e5c 100644
--- a/manifests/swift.pp
+++ b/manifests/swift.pp
@@ -228,7 +228,7 @@
}
class config (
- $statsd_host = 'statsd.eqiad.wmnet',
+ $statsd_host = 'localhost',
$statsd_metric_prefix =
"swift.${::swift::base::cluster_name}.${::hostname}"
){
require swift::storage::packages
--
To view, visit https://gerrit.wikimedia.org/r/172549
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7801c2748db1a95bdb54cb9e7077218df6b835f0
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[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
