Ori.livneh has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/83602


Change subject: Make defaults for StatsD module more sensible
......................................................................

Make defaults for StatsD module more sensible

* Management interface available on localhost interface only.
* Load Graphite and Ganglia backends by default. (The backend modules do
  nothing unless they are configured, so merely loading them does not
  alter behavior.)

Change-Id: Ia24f0a7c0a6af32efed73cbdfea63a7fb8be8af8
---
M manifests/misc/graphite.pp
M modules/statsd/manifests/init.pp
2 files changed, 2 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/02/83602/1

diff --git a/manifests/misc/graphite.pp b/manifests/misc/graphite.pp
index 9989c6f..3a2afb5 100644
--- a/manifests/misc/graphite.pp
+++ b/manifests/misc/graphite.pp
@@ -146,11 +146,8 @@
         graphite_host => 'professor.pmtpa.wmnet',
         graphite_port => 2003,
         settings      => {
-            backends         => [ './backends/graphite', './backends/ganglia' 
],
             flushInterval    => 5 * 60 * 1000,  # 5 min.
-            # Listen on loopback interface only.
             address          => $statsd_host,
-            mgmt_address     => $statsd_host,
             percentThreshold => [ 95 ],
             # Show frequency distribution of client-side latency times.
             # See <http://tinyurl.com/statsd-histograms>.
diff --git a/modules/statsd/manifests/init.pp b/modules/statsd/manifests/init.pp
index 7873af4..678820a 100644
--- a/modules/statsd/manifests/init.pp
+++ b/modules/statsd/manifests/init.pp
@@ -36,8 +36,10 @@
 ) {
     $config = ordered_json($settings, {
         port         => $port,
+        backends     => [ './backends/graphite', './backends/ganglia' ],
         graphiteHost => $graphite_host,
         graphitePort => $graphite_port,
+        mgmt_address => '127.0.0.1',
     })
 
     package { 'statsd':

-- 
To view, visit https://gerrit.wikimedia.org/r/83602
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia24f0a7c0a6af32efed73cbdfea63a7fb8be8af8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to