Support serverless #36649
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
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,24 @@ | ||
| {{header "Data Stream Lifecycle (DSL)"}} | ||
|
|
||
| # Configure Data Stream Lifecycle to manage data streams while connected to Serverless elasticsearch. | ||
| # These settings are mutually exclusive with ILM settings which are not supported in Serverless projects. | ||
|
|
||
| # Enable DSL support. Valid values are true, or false. | ||
| #setup.dsl.enabled: true | ||
|
|
||
| # Set the lifecycle policy name. The default policy name is | ||
| # '{{.BeatName}}'. | ||
| #setup.dsl.policy_name: "{{.BeatName}}" | ||
|
|
||
| # The path to a JSON file that contains a lifecycle policy configuration. Used | ||
| # to load your own lifecycle policy. | ||
| # If no custom policy is specified, a default policy with a lifetime of 7 days will be created. | ||
| #setup.dsl.policy_file: | ||
|
|
||
| # Disable the check for an existing lifecycle policy. The default is true. If | ||
| # you disable this check, set setup.dsl.overwrite: true so the lifecycle policy | ||
| # can be installed. | ||
| #setup.dsl.check_exists: true | ||
|
|
||
| # Overwrite the lifecycle policy at startup. The default is false. | ||
| #setup.dsl.overwrite: false | ||
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
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 |
|---|---|---|
|
|
@@ -84,7 +84,6 @@ type eventEvalContext struct { | |
| } | ||
|
|
||
| var ( | ||
| errConvertString = errors.New("can not convert to string") | ||
| ) | ||
|
|
||
|
|
@@ -157,19 +156,24 @@ func CompileEvent(in string) (*EventFormatString, error) { | |
| func (fs *EventFormatString) Unpack(v interface{}) error { | ||
| s, err := tryConvString(v) | ||
| if err != nil { | ||
| return fmt.Errorf("error converting type %T to event formatter: %w", v, err) | ||
| } | ||
|
|
||
| tmp, err := CompileEvent(s) | ||
| if err != nil { | ||
| return fmt.Errorf("error compiling event formatter: %w", err) | ||
| } | ||
|
|
||
| // init fs from tmp | ||
| *fs = *tmp | ||
| return nil | ||
| } | ||
|
|
||
| // IsInitialized returns true if the underlying event formatter is prepared to format an event | ||
| func (fs *EventFormatString) IsInitialized() bool { | ||
| return fs.formatter != nil | ||
| } | ||
|
|
||
| // NumFields returns number of unique event fields used by the format string. | ||
| func (fs *EventFormatString) NumFields() int { | ||
| return len(fs.fields) | ||
|
|
@@ -190,6 +194,9 @@ func (fs *EventFormatString) Fields() []string { | |
| // Run executes the format string returning a new expanded string or an error | ||
| // if execution or event field expansion fails. | ||
| func (fs *EventFormatString) Run(event *beat.Event) (string, error) { | ||
| if !fs.IsInitialized() { | ||
| return "", fmt.Errorf("event formatter is nil") | ||
| } | ||
| ctx := newEventCtx(len(fs.fields)) | ||
| defer releaseCtx(ctx) | ||
|
|
||
|
|
@@ -296,7 +303,7 @@ func (e *eventFieldCompiler) compileEventField( | |
| ops []VariableOp, | ||
| ) (FormatEvaler, error) { | ||
| if len(ops) > 1 { | ||
| return nil, errors.New("too many format modifiers given") | ||
| } | ||
|
|
||
| defaultValue := "" | ||
|
|
@@ -340,34 +347,26 @@ func (e *eventFieldCompiler) compileTimestamp( | |
| ops []VariableOp, | ||
| ) (FormatEvaler, error) { | ||
| if expression[0] != '+' { | ||
| return nil, errors.New("no timestamp expression") | ||
| } | ||
|
|
||
| formatter, err := dtfmt.NewFormatter(expression[1:]) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("%w in timestamp expression", err) | ||
| } | ||
|
|
||
| e.timestamp = true | ||
| return &eventTimestampEvaler{formatter}, nil | ||
| } | ||
|
|
||
| func (e *eventFieldEvaler) Eval(c interface{}, out *bytes.Buffer) error { | ||
| ctx := c.(*eventEvalContext) | ||
| s := ctx.keys[e.index] | ||
| _, err := out.WriteString(s) | ||
| return err | ||
| } | ||
|
|
||
| func (e *defaultEventFieldEvaler) Eval(c interface{}, out *bytes.Buffer) error { | ||
| ctx := c.(*eventEvalContext) | ||
| s := ctx.keys[e.index] | ||
| if s == "" { | ||
|
|
@@ -385,7 +384,7 @@ func (e *eventTimestampEvaler) Eval(c interface{}, out *bytes.Buffer) error { | |
|
|
||
| func parseEventPath(field string) (string, error) { | ||
| field = strings.Trim(field, " \n\r\t") | ||
| fields := []string{} | ||
|
There was a problem hiding this comment. Why make this change? https://github.com/golang/go/wiki/CodeReviewComments#declaring-empty-slices There was a problem hiding this comment. Yah, there was a linter message that complained about that line, which I thought was odd. The for loop was a little too complicated to do a |
||
|
|
||
| for len(field) > 0 { | ||
| if field[0] != '[' { | ||
|
|
||
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
Oops, something went wrong.
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.
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.
You need a newline at the end of the file otherwise there is a missing space between the end of this section and the next one: