From 1ed2fdbd33ba9848360a658ef75fd33d5254b5cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= Date: Wed, 3 Nov 2021 09:55:30 +0100 Subject: [PATCH] fix: properly copy files from compose to elastic-package (#1764) (cherry picked from commit 293ba9650c7ed5ff1588a9a36f3d9b3010b2813a) --- internal/deploy/elastic_package.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/deploy/elastic_package.go b/internal/deploy/elastic_package.go index fb930eed56..d85f2f429a 100644 --- a/internal/deploy/elastic_package.go +++ b/internal/deploy/elastic_package.go @@ -76,8 +76,7 @@ func (ep *EPServiceManager) Add(ctx context.Context, profile ServiceRequest, ser func checkElasticPackageProfile(ctx context.Context, kibanaProfile string) error { // check compose profile - // 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") + kibanaProfileFile := filepath.Join(config.OpDir(), "compose", "profiles", "fleet", kibanaProfile, "kibana.config.yml") found, err := io.Exists(kibanaProfileFile) if !found || err != nil { return err @@ -111,7 +110,8 @@ func checkElasticPackageProfile(ctx context.Context, kibanaProfile string) error log.Trace("Not creating a new Elastic Package profile for " + kibanaProfile + ". Kibana config will be overriden") } - elasticPackageProfileFile := filepath.Join(elasticPackageProfile, "stack", "kibana.config.yml") + // The kibana config file is only valid in 8.0.0, for other maintenance branches it's kibana.config.default.yml + elasticPackageProfileFile := filepath.Join(elasticPackageProfile, "stack", "kibana.config.8x.yml") // copy compose's kibana's config to elastic-package's config err = io.CopyFile(kibanaProfileFile, elasticPackageProfileFile, 10000)