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

Always use create op_type with ES 7.5+ #13936

Merged
merged 1 commit into from
Oct 14, 2019
Merged

Always use create op_type with ES 7.5+ #13936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions libbeat/outputs/elasticsearch/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ func (client *Client) publishEvents(
}

origCount := len(data)
data = bulkEncodePublishRequest(body, client.index, client.pipeline, eventType, data)
data = bulkEncodePublishRequest(client.GetVersion(), body, client.index, client.pipeline, eventType, data)
newCount := len(data)
if st != nil && origCount > newCount {
st.Dropped(origCount - newCount)
Expand Down Expand Up @@ -384,6 +384,7 @@ func (client *Client) publishEvents(
// fillBulkRequest encodes all bulk requests and returns slice of events
// successfully added to bulk request.
func bulkEncodePublishRequest(
version common.Version,
body bulkWriter,
index outputs.IndexSelector,
pipeline *outil.Selector,
Expand All @@ -393,7 +394,7 @@ func bulkEncodePublishRequest(
okEvents := data[:0]
for i := range data {
event := &data[i].Content
meta, err := createEventBulkMeta(index, pipeline, eventType, event)
meta, err := createEventBulkMeta(version, index, pipeline, eventType, event)
if err != nil {
logp.Err("Failed to encode event meta data: %s", err)
continue
Expand All @@ -409,6 +410,7 @@ func bulkEncodePublishRequest(
}

func createEventBulkMeta(
version common.Version,
indexSel outputs.IndexSelector,
pipelineSel *outil.Selector,
eventType string,
Expand Down Expand Up @@ -444,7 +446,7 @@ func createEventBulkMeta(
ID: id,
}

if id != "" {
if id != "" || version.Major > 7 || (version.Major == 7 && version.Minor >= 5) {
return bulkCreateAction{meta}, nil
}
return bulkIndexAction{meta}, nil
Expand Down
2 changes: 1 addition & 1 deletion libbeat/outputs/elasticsearch/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ func TestBulkEncodeEvents(t *testing.T) {

recorder := &testBulkRecorder{}

encoded := bulkEncodePublishRequest(recorder, index, pipeline, test.docType, events)
encoded := bulkEncodePublishRequest(common.Version{Major: 7, Minor: 5}, recorder, index, pipeline, test.docType, events)
assert.Equal(t, len(events), len(encoded), "all events should have been encoded")
assert.False(t, recorder.inAction, "incomplete bulk")

Expand Down