-
Notifications
You must be signed in to change notification settings - Fork 4.9k
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
Emit error if fileset with multiple pipelines is being used with ES < 6.5 #10001
Merged
ycombinator
merged 6 commits into
elastic:master
from
ycombinator:fb-multi-pipelines-version-check
Jan 13, 2019
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
15ff8ce
Emit error if fileset with multiple pipelines is being used with ES <…
ycombinator c2b7caf
Better error message
ycombinator 3a0f456
Adding CHANGELOG entry
ycombinator 28edeaa
Adding unit test for various version checks
ycombinator e837254
Using t.Run() to shutdown HTTP server at the end of each test case
ycombinator 27c3e97
Use custom error
ycombinator File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,105 @@ | ||
// Licensed to Elasticsearch B.V. under one or more contributor | ||
// license agreements. See the NOTICE file distributed with | ||
// this work for additional information regarding copyright | ||
// ownership. Elasticsearch B.V. licenses this file to you under | ||
// the Apache License, Version 2.0 (the "License"); you may | ||
// not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, | ||
// software distributed under the License is distributed on an | ||
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
// KIND, either express or implied. See the License for the | ||
// specific language governing permissions and limitations | ||
// under the License. | ||
|
||
// +build !integration | ||
|
||
package fileset | ||
|
||
import ( | ||
"net/http" | ||
"net/http/httptest" | ||
"testing" | ||
|
||
"github.com/stretchr/testify/assert" | ||
|
||
"github.com/elastic/beats/libbeat/outputs/elasticsearch" | ||
) | ||
|
||
func TestLoadPipelinesWithMultiPipelineFileset(t *testing.T) { | ||
cases := []struct { | ||
name string | ||
esVersion string | ||
isErrExpected bool | ||
}{ | ||
{ | ||
name: "ES < 6.5.0", | ||
esVersion: "6.4.1", | ||
isErrExpected: true, | ||
}, | ||
{ | ||
name: "ES == 6.5.0", | ||
esVersion: "6.5.0", | ||
isErrExpected: false, | ||
}, | ||
{ | ||
name: "ES > 6.5.0", | ||
esVersion: "6.6.0", | ||
isErrExpected: false, | ||
}, | ||
} | ||
|
||
for _, test := range cases { | ||
test := test | ||
t.Run(test.name, func(t *testing.T) { | ||
t.Parallel() | ||
testFilesetManifest := &manifest{ | ||
Requires: struct { | ||
Processors []ProcessorRequirement `config:"processors"` | ||
}{ | ||
Processors: []ProcessorRequirement{}, | ||
}, | ||
IngestPipeline: []string{"pipeline-plain.json", "pipeline-json.json"}, | ||
} | ||
testFileset := &Fileset{ | ||
name: "fls", | ||
modulePath: "./test/mod", | ||
manifest: testFilesetManifest, | ||
vars: map[string]interface{}{ | ||
"builtin": map[string]interface{}{}, | ||
}, | ||
pipelineIDs: []string{"filebeat-7.0.0-mod-fls-pipeline-plain", "filebeat-7.0.0-mod-fls-pipeline-json"}, | ||
} | ||
testRegistry := ModuleRegistry{ | ||
registry: map[string]map[string]*Fileset{ | ||
"mod": map[string]*Fileset{ | ||
"fls": testFileset, | ||
}, | ||
}, | ||
} | ||
|
||
testESServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { | ||
w.Write([]byte("{\"version\":{\"number\":\"" + test.esVersion + "\"}}")) | ||
})) | ||
defer testESServer.Close() | ||
|
||
testESClient, err := elasticsearch.NewClient(elasticsearch.ClientSettings{ | ||
URL: testESServer.URL, | ||
}, nil) | ||
assert.NoError(t, err) | ||
|
||
err = testESClient.Connect() | ||
assert.NoError(t, err) | ||
|
||
err = testRegistry.LoadPipelines(testESClient, false) | ||
if test.isErrExpected { | ||
assert.IsType(t, MultiplePipelineUnsupportedError{}, err) | ||
} else { | ||
assert.NoError(t, err) | ||
} | ||
}) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
{} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
{} |
Empty file.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does the current LS module also fall into this statement? Probably not because it only loads 1?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The Logstash module actually loads both/all pipelines but it only uses one of them at runtime. So it doesn't fall into this statement. I just tested this to confirm as well.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
But wouldn't we want to fail installing the LS module?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure. The
logstash/log
fileset'smanifest.yml
looks like this:beats/filebeat/module/logstash/log/manifest.yml
Line 19 in f5a9028
Whereas a fileset that is using the multiple pipelines feature will look like this:
The latter one uses the new multiple-pipeline feature, which is what the version check is for.