Gehel has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/374806 )
Change subject: wdqs - tuning of logback configuration to send logs to logstash
......................................................................
wdqs - tuning of logback configuration to send logs to logstash
* since ${HOSTNAME} is lazy loaded in latest lgoback version, load it
explicitely
* rename the "program" field to be more explicit that those logs are about
wdqs
Bug: T172710
Change-Id: I0648d53d73b75c84f3b5ba352caa50237b3b323d
---
M modules/wdqs/manifests/init.pp
M modules/wdqs/manifests/updater.pp
M modules/wdqs/templates/blazegraph-default.erb
M modules/wdqs/templates/logback.xml.erb
M modules/wdqs/templates/updater-default.erb
5 files changed, 8 insertions(+), 4 deletions(-)
Approvals:
jenkins-bot: Verified
Gehel: Looks good to me, approved
diff --git a/modules/wdqs/manifests/init.pp b/modules/wdqs/manifests/init.pp
index 35c89eb..237b455 100644
--- a/modules/wdqs/manifests/init.pp
+++ b/modules/wdqs/manifests/init.pp
@@ -110,7 +110,7 @@
mode => '0644',
}
- wdqs::logback_config { 'blazegraph':
+ wdqs::logback_config { 'wdqs-blazegraph':
logstash_host => $logstash_host,
logstash_port => $logstash_json_port,
}
diff --git a/modules/wdqs/manifests/updater.pp
b/modules/wdqs/manifests/updater.pp
index be7b1c8..1382db3 100644
--- a/modules/wdqs/manifests/updater.pp
+++ b/modules/wdqs/manifests/updater.pp
@@ -23,7 +23,7 @@
before => Systemd::Unit['wdqs-updater'],
}
- wdqs::logback_config { 'updater':
+ wdqs::logback_config { 'wdqs-updater':
pattern => '%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} -
%msg%n',
logstash_host => $logstash_host,
logstash_port => $logstash_json_port,
diff --git a/modules/wdqs/templates/blazegraph-default.erb
b/modules/wdqs/templates/blazegraph-default.erb
index 49c13df..2eb3464 100644
--- a/modules/wdqs/templates/blazegraph-default.erb
+++ b/modules/wdqs/templates/blazegraph-default.erb
@@ -1,3 +1,3 @@
HEAP_SIZE="<%= @blazegraph_heap_size %>"
BLAZEGRAPH_OPTS="<%= @blazegraph_options %>"
-LOG_CONFIG=/etc/wdqs/logback-blazegraph.xml
+LOG_CONFIG=/etc/wdqs/logback-wdqs-blazegraph.xml
diff --git a/modules/wdqs/templates/logback.xml.erb
b/modules/wdqs/templates/logback.xml.erb
index 996ee3f..4057019 100644
--- a/modules/wdqs/templates/logback.xml.erb
+++ b/modules/wdqs/templates/logback.xml.erb
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
+
+ <!-- ugly trick to ensure ${HOSTNAME} is evaluated -->
+ <property scope="context" name="hostname" value="${HOSTNAME}" />
+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern><%= @pattern %></pattern>
diff --git a/modules/wdqs/templates/updater-default.erb
b/modules/wdqs/templates/updater-default.erb
index e3038e3..76410c8 100644
--- a/modules/wdqs/templates/updater-default.erb
+++ b/modules/wdqs/templates/updater-default.erb
@@ -1 +1 @@
-LOG_CONFIG=/etc/wdqs/logback-updater.xml
+LOG_CONFIG=/etc/wdqs/logback-wdqs-updater.xml
--
To view, visit https://gerrit.wikimedia.org/r/374806
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0648d53d73b75c84f3b5ba352caa50237b3b323d
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel <[email protected]>
Gerrit-Reviewer: Gehel <[email protected]>
Gerrit-Reviewer: Smalyshev <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
