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

[8.15](backport #40565) [metricbeat][system/process, system/process_summary]: mark module as healthy if metrics are partially filled #40602

Closed
wants to merge 3 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 23, 2024

  • Bug

Proposed commit message

  • If metrics are partially available for system.process and system.process_summary, do not mark metricset as degraded.
  • Instead, keep it healthy and display the 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.

How to test this PR locally

  • Clone from this branch
  • Do mage package from x-pack/agentbeat
  • Run elastic agent with new agentbeat binary
  • Run as unprivileged mode, and run elastic-agent status --output=json
  • You should see HEALTHY state and error message displayed

Related issues

Use cases

Screenshots

Screenshot 2024-08-22 at 12 38 05 PM Screenshot 2024-08-22 at 12 38 13 PM
This is an automatic backport of pull request #40565 done by [Mergify](https://mergify.com).

…healthy if metrics are partially filled (#40565)

* chore: mark module as healthy if metrics are partially filled

* chore: mark module as healthy if metrics are partially filled

* fix: use errors.As

* fix: fix lint

* Update metricbeat/mb/event.go

Co-authored-by: Mauri de Souza Meneguzzo <[email protected]>

* fix: changelog

---------

Co-authored-by: Mauri de Souza Meneguzzo <[email protected]>
(cherry picked from commit 1f033c9)

# Conflicts:
#	metricbeat/mb/module/wrapper.go
#	metricbeat/module/system/process_summary/process_summary.go
@mergify mergify bot requested a review from a team as a code owner August 23, 2024 12:56
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Aug 23, 2024
@mergify mergify bot requested review from rdner and mauri870 and removed request for a team August 23, 2024 12:56
Copy link
Contributor Author

mergify bot commented Aug 23, 2024

Cherry-pick of 1f033c9 has failed:

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

You are currently cherry-picking commit 1f033c9eed.
  (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:   CHANGELOG.next.asciidoc
	modified:   metricbeat/mb/event.go
	modified:   metricbeat/module/system/process/process.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   metricbeat/mb/module/wrapper.go
	both modified:   metricbeat/module/system/process_summary/process_summary.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

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Aug 23, 2024
@botelastic
Copy link

botelastic bot commented Aug 23, 2024

This pull request doesn't have a Team:<team> label.

Copy link
Contributor Author

mergify bot commented Aug 26, 2024

This pull request has not been merged yet. Could you please review and merge it @VihasMakwana? 🙏

1 similar comment
Copy link
Contributor Author

mergify bot commented Sep 2, 2024

This pull request has not been merged yet. Could you please review and merge it @VihasMakwana? 🙏

Copy link
Contributor Author

mergify bot commented Sep 5, 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 mergify/bp/8.15/pr-40565 upstream/mergify/bp/8.15/pr-40565
git merge upstream/8.15
git push upstream mergify/bp/8.15/pr-40565

Copy link
Contributor Author

mergify bot commented Sep 9, 2024

This pull request has not been merged yet. Could you please review and merge it @VihasMakwana? 🙏

@rdner
Copy link
Member

rdner commented Sep 10, 2024

@VihasMakwana could you help me to resolve conflicts?

@VihasMakwana
Copy link
Contributor

@rdner actually, I dont think we need this. This is a follow-up PR of #40443

@cmacknz closed #40443. See #40443 (comment)

@mergify mergify bot deleted the mergify/bp/8.15/pr-40565 branch September 10, 2024 08:52
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 needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants