genericizing some params to prepare for later support of other destinations

Author: markxnelson

samples/weblogicLoggingExporter.yaml

@@ -16,11 +16,11 @@
 # and gives a warning.
 weblogicLoggingIndexName: wls
 
-# The host that Elastic Search is running on.  Default to localhost
-ElasticSearchHost: localhost
+# The host that Elastic Search is running on.  Defaults to localhost.
+publishHost: localhost
 
-# The port that Elastic Search is listening to.   Default to 9200
-ElasticSearchPort: 9200
+# The port that Elastic Search is listening to.   Defaults to 9200.
+publishPort: 9200
 
 # The "domainUID" used to uniquely identify this domain.  This is used to filter logs in Kibana by the domain they came
 # from.  You should use a unique value for each domain.  If you are using the WebLogic Kubernetes Operator, it is

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

@@ -33,20 +33,23 @@ class LogExportHandler extends Handler {
   private static final String INDEX = " { \"index\" : { }} ";
   private static final int offValue = Level.OFF.intValue();
 
-  private String indexName = Config.DEFAULT_INDEX_NAME;
-  private String elasticSearchHost = Config.DEFAULT_ES_HOST;
-  private int elasticSearchPort = Config.DEFAULT_ES_PORT;
-  private int bulkSize = Config.DEFAULT_BULK_SIZE;
-
-  private String httpHostPort = "http://" + elasticSearchHost + ":" + elasticSearchPort;
-  private String singleURL = httpHostPort + "/" + indexName + "/" + DOC_TYPE + "/?pretty";
-  private String bulkURL = httpHostPort + "/" + indexName + "/" + DOC_TYPE + "/_bulk?pretty";
-
   private final Client httpClient = ClientBuilder.newClient();
   private List<FilterConfig> filterConfigs = new ArrayList<>();
   private final List<String> payloadBulkList = new ArrayList<>();
 
-  private String domainUID = null;
+  //
+  //  These will all be set by initialize()
+  //
+  private String indexName;
+  private String publishHost;
+  private int publishPort;
+  private int bulkSize;
+  private String httpHostPort;
+  private String singleURL;
+  private String bulkURL;
+  private String fluentdURL;
+  private String domainUID;
+  private String destination;
 
   public LogExportHandler(Config config) {
     initialize(config);
@@ -215,8 +218,8 @@ private String recordToPayload(WLLogRecord wlLogRecord) {
 
   private void initialize(Config config) {
 
-    elasticSearchHost = config.getHost();
-    elasticSearchPort = config.getPort();
+    publishHost = config.getHost();
+    publishPort = config.getPort();
     @SuppressWarnings("unused")
     boolean enabled = config.getEnabled();
     String severity = config.getSeverity();
@@ -226,10 +229,19 @@ private void initialize(Config config) {
     indexName = config.getIndexName();
     bulkSize = config.getBulkSize();
     filterConfigs = config.getFilterConfigs();
-    httpHostPort = "http://" + elasticSearchHost + ":" + elasticSearchPort;
+    httpHostPort = "http://" + publishHost + ":" + publishPort;
     singleURL = httpHostPort + "/" + indexName + "/" + DOC_TYPE + "/?pretty";
     bulkURL = httpHostPort + "/" + indexName + "/" + DOC_TYPE + "/_bulk?pretty";
     domainUID = config.getDomainUID();
+
+    //
+    //  Set up the publishing variables...
+    //
+
+    httpHostPort = "http://" + publishHost + ":" + publishPort;
+    singleURL = httpHostPort + "/" + indexName + "/" + DOC_TYPE + "/?pretty";
+    bulkURL = httpHostPort + "/" + indexName + "/" + DOC_TYPE + "/_bulk?pretty";
+    fluentdURL = httpHostPort + "/" + indexName;
   }
 
   private void createMappings() {

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

@@ -19,23 +19,23 @@
 
 public class Config {
 
-  public static final String DEFAULT_ES_HOST = "localhost";
-  public static final int DEFAULT_ES_PORT = 9200;
+  public static final String DEFAULT_HOST = "localhost";
+  public static final int DEFAULT_PORT = 9200;
   public static final String DEFAULT_INDEX_NAME = "wls";
   public static final int DEFAULT_BULK_SIZE = 1;
   private static final String DEFAULT_DOMAIN_UID = "unknown";
 
-  private static final String HOST = "ElasticSearchHost";
-  private static final String PORT = "ElasticSearchPort";
+  private static final String HOST = "publishHost";
+  private static final String PORT = "publishPort";
   private static final String FILTERS = "weblogicLoggingExporterFilters";
   private static final String ENABLED = "weblogicLoggingExporterEnabled";
   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;
-  private int port = DEFAULT_ES_PORT;
+  private String host = DEFAULT_HOST;
+  private int port = DEFAULT_PORT;
   private String indexName = DEFAULT_INDEX_NAME;
   private int bulkSize = DEFAULT_BULK_SIZE;
   private boolean enabled = true;
@@ -46,18 +46,34 @@ public class Config {
   private Config() {}
 
   private Config(Map<String, Object> yaml) {
-    if (yaml.containsKey(HOST)) host = MapUtils.getStringValue(yaml, HOST);
-    if (yaml.containsKey(PORT)) port = MapUtils.getIntegerValue(yaml, PORT);
-    if (yaml.containsKey(ENABLED)) enabled = MapUtils.getBooleanValue(yaml, ENABLED);
-    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 (yaml.containsKey(HOST)) {
+      host = MapUtils.getStringValue(yaml, HOST);
+    }
+    if (yaml.containsKey(PORT)) {
+      port = MapUtils.getIntegerValue(yaml, PORT);
+    }
+    if (yaml.containsKey(ENABLED)) {
+      enabled = MapUtils.getBooleanValue(yaml, ENABLED);
+    }
+    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;
     }
     // index name needs to be all lowercase.
-    if (yaml.containsKey(INDEX_NAME)) indexName = MapUtils.getStringValue(yaml, INDEX_NAME);
+    if (yaml.containsKey(INDEX_NAME)) {
+      indexName = MapUtils.getStringValue(yaml, INDEX_NAME);
+    }
     if (!(indexName.toLowerCase().equals(indexName))) {
       indexName = indexName.toLowerCase();
       System.out.println("Index name is converted to all lower case : " + indexName);
@@ -136,10 +152,10 @@ public String toString() {
         + "weblogicLoggingIndexName='"
         + indexName
         + '\''
-        + ", ElasticSearchHost='"
+        + ", publishHost='"
         + host
         + '\''
-        + ", ElasticSearchPort="
+        + ", publishPort="
         + port
         + ", weblogicLoggingExporterSeverity='"
         + severity