-
Notifications
You must be signed in to change notification settings - Fork 4.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Cherry-pick #14010 to 7.5: [Filebeat] Select output index based on th…
…e source input (#14664) * [Filebeat] Select output index based on the source input (#14010) (cherry picked from commit 6a03478) * Delete debug file, fix changelog merge
- Loading branch information
Showing
11 changed files
with
526 additions
and
49 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
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,213 @@ | ||
| // 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. | ||
|
|
||
| package channel | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
|
|
||
| "github.com/elastic/beats/libbeat/beat" | ||
| "github.com/elastic/beats/libbeat/common" | ||
| "github.com/elastic/beats/libbeat/processors" | ||
| "github.com/elastic/beats/libbeat/processors/actions" | ||
| ) | ||
|
|
||
| func TestProcessorsForConfig(t *testing.T) { | ||
| testCases := map[string]struct { | ||
| beatInfo beat.Info | ||
| configStr string | ||
| clientCfg beat.ClientConfig | ||
| event beat.Event | ||
| expectedFields map[string]string | ||
| }{ | ||
| "Simple static index": { | ||
| configStr: "index: 'test'", | ||
| expectedFields: map[string]string{ | ||
| "@metadata.raw_index": "test", | ||
| }, | ||
| }, | ||
| "Index with agent info + timestamp": { | ||
| beatInfo: beat.Info{Beat: "TestBeat", Version: "3.9.27"}, | ||
| configStr: "index: 'beat-%{[agent.name]}-%{[agent.version]}-%{+yyyy.MM.dd}'", | ||
| event: beat.Event{Timestamp: time.Date(1999, time.December, 31, 23, 0, 0, 0, time.UTC)}, | ||
| expectedFields: map[string]string{ | ||
| "@metadata.raw_index": "beat-TestBeat-3.9.27-1999.12.31", | ||
| }, | ||
| }, | ||
| "Set index in ClientConfig": { | ||
| clientCfg: beat.ClientConfig{ | ||
| Processing: beat.ProcessingConfig{ | ||
| Processor: makeProcessors(&setRawIndex{"clientCfgIndex"}), | ||
| }, | ||
| }, | ||
| expectedFields: map[string]string{ | ||
| "@metadata.raw_index": "clientCfgIndex", | ||
| }, | ||
| }, | ||
| "ClientConfig processor runs after beat input Index": { | ||
| configStr: "index: 'test'", | ||
| clientCfg: beat.ClientConfig{ | ||
| Processing: beat.ProcessingConfig{ | ||
| Processor: makeProcessors(&setRawIndex{"clientCfgIndex"}), | ||
| }, | ||
| }, | ||
| expectedFields: map[string]string{ | ||
| "@metadata.raw_index": "clientCfgIndex", | ||
| }, | ||
| }, | ||
| "Set field in input config": { | ||
| configStr: `processors: [add_fields: {fields: {testField: inputConfig}}]`, | ||
| expectedFields: map[string]string{ | ||
| "fields.testField": "inputConfig", | ||
| }, | ||
| }, | ||
| "Set field in ClientConfig": { | ||
| clientCfg: beat.ClientConfig{ | ||
| Processing: beat.ProcessingConfig{ | ||
| Processor: makeProcessors(actions.NewAddFields(common.MapStr{ | ||
| "fields": common.MapStr{"testField": "clientConfig"}, | ||
| }, false)), | ||
| }, | ||
| }, | ||
| expectedFields: map[string]string{ | ||
| "fields.testField": "clientConfig", | ||
| }, | ||
| }, | ||
| "Input config processors run after ClientConfig": { | ||
| configStr: `processors: [add_fields: {fields: {testField: inputConfig}}]`, | ||
| clientCfg: beat.ClientConfig{ | ||
| Processing: beat.ProcessingConfig{ | ||
| Processor: makeProcessors(actions.NewAddFields(common.MapStr{ | ||
| "fields": common.MapStr{"testField": "clientConfig"}, | ||
| }, false)), | ||
| }, | ||
| }, | ||
| expectedFields: map[string]string{ | ||
| "fields.testField": "inputConfig", | ||
| }, | ||
| }, | ||
| } | ||
| for description, test := range testCases { | ||
| if test.event.Fields == nil { | ||
| test.event.Fields = common.MapStr{} | ||
| } | ||
| config, err := outletConfigFromString(test.configStr) | ||
| if err != nil { | ||
| t.Errorf("[%s] %v", description, err) | ||
| continue | ||
| } | ||
| processors, err := processorsForConfig(test.beatInfo, config, test.clientCfg) | ||
| if err != nil { | ||
| t.Errorf("[%s] %v", description, err) | ||
| continue | ||
| } | ||
| processedEvent, err := processors.Run(&test.event) | ||
| // We don't check if err != nil, because we are testing the final outcome | ||
| // of running the processors, including when some of them fail. | ||
| if processedEvent == nil { | ||
| t.Errorf("[%s] Unexpected fatal error running processors: %v\n", | ||
| description, err) | ||
| } | ||
| for key, value := range test.expectedFields { | ||
| field, err := processedEvent.GetValue(key) | ||
| if err != nil { | ||
| t.Errorf("[%s] Couldn't get field %s from event: %v", description, key, err) | ||
| continue | ||
| } | ||
| assert.Equal(t, field, value) | ||
| fieldStr, ok := field.(string) | ||
| if !ok { | ||
| // Note that requiring a string here is just to simplify the test setup, | ||
| // not a requirement of the underlying api. | ||
| t.Errorf("[%s] Field [%s] should be a string", description, key) | ||
| continue | ||
| } | ||
| if fieldStr != value { | ||
| t.Errorf("[%s] Event field [%s]: expected [%s], got [%s]", description, key, value, fieldStr) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func TestProcessorsForConfigIsFlat(t *testing.T) { | ||
| // This test is regrettable, and exists because of inconsistencies in | ||
| // processor handling between processors.Processors and processing.group | ||
| // (which implements beat.ProcessorList) -- see processorsForConfig for | ||
| // details. The upshot is that, for now, if the input configuration specifies | ||
| // processors, they must be returned as direct children of the resulting | ||
| // processors.Processors (rather than being collected in additional tree | ||
| // structure). | ||
| // This test should be removed once we have a more consistent mechanism for | ||
| // collecting and running processors. | ||
| configStr := `processors: | ||
| - add_fields: {fields: {testField: value}} | ||
| - add_fields: {fields: {testField2: stuff}}` | ||
| config, err := outletConfigFromString(configStr) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| processors, err := processorsForConfig( | ||
| beat.Info{}, config, beat.ClientConfig{}) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| assert.Equal(t, 2, len(processors.List)) | ||
| } | ||
|
|
||
| // setRawIndex is a bare-bones processor to set the raw_index field to a | ||
| // constant string in the event metadata. It is used to test order of operations | ||
| // for processorsForConfig. | ||
| type setRawIndex struct { | ||
| indexStr string | ||
| } | ||
|
|
||
| func (p *setRawIndex) Run(event *beat.Event) (*beat.Event, error) { | ||
| if event.Meta == nil { | ||
| event.Meta = common.MapStr{} | ||
| } | ||
| event.Meta["raw_index"] = p.indexStr | ||
| return event, nil | ||
| } | ||
|
|
||
| func (p *setRawIndex) String() string { | ||
| return fmt.Sprintf("set_raw_index=%v", p.indexStr) | ||
| } | ||
|
|
||
| // Helper function to convert from YML input string to an unpacked | ||
| // inputOutletConfig | ||
| func outletConfigFromString(s string) (inputOutletConfig, error) { | ||
| config := inputOutletConfig{} | ||
| cfg, err := common.NewConfigFrom(s) | ||
| if err != nil { | ||
| return config, err | ||
| } | ||
| if err := cfg.Unpack(&config); err != nil { | ||
| return config, err | ||
| } | ||
| return config, nil | ||
| } | ||
|
|
||
| // makeProcessors wraps one or more bare Processor objects in Processors. | ||
| func makeProcessors(procs ...processors.Processor) *processors.Processors { | ||
| procList := processors.NewList(nil) | ||
| procList.List = procs | ||
| return procList | ||
| } |
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
Oops, something went wrong.