Ori.livneh has uploaded a new change for review. https://gerrit.wikimedia.org/r/108013
Change subject: Port statsd role to use txStatsD; apply to tungsten ...................................................................... Port statsd role to use txStatsD; apply to tungsten See I19ecf608d for details and rationale. Change-Id: I4a8613d793f8f5e4c97eca642f138b30b36035ba --- D manifests/role/statsd.pp A manifests/role/txstatsd.pp M manifests/site.pp 3 files changed, 21 insertions(+), 18 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/13/108013/1 diff --git a/manifests/role/statsd.pp b/manifests/role/statsd.pp deleted file mode 100644 index 990ef19..0000000 --- a/manifests/role/statsd.pp +++ /dev/null @@ -1,15 +0,0 @@ -# == Class: role::statsd -# -# StatsD is a simple network daemon that listens to application metrics -# and aggregates them for easy plotting and analysis in Graphite or -# Ganglia. -# -class role::statsd { - class { '::statsd': - settings => { - backends => [ 'graphite' ], - graphiteHost => 'tungsten.eqiad.wmnet', - graphitePort => 2003, - }, - } -} diff --git a/manifests/role/txstatsd.pp b/manifests/role/txstatsd.pp new file mode 100644 index 0000000..da41681 --- /dev/null +++ b/manifests/role/txstatsd.pp @@ -0,0 +1,19 @@ +# == Class: role::txstatsd +# +# txStatsD is a network daemon that listens on a socket for metric data (like +# timers and counters) and writes aggregates to a metric storage backend like +# Graphite or Ganglia. See <https://github.com/sidnei/txstatsd>. +# +class role::txstatsd { + class { '::txstatsd': + settings => { + statsd => { + 'carbon-cache-host' => 'localhost', + 'carbon-cache-port' => 2003, + 'listen-port' => 8125, + 'listen-tcp-port' => 8125, + 'statsd-compliance' => 0, + }, + }, + } +} diff --git a/manifests/site.pp b/manifests/site.pp index 77731fd..06d80f3 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -2535,12 +2535,11 @@ webperf::navtiming } -# StatsD & Graphite host for eqiad. Slotted to replace professor.pmtpa. -# RT #5871 +# StatsD & Graphite node 'tungsten.eqiad.wmnet' { include standard - include role::statsd include role::graphite + include role::txstatsd include role::gdash include role::mwprof } -- To view, visit https://gerrit.wikimedia.org/r/108013 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4a8613d793f8f5e4c97eca642f138b30b36035ba Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ori.livneh <o...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits