Filippo Giunchedi has submitted this change and it was merged. Change subject: enable statsd reporting for swift proxy ......................................................................
enable statsd reporting for swift proxy ATM only the proxy template has statsd reporting, will submit another code review to extend that support to other components also set the default sample rate to 10% as a first attempt to not swamp stats with traffic. note the metric name, the sample_rate metric used before has been introducted in swift 1.8 so it can and will be used after we have upgraded https://bugs.launchpad.net/swift/+bug/1090495 Change-Id: I0bcdc959769b64867d92198b9da42b6b2574731a --- M manifests/role/swift.pp M manifests/swift.pp M templates/swift/proxy-server.conf.erb 3 files changed, 8 insertions(+), 0 deletions(-) Approvals: Filippo Giunchedi: Verified; Looks good to me, approved Giuseppe Lavagetto: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/manifests/role/swift.pp b/manifests/role/swift.pp index ce30b59..1716050 100644 --- a/manifests/role/swift.pp +++ b/manifests/role/swift.pp @@ -35,6 +35,9 @@ } class proxy inherits role::swift::eqiad-prod { class { "::swift::proxy": + statsd_host => 'statsd.eqiad.wmnet', + statsd_metric_prefix => "swift.eqiad-prod.${::hostname}", + statsd_default_sample_rate => '0.1', bind_port => "80", proxy_address => "http://ms-fe.eqiad.wmnet";, num_workers => $::processorcount, @@ -85,6 +88,9 @@ } class proxy inherits role::swift::esams-prod { class { "::swift::proxy": + statsd_host => 'statsd.eqiad.wmnet', + statsd_metric_prefix => "swift.esams-prod.${::hostname}", + statsd_default_sample_rate => '0.1', bind_port => "80", proxy_address => "http://ms-fe.esams.wmnet";, num_workers => $::processorcount, diff --git a/manifests/swift.pp b/manifests/swift.pp index 52388ec..638e873 100644 --- a/manifests/swift.pp +++ b/manifests/swift.pp @@ -105,6 +105,7 @@ $statsd_host = undef, $statsd_metric_prefix = undef, $statsd_sample_rate_factor = '1', + $statsd_default_sample_rate = '1', $bind_port = '8080', $proxy_address, $memcached_servers, diff --git a/templates/swift/proxy-server.conf.erb b/templates/swift/proxy-server.conf.erb index cb07340..f6e513c 100644 --- a/templates/swift/proxy-server.conf.erb +++ b/templates/swift/proxy-server.conf.erb @@ -7,6 +7,7 @@ <% if @statsd_host -%> log_statsd_host = <%= @statsd_host %> log_statsd_sample_rate_factor = <%= @statsd_sample_rate_factor %> +log_statsd_default_sample_rate = <%= @statsd_default_sample_rate %> <% if @statsd_metric_prefix -%> log_statsd_metric_prefix = <%= @statsd_metric_prefix %> <% end -%> -- To view, visit https://gerrit.wikimedia.org/r/138574 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0bcdc959769b64867d92198b9da42b6b2574731a Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Filippo Giunchedi <[email protected]> Gerrit-Reviewer: Andrew Bogott <[email protected]> Gerrit-Reviewer: Faidon Liambotis <[email protected]> Gerrit-Reviewer: Filippo Giunchedi <[email protected]> Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]> Gerrit-Reviewer: Ori.livneh <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
