Skip to content

Commit

Permalink
add logstash-logback-encoder and janino dependency;
Browse files Browse the repository at this point in the history 
add RollingFileAppender to logback.xml;

Signed-off-by: Stefan Maute <stefan.maute@bosch.io>
  • Loading branch information
Stefan Maute committed May 20, 2021
1 parent 540bb4c commit 0b840e5
Show file tree
Hide file tree
Showing 13 changed files with 297 additions and 33 deletions.
17 changes: 17 additions & 0 deletions bom/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@

<slf4j.version>1.7.30</slf4j.version>
<logback.version>1.2.3</logback.version>
<logstash-logback-encoder.version>6.4</logstash-logback-encoder.version>
<janino.version>2.7.8</janino.version>

<!-- ### Metrics and Tracing -->
<kamon-core.version>2.1.4</kamon-core.version>
Expand Down Expand Up @@ -362,11 +364,26 @@
<version>${slf4j.version}</version>
</dependency>

<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>${logback.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${logback.version}</version>
</dependency>
<dependency>
<groupId>net.logstash.logback</groupId>
<artifactId>logstash-logback-encoder</artifactId>
<version>${logstash-logback-encoder.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.janino</groupId>
<artifactId>janino</artifactId>
<version>${janino.version}</version>
</dependency>

<dependency>
<groupId>io.kamon</groupId>
Expand Down
14 changes: 14 additions & 0 deletions concierge/service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,20 @@
<artifactId>logback-classic</artifactId>
</dependency>

<!-- logstash appender logging -->
<dependency>
<groupId>org.codehaus.janino</groupId>
<artifactId>janino</artifactId>
</dependency>
<dependency>
<groupId>net.logstash.logback</groupId>
<artifactId>logstash-logback-encoder</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>

<!-- ### Testing ### -->
<dependency>
<groupId>org.awaitility</groupId>
Expand Down
35 changes: 30 additions & 5 deletions concierge/service/src/main/resources/logback.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,34 @@
<appender name="stash" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
<destination>${LOGSTASH_SERVER}</destination>

<!-- encoder is required -->
<!-- Encoder is required -->
<encoder class="net.logstash.logback.encoder.LogstashEncoder">
<customFields>{"appname":"concierge","instance_index":"${INSTANCE_INDEX}","host_environment":"${K8S_NAMESPACE}"}</customFields>
<customFields>{"appname":"concierge","instance_index":"${INSTANCE_INDEX}"}</customFields>
</encoder>
</appender>
</then>
</if>

<if condition='isDefined("FILE_APPENDER")'>
<then>
<appender name="file" class="ch.qos.logback.core.rolling.RollingFileAppender">
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>info</level>
</filter>
<file>concierge.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>concierge.log.%d{yyyy-MM-dd}.gz</fileNamePattern>
<!-- Keep 30 days' worth of history capped at 1GB total size -->
<maxHistory>30</maxHistory>
<totalSizeCap>1GB</totalSizeCap>
</rollingPolicy>
<encoder class="net.logstash.logback.encoder.LogstashEncoder">
<customFields>{"appname":"concierge","instance_index":"${INSTANCE_INDEX}"}</customFields>
</encoder>
</appender>
</then>
</if>

<!--<logger name="akka.actor" level="DEBUG"/>-->
<logger name="akka.management.cluster.bootstrap.contactpoint.HttpClusterBootstrapRoutes" level="WARN"/>
<logger name="akka.management.cluster.bootstrap.internal.BootstrapCoordinator" level="WARN"/>

Expand All @@ -52,21 +71,27 @@


<root level="${LOG_LEVEL:-INFO}">
<!-- logging INFO messages can be disabled by setting environment variable -->
<!-- Logging INFO messages can be disabled by setting environment variable -->
<if condition='isNull("DISABLE_SYSOUT_LOG")'>
<then>
<appender-ref ref="STDOUT"/>
</then>
</if>

<!-- always log ERRORs to syserr -->
<!-- Always log ERRORs to syserr -->
<appender-ref ref="STDERR"/>

<if condition='isDefined("LOGSTASH_SERVER")'>
<then>
<appender-ref ref="stash"/>
</then>
</if>

<if condition='isDefined("FILE_APPENDER")'>
<then>
<appender-ref ref="file"/>
</then>
</if>
</root>

</configuration>
15 changes: 15 additions & 0 deletions connectivity/service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,21 @@ jmh-generator-annprocess). jmh-generator-annprocess overwrites the whole META-IN
<groupId>org.atteo.classindex</groupId>
<artifactId>classindex</artifactId>
</dependency>

<!-- logstash appender logging -->
<dependency>
<groupId>org.codehaus.janino</groupId>
<artifactId>janino</artifactId>
</dependency>
<dependency>
<groupId>net.logstash.logback</groupId>
<artifactId>logstash-logback-encoder</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>

<!-- ### Testing ### -->
<dependency>
<groupId>org.openjdk.jmh</groupId>
Expand Down
36 changes: 31 additions & 5 deletions connectivity/service/src/main/resources/logback.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,35 @@
<appender name="stash" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
<destination>${LOGSTASH_SERVER}</destination>

<!-- encoder is required -->
<!-- Encoder is required -->
<encoder class="net.logstash.logback.encoder.LogstashEncoder">
<customFields>{"appname":"connectivity","instance_index":"${INSTANCE_INDEX}","host_environment":"${K8S_NAMESPACE}"}</customFields>
<customFields>{"appname":"connectivity","instance_index":"${INSTANCE_INDEX}"}</customFields>
</encoder>
</appender>
</then>
</if>

<!-- do not print INFO cluster messages of mongo driver: -->
<if condition='isDefined("FILE_APPENDER")'>
<then>
<appender name="file" class="ch.qos.logback.core.rolling.RollingFileAppender">
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>info</level>
</filter>
<file>connectivity.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>connectivity.log.%d{yyyy-MM-dd}.gz</fileNamePattern>
<!-- Keep 30 days' worth of history capped at 1GB total size -->
<maxHistory>30</maxHistory>
<totalSizeCap>1GB</totalSizeCap>
</rollingPolicy>
<encoder class="net.logstash.logback.encoder.LogstashEncoder">
<customFields>{"appname":"connectivity","instance_index":"${INSTANCE_INDEX}"}</customFields>
</encoder>
</appender>
</then>
</if>

<!-- Do not print INFO cluster messages of mongo driver: -->
<logger name="org.mongodb.driver" level="WARN"/>

<logger name="akka.management.cluster.bootstrap.contactpoint.HttpClusterBootstrapRoutes" level="WARN"/>
Expand All @@ -55,21 +75,27 @@
<logger name="org.eclipse.ditto" level="${LOG_LEVEL_APPLICATION:-INFO}"/>

<root level="${LOG_LEVEL:-INFO}">
<!-- logging INFO messages can be disabled by setting environment variable -->
<!-- Logging INFO messages can be disabled by setting environment variable -->
<if condition='isNull("DISABLE_SYSOUT_LOG")'>
<then>
<appender-ref ref="STDOUT"/>
</then>
</if>

<!-- always log ERRORs to syserr -->
<!-- Always log ERRORs to syserr -->
<appender-ref ref="STDERR"/>

<if condition='isDefined("LOGSTASH_SERVER")'>
<then>
<appender-ref ref="stash"/>
</then>
</if>

<if condition='isDefined("FILE_APPENDER")'>
<then>
<appender-ref ref="file"/>
</then>
</if>
</root>

</configuration>
13 changes: 13 additions & 0 deletions gateway/service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,19 @@
<artifactId>ditto-concierge-api</artifactId>
</dependency>

<!-- logstash appender logging -->
<dependency>
<groupId>org.codehaus.janino</groupId>
<artifactId>janino</artifactId>
</dependency>
<dependency>
<groupId>net.logstash.logback</groupId>
<artifactId>logstash-logback-encoder</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>

<!-- ### Testing ### -->
<dependency>
Expand Down
38 changes: 30 additions & 8 deletions gateway/service/src/main/resources/logback.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,35 @@
<appender name="stash" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
<destination>${LOGSTASH_SERVER}</destination>

<!-- encoder is required -->
<!-- Encoder is required -->
<encoder class="net.logstash.logback.encoder.LogstashEncoder">
<customFields>{"appname":"gateway","instance_index":"${INSTANCE_INDEX}","host_environment":"${K8S_NAMESPACE}"}</customFields>
<customFields>{"appname":"gateway","instance_index":"${INSTANCE_INDEX}"}</customFields>
</encoder>
</appender>
</then>
</if>

<!--<logger name="akka.actor" level="DEBUG"/>-->
<if condition='isDefined("FILE_APPENDER")'>
<then>
<appender name="file" class="ch.qos.logback.core.rolling.RollingFileAppender">
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>info</level>
</filter>
<file>connectivity.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>connectivity.log.%d{yyyy-MM-dd}.gz</fileNamePattern>
<!-- Keep 30 days' worth of history capped at 1GB total size -->
<maxHistory>30</maxHistory>
<totalSizeCap>1GB</totalSizeCap>
</rollingPolicy>
<encoder class="net.logstash.logback.encoder.LogstashEncoder">
<customFields>{"appname":"connectivity","instance_index":"${INSTANCE_INDEX}"}</customFields>
</encoder>
</appender>
</then>
</if>

<!-- do not print INFO cluster messages of mongo driver: -->
<!-- Do not print INFO cluster messages of mongo driver: -->
<logger name="org.mongodb.driver" level="WARN"/>

<logger name="akka.management.cluster.bootstrap.contactpoint.HttpClusterBootstrapRoutes" level="WARN"/>
Expand All @@ -54,24 +72,28 @@
<!-- Log level for the application -->
<logger name="org.eclipse.ditto" level="${LOG_LEVEL_APPLICATION:-INFO}"/>

<!--<logger name="akka.cluster.ddata.Replicator" level="DEBUG" />-->

<root level="${LOG_LEVEL:-INFO}">
<!-- logging INFO messages can be disabled by setting environment variable -->
<!-- Logging INFO messages can be disabled by setting environment variable -->
<if condition='isNull("DISABLE_SYSOUT_LOG")'>
<then>
<appender-ref ref="STDOUT"/>
</then>
</if>

<!-- always log ERRORs to syserr -->
<!-- Always log ERRORs to syserr -->
<appender-ref ref="STDERR"/>

<if condition='isDefined("LOGSTASH_SERVER")'>
<then>
<appender-ref ref="stash"/>
</then>
</if>

<if condition='isDefined("FILE_APPENDER")'>
<then>
<appender-ref ref="file"/>
</then>
</if>
</root>

</configuration>
16 changes: 15 additions & 1 deletion policies/service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,21 @@
<artifactId>logback-classic</artifactId>
</dependency>

<!-- test -->
<!-- logstash appender logging -->
<dependency>
<groupId>org.codehaus.janino</groupId>
<artifactId>janino</artifactId>
</dependency>
<dependency>
<groupId>net.logstash.logback</groupId>
<artifactId>logstash-logback-encoder</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>

<!-- ### Testing ### -->
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-testkit_${scala.version}</artifactId>
Expand Down
Loading

0 comments on commit 0b840e5

Please sign in to comment.