Use s3.yml as config name to match config/{{.input}}.yml in manifest.…

…yml (#17166) (#17265) (cherry picked from commit 841540c)
elastic · Mar 26, 2020 · 3562dee · 3562dee
1 parent 7dd64f1
commit 3562dee
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 14 deletions.
diff --git a/x-pack/filebeat/module/aws/cloudtrail/config/file.yml b/x-pack/filebeat/module/aws/cloudtrail/config/file.yml
@@ -0,0 +1,6 @@
+type: log
+paths:
+  {{ range $i, $path := .paths }}
+  - {{$path}}
+    {{ end }}
+exclude_files: [".gz$"]
diff --git a/...dule/aws/cloudtrail/config/cloudtrail.yml → ...ebeat/module/aws/cloudtrail/config/s3.yml b/...dule/aws/cloudtrail/config/cloudtrail.yml → ...ebeat/module/aws/cloudtrail/config/s3.yml
@@ -1,5 +1,3 @@
-{{ if eq .input "s3" }}
-
 type: s3
 queue_url: {{ .queue_url }}
 expand_event_list_from_field: Records
@@ -23,14 +21,3 @@ api_timeout: {{ .api_timeout }}
 {{ if .endpoint }}
 endpoint: {{ .endpoint }}
 {{ end }}
-
-{{ else if eq .input "file" }}
-
-type: log
-paths:
-{{ range $i, $path := .paths }}
- - {{$path}}
-{{ end }}
-exclude_files: [".gz$"]
-
-{{ end }}
diff --git a/x-pack/filebeat/module/aws/cloudtrail/manifest.yml b/x-pack/filebeat/module/aws/cloudtrail/manifest.yml
@@ -11,4 +11,4 @@ var:
   - name: endpoint
 
 ingest_pipeline: ingest/pipeline.yml
-input: config/cloudtrail.yml
+input: config/{{.input}}.yml
diff --git a/...dule/aws/cloudwatch/config/cloudwatch.yml → ...ebeat/module/aws/cloudwatch/config/s3.yml b/...dule/aws/cloudwatch/config/cloudwatch.yml → ...ebeat/module/aws/cloudwatch/config/s3.yml
diff --git a/...ck/filebeat/module/aws/ec2/config/ec2.yml → x-pack/filebeat/module/aws/ec2/config/s3.yml b/...ck/filebeat/module/aws/ec2/config/ec2.yml → x-pack/filebeat/module/aws/ec2/config/s3.yml