Filippo Giunchedi has uploaded a new change for review. https://gerrit.wikimedia.org/r/294691
Change subject: swift: enable statsd for all daemons ...................................................................... swift: enable statsd for all daemons Graphite is a significantly better state now, enable statsd collection everywhere. Change-Id: Ia63e08363d36cac511b775184d9f20b692626ceb --- M modules/swift/templates/account-server.conf.erb M modules/swift/templates/container-server.conf.erb M modules/swift/templates/object-server.conf.erb M modules/swift/templates/proxy-server.conf.erb 4 files changed, 16 insertions(+), 13 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/91/294691/1 diff --git a/modules/swift/templates/account-server.conf.erb b/modules/swift/templates/account-server.conf.erb index 0a30523..ca79de1 100644 --- a/modules/swift/templates/account-server.conf.erb +++ b/modules/swift/templates/account-server.conf.erb @@ -4,11 +4,12 @@ devices = /srv/swift-storage/ workers = <%= @processorcount %> db_preallocation = on -# statsd collection is off for the initial deploy; on after figuring out ganglia issues -# 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 %> +log_statsd_port = 8125 +log_statsd_metric_prefix = <%= @statsd_metric_prefix %> +log_statsd_sample_rate_factor = <%= @statsd_sample_rate_factor %> +<% end -%> [pipeline:main] pipeline = recon account-server diff --git a/modules/swift/templates/container-server.conf.erb b/modules/swift/templates/container-server.conf.erb index f57c29e..68b48b1 100644 --- a/modules/swift/templates/container-server.conf.erb +++ b/modules/swift/templates/container-server.conf.erb @@ -4,10 +4,12 @@ devices = /srv/swift-storage/ workers = <%= @processorcount %> db_preallocation = on +<% if @statsd_host -%> log_statsd_host = <%= @statsd_host %> log_statsd_port = 8125 log_statsd_metric_prefix = <%= @statsd_metric_prefix %> log_statsd_sample_rate_factor = <%= @statsd_sample_rate_factor %> +<% end -%> [pipeline:main] diff --git a/modules/swift/templates/object-server.conf.erb b/modules/swift/templates/object-server.conf.erb index edfdcae..db99255 100644 --- a/modules/swift/templates/object-server.conf.erb +++ b/modules/swift/templates/object-server.conf.erb @@ -3,11 +3,12 @@ bind_port = 6000 devices = /srv/swift-storage/ workers = 100 -# statsd collection is off for the initial deploy; on after figuring out ganglia issues -# 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 %> +log_statsd_port = 8125 +log_statsd_metric_prefix = <%= @statsd_metric_prefix %> +log_statsd_sample_rate_factor = <%= @statsd_sample_rate_factor %> +<% end -%> [pipeline:main] diff --git a/modules/swift/templates/proxy-server.conf.erb b/modules/swift/templates/proxy-server.conf.erb index 0942e17..faa9a71 100644 --- a/modules/swift/templates/proxy-server.conf.erb +++ b/modules/swift/templates/proxy-server.conf.erb @@ -6,10 +6,9 @@ user = swift <% if @statsd_host -%> log_statsd_host = <%= @statsd_host %> -log_statsd_sample_rate_factor = <%= @statsd_sample_rate_factor %> -<% if @statsd_metric_prefix -%> +log_statsd_port = 8125 log_statsd_metric_prefix = <%= @statsd_metric_prefix %> -<% end -%> +log_statsd_sample_rate_factor = <%= @statsd_sample_rate_factor %> <% end -%> [pipeline:main] -- To view, visit https://gerrit.wikimedia.org/r/294691 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia63e08363d36cac511b775184d9f20b692626ceb Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Filippo Giunchedi <fgiunch...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
