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

[7.x](backport #27233) Osquerybeat: Add support for input/integration level osquery platform/version/discovery configuration #27281

Merged
merged 1 commit into from
Aug 9, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 9, 2021

This is an automatic backport of pull request #27233 done by Mergify.


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.io/

…/version/discovery configuration (#27233)

(cherry picked from commit 75ed47c)
@mergify mergify bot added the backport label Aug 9, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Aug 9, 2021
@elasticmachine
Copy link
Collaborator

💚 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: 2021-08-09T14:30:32.861+0000

  • Duration: 51 min 39 sec

  • Commit: a6e9c37

Test stats 🧪

Test Results
Failed 0
Passed 3656
Skipped 0
Total 3656

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 3656
Skipped 0
Total 3656

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Aug 9, 2021
@aleksmaus aleksmaus merged commit 1a8d072 into 7.x Aug 9, 2021
@mergify mergify bot deleted the mergify/bp/7.x/pr-27233 branch August 9, 2021 15:58
@mergify
Copy link
Contributor Author

mergify bot commented Nov 8, 2021

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/7.x/pr-27233 upstream/mergify/bp/7.x/pr-27233
git merge upstream/7.x
git push upstream mergify/bp/7.x/pr-27233

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants