From 5ae1b000d640baa42a53149122670cb3fb7b0f37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= Date: Thu, 28 Oct 2021 11:59:25 +0200 Subject: [PATCH 1/6] chore: simplify unit tests --- internal/deploy/base_test.go | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/internal/deploy/base_test.go b/internal/deploy/base_test.go index 482a70448e..0326fcf014 100644 --- a/internal/deploy/base_test.go +++ b/internal/deploy/base_test.go @@ -15,40 +15,28 @@ func Test_New(t *testing.T) { t.Run("New Docker Provider", func(t *testing.T) { provider := New("docker") - s, ok := provider.(Deployment) - assert.True(t, ok, "Provider is not a Deployment") - - s, ok = s.(*dockerDeploymentManifest) + _, ok := provider.(*dockerDeploymentManifest) assert.True(t, ok, "Provider is not Docker") }) t.Run("New Elastic Package Provider", func(t *testing.T) { provider := New("elastic-package") - s, ok := provider.(Deployment) - assert.True(t, ok, "Provider is not a Deployment") - - s, ok = s.(*EPServiceManager) + _, ok := provider.(*EPServiceManager) assert.True(t, ok, "Provider is not Elastic Package") }) t.Run("New K8S Provider", func(t *testing.T) { provider := New("kubernetes") - s, ok := provider.(Deployment) - assert.True(t, ok, "Provider is not a Deployment") - - s, ok = s.(*kubernetesDeploymentManifest) + _, ok := provider.(*kubernetesDeploymentManifest) assert.True(t, ok, "Provider is not Kubernetes") }) t.Run("New Remote Provider", func(t *testing.T) { provider := New("remote") - s, ok := provider.(Deployment) - assert.True(t, ok, "Provider is not a Deployment") - - s, ok = s.(*remoteDeploymentManifest) + _, ok := provider.(*remoteDeploymentManifest) assert.True(t, ok, "Provider is not Remote") }) From 0b64bd23b88d757ac524d620d286328e70804120 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= Date: Thu, 28 Oct 2021 12:07:05 +0200 Subject: [PATCH 2/6] chore: use local package-registry It also fixes quotes and whitespaces --- .../compose/profiles/fleet/default/kibana.config.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 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..642db8b2fd 100644 --- a/cli/config/compose/profiles/fleet/default/kibana.config.yml +++ b/cli/config/compose/profiles/fleet/default/kibana.config.yml @@ -10,11 +10,10 @@ 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: "http://package-registry:8080" xpack.fleet.agents.enabled: true -xpack.fleet.agents.elasticsearch.host: http://elasticsearch:9200 -xpack.fleet.agents.fleet_server.hosts: - ["http://fleet-server:8220"] +xpack.fleet.agents.elasticsearch.host: "http://elasticsearch:9200" +xpack.fleet.agents.fleet_server.hosts: ["http://fleet-server:8220"] xpack.encryptedSavedObjects.encryptionKey: "12345678901234567890123456789012" xpack.fleet.agents.tlsCheckDisabled: true From b1e8d4711498de25571b402dd651ad6d5a67cf9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= Date: Thu, 28 Oct 2021 12:08:41 +0200 Subject: [PATCH 3/6] chore: update preconfigured policies too --- .../fleet/preconfigured-policies/kibana.config.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 5f2c3f539f..ee974e9d1e 100644 --- a/cli/config/compose/profiles/fleet/preconfigured-policies/kibana.config.yml +++ b/cli/config/compose/profiles/fleet/preconfigured-policies/kibana.config.yml @@ -4,19 +4,20 @@ server.host: "0.0.0.0" telemetry.enabled: false -elasticsearch.hosts: ["http://elasticsearch:9200"] +elasticsearch.hosts: [ "http://elasticsearch:9200" ] elasticsearch.username: elastic 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: "http://package-registry:8080" xpack.fleet.agents.enabled: true -xpack.fleet.agents.elasticsearch.host: http://elasticsearch:9200 +xpack.fleet.agents.elasticsearch.host: "http://elasticsearch:9200" xpack.fleet.agents.fleet_server.hosts: ["http://fleet-server:8220"] xpack.encryptedSavedObjects.encryptionKey: "12345678901234567890123456789012" xpack.fleet.agents.tlsCheckDisabled: true + xpack.fleet.outputs: - name: "Test output" type: "elasticsearch" From d882fd030538a6546e428cdb6514a7c7e43fb2a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= Date: Thu, 28 Oct 2021 12:11:28 +0200 Subject: [PATCH 4/6] fix: use 8.x as file name This is only valid for the master branch --- internal/deploy/elastic_package.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/internal/deploy/elastic_package.go b/internal/deploy/elastic_package.go index 57f559f47f..10e642f4a7 100644 --- a/internal/deploy/elastic_package.go +++ b/internal/deploy/elastic_package.go @@ -76,7 +76,8 @@ func (ep *EPServiceManager) Add(ctx context.Context, profile ServiceRequest, ser func checkElasticPackageProfile(ctx context.Context, kibanaProfile string) error { // check compose profile - kibanaProfileFile := filepath.Join(config.OpDir(), "compose", "profiles", "fleet", kibanaProfile, "kibana.config.yml") + // The kibana config file is only valid in 8.0.0, for other maintenance branches it's kibana.config.default.yml + kibanaProfileFile := filepath.Join(config.OpDir(), "compose", "profiles", "fleet", kibanaProfile, "kibana.config.8x.yml") found, err := io.Exists(kibanaProfileFile) if !found || err != nil { return err From becae3759555a6e0eed3bab02ac543a917fc9d08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= Date: Thu, 28 Oct 2021 12:12:14 +0200 Subject: [PATCH 5/6] chore: return to elastic-package provider --- .ci/.e2e-tests-for-elastic-agent.yaml | 8 ++++---- .ci/.e2e-tests.yaml | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.ci/.e2e-tests-for-elastic-agent.yaml b/.ci/.e2e-tests-for-elastic-agent.yaml index 227315c7e5..b657134c1a 100644 --- a/.ci/.e2e-tests-for-elastic-agent.yaml +++ b/.ci/.e2e-tests-for-elastic-agent.yaml @@ -4,14 +4,14 @@ SUITES: platforms: - labels: "arm64" - labels: "ubuntu-18.04" - provider: "docker" + provider: "elastic-package" scenarios: - name: "Fleet" pullRequestFilter: " && ~debian" tags: "fleet_mode_agent" platforms: - labels: "ubuntu-18.04" - provider: "docker" + provider: "elastic-package" - name: "Integrations" pullRequestFilter: " && ~debian" tags: "integrations" @@ -27,13 +27,13 @@ SUITES: - name: "System Integration" platforms: - labels: "ubuntu-18.04" - provider: "docker" + provider: "elastic-package" pullRequestFilter: " && ~debian" tags: "system_integration" - name: "Stand-alone" platforms: - labels: "ubuntu-18.04" - provider: "docker" + provider: "elastic-package" pullRequestFilter: " && ~ubi8" tags: "stand_alone_agent" - name: "Backend Processes" diff --git a/.ci/.e2e-tests.yaml b/.ci/.e2e-tests.yaml index fd01de12dc..e647d3b873 100644 --- a/.ci/.e2e-tests.yaml +++ b/.ci/.e2e-tests.yaml @@ -14,16 +14,16 @@ SUITES: platforms: - labels: "arm64" - labels: "ubuntu-18.04" - provider: "docker" + provider: "elastic-package" scenarios: - name: "Fleet" pullRequestFilter: " && ~debian" tags: "fleet_mode_agent" platforms: - labels: "ubuntu-18.04" - provider: "docker" + provider: "elastic-package" - labels: "windows-2019" - provider: "docker" + provider: "elastic-package" - name: "Integrations" pullRequestFilter: " && ~debian" tags: "integrations" @@ -42,13 +42,13 @@ SUITES: - name: "System Integration" platforms: - labels: "ubuntu-18.04" - provider: "docker" + provider: "elastic-package" pullRequestFilter: " && ~debian" tags: "system_integration" - name: "Stand-alone" platforms: - labels: "ubuntu-18.04" - provider: "docker" + provider: "elastic-package" pullRequestFilter: " && ~ubi8" tags: "stand_alone_agent" - name: "Backend Processes" From b06927346a70022d0887c603fdc661c89e176626 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= Date: Thu, 28 Oct 2021 13:11:30 +0200 Subject: [PATCH 6/6] fix: xpack.fleet.enabled property is not supported --- cli/config/compose/profiles/fleet/default/kibana.config.yml | 1 - .../profiles/fleet/preconfigured-policies/kibana.config.yml | 1 - 2 files changed, 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 642db8b2fd..6fb346118e 100644 --- a/cli/config/compose/profiles/fleet/default/kibana.config.yml +++ b/cli/config/compose/profiles/fleet/default/kibana.config.yml @@ -9,7 +9,6 @@ elasticsearch.username: elastic elasticsearch.password: changeme xpack.monitoring.ui.container.elasticsearch.enabled: true -xpack.fleet.enabled: true xpack.fleet.registryUrl: "http://package-registry:8080" xpack.fleet.agents.enabled: true xpack.fleet.agents.elasticsearch.host: "http://elasticsearch:9200" 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 ee974e9d1e..a995d47e26 100644 --- a/cli/config/compose/profiles/fleet/preconfigured-policies/kibana.config.yml +++ b/cli/config/compose/profiles/fleet/preconfigured-policies/kibana.config.yml @@ -9,7 +9,6 @@ elasticsearch.username: elastic elasticsearch.password: changeme xpack.monitoring.ui.container.elasticsearch.enabled: true -xpack.fleet.enabled: true xpack.fleet.registryUrl: "http://package-registry:8080" xpack.fleet.agents.enabled: true xpack.fleet.agents.elasticsearch.host: "http://elasticsearch:9200"