Support host-ip in k8s in default layout

Author: simonkotwicz

README.md

@@ -41,15 +41,18 @@ The appender supports custom layouts, the default layout function used is:
 
 ```
 let layout = (logEvent) => {
-    return {
-        'component': process.env.log4js_logmet_component || config.component,
+    let component = process.env.log4js_logmet_component || config.component;
+    let instanceId = process.env.CF_INSTANCE_INDEX || require('os').hostname().replace(new RegExp(`(-|\\.)?${ component }(-|\\.)?`, 'gi'), '');
+    let logmetEvent = {
+        'component': component,
         'host-ip': process.env.CF_INSTANCE_IP,
-        'instance-id': process.env.CF_INSTANCE_INDEX,
+        'instance-id': instanceId,
         'loglevel': logEvent.level.levelStr,
         'msg_timestamp': logEvent.startTime.toISOString(),
         'message': logEvent.data.join(' | '),
         'type': logEvent.categoryName
     };
+    return logmetEvent;
 };
 ```
 

index.js

@@ -46,15 +46,18 @@ function configure(config, layouts) {
     }
 
     let layout = (logEvent) => {
-        return {
-            'component': process.env.log4js_logmet_component || config.component,
+        let component = process.env.log4js_logmet_component || config.component;
+        let instanceId = process.env.CF_INSTANCE_INDEX || require('os').hostname().replace(new RegExp(`(-|\\.)?${ component }(-|\\.)?`, 'gi'), '');
+        let logmetEvent = {
+            'component': component,
             'host-ip': process.env.CF_INSTANCE_IP,
-            'instance-id': process.env.CF_INSTANCE_INDEX,
+            'instance-id': instanceId,
             'loglevel': logEvent.level.levelStr,
             'msg_timestamp': logEvent.startTime.toISOString(),
             'message': logEvent.data.join(' | '),
             'type': logEvent.categoryName
         };
+        return logmetEvent;
     };
     if (config.layout) {
         layout = layouts.layout(config.layout.type, config.layout);

package.json

@@ -1,6 +1,6 @@
 {
     "name": "log4js-logmet-appender",
-    "version": "1.0.0",
+    "version": "1.1.0",
     "description": "Logmet appender for node-log4js",
     "author": "Herman Singh Badwal <hermanba@ca.ibm.com>",
     "license": "MIT",