Skip to content

Commit

Permalink
Fix macOS default log path for elasticsearch module based on brew pat…
Browse files Browse the repository at this point in the history
…hs (#8939) (#8978)

* Fix macOS default log path for elasticsearch module based on homebrew paths.

* Add changelog record for macOS default path fix.

(cherry picked from commit 3f07231)
  • Loading branch information
radoondas authored Nov 8, 2018
1 parent cc1835f commit 2b63644
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 7 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ https://github.com/elastic/beats/compare/v6.4.0...6.x[Check the HEAD diff]
- Support multiline logs in logstash/log fileset of Filebeat. {pull}8562[8562]
- Fix improperly set config for CRI Flag in Docker Input {pull}8899[8899]
- Just enabling the `elasticsearch` fileset and starting Filebeat no longer causes an error. {pull}8891[8891]
- Fix macOS default log path for elasticsearch module based on homebrew paths. {pul}8939[8939]

*Heartbeat*

Expand Down
2 changes: 1 addition & 1 deletion filebeat/module/elasticsearch/audit/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ var:
default:
- /var/log/elasticsearch/*_access.log
os.darwin:
- /usr/local/elasticsearch/*_access.log
- /usr/local/var/lib/elasticsearch/*_access.log
os.windows:
- c:/ProgramData/Elastic/Elasticsearch/logs/*_access.log

Expand Down
2 changes: 1 addition & 1 deletion filebeat/module/elasticsearch/deprecation/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ var:
default:
- /var/log/elasticsearch/*_deprecation.log
os.darwin:
- /usr/local/elasticsearch/*_deprecation.log
- /usr/local/var/lib/elasticsearch/*_deprecation.log
os.windows:
- c:/ProgramData/Elastic/Elasticsearch/logs/*_deprecation.log

Expand Down
4 changes: 2 additions & 2 deletions filebeat/module/elasticsearch/gc/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ var:
- /var/log/elasticsearch/gc.log.[0-9]*
- /var/log/elasticsearch/gc.log
os.darwin:
- /usr/local/elasticsearch/gc.log.[0-9]*
- /usr/local/elasticsearch/gc.log
- /usr/local/var/lib/elasticsearch/gc.log.[0-9]*
- /usr/local/var/lib/elasticsearch/gc.log
os.windows:
- c:/ProgramData/Elastic/Elasticsearch/logs/gc.log.*
- c:/ProgramData/Elastic/Elasticsearch/logs/gc.log
Expand Down
2 changes: 1 addition & 1 deletion filebeat/module/elasticsearch/server/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ var:
default:
- /var/log/elasticsearch/*.log
os.darwin:
- /usr/local/elasticsearch/*.log
- /usr/local/var/lib/elasticsearch/*.log
os.windows:
- c:/ProgramData/Elastic/Elasticsearch/logs/*.log

Expand Down
4 changes: 2 additions & 2 deletions filebeat/module/elasticsearch/slowlog/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ var:
- /var/log/elasticsearch/*_index_search_slowlog.log
- /var/log/elasticsearch/*_index_indexing_slowlog.log
os.darwin:
- /usr/local/elasticsearch/*_index_search_slowlog.log
- /usr/local/elasticsearch/*_index_indexing_slowlog.log
- /usr/local/var/lib/elasticsearch/*_index_search_slowlog.log
- /usr/local/var/lib/elasticsearch/*_index_indexing_slowlog.log
os.windows:
- c:/ProgramData/Elastic/Elasticsearch/logs/*_index_search_slowlog.log
- c:/ProgramData/Elastic/Elasticsearch/logs/*_index_indexing_slowlog.log
Expand Down

0 comments on commit 2b63644

Please sign in to comment.