separated LOGS_RECEIVER_URL and LOGS_RECEIVER_URLS in the config; use singular for only one URL or the plural when configuring multiple endpoints

Author: adnanrahic

lib/plugins/input/docker/dockerInspect.js

@@ -169,21 +169,34 @@ function getLogseneEnabled (info) {
   info.LOGSENE_TOKEN = token || process.env.LOGS_TOKEN || process.env.LOGSENE_TOKEN
 
   // get optional log receiver URLs
-  let logsReceiver = null
-  if (info.Config && info.Config.Labels && info.Config.Labels.LOGS_RECEIVER_URL) {
-    logsReceiver = info.Config.Labels.LOGS_RECEIVER_URL
+  let logsReceivers = null
+  if (info.Config && info.Config.Labels && info.Config.Labels.LOGS_RECEIVER_URLS) {
+    logsReceivers = info.Config.Labels.LOGS_RECEIVER_URLS
   } else {
-    logsReceiver = getEnvVar('LOGS_RECEIVER_URL', info.Config.Env)
+    logsReceivers = getEnvVar('LOGS_RECEIVER_URLS', info.Config.Env)
+  }
+  if (logsReceivers) {
+    info.LOGS_RECEIVER_URLS = parser.parseReceiverList(logsReceivers)
   }
-  if (logsReceiver) {
-    info.logsReceiver = parser.parseReceiverList(logsReceiver)
+
+  // get optional log receiver
+  if (info.Config && info.Config.Labels && info.Config.Labels.LOGS_RECEIVER_URL) {
+    info.LOGS_RECEIVER_URL = info.Config.Labels.LOGS_RECEIVER_URL
+  } else {
+    info.LOGS_RECEIVER_URL = getEnvVar('LOGS_RECEIVER_URL', info.Config.Env)
   }
+
   // get optional logs target name
   if (info.Config && info.Config.Labels && info.Config.Labels.LOGS_DESTINATION) {
     info.LOGS_DESTINATION = info.Config.Labels.LOGS_DESTINATION
   } else {
     info.LOGS_DESTINATION = getEnvVar('LOGS_DESTINATION', info.Config.Env)
   }
+
+  console.log('\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n')
+  console.log(info)
+  console.log('\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n')
+
   return info
 }
 

lib/plugins/output-filter/docker-log-enrichment.js

@@ -93,14 +93,19 @@ module.exports = function enrichDockerLogs (context, config, eventEmitter, data,
       data.swarm = swarmInfo
     }
   }
-  // set logs receiver url for output plugins
-  if (context.dockerInspect && context.dockerInspect.logsReceiver) {
-    context.logsReceiver = context.dockerInspect.logsReceiver
+  // set logs receiver urls for output plugins when you have multiple URLS
+  if (context.dockerInspect && context.dockerInspect.logsReceivers) {
+    context.logsReceivers = context.dockerInspect.LOGS_RECEIVER_URLS
+  }
+  // set logs receiver urls for output plugins when you have one URL
+  if (context.dockerInspect && context.dockerInspect.LOGS_RECEIVER_URL) {
+    context.logsReceiver = context.dockerInspect.LOGS_RECEIVER_URL
   }
   // set logs destination / name of ES output module
   if (context.dockerInspect && context.dockerInspect.LOGS_DESTINATION) {
     context.logsDestination = context.dockerInspect.LOGS_DESTINATION
   }
+
   var logObject = data
   // make sure that top level message field is a String
   var messageString = logObject.message || logObject.msg || logObject.MESSAGE

lib/plugins/output/elasticsearch.js

@@ -106,8 +106,9 @@ OutputElasticsearch.prototype.eventHandler = function (data, context) {
   if (context.logsDestination && this.config.configName && this.config.configName.indexOf(context.logsDestination) === -1) {
     return
   }
-  var config = reduceConfig(context, data, this.config)
-  var index = data._index || context.index || config.index || process.env.LOGSENE_TOKEN || process.env.LOGS_TOKEN
+  const config = reduceConfig(context, data, this.config)
+  let index = data._index || context.index || config.index || process.env.LOGSENE_TOKEN || process.env.LOGS_TOKEN
+  const logsReceiverUrl = context.logsReceiver || process.env.LOGS_RECEIVER_URL
 
   if (config.tokenMapper) {
     if (config.dropLogsForUnmatchedIndices === true) {
@@ -116,16 +117,17 @@ OutputElasticsearch.prototype.eventHandler = function (data, context) {
       index = config.tokenMapper.findToken(data.logSource || context.sourceName) || index
     }
   }
+
   if (index) {
-    // support for time-based index patterns
     index = applyDateFormatToIndex(index, data)
-    this.indexData(index, data._type || 'logs', data, config, context.logsReceiverUrl)
+    this.indexData(index, data._type || 'logs', data, config, logsReceiverUrl)
   }
-  if (context.logsReceiver && context.logsReceiver.length > 0) {
-    for (let i = 0; i < context.logsReceiver.length; i++) {
+
+  if (context.logsReceivers && context.logsReceivers.length > 0) {
+    for (let i = 0; i < context.logsReceivers.length; i++) {
       this.indexData(
-        applyDateFormatToIndex(context.logsReceiver[i].index, data),
-        data._type || 'logs', data, config, context.logsReceiver[i].url)
+        applyDateFormatToIndex(context.logsReceivers[i].index, data),
+        data._type || 'logs', data, config, context.logsReceivers[i].url)
     }
   }
 }