Adding logstash-logback dependencies to tomcat to enable logging in j…

…son for ELK Signed-off-by: Sun Tan <sutan@redhat.com>
eclipse-che · Nov 16, 2017 · 4d56d47 · 4d56d47
1 parent fda6788
commit 4d56d47
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 0 deletions.
diff --git a/che-tomcat8-slf4j-logback/pom.xml b/che-tomcat8-slf4j-logback/pom.xml
@@ -35,10 +35,26 @@
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
         <dependency>
             <groupId>javax.mail</groupId>
             <artifactId>mail</artifactId>
         </dependency>
+        <dependency>
+            <groupId>net.logstash.logback</groupId>
+            <artifactId>logstash-logback-encoder</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.tomcat</groupId>
             <artifactId>tomcat-catalina-jmx-remote</artifactId>

diff --git a/che-tomcat8-slf4j-logback/src/assembly/assembly.xml b/che-tomcat8-slf4j-logback/src/assembly/assembly.xml
@@ -28,8 +28,14 @@
             <outputDirectory>lib</outputDirectory>
             <includes>
                 <include>ch.qos.logback:logback-access</include>
+                <include>ch.qos.logback:logback-classic</include>
                 <include>ch.qos.logback:logback-core</include>
+                <include>com.fasterxml.jackson.core:jackson-annotations</include>
+                <include>com.fasterxml.jackson.core:jackson-core</include>
+                <include>com.fasterxml.jackson.core:jackson-databind</include>
+                <include>net.logstash.logback:logstash-logback-encoder</include>
                 <include>org.apache.tomcat:tomcat-catalina-jmx-remote</include>
+                <include>org.slf4j:slf4j-api</include>
             </includes>
         </dependencySet>
     </dependencySets>

diff --git a/che-tomcat8-slf4j-logback/src/assembly/conf/logback.xml b/che-tomcat8-slf4j-logback/src/assembly/conf/logback.xml
@@ -39,6 +39,8 @@
 
     <include optional="true" file="${che.local.conf.dir}/logback/logback-additional-appenders.xml"/>
 
+    <include optional="true" file="${catalina.home}/conf/logback-additional-appenders.xml"/>
+
     <logger name="org.apache.catalina.loader" level="OFF"/>
     <logger name="org.apache.catalina.session.PersistentManagerBase" level="OFF"/>
     <logger name="org.apache.jasper.servlet.TldScanner" level="OFF"/>