Merge branch 'master' into k8s-autodiscover-beats

adam-stokes · web-flow · commit 7285ddae4f3f · 2021-05-03T08:19:33.000-04:00
diff --git a/cli/config/compose/profiles/fleet/configurations/kibana.config.yml b/cli/config/compose/profiles/fleet/configurations/kibana.config.yml
@@ -16,5 +16,5 @@ xpack.fleet.registryUrl: http://package-registry:8080
 xpack.fleet.agents.enabled: true
 xpack.fleet.agents.elasticsearch.host: http://elasticsearch:9200
 xpack.fleet.agents.fleet_server.hosts:
-  - http://kibana:5601
+  - http://fleet-server:8220
 xpack.fleet.agents.tlsCheckDisabled: true
diff --git a/cli/config/compose/profiles/fleet/docker-compose.yml b/cli/config/compose/profiles/fleet/docker-compose.yml
@@ -40,3 +40,22 @@ services:
       test: ["CMD", "curl", "-f", "http://localhost:8080"]
       retries: 300
       interval: 1s
+
+  fleet-server:
+    image: "docker.elastic.co/beats/elastic-agent:${stackVersion:-8.0.0-SNAPSHOT}"
+    depends_on:
+      elasticsearch:
+        condition: service_healthy
+      kibana:
+        condition: service_healthy
+    healthcheck:
+      test: "curl -f http://127.0.0.1:8220/api/status | grep HEALTHY 2>&1 >/dev/null"
+      retries: 12
+      interval: 5s
+    environment:
+      - "FLEET_SERVER_ENABLE=1"
+      - "FLEET_SERVER_INSECURE_HTTP=1"
+      - "KIBANA_FLEET_SETUP=1"
+      - "KIBANA_FLEET_HOST=http://kibana:5601"
+      - "FLEET_SERVER_HOST=0.0.0.0"
+      - "FLEET_SERVER_PORT=8220"
diff --git a/e2e/_suites/fleet/ingest_manager_test.go b/e2e/_suites/fleet/ingest_manager_test.go
@@ -176,22 +176,6 @@ func InitializeIngestManagerTestSuite(ctx *godog.TestSuiteContext) {
 
 		imts.Fleet.setup()
 
-		// we are going to bootstrap Fleet Server in a centos container, using TAR installer, and the base version
-		// Because it is the first agent in Fleet, there is no FleetServerHost
-		fleetServerBaseImage := "centos"
-		fleetServerInstallerType := "tar"
-		fleetServerVersion := common.AgentVersionBase
-		agentInstaller := installer.GetElasticAgentInstaller(fleetServerBaseImage, fleetServerInstallerType, fleetServerVersion, "")
-
-		// bootstrap Fleet Server only once: we need to set the version here
-		imts.Fleet.Version = fleetServerVersion
-		err = imts.Fleet.bootstrapFleetServerWithInstaller(fleetServerBaseImage, fleetServerInstallerType)
-		if err != nil {
-			log.WithFields(log.Fields{
-				"installer": agentInstaller,
-			}).Fatal("Fleet Server could not be bootstrapped")
-		}
-
 		imts.StandAlone.RuntimeDependenciesStartDate = time.Now().UTC()
 	})
 
