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.

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

[7.x](backport #25711) [Filebeat] Instrument aws-s3 with metrics #25747

Merged
merged 1 commit into from
May 18, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 17, 2021

This is an automatic backport of pull request #25711 done by Mergify.
Cherry-pick of d3a03b0 has failed:

On branch mergify/bp/7.x/pr-25711
Your branch is up to date with 'origin/7.x'.

You are currently cherry-picking commit d3a03b03f2.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   CHANGELOG.next.asciidoc
	modified:   filebeat/input/v2/compat/compat.go
	modified:   x-pack/filebeat/input/awss3/input.go
	new file:   x-pack/filebeat/input/awss3/metrics.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x-pack/filebeat/docs/inputs/input-aws-s3.asciidoc
	both modified:   x-pack/filebeat/input/awss3/collector.go

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels May 17, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label May 17, 2021
@botelastic
Copy link

botelastic bot commented May 17, 2021

This pull request doesn't have a Team:<team> label.

@elasticmachine
Copy link
Collaborator

elasticmachine commented May 17, 2021

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: Pull request #25747 updated

  • Start Time: 2021-05-18T19:00:05.664+0000

  • Duration: 112 min 17 sec

  • Commit: 8e77ca7

Test stats 🧪

Test Results
Failed 0
Passed 13695
Skipped 2299
Total 15994

Trends 🧪

Image of Build Times

Image of Tests

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 13695
Skipped 2299
Total 15994

@mergify
Copy link
Contributor Author

mergify bot commented May 18, 2021

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/7.x/pr-25711 upstream/mergify/bp/7.x/pr-25711
git merge upstream/7.x
git push upstream mergify/bp/7.x/pr-25711

@andrewkroh
Copy link
Member

@Mergifyio rebase

@mergify
Copy link
Contributor Author

mergify bot commented May 18, 2021

Command rebase: success

Branch has been successfully rebased

@mergify
Copy link
Contributor Author

mergify bot commented May 18, 2021

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/7.x/pr-25711 upstream/mergify/bp/7.x/pr-25711
git merge upstream/7.x
git push upstream mergify/bp/7.x/pr-25711

* Instrument aws-s3 with metrics

Diagnosing performance issues with the aws-s3 input is difficult so this instruments it with some metrics to make this easier.
These are the metrics that are added.

- Number of SQS messages received (not necessarily processed fully).
- Number of SQS visibility timeout extensions.
- Number of SQS messages inflight (gauge).
- Number of SQS message returned to queue (happens on errors implicitly after visibility timeout passes).
- Number of SQS messages deleted.
- Histogram of the elapsed SQS processing times in nanoseconds (time of receipt to time of delete/return).
- Number of S3 objects downloaded.
- Number of S3 bytes processed.
- Number of events created from processing S3 data.
- Number of S3 objects inflight (gauge).
- Histogram of the elapsed S3 object processing times in nanoseconds (start of download to completion of parsing).

The metrics are structured as:

    dataset.<input-id>:
        id=<input id>
        input=aws-s3
        sqs_messages_received_total
        sqs_visibility_timeout_extensions_total
        sqs_messages_inflight_gauge
        sqs_messages_returned_total
        sqs_messages_deleted_total
        sqs_message_processing_time.histogram
        s3_objects_requested_total
        s3_bytes_processed_total
        s3_events_created_total
        s3_objects_inflight_gauge
        s3_object_processing_time.histogram

The v2 input logger was updated to include the input ID to make correlation with metrics possible when an explicit `id` is not set in the input config.
@andrewkroh andrewkroh merged commit 8535d87 into 7.x May 18, 2021
@mergify mergify bot deleted the mergify/bp/7.x/pr-25711 branch May 18, 2021 22:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants