Renaming of http fileset to log (elastic#8405)

(cherry picked from commit 058916c)
sayden · Sep 25, 2018 · ab5fd2b · ab5fd2b
1 parent 4f14d66
commit ab5fd2b
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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/...beat/module/haproxy/http/_meta/fields.yml → filebeat/module/haproxy/log/_meta/fields.yml b/...beat/module/haproxy/http/_meta/fields.yml → filebeat/module/haproxy/log/_meta/fields.yml
diff --git a/filebeat/module/haproxy/http/config/file.yml → filebeat/module/haproxy/log/config/file.yml b/filebeat/module/haproxy/http/config/file.yml → filebeat/module/haproxy/log/config/file.yml
diff --git a/...eat/module/haproxy/http/config/syslog.yml → ...beat/module/haproxy/log/config/syslog.yml b/...eat/module/haproxy/http/config/syslog.yml → ...beat/module/haproxy/log/config/syslog.yml
diff --git a/.../module/haproxy/http/ingest/pipeline.json → ...t/module/haproxy/log/ingest/pipeline.json b/.../module/haproxy/http/ingest/pipeline.json → ...t/module/haproxy/log/ingest/pipeline.json
diff --git a/filebeat/module/haproxy/http/manifest.yml → filebeat/module/haproxy/log/manifest.yml b/filebeat/module/haproxy/http/manifest.yml → filebeat/module/haproxy/log/manifest.yml
diff --git a/...beat/module/haproxy/http/test/haproxy.log → filebeat/module/haproxy/log/test/haproxy.log b/...beat/module/haproxy/http/test/haproxy.log → filebeat/module/haproxy/log/test/haproxy.log
diff --git a/...proxy/http/test/haproxy.log-expected.json → ...aproxy/log/test/haproxy.log-expected.json b/...proxy/http/test/haproxy.log-expected.json → ...aproxy/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
@@ -1,6 +1,6 @@
 - module: haproxy
   # All logs
-  http:
+  log:
     enabled: true
 
     # Set which input to use between syslog (default) or file.