Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Mar 19, 2025

Proposed commit message

filebeat,libbeat,x-pack/filebeat: clean up state store types

This centralises the state store to simplify and clarify the use of persistent
stores.

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

Related issues

Use cases

Screenshots

Logs


This is an automatic backport of pull request #43063 done by [Mergify](https://mergify.com).

This centralises the state store to simplify and clarify the use of persistent
stores.

(cherry picked from commit df62e10)

# Conflicts:
#	filebeat/beater/filebeat.go
#	filebeat/input/journald/environment_test.go
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Mar 19, 2025
@mergify mergify bot requested review from a team as code owners March 19, 2025 19:37
@mergify mergify bot assigned efd6 Mar 19, 2025
@mergify mergify bot removed the request for review from a team March 19, 2025 19:37
@mergify
Copy link
Contributor Author

mergify bot commented Mar 19, 2025

Cherry-pick of df62e10 has failed:

On branch mergify/bp/9.0/pr-43063
Your branch is up to date with 'origin/9.0'.

You are currently cherry-picking commit df62e10c1.
  (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:   filebeat/beater/store.go
	modified:   filebeat/input/default-inputs/inputs.go
	modified:   filebeat/input/default-inputs/inputs_linux.go
	modified:   filebeat/input/default-inputs/inputs_windows.go
	modified:   filebeat/input/filestream/environment_test.go
	modified:   filebeat/input/filestream/input.go
	modified:   filebeat/input/filestream/input_test.go
	modified:   filebeat/input/filestream/internal/input-logfile/manager.go
	modified:   filebeat/input/filestream/internal/input-logfile/store.go
	modified:   filebeat/input/filestream/internal/input-logfile/store_test.go
	modified:   filebeat/input/journald/input.go
	modified:   filebeat/input/journald/input_filtering_test.go
	modified:   filebeat/input/journald/input_stub.go
	modified:   filebeat/input/v2/input-cursor/manager.go
	modified:   filebeat/input/v2/input-cursor/store.go
	modified:   filebeat/input/v2/input-cursor/store_test.go
	modified:   filebeat/input/winlog/input.go
	modified:   filebeat/registrar/registrar.go
	modified:   libbeat/statestore/store.go
	modified:   x-pack/filebeat/input/awss3/input.go
	modified:   x-pack/filebeat/input/awss3/s3_input.go
	modified:   x-pack/filebeat/input/awss3/states.go
	modified:   x-pack/filebeat/input/awss3/states_test.go
	modified:   x-pack/filebeat/input/azureblobstorage/input.go
	modified:   x-pack/filebeat/input/cel/input.go
	modified:   x-pack/filebeat/input/cel/input_manager.go
	modified:   x-pack/filebeat/input/default-inputs/inputs.go
	modified:   x-pack/filebeat/input/default-inputs/inputs_aix.go
	modified:   x-pack/filebeat/input/default-inputs/inputs_darwin.go
	modified:   x-pack/filebeat/input/default-inputs/inputs_other.go
	modified:   x-pack/filebeat/input/default-inputs/inputs_windows.go
	modified:   x-pack/filebeat/input/gcs/input.go
	modified:   x-pack/filebeat/input/httpjson/input.go
	modified:   x-pack/filebeat/input/httpjson/input_manager.go
	modified:   x-pack/filebeat/input/o365audit/input.go
	modified:   x-pack/filebeat/input/salesforce/input.go
	modified:   x-pack/filebeat/input/salesforce/input_manager.go
	modified:   x-pack/filebeat/input/salesforce/input_manager_test.go
	modified:   x-pack/filebeat/input/streaming/input.go
	modified:   x-pack/filebeat/input/streaming/input_manager.go
	modified:   x-pack/filebeat/input/unifiedlogs/input.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   filebeat/beater/filebeat.go
	both modified:   filebeat/input/journald/environment_test.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot requested review from AndersonQ and belimawr March 19, 2025 19:37
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Mar 19, 2025
@github-actions github-actions bot added enhancement Filebeat Filebeat libbeat Team:obs-ds-hosted-services Label for the Observability Hosted Services team Team:Obs-InfraObs Label for the Observability Infrastructure Monitoring team Team:Security-Service Integrations Security Service Integrations Team Team:Security-Windows Platform Windows Platform Team in Security Solution labels Mar 19, 2025
@elasticmachine
Copy link
Contributor

Pinging @elastic/obs-ds-hosted-services (Team:obs-ds-hosted-services)

@elasticmachine
Copy link
Contributor

Pinging @elastic/sec-windows-platform (Team:Security-Windows Platform)

@elasticmachine
Copy link
Contributor

Pinging @elastic/security-service-integrations (Team:Security-Service Integrations)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Mar 19, 2025
@efd6 efd6 force-pushed the mergify/bp/9.0/pr-43063 branch from 4827679 to 16f23ac Compare March 19, 2025 20:31
@efd6 efd6 merged commit 241531f into 9.0 Mar 19, 2025
187 of 190 checks passed
@efd6 efd6 deleted the mergify/bp/9.0/pr-43063 branch March 19, 2025 23:09
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 enhancement Filebeat Filebeat libbeat Team:obs-ds-hosted-services Label for the Observability Hosted Services team Team:Obs-InfraObs Label for the Observability Infrastructure Monitoring team Team:Security-Service Integrations Security Service Integrations Team Team:Security-Windows Platform Windows Platform Team in Security Solution

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants