import-beats: support multiple streams #380
Conversation
| @@ -155,7 +155,7 @@ func buildPackage(packagesBasePath string, p util.Package) error { | |||
| return err | |||
| } | |||
|
|
|||
| err = ioutil.WriteFile(filepath.Join(dirPath, "stream.yml"), []byte(streamFields), 0644) | |||
| err = ioutil.WriteFile(filepath.Join(dirPath, "stream.yml.hbs"), []byte(streamFields), 0644) | |||
There was a problem hiding this comment.
@andrewkroh You will like this.
@nchaulet @jen-huang Will this break anything at the moment in the config builder? I hope not.
| } | ||
|
|
||
| func parseStreamConfig(content []byte) (*streamConfigParsed, error) { | ||
| mapOfParsed, err := parse.Parse("hello", string(content), "", "", map[string]interface{}{ |
There was a problem hiding this comment.
There is only single template, so need to define a specific template name hence this "hello world". I can rename it to something meaningful
There was a problem hiding this comment.
ah, got it. Something more descriptive would be nice.
| @@ -0,0 +1,6 @@ | |||
| type: log | |||
| paths: | |||
| {{#each paths as |path i|}} | |||
There was a problem hiding this comment.
Is the second part as |path i| needed?
There was a problem hiding this comment.
This is tricky actually, because the "i" is always present when unrolling the "range". Wouldn't like to detect this in the code. I will let the developer adjust it later on. Is it fine?
There was a problem hiding this comment.
SGTM as long as this works on the Kibana side (I assume it does).
| // or more contributor license agreements. Licensed under the Elastic License; | ||
| // you may not use this file except in compliance with the Elastic License. | ||
|
|
||
| var ciscoIOS = (function() { |
There was a problem hiding this comment.
No need to answer this in this PR but I wonder how this will work. I assume at the moment Filebeat will still ship with this. I assume at the moment this should not be in the package.
| @@ -0,0 +1,7 @@ | |||
| type: log | |||
There was a problem hiding this comment.
I think this should be input: log as based on this the mapping to the input is done? Or did this become obsolete because of the path?
There was a problem hiding this comment.
I think you're right... I will adjust the PR.
| @@ -19,8 +19,8 @@ | |||
| "/package/multiple-false/0.0.1/manifest.yml", | |||
| "/package/multiple-false/0.0.1/docs/README.md", | |||
| "/package/multiple-false/0.0.1/dataset/foo/manifest.yml", | |||
| "/package/multiple-false/0.0.1/dataset/foo/fields/stream.yml", | |||
| "/package/multiple-false/0.0.1/dataset/foo/agent/stream/stream.yml", | |||
| "/package/multiple-false/0.0.1/dataset/foo/fields/stream.yml.hbs", | |||
There was a problem hiding this comment.
Any chance we could take the .hbs part into a separate PR. We might need here some discussions with Kibana team around this and also makes it easier to reference to it later on if questions come up.
+1 on this change BTW.
There was a problem hiding this comment.
Hmm... honestly I would keep it here as I already applied in multiple places (simpler option at the moment, preserving we will rename to this). Also it's a parsed template, so definetely a .hbs file. WDYT?
There was a problem hiding this comment.
Ok, in this case we should add a line to the changelog. And perhaps we can do a Github issue instead to describe the modifivation of the change instead and reference this PR.
There was a problem hiding this comment.
Changelog entry added.
Finally managed to add the missing piece. Got really frustrated...
Changes:
strings.Replacefor template convertion with parsing tree nodes