Skip to content

Commit

Permalink
[8.x](backport #41600) x-pack/filebeat/input/streaming: fix missing k…
Browse files Browse the repository at this point in the history
…ey in streaming input logging (#41677)

* x-pack/filebeat/input/streaming: fix missing key in streaming input logging (#41600)

(cherry picked from commit 2ea4a2b)

* Fix changelog merge issue

---------

Co-authored-by: Dan Kortschak <dan.kortschak@elastic.co>
Co-authored-by: Andrew Kroh <andrew.kroh@elastic.co>
  • Loading branch information
3 people authored Nov 28, 2024
1 parent 8d5620d commit 7a6ea14
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,8 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]
- Journald input now can read events from all boots {issue}41083[41083] {pull}41244[41244]
- Fix double encoding of client_secret in the Entity Analytics input's Azure Active Directory provider {pull}41393[41393]
- Fix aws region in aws-s3 input s3 polling mode. {pull}41572[41572]
- Fix missing key in streaming input logging. {pull}41600[41600]

- Fix errors in SQS host resolution in the `aws-s3` input when using custom (non-AWS) endpoints. {pull}41504[41504]
- Fix double encoding of client_secret in the Entity Analytics input's Azure Active Directory provider {pull}41393[41393]
- The azure-eventhub input now correctly reports its status to the Elastic Agent on fatal errors {pull}41469[41469]
Expand Down
2 changes: 1 addition & 1 deletion x-pack/filebeat/input/streaming/crowdstrike.go
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ func (s *falconHoseStream) followSession(ctx context.Context, cli *http.Client,
}
s.metrics.receivedBytesTotal.Add(uint64(len(msg)))
state["response"] = []byte(msg)
s.log.Debugw("received firehose message", logp.Namespace("falcon_hose"), debugMsg(msg))
s.log.Debugw("received firehose message", logp.Namespace("falcon_hose"), "msg", debugMsg(msg))
err = s.process(ctx, state, s.cursor, s.now().In(time.UTC))
if err != nil {
s.log.Errorw("failed to process and publish data", "error", err)
Expand Down
2 changes: 1 addition & 1 deletion x-pack/filebeat/input/streaming/websocket.go
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ func (s *websocketStream) FollowStream(ctx context.Context) error {
}
s.metrics.receivedBytesTotal.Add(uint64(len(message)))
state["response"] = message
s.log.Debugw("received websocket message", logp.Namespace("websocket"), string(message))
s.log.Debugw("received websocket message", logp.Namespace("websocket"), "msg", string(message))
err = s.process(ctx, state, s.cursor, s.now().In(time.UTC))
if err != nil {
s.metrics.errorsTotal.Inc()
Expand Down

0 comments on commit 7a6ea14

Please sign in to comment.