From fae52b330210ca6e99ab9159cf71615b91e63e5d Mon Sep 17 00:00:00 2001
From: Bill O'Neil <billoneil@Bills-MacBook-Pro-2.local>
Date: Sat, 20 Nov 2021 01:03:52 -0500
Subject: [PATCH 1/3] Add json appender for logback

---
 gradle/dependencies.gradle                       | 11 +++++++----
 k8s/chart/templates/stubbornjava.yaml            |  2 ++
 stubbornjava-common/build.gradle                 |  2 ++
 .../src/main/resources/logback.xml               | 16 +++++++++++++++-
 4 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index ed0df24e..415e7efc 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -5,16 +5,17 @@ ext {
         okhttp            : '4.9.1',       // HTTP Client
         slf4j             : '1.7.31',      // Logging 
         logback           : '1.2.5',       // Logging
-        undertow          : '2.2.8.Final',// Webserver
+        logbackJson		  : '0.1.5',
+        undertow          : '2.2.8.Final', // Webserver
         metrics           : '4.2.2',       // Metrics
-        guava             : '30.1.1-jre',    // Common / Helper libraries
+        guava             : '30.1.1-jre',  // Common / Helper libraries
         typesafeConfig    : '1.4.1',       // Configuration
         handlebars        : '4.2.0',       // HTML templating
         htmlCompressor    : '1.5.2',       // HTML compression
         hikaricp          : '4.0.3',       // JDBC connection pool
         jool              : '0.9.14',      // Functional Utils
         hsqldb            : '2.6.0',       // In memory SQL db
-        aws               : '1.12.62',    // AWS Java SDK
+        aws               : '1.12.62',     // AWS Java SDK
         flyway            : '5.1.4',       // DB migrations
         connectorj        : '8.0.25',      // JDBC MYSQL driver
         jooq              : '3.15.0',      // jOOQ
@@ -25,7 +26,7 @@ ext {
         sitemapgen4j      : '1.1.2',       // Sitemap generator for SEO
         jbcrypt           : '0.4',         // BCrypt salted hashing library
         romeRss           : '1.0',         // RSS Library
-        kotlin            : '1.4.0',      // Kotlin
+        kotlin            : '1.4.0',       // Kotlin
         javax             : '1.3.2',
         jbossLogging      : '3.4.2.Final',
         jbossThreads      : '3.4.0.Final',
@@ -55,6 +56,8 @@ ext {
         slf4jLog4j                : "org.slf4j:log4j-over-slf4j:$versions.slf4j",
         logback                   : "ch.qos.logback:logback-classic:$versions.logback",
         logbackCore               : "ch.qos.logback:logback-core:$versions.logback",
+        logbackJson			      : "ch.qos.logback.contrib:logback-json-classic:$versions.logbackJson",
+        logbackJackson			  : "ch.qos.logback.contrib:logback-jackson:$versions.logbackJson",
         guava                     : "com.google.guava:guava:$versions.guava",
         typesafeConfig            : "com.typesafe:config:$versions.typesafeConfig",
         handlebars                : "com.github.jknack:handlebars:$versions.handlebars",
diff --git a/k8s/chart/templates/stubbornjava.yaml b/k8s/chart/templates/stubbornjava.yaml
index 60e3a085..e9f3807d 100644
--- a/k8s/chart/templates/stubbornjava.yaml
+++ b/k8s/chart/templates/stubbornjava.yaml
@@ -52,6 +52,8 @@ spec:
           env:
             - name: ENV
               value: "prod"
+            - name: LOG_APPENDER
+              value: "JSON"
             - name: github.clientId
               valueFrom:
                 secretKeyRef:
diff --git a/stubbornjava-common/build.gradle b/stubbornjava-common/build.gradle
index 9cd8766e..90b26cd9 100644
--- a/stubbornjava-common/build.gradle
+++ b/stubbornjava-common/build.gradle
@@ -4,6 +4,8 @@ dependencies {
     api project(':stubbornjava-undertow')
     api libs.slf4j
     api libs.logback
+    api libs.logbackJson
+    api libs.logbackJackson
     api libs.jacksonCore
     api libs.jacksonDatabind
     api libs.jacksonDatabind
diff --git a/stubbornjava-webapp/src/main/resources/logback.xml b/stubbornjava-webapp/src/main/resources/logback.xml
index 02201c02..a0938871 100644
--- a/stubbornjava-webapp/src/main/resources/logback.xml
+++ b/stubbornjava-webapp/src/main/resources/logback.xml
@@ -1,5 +1,8 @@
 <configuration> 
 
+  <property name="LOG_APPENDER" value="${LOG_APPENDER:-STDOUT}" />
+
+  <!-- This appender is primarily used for local development -->
   <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> 
     <!-- encoders are  by default assigned the type
          ch.qos.logback.classic.encoder.PatternLayoutEncoder -->
@@ -8,8 +11,19 @@
     </encoder>
   </appender>
 
+  <!-- The JSON appender is meant to be machine friendly for log parsing -->
+  <appender name="JSON" class="ch.qos.logback.core.ConsoleAppender">
+    <layout class="ch.qos.logback.contrib.json.classic.JsonLayout">
+        <jsonFormatter
+            class="ch.qos.logback.contrib.jackson.JacksonJsonFormatter">
+            <prettyPrint>true</prettyPrint>
+        </jsonFormatter>
+        <timestampFormat>yyyy-MM-dd' 'HH:mm:ss.SSS</timestampFormat>
+    </layout>
+  </appender>
+
   <root level="INFO">
-    <appender-ref ref="STDOUT" />
+    <appender-ref ref="${LOG_APPENDER}" />
   </root>
   
   <!-- 

From 9d0d7e812fcd68d019876c5f08838421b4ba6c7d Mon Sep 17 00:00:00 2001
From: Bill O'Neil <billoneil@Bills-MacBook-Pro-2.local>
Date: Sat, 20 Nov 2021 01:06:19 -0500
Subject: [PATCH 2/3] Fix tabs

---
 gradle/dependencies.gradle | 4 ++--
 k8s/chart/Chart.yaml       | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 415e7efc..69f22f1b 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -5,7 +5,7 @@ ext {
         okhttp            : '4.9.1',       // HTTP Client
         slf4j             : '1.7.31',      // Logging 
         logback           : '1.2.5',       // Logging
-        logbackJson		  : '0.1.5',
+        logbackJson	      : '0.1.5',
         undertow          : '2.2.8.Final', // Webserver
         metrics           : '4.2.2',       // Metrics
         guava             : '30.1.1-jre',  // Common / Helper libraries
@@ -56,7 +56,7 @@ ext {
         slf4jLog4j                : "org.slf4j:log4j-over-slf4j:$versions.slf4j",
         logback                   : "ch.qos.logback:logback-classic:$versions.logback",
         logbackCore               : "ch.qos.logback:logback-core:$versions.logback",
-        logbackJson			      : "ch.qos.logback.contrib:logback-json-classic:$versions.logbackJson",
+        logbackJson               : "ch.qos.logback.contrib:logback-json-classic:$versions.logbackJson",
         logbackJackson			  : "ch.qos.logback.contrib:logback-jackson:$versions.logbackJson",
         guava                     : "com.google.guava:guava:$versions.guava",
         typesafeConfig            : "com.typesafe:config:$versions.typesafeConfig",
diff --git a/k8s/chart/Chart.yaml b/k8s/chart/Chart.yaml
index c9ca0329..8eb595f7 100644
--- a/k8s/chart/Chart.yaml
+++ b/k8s/chart/Chart.yaml
@@ -5,3 +5,8 @@ description: Helm chart to deploy StubbornJava
 type: application
 version: 0.1.0
 appVersion: 1.0.0
+
+dependencies:
+- name: promtail
+  version: 3.8.2
+  repository: https://grafana.github.io/helm-charts

From 1715c05c42f2bf8262dba9a3ee312d167934e559 Mon Sep 17 00:00:00 2001
From: Bill O'Neil <billoneil@Bills-MacBook-Pro-2.local>
Date: Sat, 20 Nov 2021 01:06:58 -0500
Subject: [PATCH 3/3] again

---
 gradle/dependencies.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 69f22f1b..b78c7900 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -5,7 +5,7 @@ ext {
         okhttp            : '4.9.1',       // HTTP Client
         slf4j             : '1.7.31',      // Logging 
         logback           : '1.2.5',       // Logging
-        logbackJson	      : '0.1.5',
+        logbackJson       : '0.1.5',
         undertow          : '2.2.8.Final', // Webserver
         metrics           : '4.2.2',       // Metrics
         guava             : '30.1.1-jre',  // Common / Helper libraries