Skip to content
This repository was archived by the owner on Sep 17, 2024. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .ci/.e2e-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ SUITES:
- name: "Fleet"
pullRequestFilter: " && ~debian"
tags: "fleet_mode_agent"
- name: "Fleet Server"
pullRequestFilter: " && ~debian"
tags: "fleet_server"
- name: "Endpoint Integration"
pullRequestFilter: " && ~debian"
tags: "agent_endpoint_integration"
Expand Down
2 changes: 1 addition & 1 deletion cli/config/compose/profiles/helm/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ services:
- xpack.monitoring.collection.enabled=true
- ELASTIC_USERNAME=elastic
- ELASTIC_PASSWORD=changeme
image: "docker.elastic.co/elasticsearch/elasticsearch:${stackVersion:-8.0.0-SNAPSHOT}"
image: "docker.elastic.co/elasticsearch/elasticsearch:${stackVersion:-7.x-SNAPSHOT}"
ports:
- "9200:9200"
10 changes: 10 additions & 0 deletions cli/config/compose/services/fleet-server-centos/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
version: '2.4'
services:
fleet-server-centos:
image: centos/systemd:${fleet_server_centosTag:-latest}
container_name: ${fleet_server_centosContainerName}
entrypoint: "/usr/sbin/init"
privileged: true
volumes:
- ${fleet_server_centosAgentBinarySrcPath:-.}:${fleet_server_centosAgentBinaryTargetPath:-/tmp}
- /sys/fs/cgroup:/sys/fs/cgroup:ro
10 changes: 10 additions & 0 deletions cli/config/compose/services/fleet-server-debian/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
version: '2.4'
services:
fleet-server-debian:
image: alehaa/debian-systemd:${fleet_server_debianTag:-stretch}
container_name: ${fleet_server_debianContainerName}
entrypoint: "/sbin/init"
privileged: true
volumes:
- ${fleet_server_debianAgentBinarySrcPath:-.}:${fleet_server_debianAgentBinaryTargetPath:-/tmp}
- /sys/fs/cgroup:/sys/fs/cgroup:ro
2 changes: 1 addition & 1 deletion cli/config/compose/services/kibana/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ services:
test: "curl -f http://localhost:5601/login | grep kbn-injected-metadata 2>&1 >/dev/null"
retries: 600
interval: 1s
image: "docker.elastic.co/kibana/kibana:${kibanaTag:-8.0.0-SNAPSHOT}"
image: "docker.elastic.co/kibana/kibana:${kibanaTag:-7.x-SNAPSHOT}"
ports:
- "5601:5601"
19 changes: 0 additions & 19 deletions e2e/_suites/fleet/features/fleet_server.feature

This file was deleted.

4 changes: 2 additions & 2 deletions e2e/_suites/fleet/features/stand_alone_agent.feature
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ Examples: Ubi8
| image |
| ubi8 |

@run_fleet_server
Scenario Outline: Deploying a <image> stand-alone agent with fleet server mode
@bootstrap-fleet-server
Scenario Outline: Bootstrapping Fleet Server from a <image> stand-alone Elastic Agent
When a "<image>" stand-alone agent is deployed with fleet server mode
Then the stand-alone agent is listed in Fleet as "online"

Expand Down
Loading