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.

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

Add grok pattern to support different timestamp fmt in redis log #10033

Merged
merged 29 commits into from
Jan 14, 2019
Merged

Add grok pattern to support different timestamp fmt in redis log #10033

merged 29 commits into from
Jan 14, 2019

Conversation

kaiyan-sheng
Copy link
Contributor

For redis 5.0.3, timestamp has year in date instead of just month and day. To fix this, a new grok pattern needs to be added to make sure the year part is captured.

closes #9819

ph and others added 25 commits November 27, 2018 10:51
Remove default version qualifier and rename the environment variable to set it from `BEAT_VERSION_QUALIFIER` to `VERSION_QUALIFIER` this will align with other parts of the stack.

**Tested with filebeat.**
```
 ❯ ./filebeat version                                                                                                                                                                                                                                                                                                                                          [08:39:01]
filebeat version 7.0.0 (amd64), libbeat 7.0.0 [0a0c267 built 2018-11-19 13:38:15 +0000 UTC]
```

**Without the patch**
```
 ❯ ./filebeat version                                                                                                                                                                                                                                                                                                                                          [08:40:07]
filebeat version 7.0.0-alpha1 (amd64), libbeat 7.0.0-alpha1 [b007837 built 2018-11-19 13:39:59 +0000 UTC]
```

Fixes: #8384
@kaiyan-sheng kaiyan-sheng requested a review from a team as a code owner January 12, 2019 01:46
@kaiyan-sheng kaiyan-sheng added review Filebeat Filebeat needs_backport PR is waiting to be backported to other branches. Team:Integrations Label for the Integrations team labels Jan 12, 2019
@kaiyan-sheng
Copy link
Contributor Author

Turned out redis logs have timestamp including year. But because of the change in #9855, timestamp is removed from generated json file under module/redis/log/test.

@kaiyan-sheng kaiyan-sheng requested a review from a team as a code owner January 14, 2019 01:13
@kaiyan-sheng kaiyan-sheng merged commit 2ec7b55 into elastic:master Jan 14, 2019
@kaiyan-sheng kaiyan-sheng deleted the redis_timestamp branch January 14, 2019 16:52
kaiyan-sheng added a commit that referenced this pull request Jan 16, 2019
…tamp fmt in redis log (#10056)

* Add grok pattern to support different timestamp fmt in redis log (#10033)

* Add grok pattern to support different timestamp fmt in redis log

* Add changelog

* Fix rebase issue

(cherry picked from commit 2ec7b55)

* Rerun GENEREATE=1 with 6.x test environment

* Deleted log level by mistake
@kaiyan-sheng kaiyan-sheng removed the needs_backport PR is waiting to be backported to other branches. label Jan 31, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Filebeat Filebeat review Team:Integrations Label for the Integrations team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

REDISTIMESTAMP format is not matching in filebeat!
3 participants