Filippo Giunchedi has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/377220 )
Change subject: thumbor: add logstash config for codfw ...................................................................... thumbor: add logstash config for codfw Also only use logstash handler if it is configured Bug: T150734 Change-Id: I027ccd6219cc763b6f634ade03a971551260b5e5 --- M hieradata/role/codfw/thumbor/mediawiki.yaml M modules/thumbor/templates/server.conf.erb 2 files changed, 7 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Filippo Giunchedi: Looks good to me, approved diff --git a/hieradata/role/codfw/thumbor/mediawiki.yaml b/hieradata/role/codfw/thumbor/mediawiki.yaml index 99fae32..307d71b 100644 --- a/hieradata/role/codfw/thumbor/mediawiki.yaml +++ b/hieradata/role/codfw/thumbor/mediawiki.yaml @@ -16,3 +16,6 @@ - '10.192.16.59:11211:1 "shard04"' # thumbor2004 thumbor::poolcounter_server: 'poolcounter2001.codfw.wmnet' + +thumbor::logstash_host: 'logstash.svc.eqiad.wmnet' +thumbor::logstash_port: 11514 diff --git a/modules/thumbor/templates/server.conf.erb b/modules/thumbor/templates/server.conf.erb index 0410291..1c65ef8 100644 --- a/modules/thumbor/templates/server.conf.erb +++ b/modules/thumbor/templates/server.conf.erb @@ -267,7 +267,11 @@ 'loggers': { '': { 'level': 'DEBUG', +<%- if @logstash_host != nil -%> 'handlers': ['debugstream', 'errorstream', 'http404', 'logstash'] +<% else %> + 'handlers': ['debugstream', 'errorstream', 'http404'] +<%- end -%> } } } -- To view, visit https://gerrit.wikimedia.org/r/377220 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I027ccd6219cc763b6f634ade03a971551260b5e5 Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Filippo Giunchedi <fgiunch...@wikimedia.org> Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org> Gerrit-Reviewer: Gilles <gdu...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits