fix: use a version of kibana with the fix for fleet-server validation…

…s (backport #1055) (#1063) * fix: use a version of kibana with the fix for fleet-server validations (#1055) * Fix kibana config for fleet server Signed-off-by: Adam Stokes <[email protected]> * Do not force fleet recreation as no fleet server exists yet Signed-off-by: Adam Stokes <[email protected]> * Revert "Do not force fleet recreation as no fleet server exists yet" This reverts commit e640941. * fix: force a valid version of kibana Co-authored-by: Adam Stokes <[email protected]> (cherry picked from commit c6f1176) * fix: use a 7.x version of the same image Co-authored-by: Manuel de la Peña <[email protected]>
elastic · Apr 21, 2021 · 6fad7eb · 6fad7eb
1 parent cc310bd
commit 6fad7eb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/e2e/Makefile b/e2e/Makefile
@@ -83,6 +83,7 @@ functional-test: install-godog
 	ELASTIC_APM_ENVIRONMENT="${ELASTIC_APM_ENVIRONMENT}" \
 	ELASTIC_APM_SECRET_TOKEN="${APM_SECRET_TOKEN}" \
 	ELASTIC_APM_SERVER_URL="${APM_SERVER_URL}" \
+	KIBANA_VERSION=pr97021 \
 	godog --format=${FORMAT} ${TAGS_FLAG} ${TAGS_VALUE}
 
 .PHONY: lint

diff --git a/e2e/_suites/fleet/configurations/kibana.config.yml b/e2e/_suites/fleet/configurations/kibana.config.yml
@@ -15,6 +15,6 @@ xpack.fleet.enabled: true
 xpack.fleet.registryUrl: http://package-registry:8080
 xpack.fleet.agents.enabled: true
 xpack.fleet.agents.elasticsearch.host: http://elasticsearch:9200
-xpack.fleet.agents.fleetServerEnabled: true
-xpack.fleet.agents.kibana.host: http://kibana:5601
+xpack.fleet.agents.fleet_server.hosts:
+  - http://kibana:5601
 xpack.fleet.agents.tlsCheckDisabled: true