Fix agent download timeout values in yaml files (#29039) (#29160)

(cherry picked from commit 692ee17) Co-authored-by: Michel Laterman <82832767+michel-laterman@users.noreply.github.com>
elastic · Nov 29, 2021 · fb63c15 · fb63c15
1 parent b314606
commit fb63c15
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/x-pack/elastic-agent/_meta/config/common.p2.yml.tmpl b/x-pack/elastic-agent/_meta/config/common.p2.yml.tmpl
@@ -94,7 +94,7 @@ inputs:
 # # path to the directory containing downloaded packages
 # target_directory: "${path.data}/downloads"
 # # timeout for downloading package
-# timeout: 30s
+# timeout: 120s
 # # file path to a public key used for verifying downloaded artifacts
 # # if not file is present agent will try to load public key from elastic.co website.
 # pgpfile: "${path.data}/elastic.pgp"

diff --git a/x-pack/elastic-agent/_meta/config/common.reference.p2.yml.tmpl b/x-pack/elastic-agent/_meta/config/common.reference.p2.yml.tmpl
@@ -63,7 +63,7 @@ inputs:
 # # path to the directory containing downloaded packages
 # target_directory: "${path.data}/downloads"
 # # timeout for downloading package
-# timeout: 30s
+# timeout: 120s
 # # file path to a public key used for verifying downloaded artifacts
 # # if not file is present agent will try to load public key from elastic.co website.
 # pgpfile: "${path.data}/elastic.pgp"

diff --git a/x-pack/elastic-agent/_meta/config/elastic-agent.docker.yml.tmpl b/x-pack/elastic-agent/_meta/config/elastic-agent.docker.yml.tmpl
@@ -63,7 +63,7 @@ inputs:
 # # path to the directory containing downloaded packages
 # target_directory: "${path.data}/downloads"
 # # timeout for downloading package
-# timeout: 30s
+# timeout: 120s
 # # file path to a public key used for verifying downloaded artifacts
 # # if not file is present agent will try to load public key from elastic.co website.
 # pgpfile: "${path.data}/elastic.pgp"

diff --git a/x-pack/elastic-agent/_meta/elastic-agent.fleet.yml b/x-pack/elastic-agent/_meta/elastic-agent.fleet.yml
@@ -12,7 +12,7 @@ fleet:
 # # path to the directory containing downloaded packages
 # target_directory: "${path.data}/downloads"
 # # timeout for downloading package
-# timeout: 30s
+# timeout: 120s
 # # file path to a public key used for verifying downloaded artifacts
 # # if not file is present Elastic Agent will try to load public key from elastic.co website.
 # pgpfile: "${path.data}/elastic.pgp"

diff --git a/x-pack/elastic-agent/_meta/elastic-agent.yml b/x-pack/elastic-agent/_meta/elastic-agent.yml
@@ -63,7 +63,7 @@ inputs:
 # # path to the directory containing downloaded packages
 # target_directory: "${path.data}/downloads"
 # # timeout for downloading package
-# timeout: 30s
+# timeout: 120s
 # # file path to a public key used for verifying downloaded artifacts
 # # if not file is present agent will try to load public key from elastic.co website.
 # pgpfile: "${path.data}/elastic.pgp"

diff --git a/x-pack/elastic-agent/elastic-agent.docker.yml b/x-pack/elastic-agent/elastic-agent.docker.yml
@@ -63,7 +63,7 @@ inputs:
 # # path to the directory containing downloaded packages
 # target_directory: "${path.data}/downloads"
 # # timeout for downloading package
-# timeout: 30s
+# timeout: 120s
 # # file path to a public key used for verifying downloaded artifacts
 # # if not file is present agent will try to load public key from elastic.co website.
 # pgpfile: "${path.data}/elastic.pgp"

diff --git a/x-pack/elastic-agent/elastic-agent.reference.yml b/x-pack/elastic-agent/elastic-agent.reference.yml
@@ -69,7 +69,7 @@ inputs:
 # # path to the directory containing downloaded packages
 # target_directory: "${path.data}/downloads"
 # # timeout for downloading package
-# timeout: 30s
+# timeout: 120s
 # # file path to a public key used for verifying downloaded artifacts
 # # if not file is present agent will try to load public key from elastic.co website.
 # pgpfile: "${path.data}/elastic.pgp"

diff --git a/x-pack/elastic-agent/elastic-agent.yml b/x-pack/elastic-agent/elastic-agent.yml
@@ -100,7 +100,7 @@ inputs:
 # # path to the directory containing downloaded packages
 # target_directory: "${path.data}/downloads"
 # # timeout for downloading package
-# timeout: 30s
+# timeout: 120s
 # # file path to a public key used for verifying downloaded artifacts
 # # if not file is present agent will try to load public key from elastic.co website.
 # pgpfile: "${path.data}/elastic.pgp"

diff --git a/x-pack/elastic-agent/pkg/agent/application/configuration_embed.go b/x-pack/elastic-agent/pkg/agent/application/configuration_embed.go