Followup to 12606 #18316
+312
−76
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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,28 @@ | ||
| // 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 events | ||
|
|
||
| type OpType int | ||
|
|
||
| //go:generate stringer -linecomment -type OpType | ||
| const ( | ||
| OpTypeDefault OpType = iota // | ||
| OpTypeCreate //create | ||
| OpTypeIndex // index | ||
| OpTypeDelete // delete | ||
| ) |
This file contains hidden or 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,84 @@ | ||
| // 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 events | ||
|
|
||
| import "github.com/elastic/beats/v7/libbeat/beat" | ||
|
|
||
| const ( | ||
| // FieldMetaID defines the ID for the event. Also see FieldMetaOpType. | ||
| FieldMetaID = "_id" | ||
|
|
||
| // FieldMetaAlias defines the index alias to use for the event. If set, it takes | ||
| // precedence over values defined using FieldMetaIndex or FieldMetaRawIndex. | ||
| FieldMetaAlias = "alias" | ||
|
|
||
| // FieldMetaIndex defines the base index name to use for the event. The value is suffixed | ||
| // with a Y-m-d value based on the event's timestamp. If set, it takes precedence over the | ||
| // value defined using FieldMetaRawIndex. | ||
| FieldMetaIndex = "index" | ||
|
|
||
| // FieldMetaRawIndex defines the raw index name to use for the event. It is used as-is, without | ||
| // any additional manipulation. | ||
| FieldMetaRawIndex = "raw_index" | ||
|
|
||
| // FieldMetaPipeline defines the ingest node pipeline to use for this event. | ||
| FieldMetaPipeline = "pipeline" | ||
|
|
||
| // FieldMetaOpType defines the metadata key name for event operation type to use with the Elasticsearch | ||
| // Bulk API encoding of the event. The key's value can be an empty string, `create`, `index`, or `delete`. | ||
| // If empty, `create` will be used if FieldMetaID is set; otherwise `index` will be used. | ||
| FieldMetaOpType = "op_type" | ||
| ) | ||
|
|
||
| // GetMetaStringValue returns the value of the given event metadata string field | ||
| func GetMetaStringValue(e beat.Event, key string) (string, error) { | ||
| tmp, err := e.Meta.GetValue(key) | ||
| if err != nil { | ||
| return "", err | ||
| } | ||
|
|
||
| if s, ok := tmp.(string); ok { | ||
| return s, nil | ||
| } | ||
|
|
||
| return "", nil | ||
| } | ||
|
|
||
| // GetOpType returns the event's op_type, if set | ||
| func GetOpType(e beat.Event) OpType { | ||
| tmp, err := e.Meta.GetValue(FieldMetaOpType) | ||
| if err != nil { | ||
| return OpTypeDefault | ||
| } | ||
|
||
|
|
||
| switch v := tmp.(type) { | ||
| case OpType: | ||
| return v | ||
| case string: | ||
| switch v { | ||
| case "create": | ||
| return OpTypeCreate | ||
| case "index": | ||
| return OpTypeIndex | ||
| case "delete": | ||
| return OpTypeDelete | ||
| } | ||
| } | ||
|
|
||
| return OpTypeDefault | ||
| } | ||
This file contains hidden or 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,90 @@ | ||
| // 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 events | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/require" | ||
|
|
||
| "github.com/elastic/beats/v7/libbeat/beat" | ||
| "github.com/elastic/beats/v7/libbeat/common" | ||
| ) | ||
|
|
||
| func TestGetMetaStringValue(t *testing.T) { | ||
| tests := map[string]struct { | ||
| event beat.Event | ||
| metaFieldPath string | ||
| expectedValue string | ||
| expectedErr error | ||
| }{ | ||
| "nonexistent_field": { | ||
| beat.Event{ | ||
| Meta: common.MapStr{ | ||
| "foo": "bar", | ||
| }, | ||
| }, | ||
| "nonexistent", | ||
| "", | ||
| common.ErrKeyNotFound, | ||
| }, | ||
| "root": { | ||
| beat.Event{ | ||
| Meta: common.MapStr{ | ||
| "foo": "bar", | ||
| "baz": "hello", | ||
| }, | ||
| }, | ||
| "baz", | ||
| "hello", | ||
| nil, | ||
| }, | ||
| "nested": { | ||
| beat.Event{ | ||
| Meta: common.MapStr{ | ||
| "foo": "bar", | ||
| "baz": common.MapStr{ | ||
| "qux": "hello", | ||
| }, | ||
| }, | ||
| }, | ||
| "baz.qux", | ||
| "hello", | ||
| nil, | ||
| }, | ||
| "non_string": { | ||
| beat.Event{ | ||
| Meta: common.MapStr{ | ||
| "foo": "bar", | ||
| "baz": 17, | ||
| }, | ||
| }, | ||
| "baz", | ||
| "", | ||
| nil, | ||
| }, | ||
| } | ||
|
|
||
| for name, test := range tests { | ||
| t.Run(name, func(t *testing.T) { | ||
| value, err := GetMetaStringValue(test.event, test.metaFieldPath) | ||
| require.Equal(t, test.expectedValue, value) | ||
| require.Equal(t, test.expectedErr, err) | ||
| }) | ||
| } | ||
| } |
This file contains hidden or 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 hidden or 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.
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.
Uh oh!
There was an error while loading. Please reload this page.