From 7979e36496b5a4aa2a9fdf14468a9d12454fd5cf Mon Sep 17 00:00:00 2001 From: Michel Laterman <82832767+michel-laterman@users.noreply.github.com> Date: Thu, 25 Nov 2021 15:35:34 -0800 Subject: [PATCH] Fix agent download timeout values in yaml files (#29039) (cherry picked from commit 692ee17fb00c9aa2a57c1758c9af2b24b3c280c7) --- x-pack/elastic-agent/_meta/config/common.p2.yml.tmpl | 2 +- x-pack/elastic-agent/_meta/config/common.reference.p2.yml.tmpl | 2 +- x-pack/elastic-agent/_meta/config/elastic-agent.docker.yml.tmpl | 2 +- x-pack/elastic-agent/_meta/elastic-agent.fleet.yml | 2 +- x-pack/elastic-agent/_meta/elastic-agent.yml | 2 +- x-pack/elastic-agent/elastic-agent.docker.yml | 2 +- x-pack/elastic-agent/elastic-agent.reference.yml | 2 +- x-pack/elastic-agent/elastic-agent.yml | 2 +- .../elastic-agent/pkg/agent/application/configuration_embed.go | 2 +- 9 files changed, 9 insertions(+), 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 index 23d6203c2ec..a451165969f 100644 --- 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 index 312730db592..922e6a4dd6a 100644 --- 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 index 78c64b51494..a8236033303 100644 --- 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 index 5e73fbe0821..9189547155e 100644 --- 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 index 6167575e769..49388718013 100644 --- 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 index 81b48af034d..a1ef12ae405 100644 --- 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 index e0c4077f282..d41b7c54ed8 100644 --- 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 index 70926508570..2ea81fda476 100644 --- 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 index 85c6137d7d3..eb1679a536e 100644 --- a/x-pack/elastic-agent/pkg/agent/application/configuration_embed.go +++ b/x-pack/elastic-agent/pkg/agent/application/configuration_embed.go @@ -15,7 +15,7 @@ var DefaultAgentFleetConfig []byte func init() { // Packed File // _meta/elastic-agent.fleet.yml - unpacked := packer.MustUnpack("eJycVUuTo7oV3udnzD43PJqpIVVZWHQjxLTpGF9LSJsUkjwytoSp2GCLVP57SuC2u29Npabugo2QzuN7nPOfL/8y23P9t62uT+dG/LVW2/b82w+93Z5/s0Z/+fsXZBfxP3/3fu1bg4yRSAuTntDzL755fN+RBQkjqScs6IQFex5EpibSFwYfUIZ7BrFFL+zECPZeExDxcKNokPYIlpoZ3bM1OPOw8FBWaJmVHTdyTJqlYm0+8DXwarhR60A3lEQ7lOL8tQHsHiPDFwZTj0339Igg6zjcKAm/KRrEPTO6lVWuUVYe2RqMrCq9mkStsO5+6rk81P2H0SATMMoKXHiYe4ysFG0PqjRXzapVn5i5/jd1VAjinpL8xMjqK8pKK8nm+xSHSM3bVc9gHHJzHShZfXXnKFnsUVYMssr3bA0G1sw90Sr3asJ2NCzH1wRYVqV+XeVaWKA5TEcJ9R7Ba1cHGyVCl6fwpl5g2rME9JT4HTdC8YAqCXcawbzjJrU1weM9L9z0zC4GGeipLmH9p7dn2m+Nvsx3wMhDbGmA8eZw+IqS/Ciz8iLG4/AapFZCbSgpPGGje02vphheg3KQQXTiQXoQNm5m/r81j37BTkI18TDXVnbC4L2Esd2uJ414lOjecYHgI5bDXcB0Xwdpy6rld2QXCmXlThipZRofHD40LAfRulrRYRtOeXqnAVp5wwP7ckTquEfJQiHHNfE1D7GHIBtEAw48lD2H8Y5B3TMLLpQU/3b83TC5339rFuMyu9WRLBUz+sTW4EKr8oiyckDwRYkMN3zi6qy3a+CLAB9ueQJW5R1r9cTTh9o0S8BOtGXHTLqXH+LXhCpuYu9dx3W1VCLLtQhwLxOQ3nXxkraMRB7KZMfhRcksj+Z6Jt39sSYjTHxGEJ9oVXg1WfY0+KZkgBsRaI+tn244g1bMeX+OLbnuRFh21EYXFi4eXEPdi7DccXj9IWDq1Qk4sKrYC6MbVi1v/F8HGqReTeIewdh8eOOwuOMvbHwRJm6FSc/CPql1tZowoOQ6cjtj+8g7YWwZSQ+TjjJgeSAtJZ4SIdA00KYmxU5CPfB22d+47XhbeJRcT9Xc3097rUk0SpieeII+eVtk+UADPIrxeOeMTzr2dzyZZweCkc9JrkUDDA+Rq2Ung2jqU5h4z6pivGsb+h3X8fTurVlcl8+Ly3Jx1+2ZVruOV/iMMjCIdqV4i8/UYHvrfRQwDfk0Z13vhRZhocVlfs9J+lSF07uv6Hl5cbEf/iw7TvAgq5ViJrYIFg5Hb/ZjpKX9VGuPMnlk5End+59nfc/DlRIh3k9nAfM5vEbvsd5nqIS7Tnzw4IeZ6LkZiGB8YVU+89Tcd8hYk1JPOwS+KGbSjmfYstXc2w3THxLqMyOxL5+PajmCMXGeh7M3XttcO1+8PeaA5iZtOHQxSy0hto67SaPBTjudTnqqSjejXB0XHhZj7Wb9+kmVEBta4ZNMpn/GafLunZ/shHd9CIM9YbQWfrzn4eTjUUC8rwnrXO4Hp7FB2VRzN2H+4vZj6vNs9sDSPt1jblzM9uB2nM+dLgKqlmtwZiTtHTcyAWFNricE3e67xSTuXqRn7jeKEuaxCs1nkO1qcvWF2bz7ZMLB7ZIqKAZJomkWPrxXun0Qoay4MFJ0zPVnwcHNCIcdb8BZWNCwqgwZwf3/7cvxNuec3/9+/HDmcvm7bRq/x/6MHUmfauL7fP1ncy8un/wSzH29NQufr+66SbcZGLjBvYTa+fzAKqdNt3/xOHmjKo8OSzbN2MMUW2a5ptVt1lugP8d4cIkD7dXJtGfu7ymJDuj5g3ZGh8nihJ7p5TVZXJf7D/j8oSdm0pMINu+6fBIw7p0fapKe3pqbblfHf3z571/+FwAA//9N0n8p") + unpacked := packer.MustUnpack("eJycVUuTo7oV3udnzD43PIauITsLN0KModO4jZA2KSS5BbaEqWsDhlT+e0rgtrtv3aSmsmAjpPP4Huf869s/9f5S/m2vyvOl5n8t5b65/Pau9vvLb6NW3/7+DY0r/x9v1q99WxBR7CmuwzNa/+Kbx/cTjSCgOLT4CFo+ggNzPF1iYXOdH1GUdxTmI3qmZ4pzaxMAj7k7SZywQzBTVKuObsGFuamFolSJKGuZFlNQJ5I2cc+2wCrhTm4dVRPsVSjM400N6D1GlA8Uhhad76kJQdoyuJMC/pDE8TuqVSOKWKEoO9EtmGiRWSX2Gj6a+6Fl8hDzH3q9CMAkCjAwN7YofpWkOcpMXxUtXrtAL/W/yJNEMO8Ijs8Uvz6hKBsF3v2c42ChWPPaUei7TF97gl+fzDkKVgcUpb0o4gPdgp7WS0+kiK0S04q42bQJwEiL0C6LWPERKAbDSUB1QPDals5OctfkSa25Fxh2NAAdwXbLNJfMIVLASiEYt0yHY4nz6Z4X7jo6rnrhqLkuPtrfX9ak22s1LHfAxNx8JE6e747HJxTEJxFlA59O/cYJRwGVJji1+Ojda9rotN84WS8c78yc8MhHv174/1E/+gWVgHLmYakta7nODwL64347a8QiWHWGCwQfsQzuHIaH0gkbWiQ/0biSKMoqroUSoX80+BA363ljakXHvTvn6YwGSGH1D+yzCcnTAQUriQzX2FbMzS0Eac9rcGSu6Bj0KwpVR0cwEJz+bvi7YXK//1KvrskBfMJz0ReHoVUGwGIjqFAEbKKvLRnB77Q4SlGkigZAMxdJofOxxNT7sz4/8/+Ir/RNi7rEV4WMpiOjjdRoS2b4WnE3M7kAdfJOBMAt8fVsdLjfzvXM8f9Y081LXzhEkVCkSVsBd92t74G6S96XelXH0WUgRXba6KwSMPQ3Tn4mRWqVOOk4FMMnfFvWpBbB13Ox8CEpzCfixi3R+XTz3pk5aSWg6lk9e+D+5g+c9zyKe+rGFSuSDj0ra8YAhmfu/FiwXd3zzhhznd955NpvuA4vKEoHitOWanUgRdYyx5s2t3pL7E0ChmcW+nN/f96r6ribVQwOdWDewbCh2LM2DRiZkyruJg9vQ+NDdSF4kBz6owhAJ7Bd0wJJqv3R1EIK0c19RnFPnHzizodHwaXE3vv8bn2SydtqSNarRfdBIhkOv5fYttl2mUsIejbDseL1rXeDt+MZvZneD7RIp7tvoF3tQ39+91KvpmS9GpLVf/XEweAoFhw7WvAvtW5q4JYw74wWb/3Lskgk076Z2zaZz1It8PVs/L3Eyo8Ixp7h39wVUF0o9m3xqMHwYPDqOczHhafvc1wzu7mjjrSITW8VgrQq8dXmenebCQumhZu1DOe9KF6f0DoZ+HAy+6havOGNtMjG/dvpjifFXkXMTA/AkRaZ4tpwZzQqTrTIToYzrnOLN8e5Dg79iTuqZnDXoWezr0KbRa/zP6qNJu/eUUyHNYP58aUGFm9y9ZiFsRJR3NIifSeObxsfcxco4ihtZvUnTo0v5prN+aYGzxTTSuDr4oF10t1jhnNMD8G0F9izEPQ1Wj9LhvOKNYabVykcdWYBqOn2HvOIoN/NuxLbZo9oYXbzcqYJVmezXz58MuOgleK2f2Bu3s36HO7cHSm+VvstmDjMDyWmLTWYQDMjjrLE3yUzPOrcEk6u2P/uy/A2x729f/p8hkZwIUX1/hH7K3Z2tYfqIrD1f+dOoi9+Wfp6O8kUW3fdZEU1MMdTrMla43MKc4sWsfGu2dfGG1Y5Y5mZGestczsbzV5cZn0i6dcYn7gUrZmZyQSmx3uz41fTQzvJjMkmWDlJMMjkDX3G52tPkFYsSj92mdpHoGc67wRUFVufPnT789u///KfAAAA//+w0n9F") raw, ok := unpacked["_meta/elastic-agent.fleet.yml"] if !ok { // ensure we have something loaded.