From ab5fd2b52fa571e36e3e7b9a450e0ddd3753475b Mon Sep 17 00:00:00 2001 From: Mario Castro Date: Tue, 25 Sep 2018 10:29:18 +0200 Subject: [PATCH] Renaming of http fileset to log (#8405) (cherry picked from commit 058916c6df29934a98c09e140ac859c78f5d8397) --- filebeat/docs/modules/haproxy.asciidoc | 6 +++--- filebeat/filebeat.reference.yml | 2 +- filebeat/module/haproxy/_meta/config.yml | 2 +- filebeat/module/haproxy/_meta/docs.asciidoc | 6 +++--- filebeat/module/haproxy/{http => log}/_meta/fields.yml | 0 filebeat/module/haproxy/{http => log}/config/file.yml | 0 filebeat/module/haproxy/{http => log}/config/syslog.yml | 0 filebeat/module/haproxy/{http => log}/ingest/pipeline.json | 0 filebeat/module/haproxy/{http => log}/manifest.yml | 0 filebeat/module/haproxy/{http => log}/test/haproxy.log | 0 .../haproxy/{http => log}/test/haproxy.log-expected.json | 2 +- filebeat/modules.d/haproxy.yml.disabled | 2 +- 12 files changed, 10 insertions(+), 10 deletions(-) rename filebeat/module/haproxy/{http => log}/_meta/fields.yml (100%) rename filebeat/module/haproxy/{http => log}/config/file.yml (100%) rename filebeat/module/haproxy/{http => log}/config/syslog.yml (100%) rename filebeat/module/haproxy/{http => log}/ingest/pipeline.json (100%) rename filebeat/module/haproxy/{http => log}/manifest.yml (100%) rename filebeat/module/haproxy/{http => log}/test/haproxy.log (100%) rename filebeat/module/haproxy/{http => log}/test/haproxy.log-expected.json (98%) diff --git a/filebeat/docs/modules/haproxy.asciidoc b/filebeat/docs/modules/haproxy.asciidoc index 08461f50c570..8fff27047449 100644 --- a/filebeat/docs/modules/haproxy.asciidoc +++ b/filebeat/docs/modules/haproxy.asciidoc @@ -37,19 +37,19 @@ it can also be configured to read from a file path. See the following example. ["source","yaml",subs="attributes"] ----- - module: haproxy - http: + log: enabled: true var.paths: ["/var/log/haproxy.log"] var.input: "file" ----- -:fileset_ex: http +:fileset_ex: log include::../include/config-option-intro.asciidoc[] [float] -==== `http` log fileset settings +==== `log` fileset settings include::../include/var-paths.asciidoc[] diff --git a/filebeat/filebeat.reference.yml b/filebeat/filebeat.reference.yml index 5b9f953fcdf6..f22078b937ae 100644 --- a/filebeat/filebeat.reference.yml +++ b/filebeat/filebeat.reference.yml @@ -119,7 +119,7 @@ filebeat.modules: #------------------------------- haproxy Module ------------------------------ - module: haproxy # All logs - http: + log: enabled: true # Set which input to use between syslog (default) or file. diff --git a/filebeat/module/haproxy/_meta/config.yml b/filebeat/module/haproxy/_meta/config.yml index 5071f0fccd80..0e1431e503c0 100644 --- a/filebeat/module/haproxy/_meta/config.yml +++ b/filebeat/module/haproxy/_meta/config.yml @@ -1,6 +1,6 @@ - module: haproxy # All logs - http: + log: enabled: true # Set which input to use between syslog (default) or file. diff --git a/filebeat/module/haproxy/_meta/docs.asciidoc b/filebeat/module/haproxy/_meta/docs.asciidoc index bb0111ca19c1..25955b54f6cb 100644 --- a/filebeat/module/haproxy/_meta/docs.asciidoc +++ b/filebeat/module/haproxy/_meta/docs.asciidoc @@ -32,18 +32,18 @@ it can also be configured to read from a file path. See the following example. ["source","yaml",subs="attributes"] ----- - module: haproxy - http: + log: enabled: true var.paths: ["/var/log/haproxy.log"] var.input: "file" ----- -:fileset_ex: http +:fileset_ex: log include::../include/config-option-intro.asciidoc[] [float] -==== `http` log fileset settings +==== `log` fileset settings include::../include/var-paths.asciidoc[] diff --git a/filebeat/module/haproxy/http/_meta/fields.yml b/filebeat/module/haproxy/log/_meta/fields.yml similarity index 100% rename from filebeat/module/haproxy/http/_meta/fields.yml rename to filebeat/module/haproxy/log/_meta/fields.yml diff --git a/filebeat/module/haproxy/http/config/file.yml b/filebeat/module/haproxy/log/config/file.yml similarity index 100% rename from filebeat/module/haproxy/http/config/file.yml rename to filebeat/module/haproxy/log/config/file.yml diff --git a/filebeat/module/haproxy/http/config/syslog.yml b/filebeat/module/haproxy/log/config/syslog.yml similarity index 100% rename from filebeat/module/haproxy/http/config/syslog.yml rename to filebeat/module/haproxy/log/config/syslog.yml diff --git a/filebeat/module/haproxy/http/ingest/pipeline.json b/filebeat/module/haproxy/log/ingest/pipeline.json similarity index 100% rename from filebeat/module/haproxy/http/ingest/pipeline.json rename to filebeat/module/haproxy/log/ingest/pipeline.json diff --git a/filebeat/module/haproxy/http/manifest.yml b/filebeat/module/haproxy/log/manifest.yml similarity index 100% rename from filebeat/module/haproxy/http/manifest.yml rename to filebeat/module/haproxy/log/manifest.yml diff --git a/filebeat/module/haproxy/http/test/haproxy.log b/filebeat/module/haproxy/log/test/haproxy.log similarity index 100% rename from filebeat/module/haproxy/http/test/haproxy.log rename to filebeat/module/haproxy/log/test/haproxy.log diff --git a/filebeat/module/haproxy/http/test/haproxy.log-expected.json b/filebeat/module/haproxy/log/test/haproxy.log-expected.json similarity index 98% rename from filebeat/module/haproxy/http/test/haproxy.log-expected.json rename to filebeat/module/haproxy/log/test/haproxy.log-expected.json index 79127a28786b..990ec9ae8547 100644 --- a/filebeat/module/haproxy/http/test/haproxy.log-expected.json +++ b/filebeat/module/haproxy/log/test/haproxy.log-expected.json @@ -2,7 +2,7 @@ { "@timestamp": "2018-07-30T09:03:52.726Z", "fileset.module": "haproxy", - "fileset.name": "http", + "fileset.name": "log", "haproxy.backend_name": "docs_microservice", "haproxy.backend_queue": 0, "haproxy.client_ip": "1.2.3.4", diff --git a/filebeat/modules.d/haproxy.yml.disabled b/filebeat/modules.d/haproxy.yml.disabled index 5071f0fccd80..0e1431e503c0 100644 --- a/filebeat/modules.d/haproxy.yml.disabled +++ b/filebeat/modules.d/haproxy.yml.disabled @@ -1,6 +1,6 @@ - module: haproxy # All logs - http: + log: enabled: true # Set which input to use between syslog (default) or file.