Filippo Giunchedi has uploaded a new change for review. https://gerrit.wikimedia.org/r/172917
Change subject: swift: expand txstats complete configuration ...................................................................... swift: expand txstats complete configuration the txstatsd class configuration has no defaults and passing in more parameters doesn't merge those. Most importantly, this makes txstats create new metrics, because the default prefix is "stats". Thus as an hotfix pass in the complete config everywhere. Change-Id: I603bbe7ddad16d52ff3909105d55d76d18bfe41e --- M manifests/role/swift.pp 1 file changed, 42 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/17/172917/1 diff --git a/manifests/role/swift.pp b/manifests/role/swift.pp index 3cdc702..fc80edeb 100644 --- a/manifests/role/swift.pp +++ b/manifests/role/swift.pp @@ -114,7 +114,13 @@ class { '::txstatsd': settings => { statsd => { - 'carbon-cache-host' => 'graphite-in.eqiad.wmnet', + 'carbon-cache-host' => 'graphite-in.eqiad.wmnet', + 'carbon-cache-port' => 2004, + 'listen-port' => 8125, + 'statsd-compliance' => 0, + 'prefix' => '', + 'max-queue-size' => 1000 * 1000, + 'max-datapoints-per-message' => 10 * 1000, }, }, } @@ -129,7 +135,13 @@ class { '::txstatsd': settings => { statsd => { - 'carbon-cache-host' => 'graphite-in.eqiad.wmnet', + 'carbon-cache-host' => 'graphite-in.eqiad.wmnet', + 'carbon-cache-port' => 2004, + 'listen-port' => 8125, + 'statsd-compliance' => 0, + 'prefix' => '', + 'max-queue-size' => 1000 * 1000, + 'max-datapoints-per-message' => 10 * 1000, }, }, } @@ -237,7 +249,13 @@ class { '::txstatsd': settings => { statsd => { - 'carbon-cache-host' => 'graphite-in.eqiad.wmnet', + 'carbon-cache-host' => 'graphite-in.eqiad.wmnet', + 'carbon-cache-port' => 2004, + 'listen-port' => 8125, + 'statsd-compliance' => 0, + 'prefix' => '', + 'max-queue-size' => 1000 * 1000, + 'max-datapoints-per-message' => 10 * 1000, }, }, } @@ -250,7 +268,13 @@ class { '::txstatsd': settings => { statsd => { - 'carbon-cache-host' => 'graphite-in.eqiad.wmnet', + 'carbon-cache-host' => 'graphite-in.eqiad.wmnet', + 'carbon-cache-port' => 2004, + 'listen-port' => 8125, + 'statsd-compliance' => 0, + 'prefix' => '', + 'max-queue-size' => 1000 * 1000, + 'max-datapoints-per-message' => 10 * 1000, }, }, } @@ -393,7 +417,13 @@ class { '::txstatsd': settings => { statsd => { - 'carbon-cache-host' => "${::swift_new::params::graphite_host}", + 'carbon-cache-host' => "${::swift_new::params::graphite_host}", + 'carbon-cache-port' => 2004, + 'listen-port' => 8125, + 'statsd-compliance' => 0, + 'prefix' => '', + 'max-queue-size' => 1000 * 1000, + 'max-datapoints-per-message' => 10 * 1000, }, }, } @@ -428,7 +458,13 @@ class { '::txstatsd': settings => { statsd => { - 'carbon-cache-host' => "${::swift_new::params::graphite_host}", + 'carbon-cache-host' => "${::swift_new::params::graphite_host}", + 'carbon-cache-port' => 2004, + 'listen-port' => 8125, + 'statsd-compliance' => 0, + 'prefix' => '', + 'max-queue-size' => 1000 * 1000, + 'max-datapoints-per-message' => 10 * 1000, }, }, } -- To view, visit https://gerrit.wikimedia.org/r/172917 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I603bbe7ddad16d52ff3909105d55d76d18bfe41e 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