Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix _id field in s3 and googlepubsub inputs #17026

Merged
merged 1 commit into from
Mar 18, 2020
Merged

Fix _id field in s3 and googlepubsub inputs #17026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Fix merging of fileset inputs to replace paths and append processors. {pull}16450{16450}
- Add queue_url definition in manifest file for aws module. {pull}16640{16640}
- Fix issue where autodiscover hints default configuration was not being copied. {pull}16987[16987]
- Fix Elasticsearch `_id` field set by S3 and Google Pub/Sub inputs. {pull}17026[17026]

*Heartbeat*

Expand Down
27 changes: 13 additions & 14 deletions x-pack/filebeat/input/googlepubsub/input.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,25 +193,24 @@ func makeTopicID(project, topic string) string {
func makeEvent(topicID string, msg *pubsub.Message) beat.Event {
id := topicID + "-" + msg.ID

fields := common.MapStr{
"event": common.MapStr{
"id": id,
"created": time.Now().UTC(),
event := beat.Event{
Timestamp: msg.PublishTime.UTC(),
Fields: common.MapStr{
"event": common.MapStr{
"id": id,
"created": time.Now().UTC(),
},
"message": string(msg.Data),
},
"message": string(msg.Data),
Private: msg,
}
event.SetID(id)

if len(msg.Attributes) > 0 {
fields.Put("labels", msg.Attributes)
event.PutValue("labels", msg.Attributes)
}

return beat.Event{
Timestamp: msg.PublishTime.UTC(),
Meta: common.MapStr{
"id": id,
},
Fields: fields,
Private: msg,
}
return event
}

func (in *pubsubInput) getOrCreateSubscription(ctx context.Context, client *pubsub.Client) (*pubsub.Subscription, error) {
Expand Down
47 changes: 24 additions & 23 deletions x-pack/filebeat/input/s3/input.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,33 +587,34 @@ func (p *s3Input) deleteMessage(queueURL string, messagesReceiptHandle string, s
}

func createEvent(log string, offset int, info s3Info, objectHash string, s3Ctx *s3Context) beat.Event {
f := common.MapStr{
"message": log,
"log": common.MapStr{
"offset": int64(offset),
"file.path": constructObjectURL(info),
},
"aws": common.MapStr{
"s3": common.MapStr{
"bucket": common.MapStr{
"name": info.name,
"arn": info.arn},
"object.key": info.key,
s3Ctx.Inc()

event := beat.Event{
Timestamp: time.Now().UTC(),
Fields: common.MapStr{
"message": log,
"log": common.MapStr{
"offset": int64(offset),
"file.path": constructObjectURL(info),
},
"aws": common.MapStr{
"s3": common.MapStr{
"bucket": common.MapStr{
"name": info.name,
"arn": info.arn},
"object.key": info.key,
},
},
"cloud": common.MapStr{
"provider": "aws",
"region": info.region,
},
},
"cloud": common.MapStr{
"provider": "aws",
"region": info.region,
},
Private: s3Ctx,
}
event.SetID(objectHash + "-" + fmt.Sprintf("%012d", offset))

s3Ctx.Inc()
return beat.Event{
Timestamp: time.Now(),
Fields: f,
Meta: common.MapStr{"id": objectHash + "-" + fmt.Sprintf("%012d", offset)},
Private: s3Ctx,
}
return event
}

func constructObjectURL(info s3Info) string {
Expand Down