Skip to content

[8.14](backport #39404) Add error check to groupToEvents so we don't blindly add error values#39504

Merged
ycombinator merged 2 commits into8.14from
mergify/bp/8.14/pr-39404
May 15, 2024
Merged

[8.14](backport #39404) Add error check to groupToEvents so we don't blindly add error values#39504
ycombinator merged 2 commits into8.14from
mergify/bp/8.14/pr-39404

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented May 10, 2024 •
edited by zube bot
Loading

Proposed commit message

fixes #38140

This adds an error check to the eventMap in groupToEvents() so we don't report an error where there isn't one.

I almost never touch any of the windows code, so feel free to ignore this until CI is green.

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.
This is an automatic backport of pull request #39404 done by [Mergify](https://mergify.com).

@fearful-symmetry @mergify
Add error check to groupToEvents so we don't blindly add error values (…
981e48f 
…#39404)

* add error check to perfmon groupToEvents

* linter...

* tests

* add changelog

* fix changelog

* make linter happy

(cherry picked from commit 760208b)
@mergify mergify bot requested a review from a team as a code owner May 10, 2024 06:34
@mergify mergify bot added the backport label May 10, 2024
@mergify mergify bot requested review from faec and leehinman and removed request for a team May 10, 2024 06:34
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label May 10, 2024
@pierrehilbert pierrehilbert added the Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team label May 10, 2024
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented May 10, 2024

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 May 10, 2024
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented May 13, 2024

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

@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented May 14, 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.14/pr-39404 upstream/mergify/bp/8.14/pr-39404
git merge upstream/8.14
git push upstream mergify/bp/8.14/pr-39404

@ycombinator ycombinator enabled auto-merge (squash) May 15, 2024 21:39
@ycombinator ycombinator merged commit e090084 into 8.14 May 15, 2024
@ycombinator ycombinator deleted the mergify/bp/8.14/pr-39404 branch May 15, 2024 21:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ycombinator ycombinator ycombinator approved these changes

@faec faec Awaiting requested review from faec faec is a code owner automatically assigned from elastic/elastic-agent-data-plane

@leehinman leehinman Awaiting requested review from leehinman leehinman is a code owner automatically assigned from elastic/elastic-agent-data-plane

Assignees

@fearful-symmetry fearful-symmetry

Labels

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

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@elasticmachine @ycombinator @pierrehilbert @fearful-symmetry