Gilles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/235716
Change subject: Enable statsd in thumbor role
......................................................................
Enable statsd in thumbor role
Conveniently pointing to the stats role
Bug: T110858
Change-Id: I72bdf27e68ec6f3a46e9e0c0b36b1988a351cd1e
---
M puppet/modules/thumbor/manifests/init.pp
M puppet/modules/thumbor/templates/thumbor.conf.erb
2 files changed, 10 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/16/235716/1
diff --git a/puppet/modules/thumbor/manifests/init.pp
b/puppet/modules/thumbor/manifests/init.pp
index 75d8432..6688d75 100644
--- a/puppet/modules/thumbor/manifests/init.pp
+++ b/puppet/modules/thumbor/manifests/init.pp
@@ -20,6 +20,7 @@
$cfg_file,
) {
require ::virtualenv
+ include ::role::statsd
# jpegtran
require_package('libjpeg-progs')
@@ -29,7 +30,9 @@
# not used here by default because of
https://github.com/thumbor/opencv-engine/issues/16
require_package('python-opencv')
- $thumbor_cli = "${deploy_dir}/bin/thumbor -c '${cfg_file}'"
+ $statsd_host = "localhost"
+ $statsd_port = $::statsd::port
+ $statsd_prefix = "Thumbor"
virtualenv::environment { $deploy_dir:
ensure => present,
diff --git a/puppet/modules/thumbor/templates/thumbor.conf.erb
b/puppet/modules/thumbor/templates/thumbor.conf.erb
index 71b34c8..837fbf4 100644
--- a/puppet/modules/thumbor/templates/thumbor.conf.erb
+++ b/puppet/modules/thumbor/templates/thumbor.conf.erb
@@ -18,11 +18,15 @@
## Host to send statsd instrumentation to
## Defaults to: None
-#STATSD_HOST = None
+STATSD_HOST = '<%= @statsd_host %>'
+
+## Port to send statsd instrumentation to
+## Defaults to: None
+STATSD_PORT = <%= @statsd_port %>
## Prefix for statsd
## Defaults to: None
-#STATSD_PREFIX = None
+STATSD_PREFIX = '<%= @statsd_prefix %>'
################################################################################
--
To view, visit https://gerrit.wikimedia.org/r/235716
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I72bdf27e68ec6f3a46e9e0c0b36b1988a351cd1e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gilles <gdu...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
