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

Add error check to groupToEvents so we don't blindly add error values #39404

Merged
merged 8 commits into from
May 10, 2024
Merged

Add error check to groupToEvents so we don't blindly add error values #39404

merged 8 commits into from
May 10, 2024

Conversation

fearful-symmetry
Copy link
Contributor

@fearful-symmetry fearful-symmetry commented May 3, 2024 •
edited
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.

@fearful-symmetry fearful-symmetry self-assigned this May 3, 2024
@fearful-symmetry fearful-symmetry requested a review from a team as a code owner May 3, 2024 21:18
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label May 3, 2024
@mergify Mergify
Copy link
Contributor

mergify bot commented May 3, 2024

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @fearful-symmetry? 🙏.
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

@elasticmachine
Copy link
Collaborator

elasticmachine commented May 3, 2024 •
edited
Loading

💚 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

  • Start Time: 2024-05-06T16:01:52.789+0000

  • Duration: 161 min 36 sec

Test stats 🧪

Test Results
Failed 0
Passed 8033
Skipped 1089
Total 9122

💚 Flaky test report

Tests succeeded.

🤖 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!)

@pierrehilbert pierrehilbert added the Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team label May 5, 2024
@elasticmachine
Copy link
Collaborator

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 5, 2024
@pierrehilbert pierrehilbert requested review from faec and removed request for AndersonQ May 6, 2024 13:10
leehinman
leehinman requested changes May 6, 2024
View reviewed changes
Copy link
Contributor

@leehinman leehinman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

code LGTM

Needs a changelog entry

leehinman
leehinman approved these changes May 6, 2024
View reviewed changes
Copy link
Contributor

@leehinman leehinman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggestion on changelog to include issue.

CHANGELOG.next.asciidoc Outdated Show resolved Hide resolved
@fearful-symmetry fearful-symmetry requested a review from a team as a code owner May 6, 2024 16:01
@pierrehilbert pierrehilbert added the backport-v8.14.0 Automated backport with mergify label May 7, 2024
@mergify Mergify
Copy link
Contributor

mergify bot commented May 9, 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 perfmon-error-check upstream/perfmon-error-check
git merge upstream/main
git push upstream perfmon-error-check

@pierrehilbert pierrehilbert merged commit 760208b into elastic:main May 10, 2024
37 checks passed
mergify bot pushed a commit that referenced this pull request May 10, 2024
@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 mentioned this pull request May 10, 2024
Merged
6 tasks
v1v added a commit to v1v/beats that referenced this pull request May 15, 2024
@v1v
Merge remote-tracking branch 'upstream/main' into feature/check-on-gh…
4c5e0d6 
…-actions

* upstream/main: (313 commits)
  github-action: delete opentelemetry workflow (elastic#39559)
  updatecli: move to the .github folder and support for signed commits (elastic#39472)
  Osquerybeat: Add action responses data stream (elastic#39143)
  [winlogbeat] performance improvment; avoid rendering event message twice (elastic#39544)
  Fix the AWS SDK dependencies issue causing the "not found, ResolveEndpointV2" error (elastic#39454)
  x-pack/filebeat/input/cel: add http metrics collection (elastic#39503)
  build(deps): bump github.com/elastic/elastic-agent-libs from 0.9.4 to 0.9.7 (elastic#39424)
  Remove unused env vars from pipelines (elastic#39534)
  [BK] - Remove osx steps from branch execution (elastic#39552)
  [BK] - Remove certain steps from running for Branches (elastic#39533)
  Allow dependabot report BK status checks (elastic#39540)
  Remove hardcoded module definitions in CI (elastic#39506)
  Explicitly set DOCKER_PULL, RACE_DETECTOR and TEST_COVERAGE for pipelines (elastic#39510)
  Fixed pipelines formatting (elastic#39513)
  Update filebeat pipeline to match Jenkins steps (elastic#39261)
  Add error check to groupToEvents so we don't blindly add error values (elastic#39404)
  Remove fields not needed for session view in add_session_view processor (elastic#39500)
  `aws-s3` input: Split S3 poller and SQS reader into explicit input objects (elastic#39353)
  ci(jenkins): remove post-build notifications (elastic#39483)
  [DOCS] Add the `read_pipeline` cluster privilege for winlogbeat and the `auto_configure` index privilege to beats documentation (elastic#38534)
  ...
ycombinator pushed a commit that referenced this pull request May 15, 2024
@mergify @fearful-symmetry
Add error check to groupToEvents so we don't blindly add error values (…
e090084 
…#39404) (#39504)

* add error check to perfmon groupToEvents

* linter...

* tests

* add changelog

* fix changelog

* make linter happy

(cherry picked from commit 760208b)

Co-authored-by: Alex K <[email protected]>
Co-authored-by: fearful-symmetry <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@leehinman leehinman leehinman approved these changes

@faec faec faec approved these changes

@zmoog zmoog zmoog approved these changes

Assignees

@fearful-symmetry fearful-symmetry

Labels
backport-v8.14.0 Automated backport with mergify 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.

[metricbeat/perfmon] Error reported when no error is present
6 participants
@fearful-symmetry @elasticmachine @zmoog @faec @leehinman @pierrehilbert