Skip to content

Commit 396d745

Browse files
authored
[Fleet] Fix kibana config in e2e tests (#3023)
1 parent fbfbd0c commit 396d745

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

dev-tools/e2e/kibana.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
server.name: kibana
22
server.host: "0.0.0.0"
33
server.ssl.enabled: false
4-
elasticsearch.hosts: [ "http://elasticsearch:9200" ]
4+
elasticsearch.hosts: ["http://elasticsearch:9200"]
55
elasticsearch.serviceAccountToken: "${KIBANA_TOKEN}"
66

7-
87
xpack.securitySolution.packagerTaskInterval: 1s
98
xpack.fleet.agents.enabled: true
109
xpack.fleet.agents.fleet_server.hosts: ["https://fleet-server:8220"]
11-
xpack.fleet.agents.elasticsearch.hosts: ["http://elasticsearch:9200"]
1210
xpack.fleet.packages:
1311
- name: elastic_agent
1412
version: latest
@@ -40,6 +38,6 @@ xpack.fleet.outputs:
4038
- id: fleet-default-output
4139
name: default
4240
type: elasticsearch
43-
hosts: [ http://elasticsearch:9200 ]
41+
hosts: [http://elasticsearch:9200]
4442
is_default: true
4543
is_default_monitoring: true

dev-tools/e2e/wait-for-kibana.sh

+8
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,16 @@ host="$1"
66
shift
77
cmd="$@"
88

9+
REPO_ROOT=$(cd $(dirname $(readlink -f "$0"))/../.. && pwd)
10+
11+
912

1013
until $(curl --output /dev/null --silent --head --fail "${host}/api/status"); do
14+
if [[ ! $(docker compose -f $REPO_ROOT/dev-tools/e2e/docker-compose.yml --env-file $REPO_ROOT/dev-tools/integration/.env ps --filter status=running -q kibana 2>/dev/null) ]]; then
15+
echo "Kibana container is not running"
16+
docker-compose -f $REPO_ROOT/dev-tools/e2e/docker-compose.yml --env-file $REPO_ROOT/dev-tools/integration/.env logs kibana
17+
exit 1
18+
fi
1119
printf '.'
1220
sleep 1
1321
done

dev-tools/integration/.env

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ELASTICSEARCH_VERSION=8.11.0-6faed5c7-SNAPSHOT
1+
ELASTICSEARCH_VERSION=8.12.0-31787d8c-SNAPSHOT
22
ELASTICSEARCH_USERNAME=elastic
33
ELASTICSEARCH_PASSWORD=changeme
44
TEST_ELASTICSEARCH_HOSTS=localhost:9200

0 commit comments

Comments
 (0)