From 1c05641c5cba543de5e7496e9811f99f82bcbde4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= Date: Tue, 20 Apr 2021 16:00:08 +0200 Subject: [PATCH] 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 <51892+adam-stokes@users.noreply.github.com> * Do not force fleet recreation as no fleet server exists yet Signed-off-by: Adam Stokes <51892+adam-stokes@users.noreply.github.com> * Revert "Do not force fleet recreation as no fleet server exists yet" This reverts commit e640941e86788a75ffe8b91a630df8e30ea5c24f. * fix: force a valid version of kibana Co-authored-by: Adam Stokes <51892+adam-stokes@users.noreply.github.com> (cherry picked from commit c6f1176043a6413fff0a2c1dbfcf0c74210ac2ad) --- e2e/Makefile | 1 + e2e/_suites/fleet/configurations/kibana.config.yml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/e2e/Makefile b/e2e/Makefile index 8b1762cc01..27dc31f944 100644 --- 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=pr96718 \ 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 index e4f017652a..8c466c6da6 100644 --- 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