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.

Sign up for GitHub

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

Jump to bottom

[beat] Set cluster UUID in state metricset correctly #37419

Merged
merged 5 commits into from
Dec 13, 2023
Merged

[beat] Set cluster UUID in state metricset correctly #37419

merged 5 commits into from
Dec 13, 2023

Conversation

miltonhultgren
Copy link
Contributor

@miltonhultgren miltonhultgren commented Dec 12, 2023 •
edited
Loading

Closes #37414

In the state metricset of the Beat module, we would set the field beat.state.cluster.uuid but miss to set the field beat.elasticsearch.cluster.id when using a non-Elasticsearch output, this PR fixes that.

@miltonhultgren miltonhultgren added Metricbeat Metricbeat Team:Infra Monitoring UI - DEPRECATED Infrastructure Monitoring UI team - DEPRECATED - Use Team:Monitoring Module:beat The beat Metricbeat module labels Dec 12, 2023
@miltonhultgren miltonhultgren requested a review from a team as a code owner December 12, 2023 19:58
@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Dec 12, 2023
@mergify Mergify
Copy link
Contributor

mergify bot commented Dec 12, 2023

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @miltonhultgren? 🙏.
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-v8./d.0 is the label to automatically backport to the 8./d branch. /d is the digit

@miltonhultgren miltonhultgren added the backport-v8.12.0 Automated backport with mergify label Dec 12, 2023
@elasticmachine
Copy link
Collaborator

💚 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 preview

Expand to view the summary

Build stats

  • Duration: 51 min 7 sec

❕ Flaky test report

No test was executed to be analysed.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

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

@neptunian
Copy link
Contributor

Should we add a test for this case?

@elasticmachine
Copy link
Collaborator

❕ Build Aborted

Either there was a build timeout or someone aborted the build.

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

  • Duration: 21 min 12 sec

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

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

@elasticmachine
Copy link
Collaborator

❕ Build Aborted

Either there was a build timeout or someone aborted the build.

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

  • Duration: 18 min 4 sec

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

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

@elasticmachine
Copy link
Collaborator

💚 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 preview

Expand to view the summary

Build stats

  • Duration: 49 min 29 sec

❕ Flaky test report

No test was executed to be analysed.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

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

@miltonhultgren miltonhultgren merged commit ef1bce5 into main Dec 13, 2023
30 checks passed
@miltonhultgren miltonhultgren deleted the 37414-beat-logstash-output-uuid branch December 13, 2023 13:28
mergify bot pushed a commit that referenced this pull request Dec 13, 2023
@miltonhultgren @mergify
[beat] Set cluster UUID in state metricset correctly (#37419)
3cdfd9d 
* [beat] Set cluster UUID in state metricset correctly

* Add test

* Fix file ending with new line

* Fix spacing error

(cherry picked from commit ef1bce5)
@mergify mergify bot mentioned this pull request Dec 13, 2023
Merged
miltonhultgren added a commit that referenced this pull request Dec 13, 2023
@mergify @miltonhultgren
[beat] Set cluster UUID in state metricset correctly (#37419) (#37432)
5385cd4 
* [beat] Set cluster UUID in state metricset correctly

* Add test

* Fix file ending with new line

* Fix spacing error

(cherry picked from commit ef1bce5)

Co-authored-by: Milton Hultgren <[email protected]>
Scholar-Li pushed a commit to Scholar-Li/beats that referenced this pull request Feb 5, 2024
@miltonhultgren @Scholar-Li
[beat] Set cluster UUID in state metricset correctly (elastic#37419)
e9c6eb5 
* [beat] Set cluster UUID in state metricset correctly

* Add test

* Fix file ending with new line

* Fix spacing error
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@neptunian neptunian neptunian approved these changes

Assignees

@miltonhultgren miltonhultgren

Labels
backport-v8.12.0 Automated backport with mergify Metricbeat Metricbeat Module:beat The beat Metricbeat module Team:Infra Monitoring UI - DEPRECATED Infrastructure Monitoring UI team - DEPRECATED - Use Team:Monitoring
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[beat] Using Logstash output causes cluster UUID to be missing in state metricset
3 participants
@miltonhultgren @elasticmachine @neptunian