Merge pull request #341 from filecoin-project/feat/logs-elk-2

Update filebeat
This commit is contained in:
Łukasz Magiera 2019-10-12 02:13:17 +02:00 committed by GitHub
commit 35b13ee4fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions

View File

@ -163,7 +163,7 @@ func (c *client) makeOutChan(ctx context.Context, ftyp reflect.Type, valOut int)
buf.PushBack(val) buf.PushBack(val)
if buf.Len() > 1 { if buf.Len() > 1 {
log.Warnf("rpc output channel has %d buffered messages", buf.Len()) log.Warnw("rpc output message buffer", "n", buf.Len())
bufLk.Unlock() bufLk.Unlock()
return return
} }

View File

@ -11,6 +11,8 @@ filebeat.inputs:
type: lotus-miner type: lotus-miner
fields_under_root: true fields_under_root: true
json.keys_under_root: false json.keys_under_root: false
json.message_key: msg
encoding: utf-8 encoding: utf-8
ignore_older: 3h ignore_older: 3h
- type: log - type: log
@ -22,6 +24,7 @@ filebeat.inputs:
type: lotus-daemon type: lotus-daemon
fields_under_root: true fields_under_root: true
json.keys_under_root: false json.keys_under_root: false
json.message_key: msg
encoding: utf-8 encoding: utf-8
ignore_older: 3h ignore_older: 3h
@ -55,6 +58,13 @@ processors:
- '2019-10-10T22:37:48.297+0200' - '2019-10-10T22:37:48.297+0200'
- drop_fields: - drop_fields:
fields: ['json.ts'] fields: ['json.ts']
- if:
has_fields: ['json.msg']
then:
- rename:
fields:
- from: 'json.msg'
to: 'message'
############################# Output ########################################## ############################# Output ##########################################