Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/326177 )
Change subject: Gerrit: Enable logstash in gerrit
......................................................................
Gerrit: Enable logstash in gerrit
We are doing this so more users can help debug a problem (read logs)
since currently debugging (reading logs) requires server access, so the access
will be limited whereas allowing users to read the logs in kibana will help
releng.
Bug: T141324
Change-Id: I4262d85e4bd54c1190cdd2d12d839cf9a285d2ed
---
M hieradata/role/common/gerrit/server.yaml
M modules/gerrit/manifests/jetty.pp
M modules/gerrit/templates/log4j.properties.erb
3 files changed, 16 insertions(+), 1 deletion(-)
Approvals:
Paladox: Looks good to me, but someone else must approve
Chad: Looks good to me, but someone else must approve
jenkins-bot: Verified
Gehel: Looks good to me, but someone else must approve
Dzahn: Looks good to me, approved
diff --git a/hieradata/role/common/gerrit/server.yaml
b/hieradata/role/common/gerrit/server.yaml
index 4303f62..dd902c8 100644
--- a/hieradata/role/common/gerrit/server.yaml
+++ b/hieradata/role/common/gerrit/server.yaml
@@ -21,3 +21,4 @@
- '+refs/heads/*:refs/heads/*'
- '+refs/tags/*:refs/tags/*'
role::gerrit::server::bacula: 'srv-gerrit-git'
+gerrit::jetty::log_host: 'logstash1002.eqiad.wmnet'
diff --git a/modules/gerrit/manifests/jetty.pp
b/modules/gerrit/manifests/jetty.pp
index 0605bf0..875c60d 100644
--- a/modules/gerrit/manifests/jetty.pp
+++ b/modules/gerrit/manifests/jetty.pp
@@ -9,6 +9,8 @@
$heap_limit = '28g',
$slave = false,
$java_home = '/usr/lib/jvm/java-8-openjdk-amd64/jre',
+ $log_host = undef,
+ $log_port = '4560'
) {
include nrpe
diff --git a/modules/gerrit/templates/log4j.properties.erb
b/modules/gerrit/templates/log4j.properties.erb
index 2f1b556..f899661 100644
--- a/modules/gerrit/templates/log4j.properties.erb
+++ b/modules/gerrit/templates/log4j.properties.erb
@@ -13,13 +13,25 @@
# limitations under the License.
#
-log4j.rootLogger=DEBUG, error_log
+log4j.rootLogger=DEBUG, error_log<% if @log_host %>, tcp<% end %>
log4j.logger.com.google.gerrit.sshd.SshLog=DEBUG, sshd_log
log4j.logger.com.google.gerrit.pgm.http.jetty.HttpLog=DEBUG, httpd_log
log4j.logger.gc_log=DEBUG, gc_log
# Prevent gc_log from outputting to error_log
log4j.additivity.gc_log=false
+<% if @log_host %>
+### Logstash
+
+log4j.appender.tcp=org.apache.log4j.net.SocketAppender
+log4j.appender.tcp.Port=<%= @log_port %>
+log4j.appender.tcp.RemoteHost=<%= @log_host %>
+log4j.appender.tcp.ReconnectionDelay=10000
+log4j.appender.tcp.Application=playground
+<% end %>
+
+###
+
# Configure log appenders as defaults
log4j.appender.error_log=org.apache.log4j.DailyRollingFileAppender
log4j.appender.error_log.File=/var/lib/gerrit2/review_site/logs/error_log
--
To view, visit https://gerrit.wikimedia.org/r/326177
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4262d85e4bd54c1190cdd2d12d839cf9a285d2ed
Gerrit-PatchSet: 26
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Gehel <gleder...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
