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

Agent: Fix panic on receiving osquery action due to bad merge to 7.x #25447

Merged
merged 1 commit into from
Apr 30, 2021
Merged

Agent: Fix panic on receiving osquery action due to bad merge to 7.x #25447

merged 1 commit into from
Apr 30, 2021

Conversation

aleksmaus
Copy link
Member

What does this PR do?

Fix panic on receiving osquery action due to bad merge to 7.x, due to bad merge 23 days ago.
Addresses #25441

Why is it important?

Without this fix the agent crashes upon receiving an action.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas

Related issues

@aleksmaus aleksmaus added bug v7.13.0 Team:Elastic-Agent Label for the Agent team backport-v7.13.0 Automated backport with mergify labels Apr 29, 2021
@elasticmachine
Copy link
Collaborator

Pinging @elastic/agent (Team:Agent)

@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 Apr 29, 2021
@elasticmachine
Copy link
Collaborator

elasticmachine commented Apr 29, 2021 •
edited by jenkins-beats-ci bot
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

Expand to view the summary

Build stats

  • Build Cause: aleksmaus commented: /test

  • Start Time: 2021-04-30T00:48:02.467+0000

  • Duration: 22 min 33 sec

  • Commit: 6b6cb92

Test stats 🧪

Test Results
Failed 0
Passed 843
Skipped 3
Total 846

Trends 🧪

Image of Build Times

Image of Tests

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 843
Skipped 3
Total 846

@aleksmaus aleksmaus requested a review from urso April 29, 2021 22:41
@aleksmaus
Copy link
Member Author

/test

blakerouse
blakerouse approved these changes Apr 30, 2021
View reviewed changes
Copy link
Contributor

@blakerouse blakerouse left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Looks good.

@aleksmaus aleksmaus added the backport-v7.14.0 Automated backport with mergify label Apr 30, 2021
@aleksmaus aleksmaus merged commit 839aa77 into elastic:7.x Apr 30, 2021
@ruflin ruflin mentioned this pull request Apr 30, 2021
Closed
@aleksmaus aleksmaus mentioned this pull request Apr 30, 2021
Merged
2 tasks
aleksmaus added a commit to aleksmaus/beats that referenced this pull request Apr 30, 2021
@aleksmaus
Agent: Fix panic on receiving osquery action due to bad merge to 7.x (e…
f24cc7d 
…lastic#25447)

(cherry picked from commit 839aa77)
aleksmaus added a commit that referenced this pull request Apr 30, 2021
@aleksmaus
Agent: Fix panic on receiving osquery action due to bad merge to 7.x (#…
87da3df 
…25447) (#25457)

(cherry picked from commit 839aa77)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@james-elastic james-elastic james-elastic approved these changes

@blakerouse blakerouse blakerouse approved these changes

@michalpristas michalpristas Awaiting requested review from michalpristas

@urso urso Awaiting requested review from urso

Assignees
No one assigned
Labels
backport-v7.13.0 Automated backport with mergify backport-v7.14.0 Automated backport with mergify bug Team:Elastic-Agent Label for the Agent team v7.13.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@aleksmaus @elasticmachine @blakerouse @james-elastic