Faidon Liambotis has submitted this change and it was merged.
Change subject: swift: add statsd support to proxy-server
......................................................................
swift: add statsd support to proxy-server
Enable statsd support, starting with proxies (object/account servers to
follow). Point to the newly provisioned tungsten as our working statsd
server.
The abstraction layers aren't very good but this is needed to remove the
logtailer machinery, which is a tad more important :-)
Change-Id: Id7920d2dabcf996520ad2dd88c8e7232b4078853
---
M manifests/role/swift.pp
M manifests/swift.pp
M templates/swift/proxy-server.conf.erb
3 files changed, 10 insertions(+), 8 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/swift.pp b/manifests/role/swift.pp
index 032839c..bc01362 100644
--- a/manifests/role/swift.pp
+++ b/manifests/role/swift.pp
@@ -41,6 +41,8 @@
proxy_address => "http://ms-fe.pmtpa.wmnet";,
num_workers => $::processorcount,
memcached_servers => [
"ms-fe1.pmtpa.wmnet:11211", "ms-fe2.pmtpa.wmnet:11211",
"ms-fe3.pmtpa.wmnet:11211", "ms-fe4.pmtpa.wmnet:11211" ],
+ statsd_host => '10.64.0.18', #
tungsten.eqiad.wmnet
+ statsd_metric_prefix =>
"swift.pmtpa.${::hostname}",
auth_backend => 'swauth',
super_admin_key =>
$passwords::swift::pmtpa-prod::super_admin_key,
rewrite_account =>
"AUTH_43651b15-ed7a-40b6-b745-47666abf8dfe",
@@ -91,6 +93,8 @@
proxy_address => "http://ms-fe.eqiad.wmnet";,
num_workers => $::processorcount,
memcached_servers => [
"ms-fe1001.eqiad.wmnet:11211", "ms-fe1002.eqiad.wmnet:11211",
"ms-fe1003.eqiad.wmnet:11211", "ms-fe1004.eqiad.wmnet:11211" ],
+ statsd_host => '10.64.0.18', #
tungsten.eqiad.wmnet
+ statsd_metric_prefix =>
"swift.eqiad.${::hostname}",
auth_backend => 'tempauth',
super_admin_key =>
$passwords::swift::eqiad-prod::super_admin_key,
rewrite_account => 'AUTH_mw',
diff --git a/manifests/swift.pp b/manifests/swift.pp
index fa8f168..4f1aa9a 100644
--- a/manifests/swift.pp
+++ b/manifests/swift.pp
@@ -35,7 +35,6 @@
'swift-doc',
'python-swift',
'python-swiftclient',
- 'python-ss-statsd',
]:
ensure => present;
}
diff --git a/templates/swift/proxy-server.conf.erb
b/templates/swift/proxy-server.conf.erb
index 43f784a..760213a 100644
--- a/templates/swift/proxy-server.conf.erb
+++ b/templates/swift/proxy-server.conf.erb
@@ -4,13 +4,12 @@
bind_port = <%= @bind_port %>
workers = <%= @num_workers %>
user = swift
-# You can enable default statsD logging here and/or override it in sections
-# below:
-## statsd logging disabled for the initial releas of 1.5.0
-#log_statsd_host = localhost
-#log_statsd_port = 8125
-#log_statsd_default_sample_rate = 1
-#log_statsd_metric_prefix =
+<% if @statsd_host -%>
+log_statsd_host = <%= @statsd_host %>
+<% end -%>
+<% if @statsd_metric_prefix -%>
+log_statsd_metric_prefix = <%= @statsd_metric_prefix %>
+<% end -%>
[pipeline:main]
<% if @auth_backend == 'swauth' -%>
--
To view, visit https://gerrit.wikimedia.org/r/88058
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id7920d2dabcf996520ad2dd88c8e7232b4078853
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
