Never default to a qualifier when none of them are set. #9148
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
By default if not qualifier were set by the build process the version subcommand would default to [current version]+[alpha1].
|
@andrewkroh Don't review, I have to make a few more changes for #8384 |
ph
force-pushed
the
fix/make-sure-version-subcommand-doesnt-default-to-alpha1-qualifier
branch
from
4338232
to
0ea530b
Compare
|
@andrewkroh I believe i've removed all the trace from I've tested it with the following: |
andrewkroh
approved these changes
Nov 19, 2018
There was a problem hiding this comment.
The changes LGTM.
Can you look into removing the version qualifier from version used in executing beats-tester? Currently it will consume the -alpha1 artifacts which are not actually the latest. See https://beats-ci.elastic.co/job/elastic+beats-tester+master/build?delay=0sec.
|
I've kick a PR package tests at https://beats-ci.elastic.co/job/elastic+beats+pull-request+package/10/ just to be sure. |
|
We could simplify a bit further if you'd like, since unset |
|
@andrewkroh I think this is what you meant for beat-tester elastic/beats-tester#96 |
|
@ph That did make important changes to beats-tester, but it only affects users that run it locally with the There's still a change needed in elastic/infra to modify the default value of the version shown the Build Parameters page. |
kaiyan-sheng
added a commit
that referenced
this pull request
Dec 17, 2018
* 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 * Add DeDot in add_docker_metadata processor * Add dedot into config and default to be false * Update changelog and documentation * Add documentation into processors-using.asciidoc * Run mage fmt update under x-pack filebeat * Run mage fmt update on x-pack metricbeat * Run update again * Run make update fmt from top level dir * Remove mistakes from rebase * Remove repeated doc
kaiyan-sheng
added a commit
that referenced
this pull request
Dec 31, 2018
* 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
kaiyan-sheng
added a commit
that referenced
this pull request
Jan 4, 2019
#9647) (#9843) * Fix mysql slowlog template to support mysql 5.7.22 (#9647) * 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) * Rerun test with GENERATE=1 and 6.x environment
kaiyan-sheng
added a commit
that referenced
this pull request
Jan 14, 2019
* 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 * Add Dedot for Kubernetes labels and annotations * Add dedot options in libbeat kubernetes metadata * Update changelog * Refactor TestGenerateMapStrFromEvent * Update shared-autodiscover.asciidoc with dedot params * Add names for each unit test case in event_test.go * Fix rebase errors
DStape
pushed a commit
to DStape/beats
that referenced
this pull request
Aug 20, 2019
* Never default to a qualifier when none of them are set. (elastic#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: elastic#8384 * Add DeDot in add_docker_metadata processor * Add dedot into config and default to be false * Update changelog and documentation * Add documentation into processors-using.asciidoc * Run mage fmt update under x-pack filebeat * Run mage fmt update on x-pack metricbeat * Run update again * Run make update fmt from top level dir * Remove mistakes from rebase * Remove repeated doc
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Remove default version qualifier and rename the environment variable to set it from
BEAT_VERSION_QUALIFIERtoVERSION_QUALIFIERthis will align with other parts of the stack.Tested with filebeat.
Without the patch
Fixes: #8384
NOTES: You may need to remove your
~/.magefilecache to see the changes.