Skip to content

[7.x] modelindexer: introduce go-elasticsearch indexer (backport #5970)#6317

Merged
axw merged 2 commits into7.xfrom
mergify/bp/7.x/pr-5970
Oct 12, 2021
Merged

[7.x] modelindexer: introduce go-elasticsearch indexer (backport #5970)#6317
axw merged 2 commits into7.xfrom
mergify/bp/7.x/pr-5970

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Oct 11, 2021

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

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

You are currently cherry-picking commit aa4f76a2.
  (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:   beater/beater.go
	modified:   beater/server_test.go
	modified:   cmd/root.go
	new file:   model/modelindexer/bulk_indexer.go
	new file:   model/modelindexer/indexer.go
	new file:   model/modelindexer/indexer_integration_test.go
	new file:   model/modelindexer/indexer_test.go
	modified:   publish/pub_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   changelogs/head.asciidoc

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

@axw
modelindexer: introduce go-elasticsearch indexer (#5970)
98f0bbc 
* modelindexer: introduce go-elasticsearch indexer

Introduce an experimental option to index events
using go-elasticsearch, bypassing libbeat.

(cherry picked from commit aa4f76a)

# Conflicts:
#	changelogs/head.asciidoc
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Oct 11, 2021
@mergify mergify bot assigned axw Oct 11, 2021
@ghost
Copy link
Copy Markdown

ghost commented Oct 11, 2021

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /hey-apm : Run the hey-apm benchmark.

  • /package : Generate and publish the docker images.

@axw axw removed the conflicts There is a conflict in the backported pull request label Oct 12, 2021
@axw axw enabled auto-merge (squash) October 12, 2021 02:46
@axw axw merged commit 2ff4d3b into 7.x Oct 12, 2021
@mergify mergify bot deleted the mergify/bp/7.x/pr-5970 branch October 12, 2021 03:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@axw axw

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@axw