Never default to a qualifier when none of them are set.

CHANGELOG-developer.asciidoc

@@ -37,6 +37,7 @@ The list below covers the major changes between 6.3.0 and master only.
 - Fix permissions of generated Filebeat filesets. {pull}7140[7140]
 - Collect fields from _meta/fields.yml too. {pull}8397[8397]
 - Fix issue on asset generation that could lead to different results in Windows. {pull}8464[8464]
+- Remove default version qualifier, you can use `VERSION_QUALIFIER` environment variable to set it. {pull}9148[9148]
 
 ==== Added
 

auditbeat/magefile.go

@@ -75,7 +75,7 @@ func Clean() error {
 // Package packages the Beat for distribution.
 // Use SNAPSHOT=true to build snapshots.
 // Use PLATFORMS to control the target platforms.
-// Use BEAT_VERSION_QUALIFIER to control the version qualifier.
+// Use VERSION_QUALIFIER to control the version qualifier.
 func Package() {
 	start := time.Now()
 	defer func() { fmt.Println("package ran for", time.Since(start)) }()

dev-tools/jenkins_release.sh

@@ -18,7 +18,6 @@ trap cleanup EXIT
 
 # This controls the defaults used the Jenkins package job. They can be
 # overridden by setting them in the environement prior to running this script.
-export BEAT_VERSION_QUALIFIER="${VERSION_QUALIFIER}"
 export SNAPSHOT="${SNAPSHOT:-true}"
 export PLATFORMS="${PLATFORMS:-+linux/armv7 +linux/ppc64le +linux/s390x +linux/mips64}"
 

dev-tools/mage/crossbuild.go

@@ -247,7 +247,7 @@ func (b GolangCrossBuilder) Build() error {
 		)
 	}
 	if versionQualified {
-		args = append(args, "--env", "BEAT_VERSION_QUALIFIER="+versionQualifier)
+		args = append(args, "--env", "VERSION_QUALIFIER="+versionQualifier)
 	}
 	args = append(args,
 		"--rm",

dev-tools/mage/settings.go

@@ -103,7 +103,7 @@ func init() {
 		panic(errors.Errorf("failed to parse SNAPSHOT env value", err))
 	}
 
-	versionQualifier, versionQualified = os.LookupEnv("BEAT_VERSION_QUALIFIER")
+	versionQualifier, versionQualified = os.LookupEnv("VERSION_QUALIFIER")
 }
 
 // EnvMap returns map containing the common settings variables and all variables
@@ -319,7 +319,7 @@ var (
 )
 
 // BeatQualifiedVersion returns the Beat's qualified version.  The value can be overwritten by
-// setting BEAT_VERSION_QUALIFIER in the environment.
+// setting VERSION_QUALIFIER in the environment.
 func BeatQualifiedVersion() (string, error) {
 	version, err := beatVersion()
 	if err != nil {

filebeat/magefile.go

@@ -75,7 +75,7 @@ func Clean() error {
 // Package packages the Beat for distribution.
 // Use SNAPSHOT=true to build snapshots.
 // Use PLATFORMS to control the target platforms.
-// Use BEAT_VERSION_QUALIFIER to control the version qualifier.
+// Use VERSION_QUALIFIER to control the version qualifier.
 func Package() {
 	start := time.Now()
 	defer func() { fmt.Println("package ran for", time.Since(start)) }()

heartbeat/magefile.go

@@ -75,7 +75,7 @@ func Clean() error {
 // Package packages the Beat for distribution.
 // Use SNAPSHOT=true to build snapshots.
 // Use PLATFORMS to control the target platforms.
-// Use BEAT_VERSION_QUALIFIER to control the version qualifier.
+// Use VERSION_QUALIFIER to control the version qualifier.
 func Package() {
 	start := time.Now()
 	defer func() { fmt.Println("package ran for", time.Since(start)) }()

libbeat/version/helper.go

@@ -31,7 +31,7 @@ func GetDefaultVersion() string {
 var (
 	buildTime = "unknown"
 	commit    = "unknown"
-	qualifier = "alpha1"
+	qualifier = ""
 )
 
 // BuildTime exposes the compile-time build time information.

metricbeat/magefile.go

@@ -75,7 +75,7 @@ func Clean() error {
 // Package packages the Beat for distribution.
 // Use SNAPSHOT=true to build snapshots.
 // Use PLATFORMS to control the target platforms.
-// Use BEAT_VERSION_QUALIFIER to control the version qualifier.
+// Use VERSION_QUALIFIER to control the version qualifier.
 func Package() {
 	start := time.Now()
 	defer func() { fmt.Println("package ran for", time.Since(start)) }()

packetbeat/magefile.go

@@ -113,7 +113,7 @@ func Clean() error {
 // Package packages the Beat for distribution.
 // Use SNAPSHOT=true to build snapshots.
 // Use PLATFORMS to control the target platforms.
-// Use BEAT_VERSION_QUALIFIER to control the version qualifier.
+// Use VERSION_QUALIFIER to control the version qualifier.
 func Package() {
 	start := time.Now()
 	defer func() { fmt.Println("package ran for", time.Since(start)) }()

winlogbeat/magefile.go

@@ -75,7 +75,7 @@ func Clean() error {
 // Package packages the Beat for distribution.
 // Use SNAPSHOT=true to build snapshots.
 // Use PLATFORMS to control the target platforms.
-// Use BEAT_VERSION_QUALIFIER to control the version qualifier.
+// Use VERSION_QUALIFIER to control the version qualifier.
 func Package() {
 	start := time.Now()
 	defer func() { fmt.Println("package ran for", time.Since(start)) }()