Skip to content

Commit 047b53c

Browse files
committed
changes to connect to k8s efk stack in cloud env
1 parent 0822410 commit 047b53c

File tree

9 files changed

+61
-12
lines changed

9 files changed

+61
-12
lines changed

config/default.json

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
{
22
"efk": {
3-
"host": "localhost",
3+
"host": "dev1-fluentd.mojaloop.live",
44
"port": 24224,
55
"timeout": 3.0,
6-
"reconnectInterval": 600
6+
"reconnectInterval": 600,
7+
"requireAckResponse": true
8+
},
9+
"apm": {
10+
"serviceName": "event-stream-processor",
11+
"serverUrl": "http://dev1-apm.mojaloop.live:80"
712
},
813
"PORT": 3082,
914
"KAFKA": {

package-lock.json

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"check-types": "7.4.0",
1515
"config": "3.0.0",
1616
"fluent-logger": "^3.3.1",
17+
"fluent-logger-stream": "0.0.1",
1718
"healthcheck-server": "1.0.0",
1819
"json-rules-engine": "2.3.0",
1920
"lazy-ass": "1.6.0",

src/lib/efk/index.js

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
const logger = require('fluent-logger')
22

33
module.exports.initLogger = (prefix, options) => {
4-
return logger.configure(prefix, options)
4+
logger.configure(prefix, options)
5+
logger.on('error', (error) => {
6+
console.log(error)
7+
})
8+
logger.on('connect', (v) => {
9+
console.log('connected!' + v)
10+
})
511
}
12+
13+
module.exports.logger = logger

src/lib/tracer/index.js

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
const Agent = require('@mojaloop/elastic-apm-node')
22
const Tracer = require('@mojaloop/elastic-apm-node-opentracing')
3+
const Config = require('../config')
4+
const configuration = Config.util.toObject()
5+
6+
37

48
const agent = (function () {
5-
let self = Agent.start({serviceName: 'event-stream-processor'})
9+
let self = Agent.start(configuration.apm)
610
this.agent = self
711
return this
812
})()

src/observables/fluentd-logger.js

+18-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,25 @@
11
const Rx = require('rxjs')
2-
const logger = require('fluent-logger')
2+
const logger = require('../lib/efk').logger
3+
const initLogger = require('../lib/efk').initLogger
4+
5+
const Config = require('../lib/config')
6+
7+
const configuration = Config.util.toObject()
8+
9+
// initLogger('fluentd.test', configuration.efk)
310

411
const FluentdLoggerObservable = ({ message }) => {
512
return Rx.Observable.create(observable => {
6-
logger.emit('logstash', message)
13+
14+
logger.configure('logstash', configuration.efk)
15+
logger.on('error', (error) => {
16+
console.log(error)
17+
})
18+
logger.on('connect', () => {
19+
console.log('connected!')
20+
})
21+
22+
logger.emit('logstash', message.value, (err) => console.log(`fluentd err ${err}`))
723
observable.complete()
824
})
925
}

src/observables/log_it.js

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
var message = {message: 'helloworld_new'}
2+
3+
var Logger = require('fluent-logger-stream')
4+
var logger = new Logger({tag: 'logstash', type: 'http', host: 'dev1-fluentd.mojaloop.live', port: 80}) //in_http
5+
logger.send('logstash', message)
6+

src/setup.js

+5-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,11 @@ const setup = async () => {
6868
const sharedMessageObservable = topicObservable.pipe(share())
6969

7070
sharedMessageObservable.subscribe(async props => {
71-
Observables.fluentdObservable(props).subscribe(v => console.log(v))
71+
Observables.fluentdObservable(props).subscribe({
72+
next: v => Logger.info(v),
73+
error: (e) => Logger.error(e),
74+
completed: () => Logger.info('fluentd log completed')
75+
})
7276
})
7377

7478
const tracingObservable = sharedMessageObservable.pipe(

test/util/scripts/docker-efk/docker-compose.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@ services:
6262
- setup.kibana.host="kibana:5601"
6363
- setup.template.enabled=true
6464
- logging.to_files=false
65-
depends_on:
66-
elasticsearch:
67-
condition: service_healthy
68-
kibana:
69-
condition: service_healthy
65+
# depends_on:
66+
# elasticsearch:
67+
# condition: service_healthy
68+
# kibana:
69+
# condition: service_healthy
7070

7171

7272
volumes:

0 commit comments

Comments
 (0)