Skip to content

Cherry-pick to 6.x: Fix mysql slowlog template to support mysql 5.7.22 (#9647) #9843

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

Merged
merged 3 commits into from
Jan 4, 2019
Merged

Cherry-pick to 6.x: Fix mysql slowlog template to support mysql 5.7.22 (#9647) #9843

merged 3 commits into from
Jan 4, 2019

Conversation

kaiyan-sheng
Copy link
Contributor

@kaiyan-sheng kaiyan-sheng commented Jan 2, 2019

Fixes: #8384

  • Fix mysql slowlog template to support mysql 5.7.22

  • Add changelog

  • Remove changes introduced from rebasing that are not related to this change

  • Add more log entries to test log file

  • Add OR in multiline.pattern to remove # Time from mysql.slowlog.query

  • Use CHANGELOG.next.asciidoc instead

(cherry picked from commit b29ddfc)

* Never default to a qualifier when none of them are set. (#9148)

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

* Fix mysql slowlog template to support mysql 5.7.22

* Add changelog

* Remove changes introduced from rebasing that are not related to this change

* Add more log entries to test log file

* Add OR in multiline.pattern to remove # Time from mysql.slowlog.query

* Use CHANGELOG.next.asciidoc instead

(cherry picked from commit b29ddfc)
@kaiyan-sheng kaiyan-sheng requested a review from jsoriano January 4, 2019 05:10
@kaiyan-sheng kaiyan-sheng merged commit 7e18314 into elastic:6.x Jan 4, 2019
@kaiyan-sheng kaiyan-sheng deleted the backport_9647_6.x branch January 4, 2019 15:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants