Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Haproxy fileset http renamed to log #8405

Merged
merged 1 commit into from
Sep 25, 2018
Merged

Haproxy fileset http renamed to log #8405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions filebeat/docs/modules/haproxy.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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[]

Expand Down
2 changes: 1 addition & 1 deletion filebeat/filebeat.reference.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion filebeat/module/haproxy/_meta/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- module: haproxy
# All logs
http:
log:
enabled: true

# Set which input to use between syslog (default) or file.
Expand Down
6 changes: 3 additions & 3 deletions filebeat/module/haproxy/_meta/docs.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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[]
0 ...beat/module/haproxy/http/_meta/fields.yml → filebeat/module/haproxy/log/_meta/fields.yml
View file
Open in desktop
File renamed without changes.
0 filebeat/module/haproxy/http/config/file.yml → filebeat/module/haproxy/log/config/file.yml
View file
Open in desktop
File renamed without changes.
0 ...eat/module/haproxy/http/config/syslog.yml → ...beat/module/haproxy/log/config/syslog.yml
View file
Open in desktop
File renamed without changes.
0 .../module/haproxy/http/ingest/pipeline.json → ...t/module/haproxy/log/ingest/pipeline.json
View file
Open in desktop
File renamed without changes.
0 filebeat/module/haproxy/http/manifest.yml → filebeat/module/haproxy/log/manifest.yml
View file
Open in desktop
File renamed without changes.
0 ...beat/module/haproxy/http/test/haproxy.log → filebeat/module/haproxy/log/test/haproxy.log
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...proxy/http/test/haproxy.log-expected.json → ...aproxy/log/test/haproxy.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"@timestamp": "2018-07-30T09:03:52.726Z",
"fileset.module": "haproxy",
"fileset.name": "http",
"fileset.name": "log",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is the only change that should be done to this file, see #8401

Copy link
Contributor Author

@sayden sayden Sep 24, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It must have been something related with make update command because tests are passing. :| Means, I haven't directly touched those lines.

"haproxy.backend_name": "docs_microservice",
"haproxy.backend_queue": 0,
"haproxy.client_ip": "1.2.3.4",
Expand Down
2 changes: 1 addition & 1 deletion filebeat/modules.d/haproxy.yml.disabled
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- module: haproxy
# All logs
http:
log:
enabled: true

# Set which input to use between syslog (default) or file.
Expand Down