From 6bd2be2ace3456f69449b74ca0c0e5ebe49567c9 Mon Sep 17 00:00:00 2001 From: Tudor Golubenco Date: Fri, 17 Feb 2017 13:59:22 +0100 Subject: [PATCH] Fix generator files There were some changes in the structure of some files, and this is needed to update the generator as well. Part of #3159. --- filebeat/scripts/module/fileset/config/config.yml | 15 ++++++--------- filebeat/scripts/module/fileset/manifest.yml | 13 ++++++------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/filebeat/scripts/module/fileset/config/config.yml b/filebeat/scripts/module/fileset/config/config.yml index 20122796dbe1..56e3dfd95b82 100644 --- a/filebeat/scripts/module/fileset/config/config.yml +++ b/filebeat/scripts/module/fileset/config/config.yml @@ -1,9 +1,6 @@ -- input_type: log - paths: - {%- for path in paths %} - - {{path}} - {%- endfor %} - exclude_files: [".gz$"] - fields: - source_type: {module}-{fileset} - pipeline_id: {{beat.pipeline_id}} +input_type: log +paths: +{{ range $i, $path := .paths }} + - {{$path}} +{{ end }} +exclude_files: [".gz$"] diff --git a/filebeat/scripts/module/fileset/manifest.yml b/filebeat/scripts/module/fileset/manifest.yml index 2982d637b162..e8c4f0894cda 100644 --- a/filebeat/scripts/module/fileset/manifest.yml +++ b/filebeat/scripts/module/fileset/manifest.yml @@ -1,14 +1,13 @@ module_version: 1.0 -vars: - paths: +var: + - name: paths default: - - /example/path* + - /example/test.log* os.darwin: - - /usr/local/example/path* + - /usr/local/example/test.log* os.windows: - - "c:/example/path*" + - c:/programdata/example/logs/test.log* ingest_pipeline: ingest/pipeline.json -prospectors: - - config/{fileset}.yml +prospectors: config/{fileset}.yml