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

[9.0](backport #42803) fix: don't fail merticbeat/windows/perfmon when no data is available #42946

Merged
merged 2 commits into from
Feb 28, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 27, 2025

Proposed commit message

The bug causes issue in iis/webserver module when IIS isn't installed (meaning there is no data to collect), it makes elastic-agent to go to DEGRATED state:
Screenshot 2025-02-17 at 12 56 07 PM

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

Closes #42802

Use cases

Screenshots

Screenshot 2025-02-20 at 3 01 53 PM

Logs


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

…42803)

* fix: don't fail merticbeat/windows/perfmon when no data is available

* add CHANGELOG.next.asciidoc entry

* fix: linter issue

* fix: linter issue

* fix: fix code according to PR comments

* refactor: make CollectData error handling testable

* fix: add mossing imports to windows/perfmon/reader_test.go

* fix: add mossing imports to windows/perfmon/reader_test.go

---------

Co-authored-by: Pierre HILBERT <[email protected]>
(cherry picked from commit 0ea31fd)
@mergify mergify bot requested a review from a team as a code owner February 27, 2025 15:46
@mergify mergify bot added the backport label Feb 27, 2025
@mergify mergify bot requested review from rdner and khushijain21 and removed request for a team February 27, 2025 15:46
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Feb 27, 2025
@github-actions github-actions bot added bug Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team Team:Obs-InfraObs Label for the Observability Infrastructure Monitoring team labels Feb 27, 2025
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Feb 27, 2025
@elasticmachine
Copy link
Collaborator

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

@stefans-elastic stefans-elastic self-requested a review February 28, 2025 09:51
@stefans-elastic stefans-elastic merged commit 43a8c3f into 9.0 Feb 28, 2025
33 checks passed
@stefans-elastic stefans-elastic deleted the mergify/bp/9.0/pr-42803 branch February 28, 2025 09:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport bug Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team Team:Obs-InfraObs Label for the Observability Infrastructure Monitoring team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants