Add implementation for mandatory MDC default value

Bump ELK stack version to 2.0.7

Issue-ID: ACUMOS-2458

Change-Id: Ifa4686fc9a04e6bdff51dc7c6ab121bd6baa2e86
Signed-off-by: GUPTA <pg0057291@techmahindra.com>

diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index cb2c6f5..fd9ff5b 100644 (file)
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -20,6 +20,10 @@
 Platform Operations, Administration, and Management (OA&M) Release Notes
 ========================================================================
 
+Version 2.0.7, 07 February 2019
+-------------------------------
+* Add implementation for mandatory MDC default value in logging POC and bump ELK stack version to 2.0.7(`ACUMOS-2458 <https://jira.acumos.org/browse/ACUMOS-2458>`_)
+
 Version 2.0.4, 24 January 2019
 -------------------------------
 * Update logstash queries for database version 2.0.4 (`ACUMOS-2403 <https://jira.acumos.org/browse/ACUMOS-2403>`_)

diff --git a/elk-stack/elasticsearch/pom.xml b/elk-stack/elasticsearch/pom.xml
index 411d9e8..de189e7 100644 (file)
--- a/elk-stack/elasticsearch/pom.xml
+++ b/elk-stack/elasticsearch/pom.xml
@@ -25,7 +25,7 @@
         <!-- docker image name -->
         <artifactId>acumos-elasticsearch</artifactId>
         <!-- docker tag -->
-        <version>2.0.4-SNAPSHOT</version>
+        <version>2.0.7-SNAPSHOT</version>
 </project>
 
 

diff --git a/elk-stack/kibana/pom.xml b/elk-stack/kibana/pom.xml
index 1a82d6a..6325ad1 100644 (file)
--- a/elk-stack/kibana/pom.xml
+++ b/elk-stack/kibana/pom.xml
@@ -25,7 +25,7 @@
         <!-- docker image name -->
         <artifactId>acumos-kibana</artifactId>
         <!-- docker tag -->
-        <version>2.0.4-SNAPSHOT</version>
+        <version>2.0.7-SNAPSHOT</version>
 </project>
 
 

diff --git a/elk-stack/logstash/pom.xml b/elk-stack/logstash/pom.xml
index a22e350..149420e 100644 (file)
--- a/elk-stack/logstash/pom.xml
+++ b/elk-stack/logstash/pom.xml
@@ -25,5 +25,5 @@
         <!-- docker image name -->
         <artifactId>acumos-logstash</artifactId>
         <!-- docker tag -->
-        <version>2.0.4-SNAPSHOT</version>
+        <version>2.0.7-SNAPSHOT</version>
 </project>

diff --git a/filebeat/pom.xml b/filebeat/pom.xml
index b42ad2a..9e3ca43 100644 (file)
--- a/filebeat/pom.xml
+++ b/filebeat/pom.xml
@@ -25,7 +25,7 @@
         <!-- docker image name -->
         <artifactId>acumos-filebeat</artifactId>
         <!-- docker tag -->
-        <version>2.0.4-SNAPSHOT</version>
+        <version>2.0.7-SNAPSHOT</version>
 </project>
 
 

diff --git a/logging-demo/pom.xml b/logging-demo/pom.xml
index 79214ed..fa0b888 100644 (file)
--- a/logging-demo/pom.xml
+++ b/logging-demo/pom.xml
@@ -23,7 +23,7 @@
 
        <groupId>org.acumos.platform-oam</groupId>
        <artifactId>logging-demo</artifactId>
-       <version>0.0.1-SNAPSHOT</version>
+       <version>2.0.7-SNAPSHOT</version>
        <packaging>jar</packaging>
        <name>logging-demo</name>
        <description>Demo project for Logging</description>

diff --git a/logging-demo/src/main/java/org/acumos/demo/logging/Execute.java b/logging-demo/src/main/java/org/acumos/demo/logging/Execute.java
index 74b2312..ccf614c 100644 (file)
--- a/logging-demo/src/main/java/org/acumos/demo/logging/Execute.java
+++ b/logging-demo/src/main/java/org/acumos/demo/logging/Execute.java
@@ -21,6 +21,7 @@ package org.acumos.demo.logging;
 
 import java.util.UUID;
 import org.acumos.demo.logging.service.ApplicationService;
