Skip to content

Commit

Permalink
[7.1] Adding JSON paths to FB ES module docs (elastic#12008) (elastic…
Browse files Browse the repository at this point in the history
…#12030)

* Adding JSON paths to FB ES module docs

* Adding note about ES version

* Apply suggestions from code review

Co-Authored-By: ycombinator <[email protected]>

* Remove mention of *_audit.log to avoid confusion
  • Loading branch information
ycombinator authored May 3, 2019
1 parent 53b6f9f commit 498fd2b
Show file tree
Hide file tree
Showing 2 changed files with 52 additions and 10 deletions.
31 changes: 26 additions & 5 deletions filebeat/docs/modules/elasticsearch.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,13 @@ Example config:
server:
enabled: true
var.paths:
- /var/log/elasticsearch/*.log
- /var/log/elasticsearch/*.log # Plain text logs
- /var/log/elasticsearch/*_server.json # JSON logs
----
+
NOTE: If you're running against Elasticsearch >= 7.0.0, configure the
`var.paths` setting to point to JSON logs. Otherwise, configure it
to point to plain text logs.

[float]
==== `gc` log fileset settings
Expand Down Expand Up @@ -70,8 +75,13 @@ Example config:
----
audit:
var.paths:
- /var/log/elasticsearch/*_audit.json
- /var/log/elasticsearch/*_access.log # Plain text logs
- /var/log/elasticsearch/*_audit.json # JSON logs
----
+
NOTE: If you're running against Elasticsearch >= 7.0.0, configure the
`var.paths` setting to point to JSON logs. Otherwise, configure it
to point to plain text logs.

[float]
==== `slowlog` log fileset settings
Expand All @@ -84,9 +94,15 @@ Example config:
----
slowlog:
var.paths:
- /var/log/elasticsearch/*_index_search_slowlog.log
- /var/log/elasticsearch/*_index_indexing_slowlog.log
- /var/log/elasticsearch/*_index_search_slowlog.log # Plain text logs
- /var/log/elasticsearch/*_index_indexing_slowlog.log # Plain text logs
- /var/log/elasticsearch/*_index_search_slowlog.json # JSON logs
- /var/log/elasticsearch/*_index_indexing_slowlog.json # JSON logs
----
+
NOTE: If you're running against Elasticsearch >= 7.0.0, configure the
`var.paths` setting to point to JSON logs. Otherwise, configure it
to point to plain text logs.

[float]
==== `deprecation` log fileset settings
Expand All @@ -99,8 +115,13 @@ Example config:
----
deprecation:
var.paths:
- /var/log/elasticsearch/*_deprecation.log
- /var/log/elasticsearch/*_deprecation.log # Plain text logs
- /var/log/elasticsearch/*_deprecation.json # JSON logs
----
+
NOTE: If you're running against Elasticsearch >= 7.0.0, configure the
`var.paths` setting to point to JSON logs. Otherwise, configure it
to point to plain text logs.

:has-dashboards!:

Expand Down
31 changes: 26 additions & 5 deletions filebeat/module/elasticsearch/_meta/docs.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,13 @@ Example config:
server:
enabled: true
var.paths:
- /var/log/elasticsearch/*.log
- /var/log/elasticsearch/*.log # Plain text logs
- /var/log/elasticsearch/*_server.json # JSON logs
----
+
NOTE: If you're running against Elasticsearch >= 7.0.0, configure the
`var.paths` setting to point to JSON logs. Otherwise, configure it
to point to plain text logs.

[float]
==== `gc` log fileset settings
Expand Down Expand Up @@ -65,8 +70,13 @@ Example config:
----
audit:
var.paths:
- /var/log/elasticsearch/*_audit.json
- /var/log/elasticsearch/*_access.log # Plain text logs
- /var/log/elasticsearch/*_audit.json # JSON logs
----
+
NOTE: If you're running against Elasticsearch >= 7.0.0, configure the
`var.paths` setting to point to JSON logs. Otherwise, configure it
to point to plain text logs.

[float]
==== `slowlog` log fileset settings
Expand All @@ -79,9 +89,15 @@ Example config:
----
slowlog:
var.paths:
- /var/log/elasticsearch/*_index_search_slowlog.log
- /var/log/elasticsearch/*_index_indexing_slowlog.log
- /var/log/elasticsearch/*_index_search_slowlog.log # Plain text logs
- /var/log/elasticsearch/*_index_indexing_slowlog.log # Plain text logs
- /var/log/elasticsearch/*_index_search_slowlog.json # JSON logs
- /var/log/elasticsearch/*_index_indexing_slowlog.json # JSON logs
----
+
NOTE: If you're running against Elasticsearch >= 7.0.0, configure the
`var.paths` setting to point to JSON logs. Otherwise, configure it
to point to plain text logs.

[float]
==== `deprecation` log fileset settings
Expand All @@ -94,8 +110,13 @@ Example config:
----
deprecation:
var.paths:
- /var/log/elasticsearch/*_deprecation.log
- /var/log/elasticsearch/*_deprecation.log # Plain text logs
- /var/log/elasticsearch/*_deprecation.json # JSON logs
----
+
NOTE: If you're running against Elasticsearch >= 7.0.0, configure the
`var.paths` setting to point to JSON logs. Otherwise, configure it
to point to plain text logs.

:has-dashboards!:

Expand Down

0 comments on commit 498fd2b

Please sign in to comment.