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

[Filebeat] Add timezone information in apache error fileset #13304

Merged
merged 5 commits into from
Aug 26, 2019
Merged

[Filebeat] Add timezone information in apache error fileset #13304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4f3f635
Add timezone information in Apache Error metricset
kaiyan-sheng Aug 21, 2019
b3800d7
Update changelog
kaiyan-sheng Aug 21, 2019
6fbf952
fix duplicate date pipeline
kaiyan-sheng Aug 22, 2019
4f06aad
Add timezone-support link
kaiyan-sheng Aug 23, 2019
a82fca3
Fix date pipeline
kaiyan-sheng Aug 23, 2019
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
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Allow path variables to be used in files loaded from modules.d. {issue}13184[13184]
- Fix incorrect references to index patterns in AWS and CoreDNS dashboards. {pull}13303[13303]
- Change iis url.path grok pattern from URIPATH to NOTSPACE. {issue}12710[12710] {pull}13225[13225]
- Add timezone information to apache error fileset. {issue}12772[12772] {pull}13304[13304]

*Heartbeat*

Expand Down
2 changes: 2 additions & 0 deletions filebeat/docs/modules/apache.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ include::../include/var-paths.asciidoc[]

include::../include/var-paths.asciidoc[]

include::../include/timezone-support.asciidoc[]

:has-dashboards!:

:fileset_ex!:
Expand Down
2 changes: 2 additions & 0 deletions filebeat/module/apache/_meta/docs.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ include::../include/var-paths.asciidoc[]

include::../include/var-paths.asciidoc[]

include::../include/timezone-support.asciidoc[]

:has-dashboards!:

:fileset_ex!:
Expand Down
3 changes: 3 additions & 0 deletions filebeat/module/apache/error/config/error.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@ paths:
- {{$path}}
{{ end }}
exclude_files: [".gz$"]

processors:
- add_locale: ~
20 changes: 20 additions & 0 deletions filebeat/module/apache/error/ingest/pipeline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,26 @@
"ignore_failure": true
}
},
{
"date": {
"if": "ctx.event.timezone != null",
"field": "apache.error.timestamp",
"target_field": "@timestamp",
"formats": [
"EEE MMM dd H:m:s yyyy",
"EEE MMM dd H:m:s.SSSSSS yyyy"
],
"timezone": "{{ event.timezone }}",
"on_failure": [
{
"append": {
"field": "error.message",
"value": "{{ _ingest.on_failure_message }}"
}
}
]
}
},
{
"remove": {
"field": "apache.error.timestamp",
Expand Down
2 changes: 2 additions & 0 deletions filebeat/module/apache/error/test/darwin-2.4.23.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"apache.error.module": "mpm_prefork",
"event.dataset": "apache.error",
"event.module": "apache",
"event.timezone": "+00:00",
"fileset.name": "error",
"input.type": "log",
"log.level": "notice",
Expand All @@ -17,6 +18,7 @@
"apache.error.module": "core",
"event.dataset": "apache.error",
"event.module": "apache",
"event.timezone": "+00:00",
"fileset.name": "error",
"input.type": "log",
"log.level": "notice",
Expand Down
4 changes: 4 additions & 0 deletions filebeat/module/apache/error/test/test.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"@timestamp": "2016-12-26T16:22:08.000Z",
"event.dataset": "apache.error",
"event.module": "apache",
"event.timezone": "+00:00",
"fileset.name": "error",
"input.type": "log",
"log.level": "error",
Expand All @@ -17,6 +18,7 @@
"apache.error.module": "core",
"event.dataset": "apache.error",
"event.module": "apache",
"event.timezone": "+00:00",
"fileset.name": "error",
"input.type": "log",
"log.level": "notice",
Expand All @@ -30,6 +32,7 @@
"apache.error.module": "core",
"event.dataset": "apache.error",
"event.module": "apache",
"event.timezone": "+00:00",
"fileset.name": "error",
"input.type": "log",
"log.level": "error",
Expand All @@ -55,6 +58,7 @@
"apache.error.module": "include",
"event.dataset": "apache.error",
"event.module": "apache",
"event.timezone": "+00:00",
"fileset.name": "error",
"input.type": "log",
"log.level": "warn",
Expand Down
7 changes: 7 additions & 0 deletions filebeat/module/apache/error/test/ubuntu-2.2.22.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"@timestamp": "2016-12-26T16:17:53.000Z",
"event.dataset": "apache.error",
"event.module": "apache",
"event.timezone": "+00:00",
"fileset.name": "error",
"input.type": "log",
"log.level": "notice",
Expand All @@ -14,6 +15,7 @@
"@timestamp": "2016-12-26T16:22:00.000Z",
"event.dataset": "apache.error",
"event.module": "apache",
"event.timezone": "+00:00",
"fileset.name": "error",
"input.type": "log",
"log.level": "error",
Expand All @@ -27,6 +29,7 @@
"@timestamp": "2016-12-26T16:22:08.000Z",
"event.dataset": "apache.error",
"event.module": "apache",
"event.timezone": "+00:00",
"fileset.name": "error",
"input.type": "log",
"log.level": "error",
Expand All @@ -40,6 +43,7 @@
"@timestamp": "2016-12-26T16:22:08.000Z",
"event.dataset": "apache.error",
"event.module": "apache",
"event.timezone": "+00:00",
"fileset.name": "error",
"input.type": "log",
"log.level": "error",
Expand All @@ -53,6 +57,7 @@
"@timestamp": "2016-12-26T16:22:10.000Z",
"event.dataset": "apache.error",
"event.module": "apache",
"event.timezone": "+00:00",
"fileset.name": "error",
"input.type": "log",
"log.level": "error",
Expand All @@ -66,6 +71,7 @@
"@timestamp": "2016-12-26T16:22:13.000Z",
"event.dataset": "apache.error",
"event.module": "apache",
"event.timezone": "+00:00",
"fileset.name": "error",
"input.type": "log",
"log.level": "error",
Expand All @@ -79,6 +85,7 @@
"@timestamp": "2016-12-26T16:22:17.000Z",
"event.dataset": "apache.error",
"event.module": "apache",
"event.timezone": "+00:00",
"fileset.name": "error",
"input.type": "log",
"log.level": "error",
Expand Down