Ori.livneh has submitted this change and it was merged.
Change subject: Add statsd host in restbase config
..
Add statsd host in restbase config
RESTBase systematically emits metrics for response times and
error rates per entry point and method via statsd. This includes
every backend request, so we get monitoring of each backend service
for free.
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(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
Ottomata: Looks good to me, but someone else must approve
Jdouglas: Looks good to me, but someone else must approve
jenkins-bot: Verified
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: merged
Gerrit-Change-Id: I490e47024b690256d037f68f4436a03e156fc4ef
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: GWicke
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: GWicke
Gerrit-Reviewer: Gage
Gerrit-Reviewer: Jdouglas
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: Ottomata
Gerrit-Reviewer: Yuvipanda
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
