Skip to content

[9.1](backport #45222) Support both take over configurations#45293

Merged
belimawr merged 1 commit into9.1from
mergify/bp/9.1/pr-45222
Jul 10, 2025
Merged

[9.1](backport #45222) Support both take over configurations#45293
belimawr merged 1 commit into9.1from
mergify/bp/9.1/pr-45222

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Jul 10, 2025

Proposed commit message

The take over mode configuration changed format when its functionality was expanded. It changed
from a single boolean

take_over: true

To an object:

take_over:
  enabled: true
  from_ids: ["foo", "bar"]

This commit makes both formats accepted with no change on how the feature works.

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
## Author's Checklist

How to test this PR locally

Run the tests

cd filebeat

# Unit Tests
go test -run="TestTakeOverCfg|TestGetTakeOver" -count=1 -v ./input/filestream/...

# Integration tests
mage buildSystemTestBinary
go test -tags=integration -run=TestFilestreamTakeOver -v -count=1 ./tests/integration

For manual testing, follow the procedures from #42624 and use both configuration formats.

Related issues

## Use cases
## Screenshots
## Logs


This is an automatic backport of pull request #45222 done by Mergify.

The take over mode configuration changed format, this commit makes
both formats accepted with no change on how the feature works.

---------

Co-authored-by: Anderson Queiroz <me@andersonq.me>
Co-authored-by: Colleen McGinnis <colleen.j.mcginnis@gmail.com>
Co-authored-by: Craig MacKenzie <craig.mackenzie@elastic.co>
(cherry picked from commit f72b33d)
@mergify mergify Bot added the backport label Jul 10, 2025
@mergify mergify Bot requested review from a team as code owners July 10, 2025 15:10
@mergify mergify Bot added the backport label Jul 10, 2025
@mergify mergify Bot requested review from AndersonQ and rdner and removed request for a team July 10, 2025 15:10
@botelastic botelastic Bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jul 10, 2025
@github-actions
Copy link
Copy Markdown
Contributor

🤖 GitHub comments

Expand to view the GitHub comments

Just comment with:

  • run docs-build : Re-trigger the docs validation. (use unformatted text in the comment!)

@github-actions github-actions Bot added the Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team label Jul 10, 2025
@elasticmachine
Copy link
Copy Markdown
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 Jul 10, 2025
@github-actions
Copy link
Copy Markdown
Contributor

🔍 Preview links for changed docs

@belimawr belimawr merged commit be7a9ae into 9.1 Jul 10, 2025
49 of 52 checks passed
@belimawr belimawr deleted the mergify/bp/9.1/pr-45222 branch July 10, 2025 18:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants