Gehel has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/352655 )
Change subject: elasticsearch - do not define gelf appender if it is unused
......................................................................
elasticsearch - do not define gelf appender if it is unused
just defining the appender, even if unused, will make elasticsearch try to
load the gelf plugin, which might not be available if we do not want to
activate gelf.
Change-Id: I43f22df455f1aacaa271029013eb7032b202d793
---
M modules/elasticsearch/templates/log4j2.properties.erb
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
EBernhardson: Looks good to me, but someone else must approve
jenkins-bot: Verified
Gehel: Looks good to me, approved
diff --git a/modules/elasticsearch/templates/log4j2.properties.erb
b/modules/elasticsearch/templates/log4j2.properties.erb
index 0799c0c..79ad21d 100644
--- a/modules/elasticsearch/templates/log4j2.properties.erb
+++ b/modules/elasticsearch/templates/log4j2.properties.erb
@@ -58,6 +58,7 @@
appender.index_indexing_slow_log_file.layout.type = PatternLayout
appender.index_indexing_slow_log_file.layout.pattern =
[%d{ISO8601}][%-5p][%-25c] %m%n
+<% if @send_logs_to_logstash %>
# ship_to_logstash needs to also be added to rootLogger to actually ship logs
appender.ship_to_logstash.name = ship_to_logstash
appender.ship_to_logstash.type = Gelf
@@ -66,3 +67,4 @@
appender.ship_to_logstash.originHost = <%= @hostname %>
appender.ship_to_logstash.facility = elasticsearch
appender.ship_to_logstash.extractStackTrace = true
+<% end %>
--
To view, visit https://gerrit.wikimedia.org/r/352655
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I43f22df455f1aacaa271029013eb7032b202d793
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel <guillaume.leder...@wikimedia.org>
Gerrit-Reviewer: EBernhardson <ebernhard...@wikimedia.org>
Gerrit-Reviewer: Gehel <guillaume.leder...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
