add domainUID, fix config file name bug, change to server log instead of domain log

Author: markxnelson

src/main/java/weblogic/logging/exporter/LogExportHandler.java

@@ -48,6 +48,8 @@ public class LogExportHandler extends Handler {
   private List<FilterConfig> filterConfigs = new ArrayList<>();
   private List<String> payloadBulkList = new ArrayList<>();
 
+  private String domainUID = null;
+
   public LogExportHandler(Config config) {
     initialize(config);
     createMappings();
@@ -177,6 +179,7 @@ private Result executePutOrPostOnUrl(
   private String recordToPayload(WLLogRecord wlLogRecord) {
     return
       "{" +
+        dataAsJson("domainUID", domainUID) + "," +
         dataAsJson("messageID", wlLogRecord.getId()) + "," +
         dataAsJson("message", wlLogRecord.getMessage()) + "," +
         dataAsJson("timestamp", wlLogRecord.getMillis()) + "," +
@@ -211,6 +214,7 @@ private void initialize(Config  config){
     httpHostPort="http://"+elasticSearchHost+":"+elasticSearchPort;
     singleURL = httpHostPort + "/" + indexName + "/"+ DOC_TYPE +  "/?pretty";
     bulkURL =   httpHostPort + "/" + indexName + "/"+ DOC_TYPE +  "/_bulk?pretty";
+    domainUID = config.getDomainUID();
   }
 
 
@@ -220,6 +224,7 @@ private void createMappings(){
       + "  \"mappings\": {"
       + "    \"" + DOC_TYPE + "\": {"
       + "      \"properties\": {"
+      + "        \"domainUID\": {" + "\"type\": \"keyword\" " + "},"
       + "        \"timestamp\": {" + "\"type\": \"date\" " + "},"
       + "        \"sequenceNumber\": {" + "\"type\": \"keyword\" " + "},"
       + "        \"severity\": {" + "\"type\": \"keyword\" " + "},"

src/main/java/weblogic/logging/exporter/Startup.java

@@ -14,12 +14,13 @@
 
 public class Startup {
 
-  private static final String DEFAULT_CONFIG_FILE = "config/WeblogicLoggingExporter.yaml";
+  private static final String DEFAULT_CONFIG_FILE = "config/WebLogicLoggingExporter.yaml";
 
   public static void main(String argv[]) {
     System.out.println("======================= Weblogic Logging Exporter Startup class called");
     try {
-      Logger logger = LoggingHelper.getDomainLogger();
+      //Logger logger = LoggingHelper.getDomainLogger();
+      Logger logger = LoggingHelper.getServerLogger();
 
       /*
        We will read from the system variable for the location and name of the configuration file.
@@ -37,7 +38,7 @@ public static void main(String argv[]) {
       }else{
         System.out.println("Weblogic Logging Exporter is disabled");
       }
-    } catch (LoggerNotAvailableException e) {
+    } catch (Exception e) {
       e.printStackTrace();
     }
   }

src/main/java/weblogic/logging/exporter/config/Config.java

@@ -24,6 +24,7 @@ public class Config {
   public static final int DEFAULT_ES_PORT = 9200;
   public static final String DEFAULT_INDEX_NAME = "wls";
   public static final int DEFAULT_BULK_SIZE = 1;
+  public static final String DEFAULT_DOMAIN_UID = "unknown";
 
   private static final String HOST = "ElasticSearchHost";
   private static final String PORT = "ElasticSearchPort";
@@ -32,6 +33,7 @@ public class Config {
   private static final String SEVERITY = "weblogicLoggingExporterSeverity";
   private static final String BULK_SIZE = "weblogicLoggingExporterBulkSize";
   private static final String INDEX_NAME = "weblogicLoggingIndexName";
+  private static final String DOMAIN_UID = "domainUID";
 
 
   private String host = DEFAULT_ES_HOST;
@@ -41,6 +43,7 @@ public class Config {
   private boolean enabled = true;
   private String severity = null;
   private List<FilterConfig> filterConfigs = new ArrayList<>();
+  private String domainUID = DEFAULT_DOMAIN_UID;
 
   private Config() {}
 
@@ -51,6 +54,7 @@ private Config(Map<String, Object> yaml) {
     if (yaml.containsKey(SEVERITY)) severity = MapUtils.getStringValue(yaml, SEVERITY);
     if (yaml.containsKey(BULK_SIZE)) bulkSize = MapUtils.getIntegerValue(yaml, BULK_SIZE);
     if (yaml.containsKey(INDEX_NAME)) indexName = MapUtils.getStringValue(yaml, INDEX_NAME);
+    if (yaml.containsKey(DOMAIN_UID)) domainUID = MapUtils.getStringValue(yaml, DOMAIN_UID);
     if (bulkSize <= 1){
       bulkSize = 1;
     }
@@ -138,6 +142,7 @@ public String toString() {
       ", weblogicLoggingExporterBulkSize='" + bulkSize + '\'' +
       ", enabled=" + enabled +
       ", weblogicLoggingExporterFilters=" + filterConfigs +
+      ", domainUID='" + domainUID + '\'' +
       '}';
   }
 
@@ -168,4 +173,8 @@ public List<FilterConfig> getFilterConfigs() {
 
   public int getBulkSize() { return bulkSize; }
 
+  public String getDomainUID() {
+    return domainUID;
+  }
+
 }