Gehel has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/342618 )
Change subject: elasticsearch - enable shipping logs to logstash for
elasticsearch 5.x
......................................................................
elasticsearch - enable shipping logs to logstash for elasticsearch 5.x
Shipping logs to logstash was disabled pending more testing. Testing has
been done on relforge1001 and seems to be working just fine. The library
used to ship logs is still the same, but the appender used is the one
compatible with log4j2.
Change-Id: I7c7b32b0f651f30918717d11737f5a7a1ff610aa
---
M modules/elasticsearch/templates/log4j2.properties.erb
1 file changed, 9 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/18/342618/1
diff --git a/modules/elasticsearch/templates/log4j2.properties.erb
b/modules/elasticsearch/templates/log4j2.properties.erb
index 9d0e276..3d47237 100644
--- a/modules/elasticsearch/templates/log4j2.properties.erb
+++ b/modules/elasticsearch/templates/log4j2.properties.erb
@@ -2,7 +2,7 @@
rootLogger.level = info
rootLogger.appenderRef.file.ref = file
<% if @send_logs_to_logstash %>
-#rootLogger.appenderRef.ship_to_logstash.ref = ship_to_logstash
+rootLogger.appenderRef.ship_to_logstash.ref = ship_to_logstash
<% end %>
# log action execution errors for easier debugging
@@ -59,13 +59,11 @@
appender.index_indexing_slow_log_file.layout.pattern =
[%d{ISO8601}][%-5p][%-25c] %m%n
# ship_to_logstash needs to also be added to rootLogger to actually ship logs
-# @TODO This class is for log4j v1, for v2 should we test
-# org.graylog2.log4j2.GelfAppender ?
-#appender.ship_to_logstash.name = ship_to_logstash
-#appender.ship_to_logstash.type = biz.paluch.logging.gelf.log4j.GelfLogAppender
-#appender.ship_to_logstash.host = udp:<%= @graylog_host %>
-#appender.ship_to_logstash.port <%= @graylog_port %>
-#appender.ship_to_logstash.originHost = <%= @hostname %>
-#appender.ship_to_logstash.facility = elasticsearch
-#appender.ship_to_logstash.extractStackTrace = true
-#appender.ship_to_logstash.threshold = DEBUG
+appender.ship_to_logstash.name = ship_to_logstash
+appender.ship_to_logstash.type = Gelf
+appender.ship_to_logstash.host = udp:<%= @graylog_host %>
+appender.ship_to_logstash.port = <%= @graylog_port %>
+appender.ship_to_logstash.originHost = <%= @hostname %>
+appender.ship_to_logstash.facility = elasticsearch
+appender.ship_to_logstash.extractStackTrace = true
+appender.ship_to_logstash.threshold = DEBUG
--
To view, visit https://gerrit.wikimedia.org/r/342618
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7c7b32b0f651f30918717d11737f5a7a1ff610aa
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel <guillaume.leder...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
