Add variant for Kibana >= 8.7.0 with Fleet experimental toggles enabled (#1128)

Author: jsoriano

.ci/Jenkinsfile

@@ -99,6 +99,7 @@ pipeline {
                     'stack-command-default': generateTestCommandStage(command: 'test-stack-command-default', artifacts: ['build/elastic-stack-dump/stack/*/logs/*.log', 'build/elastic-stack-dump/stack/*/logs/fleet-server-internal/*', 'build/elastic-stack-status/*/*']),
                     'stack-command-oldest': generateTestCommandStage(command: 'test-stack-command-oldest', artifacts: ['build/elastic-stack-dump/stack/*/logs/*.log', 'build/elastic-stack-dump/stack/*/logs/fleet-server-internal/*', 'build/elastic-stack-status/*/*']),
                     'stack-command-7x': generateTestCommandStage(command: 'test-stack-command-7x', artifacts: ['build/elastic-stack-dump/stack/*/logs/*.log', 'build/elastic-stack-dump/stack/*/logs/fleet-server-internal/*', 'build/elastic-stack-status/*/*']),
+                    'stack-command-86': generateTestCommandStage(command: 'test-stack-command-86', artifacts: ['build/elastic-stack-dump/stack/*/logs/*.log', 'build/elastic-stack-dump/stack/*/logs/fleet-server-internal/*', 'build/elastic-stack-status/*/*']),
                     'stack-command-8x': generateTestCommandStage(command: 'test-stack-command-8x', artifacts: ['build/elastic-stack-dump/stack/*/logs/*.log', 'build/elastic-stack-dump/stack/*/logs/fleet-server-internal/*', 'build/elastic-stack-status/*/*']),
                     'check-packages-with-kind': generateTestCommandStage(command: 'test-check-packages-with-kind', artifacts: ['build/test-results/*.xml', 'build/kubectl-dump.txt', 'build/elastic-stack-dump/check-*/logs/*.log', 'build/elastic-stack-dump/check-*/logs/fleet-server-internal/*'], junitArtifacts: true, publishCoverage: true),
                     'check-packages-other': generateTestCommandStage(command: 'test-check-packages-other', artifacts: ['build/test-results/*.xml', 'build/elastic-stack-dump/check-*/logs/*.log', 'build/elastic-stack-dump/check-*/logs/fleet-server-internal/*'], junitArtifacts: true, publishCoverage: true),

Makefile

@@ -58,10 +58,14 @@ test-stack-command-oldest:
 	./scripts/test-stack-command.sh 7.14.2
 
 test-stack-command-7x:
-	./scripts/test-stack-command.sh 7.17.3-SNAPSHOT
+	./scripts/test-stack-command.sh 7.17.8
+
+# Keeping a test for 8.6 because it has an specific configuration file.
+test-stack-command-86:
+	./scripts/test-stack-command.sh 8.6.1
 
 test-stack-command-8x:
-	./scripts/test-stack-command.sh 8.6.0-SNAPSHOT
+	./scripts/test-stack-command.sh 8.7.0-SNAPSHOT
 
 test-stack-command: test-stack-command-default test-stack-command-7x test-stack-command-800 test-stack-command-8x
 

internal/stack/_static/kibana.yml.tmpl

@@ -28,6 +28,10 @@ xpack.fleet.registryUrl: "https://package-registry:8080"
 xpack.fleet.agents.enabled: true
 xpack.fleet.agents.fleet_server.hosts: ["https://fleet-server:8220"]
 
+{{ if not (semverLessThan $version "8.7.0") }}
+xpack.fleet.enableExperimental: ["experimentalDataStreamSettings"] # Enable experimental toggles in Fleet UI
+{{ end }}
+
 xpack.encryptedSavedObjects.encryptionKey: "12345678901234567890123456789012"
 
 {{ if not (semverLessThan $version "8.1.0") }}

internal/stack/variants.go

@@ -14,13 +14,15 @@ import (
 // This map is used to deploy different versions of the Elastic stack with matching configurations.
 var configurationVariantMap = map[string]string{
 	"8.0-0 - 8.1.x-x": "80",
-	"^8.2-0":          "8x",
+	"8.2-0 - 8.6.x-x": "86",
+	"^8.7-0":          "8x",
 }
 
 // stackVariantAsEnv function returns a stack variant based on the given stack version.
 // We identified three variants:
 // * default, covers all of 7.x branches
 // * 80, covers stack versions 8.0.0 to 8.1.x
+// * 86, covers stack versions 8.2.0 to 8.6.x, they don't support experimental toggles in Fleet
 // * 8x, supports different configuration options in Kibana, covers stack versions 8.2.0+
 func stackVariantAsEnv(version string) string {
 	return fmt.Sprintf("STACK_VERSION_VARIANT=%s", selectStackVersion(version))

internal/stack/variants_test.go

@@ -32,14 +32,18 @@ var tests = []struct {
 	{"8.1.58", "80"},
 	{"8.1.99-beta", "80"},
 	{"8.1.999-SNAPSHOT", "80"},
-	{"8.2-0", "8x"},
-	{"8.2", "8x"},
-	{"8.2.0-alpha", "8x"},
-	{"8.2.0", "8x"},
-	{"8.2.58", "8x"},
-	{"8.2.99-gamma", "8x"},
-	{"8.2.777-SNAPSHOT+arm64", "8x"},
-	{"8.5", "8x"},
+	{"8.2-0", "86"},
+	{"8.2", "86"},
+	{"8.2.0-alpha", "86"},
+	{"8.2.0", "86"},
+	{"8.2.58", "86"},
+	{"8.2.99-gamma", "86"},
+	{"8.2.777-SNAPSHOT+arm64", "86"},
+	{"8.5", "86"},
+	{"8.6.1", "86"},
+	{"8.7.0", "8x"},
+	{"8.7.0-SNAPSHOT", "8x"},
+	{"8.7.1-SNAPSHOT", "8x"},
 	{"9", "default"},
 }