forked from elastic/beats
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Emit error if fileset with multiple pipelines is being used with ES <…
… 6.5 (elastic#10001) Follow up to elastic#8914. In elastic#8914, we introduced the ability for Filebeat filesets to have multiple Ingest pipelines, the first one being the entry point. This feature relies on the Elasticsearch Ingest node having a `pipeline` processor and `if` conditions for processors, both of which were introduced in Elasticsearch 6.5.0. This PR implements a check for whether a fileset has multiple Ingest pipelines AND is talking to an Elasticsearch cluster < 6.5.0. If that's the case, we emit an error. (cherry picked from commit c55226e)
- Loading branch information
1 parent
a1b8d65
commit fe9d999
Showing
6 changed files
with
134 additions
and
0 deletions.
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.