Skip to content

[7.x](backport #25641) Osquerybeat: Rewrite queries scheduling with extensions for scheduling and logging#25722

Merged
aleksmaus merged 2 commits into7.xfrom
mergify/bp/7.x/pr-25641
May 17, 2021
Merged

[7.x](backport #25641) Osquerybeat: Rewrite queries scheduling with extensions for scheduling and logging#25722
aleksmaus merged 2 commits into7.xfrom
mergify/bp/7.x/pr-25641

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented May 14, 2021 •
edited by zube bot
Loading

This is an automatic backport of pull request #25641 done by Mergify.
Cherry-pick of c1a3a8d has failed:

On branch mergify/bp/7.x/pr-25641
Your branch is up to date with 'origin/7.x'.

You are currently cherry-picking commit c1a3a8df32.
  (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:   NOTICE.txt
	modified:   go.sum
	modified:   x-pack/osquerybeat/.gitignore
	new file:   x-pack/osquerybeat/beater/action_handler.go
	new file:   x-pack/osquerybeat/beater/config_plugin.go
	new file:   x-pack/osquerybeat/beater/config_plugin_test.go
	modified:   x-pack/osquerybeat/beater/install.go
	new file:   x-pack/osquerybeat/beater/logger_plugin.go
	new file:   x-pack/osquerybeat/beater/logger_plugin_test.go
	modified:   x-pack/osquerybeat/beater/osquerybeat.go
	deleted:    x-pack/osquerybeat/beater/runner.go
	deleted:    x-pack/osquerybeat/beater/scheduler.go
	deleted:    x-pack/osquerybeat/beater/sockdir_unix.go
	deleted:    x-pack/osquerybeat/beater/sockdir_windows.go
	modified:   x-pack/osquerybeat/dev-tools/packaging/packages.yml
	new file:   x-pack/osquerybeat/ext/osquery-extension/main.go
	modified:   x-pack/osquerybeat/internal/config/config.go
	new file:   x-pack/osquerybeat/internal/osqd/osqueryd.go
	renamed:    x-pack/osquerybeat/internal/osqueryd/osqueryd_unix.go -> x-pack/osquerybeat/internal/osqd/osqueryd_unix.go
	renamed:    x-pack/osquerybeat/internal/osqueryd/osqueryd_windows.go -> x-pack/osquerybeat/internal/osqd/osqueryd_windows.go
	new file:   x-pack/osquerybeat/internal/osqdcli/cache.go
	new file:   x-pack/osquerybeat/internal/osqdcli/client.go
	deleted:    x-pack/osquerybeat/internal/osqueryd/client.go
	deleted:    x-pack/osquerybeat/internal/osqueryd/osqueryd.go
	renamed:    x-pack/osquerybeat/internal/config/config_test.go -> x-pack/osquerybeat/internal/testutil/testutil.go
	modified:   x-pack/osquerybeat/magefile.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/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.io/

@aleksmaus
Osquerybeat: Rewrite queries scheduling with extensions for schedulin…
adb3c24 
…g and logging (#25641)

* Osquerybeat: Rewrite queries scheduling  with extensions for scheduling and logging

* Make check happy

* Update notice, to make linter happy

* Fix Go 1.16 check failure, when calling t.Fatal from goroutine

* Fix windows build

* Add configuration plugin tests

* Add logger plugin unit tests

* Rollback gotest_test change

* Address code review comments

(cherry picked from commit c1a3a8d)

# Conflicts:
#	go.mod
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels May 14, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label May 14, 2021
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented May 14, 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-05-17T12:24:56.074+0000

  • Duration: 96 min 42 sec

  • Commit: c3ce4d1

Trends 🧪

Image of Build Times

❕ Flaky test report

No test was executed to be analysed.

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label May 14, 2021
@aleksmaus
Copy link
Copy Markdown
Contributor

aleksmaus commented May 17, 2021

/test

@aleksmaus aleksmaus merged commit 897bae3 into 7.x May 17, 2021
@aleksmaus aleksmaus deleted the mergify/bp/7.x/pr-25641 branch May 17, 2021 14:23
@mdelapenya
Copy link
Copy Markdown
Contributor

mdelapenya commented May 17, 2021

Detected that the e2e tests failed as they ran before a fix to the suites was added 2hs ago. Re-triggering them manually again for completeness: https://beats-ci.elastic.co/blue/organizations/jenkins/e2e-tests%2Fe2e-testing-mbp/detail/7.x/517/pipeline

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 Team:Asset Mgt

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@elasticmachine @aleksmaus @mdelapenya