Skip to content

Commit 9713bd5

Browse files
committed
Modify host-ip for k8s not to rely on component name
1 parent 7794abe commit 9713bd5

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,9 @@ The appender supports custom layouts, the default layout function used is:
4141

4242
```
4343
let layout = (logEvent) => {
44-
let component = process.env.log4js_logmet_component || config.component;
45-
let instanceId = process.env.CF_INSTANCE_INDEX || require('os').hostname().replace(new RegExp(`(-|\\.)?${ component }(-|\\.)?`, 'gi'), '');
44+
let instanceId = process.env.CF_INSTANCE_INDEX || require('os').hostname().replace(/^.*-([a-zA-Z0-9]+-[a-zA-Z0-9]+)$/g,'$1');
4645
let logmetEvent = {
47-
'component': component,
46+
'component': process.env.log4js_logmet_component || config.component,
4847
'host-ip': process.env.CF_INSTANCE_IP,
4948
'instance-id': instanceId,
5049
'loglevel': logEvent.level.levelStr,

index.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,9 @@ function configure(config, layouts) {
4646
}
4747

4848
let layout = (logEvent) => {
49-
let component = process.env.log4js_logmet_component || config.component;
50-
let instanceId = process.env.CF_INSTANCE_INDEX || require('os').hostname().replace(new RegExp(`(-|\\.)?${ component }(-|\\.)?`, 'gi'), '');
49+
let instanceId = process.env.CF_INSTANCE_INDEX || require('os').hostname().replace(/^.*-([a-zA-Z0-9]+-[a-zA-Z0-9]+)$/g,'$1');
5150
let logmetEvent = {
52-
'component': component,
51+
'component': process.env.log4js_logmet_component || config.component,
5352
'host-ip': process.env.CF_INSTANCE_IP,
5453
'instance-id': instanceId,
5554
'loglevel': logEvent.level.levelStr,

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "log4js-logmet-appender",
3-
"version": "1.1.0",
3+
"version": "1.1.1",
44
"description": "Logmet appender for node-log4js",
55
"author": "Herman Singh Badwal <hermanba@ca.ibm.com>",
66
"license": "MIT",

0 commit comments

Comments
 (0)