+import org.acumos.demo.logging.util.ACUMOSLogConstants;
 import org.acumos.demo.logging.util.ACUMOSLogConstants.MDCs;
 import org.slf4j.MDC;
 import org.springframework.boot.CommandLineRunner;
@@ -38,12 +39,8 @@ public class Execute implements CommandLineRunner {
        public void run(String... args) {
 
                String txId = UUID.randomUUID().toString();
-
-               MDC.put(MDCs.REQUEST_ID, txId);
-               MDC.put(MDCs.RESPONSE_CODE, "500");
-               MDC.put(MDCs.RESPONSE_DESCRIPTION, "Internal Server Error");
-               MDC.put(MDCs.RESPONSE_SEVERITY, "ERROR");
-               MDC.put(MDCs.STATUS_CODE, "ERROR");
+               ACUMOSLogConstants.setDefaultMDCs();
+               MDC.put(MDCs.REQUEST_ID, txId);         
                MDC.put(MDCs.TARGET_ENTITY, "Onboarding");
                MDC.put(MDCs.TARGET_SERVICE_NAME, "Onboarding/api/v2");
                MDC.put(MDCs.CLIENT_IP_ADDRESS, "127.0.0.1");

diff --git a/logging-demo/src/main/java/org/acumos/demo/logging/util/ACUMOSLogConstants.java b/logging-demo/src/main/java/org/acumos/demo/logging/util/ACUMOSLogConstants.java
index 7ff2794..57d3eae 100644 (file)
--- a/logging-demo/src/main/java/org/acumos/demo/logging/util/ACUMOSLogConstants.java
+++ b/logging-demo/src/main/java/org/acumos/demo/logging/util/ACUMOSLogConstants.java
@@ -21,6 +21,8 @@ package org.acumos.demo.logging.util;
 
 import org.slf4j.Marker;
 import org.slf4j.MarkerFactory;
+import org.slf4j.MDC;
+
 
 /**
  * Constants for standard ACUMOS headers, MDCs, etc.
@@ -120,7 +122,7 @@ public final class ACUMOSLogConstants {
                /** MDC reporting outcome error level. */
                public static final String RESPONSE_SEVERITY = "Severity";
 
-               /** MDC reporting outcome error level. */
+               /** MDC reporting outcome status of the request. */
                public static final String STATUS_CODE = "StatusCode";
 
                // Unsorted. ///////////////////////////////////////////////////////////
@@ -149,6 +151,16 @@ public final class ACUMOSLogConstants {
                }
        }
 
+       /**
+        * Overrideable method to set MDCs based on property values.
+        */
+       public static void setDefaultMDCs() {
+               MDC.put(MDCs.RESPONSE_CODE, "200");
+               MDC.put(MDCs.RESPONSE_DESCRIPTION, "200 OK");
+               MDC.put(MDCs.RESPONSE_SEVERITY, ResponseSeverity.INFO.toString());
+               MDC.put(MDCs.STATUS_CODE, ResponseStatus.INPROGRESS.toString());
+       }
+
        ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
        //
        // Enums.
@@ -156,20 +168,28 @@ public final class ACUMOSLogConstants {
        ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
        /**
-        * Response success or not, for setting <tt>StatusCode</tt>.
+        * Response success or not, for setting StatusCode.
         */
        public enum ResponseStatus {
-
-               /** Success. */
+               
                COMPLETED,
-
-               /** Not. */
                ERROR,
-
-               /** In Progress. */
                INPROGRESS
        }
 
+       /**
+        * Response of log level, for setting Severity.
+        */
+       public enum ResponseSeverity {
+
+               INFO,
+               ERROR,
+               TRACE,
+               DEBUG,
+               WARN,
+               FATAL
+       }
+
        /**
         * Synchronous or asynchronous execution, for setting invocation marker.
         */

diff --git a/metricbeat/pom.xml b/metricbeat/pom.xml
index 19195c0..c27e212 100644 (file)
--- a/metricbeat/pom.xml
+++ b/metricbeat/pom.xml
@@ -25,7 +25,7 @@
         <!-- docker image name -->
         <artifactId>acumos-metricbeat</artifactId>
         <!-- docker tag -->
-        <version>2.0.4-SNAPSHOT</version>
+        <version>2.0.7-SNAPSHOT</version>
 </project>