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 convert_timezone to nginx module #10148

Merged
merged 39 commits into from
Jan 21, 2019
Merged

Add convert_timezone to nginx module #10148

merged 39 commits into from
Jan 21, 2019

Conversation

kaiyan-sheng
Copy link
Contributor

Before figuring out how to add convert_timezone for all filesets, this fix is needed for nginx module in filebeat.
closes #9839

ph and others added 30 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 review from a team as code owners January 17, 2019 18:13
@kaiyan-sheng kaiyan-sheng added in progress Pull request is currently in progress. Filebeat Filebeat needs_backport PR is waiting to be backported to other branches. Team:Integrations Label for the Integrations team labels Jan 17, 2019
Copy link
Contributor

@ruflin ruflin left a comment

Choose a reason for hiding this comment

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

CI failure not related.

@kaiyan-sheng kaiyan-sheng removed the in progress Pull request is currently in progress. label Jan 21, 2019
@kaiyan-sheng kaiyan-sheng merged commit d53fa9f into elastic:master Jan 21, 2019
@kaiyan-sheng kaiyan-sheng deleted the nginx_convert_timezone branch January 21, 2019 13:54
@kaiyan-sheng kaiyan-sheng self-assigned this Jan 21, 2019
kaiyan-sheng added a commit that referenced this pull request Jan 21, 2019
…0219)

* Add convert_timezone to nginx module (#10148)
* Run make update for filebeat
@kaiyan-sheng kaiyan-sheng removed the needs_backport PR is waiting to be backported to other branches. label Jan 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Filebeat Filebeat Team:Integrations Label for the Integrations team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[filebeat] Add convert_timezone to nginx module
3 participants