Skip to content

[feat:filebeat/input/redis/slowlog] Add client address and name to submitted slowlogs#41507

Merged
rdner merged 16 commits intoelastic:mainfrom
jdheyburn:jdheyburn/filebeat/input/redis/add-client-info
Nov 17, 2025
Merged

[feat:filebeat/input/redis/slowlog] Add client address and name to submitted slowlogs#41507
rdner merged 16 commits intoelastic:mainfrom
jdheyburn:jdheyburn/filebeat/input/redis/add-client-info

Conversation

@jdheyburn
Copy link
Contributor

  • Enhancement

Proposed commit message

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Disruptive User Impact

No disruption expected

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Use cases

Identifying which clients are causing the slow logs.

Screenshots

Logs

@jdheyburn jdheyburn requested a review from a team as a code owner November 4, 2024 14:22
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Nov 4, 2024
@mergify
Copy link
Contributor

mergify bot commented Nov 4, 2024

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @jdheyburn? 🙏.
For such, you'll need to label your PR with:

  • The upcoming major version of the Elastic Stack
  • The upcoming minor version of the Elastic Stack (if you're not pushing a breaking change)

To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-8./d is the label to automatically backport to the 8./d branch. /d is the digit
@mergify
Copy link
Contributor

mergify bot commented Nov 4, 2024

backport-8.x has been added to help with the transition to the new branch 8.x.
If you don't need it please use backport-skip label and remove the backport-8.x label.

@mergify mergify bot added the backport-8.x Automated backport to the 8.x branch with mergify label Nov 4, 2024
@pierrehilbert pierrehilbert added the Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team label Nov 4, 2024
@elasticmachine
Copy link
Contributor

Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Nov 4, 2024
@pierrehilbert
Copy link
Contributor

@lalit-satapathy could we have someone from your team to review here please?

@pierrehilbert pierrehilbert added the Team:Obs-InfraObs Label for the Observability Infrastructure Monitoring team label Nov 4, 2024
@lalit-satapathy
Copy link
Contributor

@lalit-satapathy could we have someone from your team to review here please?

@devamanv, Could you take a look?

@mergify
Copy link
Contributor

mergify bot commented Dec 9, 2024

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 jdheyburn/filebeat/input/redis/add-client-info upstream/jdheyburn/filebeat/input/redis/add-client-info
git merge upstream/main
git push upstream jdheyburn/filebeat/input/redis/add-client-info
@jdheyburn
Copy link
Contributor Author

@lalit-satapathy @devamanv Is it possible for a review? All the checks are green now.

Copy link
Contributor

@faec faec left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approving code for data plane, but it should still have infraobs-integrations approval before merge

@ebeahan
Copy link
Member

ebeahan commented May 28, 2025

Buildkite test this

@ebeahan
Copy link
Member

ebeahan commented May 28, 2025

@lalit-satapathy @devamanv can you review these changes please?

@jdheyburn reached out out-of-band asking if we could do a final review to merge.

@ebeahan
Copy link
Member

ebeahan commented May 29, 2025

@elasticmachine run buildkite/beats

@ebeahan
Copy link
Member

ebeahan commented May 29, 2025

run docs-build

@pierrehilbert
Copy link
Contributor

/test

Copy link
Contributor

@devamanv devamanv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@jdheyburn
Copy link
Contributor Author

@ebeahan Can I assist in getting this PR over the line?

@rdner
Copy link
Member

rdner commented Nov 7, 2025

@jdheyburn looks like the Redis tests (Python files) are timing out. Have you tried to run them on your machine? There is also a merge conflict with the CHANGELOG.next.asciidoc file on the main branch.

Once the tests are passing and the conflict is resolved we can merge this PR.

@jdheyburn
Copy link
Contributor Author

@rdner Thanks for checking on this! I've rebased and did some testing locally. It seems the Docker image being used in the integration tests doesn't support the new fields being added. I've made those fields optional in the harvester and upgraded the Dockerfile used for testing to support those fields.

In a follow up PR I could implement a matrix to check against varying Redis versions and the different fields they support. Given that Valkey has now forked Redis there are likely going to be differences in these too.

@rdner
Copy link
Member

rdner commented Nov 10, 2025

@elastic/obs-infraobs-integrations as maintainers of the module that consumes the Redis slowlogs, could you have a look?

@rdner
Copy link
Member

rdner commented Nov 10, 2025

/test

@rdner rdner requested a review from a team November 10, 2025 14:34
@rdner
Copy link
Member

rdner commented Nov 10, 2025

I noticed that the changelog entry was added to the old changelog file. We've migrated to using this tool instead https://github.com/elastic/elastic-agent-changelog-tool/blob/main/docs/usage.md

@jdheyburn could you please migrate the changelog entry. Sorry for the inconvenience.

@jdheyburn
Copy link
Contributor Author

Thanks @rdner , I've used that tool to check in a new changelog, let me know if there's anything else I need to do from my side.

@rdner
Copy link
Member

rdner commented Nov 10, 2025

/test

@rdner
Copy link
Member

rdner commented Nov 10, 2025

@jdheyburn thank you!

Now everything looks good to me. Once the code owners approved the changes, Given the tests also passed, I'll merge this PR.

@rdner
Copy link
Member

rdner commented Nov 10, 2025

@devamanv could you have another look?

@rdner rdner merged commit 3a8a181 into elastic:main Nov 17, 2025
53 of 54 checks passed
andrzej-stencel pushed a commit to andrzej-stencel/beats that referenced this pull request Dec 1, 2025
…bmitted slowlogs (elastic#41507)

* [DOCS] Removed reference to the Stack GS (elastic#32083)
* Add client address and name to submitted slowlogs

---------

Co-authored-by: debadair <debadair@elastic.co>
Co-authored-by: Eric Beahan <eric.beahan@elastic.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-8.x Automated backport to the 8.x branch with mergify Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team Team:Obs-InfraObs Label for the Observability Infrastructure Monitoring team

10 participants