GWicke has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177078
Change subject: Add statsd host in restbase config
......................................................................
Add statsd host in restbase config
Change-Id: I490e47024b690256d037f68f4436a03e156fc4ef
---
M hieradata/mainrole/restbase.yaml
M modules/restbase/manifests/init.pp
M modules/restbase/templates/config.yaml.erb
3 files changed, 7 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/78/177078/1
diff --git a/hieradata/mainrole/restbase.yaml b/hieradata/mainrole/restbase.yaml
index 11ea3cc..43d3d0f 100644
--- a/hieradata/mainrole/restbase.yaml
+++ b/hieradata/mainrole/restbase.yaml
@@ -17,3 +17,4 @@
- praseodymium.eqiad.wmnet
restbase::logstash_host: logstash1002.eqiad.wmnet
restbase::cassandra_defaultConsistency: localQuorum
+restbase::statsd_host: statsd.eqiad.wmnet
diff --git a/modules/restbase/manifests/init.pp
b/modules/restbase/manifests/init.pp
index 3e190ee..904abeb 100644
--- a/modules/restbase/manifests/init.pp
+++ b/modules/restbase/manifests/init.pp
@@ -21,6 +21,8 @@
# GELF logging host. Default: localhost
# [*logstash_port*]
# GELF logging port. Default: 12201
+# [*statsd_host*]
+# statsd host name. Default: localhost
#
class restbase(
$cassandra_user = 'cassandra',
@@ -30,6 +32,7 @@
$port = 7231,
$logstash_host = 'localhost',
$logstash_port = 12201,
+ $statsd_host = 'localhost',
) {
ensure_packages( ['nodejs', 'nodejs-legacy', 'npm'] )
diff --git a/modules/restbase/templates/config.yaml.erb
b/modules/restbase/templates/config.yaml.erb
index e10d00e..141fced 100644
--- a/modules/restbase/templates/config.yaml.erb
+++ b/modules/restbase/templates/config.yaml.erb
@@ -22,3 +22,6 @@
- type: gelf
host: <%= @logstash_host %>
port: <%= @logstash_port %>
+
+monitoring:
+ statsdHost: <%= @statsd_host %>
--
To view, visit https://gerrit.wikimedia.org/r/177078
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I490e47024b690256d037f68f4436a03e156fc4ef
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: GWicke <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
