From 627e1ab61603504c76d79d7aaab821f1a7aaea47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= Date: Tue, 2 Nov 2021 13:15:11 +0100 Subject: [PATCH 1/3] chore: use quotes for attribute --- cli/config/compose/profiles/fleet/default/kibana.config.yml | 2 +- .../profiles/fleet/preconfigured-policies/kibana.config.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cli/config/compose/profiles/fleet/default/kibana.config.yml b/cli/config/compose/profiles/fleet/default/kibana.config.yml index 3d97786aa4..56c093f4b8 100644 --- a/cli/config/compose/profiles/fleet/default/kibana.config.yml +++ b/cli/config/compose/profiles/fleet/default/kibana.config.yml @@ -10,7 +10,7 @@ elasticsearch.password: changeme xpack.monitoring.ui.container.elasticsearch.enabled: true xpack.fleet.enabled: true -xpack.fleet.registryUrl: https://epr-staging.elastic.co +xpack.fleet.registryUrl: "https://epr-staging.elastic.co" xpack.fleet.agents.enabled: true xpack.fleet.agents.elasticsearch.host: http://elasticsearch:9200 xpack.fleet.agents.fleet_server.hosts: diff --git a/cli/config/compose/profiles/fleet/preconfigured-policies/kibana.config.yml b/cli/config/compose/profiles/fleet/preconfigured-policies/kibana.config.yml index 3d97786aa4..56c093f4b8 100644 --- a/cli/config/compose/profiles/fleet/preconfigured-policies/kibana.config.yml +++ b/cli/config/compose/profiles/fleet/preconfigured-policies/kibana.config.yml @@ -10,7 +10,7 @@ elasticsearch.password: changeme xpack.monitoring.ui.container.elasticsearch.enabled: true xpack.fleet.enabled: true -xpack.fleet.registryUrl: https://epr-staging.elastic.co +xpack.fleet.registryUrl: "https://epr-staging.elastic.co" xpack.fleet.agents.enabled: true xpack.fleet.agents.elasticsearch.host: http://elasticsearch:9200 xpack.fleet.agents.fleet_server.hosts: From f4b29aab2eaba6957c80a2a393b4ebc10cce1d32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= Date: Tue, 2 Nov 2021 13:15:25 +0100 Subject: [PATCH 2/3] chore: do not start local package-registry --- internal/deploy/elastic_package.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/deploy/elastic_package.go b/internal/deploy/elastic_package.go index 57f559f47f..0858abc88d 100644 --- a/internal/deploy/elastic_package.go +++ b/internal/deploy/elastic_package.go @@ -131,7 +131,7 @@ func checkElasticPackageProfile(ctx context.Context, kibanaProfile string) error // Bootstrap sets up environment with docker compose func (ep *EPServiceManager) Bootstrap(ctx context.Context, profile ServiceRequest, env map[string]string, waitCB func() error) error { - services := "elasticsearch,fleet-server,kibana,package-registry" + services := "elasticsearch,fleet-server,kibana" version := common.StackVersion From 1013ffe96b335adf0d40a4a4504a39836f1180d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= Date: Tue, 2 Nov 2021 13:15:55 +0100 Subject: [PATCH 3/3] Revert "fix: run local package registry with docker provider (#1743) (#1750)" This reverts commit 046f12d3d6cbd54d70ba59193c48cb399ea1fa9c. --- .../profiles/fleet/default/package-registry.config.yml | 5 ----- cli/config/compose/profiles/fleet/docker-compose.yml | 8 -------- .../preconfigured-policies/package-registry.config.yml | 5 ----- 3 files changed, 18 deletions(-) delete mode 100644 cli/config/compose/profiles/fleet/default/package-registry.config.yml delete mode 100644 cli/config/compose/profiles/fleet/preconfigured-policies/package-registry.config.yml diff --git a/cli/config/compose/profiles/fleet/default/package-registry.config.yml b/cli/config/compose/profiles/fleet/default/package-registry.config.yml deleted file mode 100644 index ed56090f02..0000000000 --- a/cli/config/compose/profiles/fleet/default/package-registry.config.yml +++ /dev/null @@ -1,5 +0,0 @@ -package_paths: - - /packages/development - - /packages/production - - /packages/staging - - /packages/snapshot diff --git a/cli/config/compose/profiles/fleet/docker-compose.yml b/cli/config/compose/profiles/fleet/docker-compose.yml index 16a2ef6272..00a62ca35f 100644 --- a/cli/config/compose/profiles/fleet/docker-compose.yml +++ b/cli/config/compose/profiles/fleet/docker-compose.yml @@ -54,11 +54,3 @@ services: - "KIBANA_FLEET_HOST=http://kibana:5601" - "FLEET_SERVER_HOST=0.0.0.0" - "FLEET_SERVER_PORT=8220" - package-registry: - image: docker.elastic.co/package-registry/distribution:staging - healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:8080"] - retries: 300 - interval: 1s - volumes: - - ./${kibanaProfile:-default}/package-registry.config.yml:/package-registry/config.yml diff --git a/cli/config/compose/profiles/fleet/preconfigured-policies/package-registry.config.yml b/cli/config/compose/profiles/fleet/preconfigured-policies/package-registry.config.yml deleted file mode 100644 index ed56090f02..0000000000 --- a/cli/config/compose/profiles/fleet/preconfigured-policies/package-registry.config.yml +++ /dev/null @@ -1,5 +0,0 @@ -package_paths: - - /packages/development - - /packages/production - - /packages/staging - - /packages/snapshot