Skip to content

[7.17](backport #30388) Osquerybeat: Add install verification for osquerybeat#30405

Merged
aleksmaus merged 3 commits into7.17from
mergify/bp/7.17/pr-30388
Feb 17, 2022
Merged

[7.17](backport #30388) Osquerybeat: Add install verification for osquerybeat#30405
aleksmaus merged 3 commits into7.17from
mergify/bp/7.17/pr-30388

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Feb 15, 2022 •
edited by zube bot
Loading

This is an automatic backport of pull request #30388 done by Mergify.
Cherry-pick of 1c68693 has failed:

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

You are currently cherry-picking commit 1c68693c14.
  (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:   x-pack/elastic-agent/spec/osquerybeat.yml
	new file:   x-pack/osquerybeat/internal/install/verify.go
	new file:   x-pack/osquerybeat/internal/install/verify_test.go
	modified:   x-pack/osquerybeat/internal/osqd/osqueryd.go
	modified:   x-pack/osquerybeat/internal/osqd/osqueryd_unix.go
	modified:   x-pack/osquerybeat/internal/osqd/osqueryd_windows.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x-pack/elastic-agent/pkg/agent/program/supported.go
	both modified:   x-pack/osquerybeat/cmd/root.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@aleksmaus
Osquerybeat: Add install verification for osquerybeat (#30388)
61a5112 
(cherry picked from commit 1c68693)

# Conflicts:
#	x-pack/elastic-agent/pkg/agent/program/supported.go
#	x-pack/osquerybeat/cmd/root.go
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Feb 15, 2022
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Feb 15, 2022
@botelastic
Copy link
Copy Markdown

botelastic bot commented Feb 15, 2022

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

@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Feb 15, 2022 •
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 preview

Expand to view the summary

Build stats

  • Start Time: 2022-02-16T16:23:09.416+0000

  • Duration: 107 min 57 sec

Test stats 🧪

Test Results
Failed 0
Passed 11253
Skipped 24
Total 11277

💚 Flaky test report

Tests succeeded.

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

@aleksmaus aleksmaus merged commit 8a15f89 into 7.17 Feb 17, 2022
@mergify mergify bot deleted the mergify/bp/7.17/pr-30388 branch February 17, 2022 15:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@aleksmaus aleksmaus

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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@elasticmachine @aleksmaus