Merge branch 'main' of github.com:elastic/elastic-agent into feat/aci…

…-image
elastic · Oct 16, 2023 · 645f786 · 645f786
2 parents d6396ae + be04fba
commit 645f786
Show file tree

Hide file tree

Showing 36 changed files with 825 additions and 979 deletions.
diff --git a/.ci/bump-golang.yml b/.ci/bump-golang.yml
@@ -103,15 +103,6 @@ targets:
       content: '{{ source "latestGoVersion" }}'
       file: .golangci.yml
       matchpattern: '\d+.\d+.\d+'
-  update-govulncheck:
-    name: "Update govulncheck.yml"
-    sourceid: latestGoVersion
-    scmid: githubConfig
-    kind: file
-    spec:
-      content: '{{ source "latestGoVersion" }}'
-      file: .github/workflows/govulncheck.yml
-      matchpattern: '\d+.\d+.\d+'
   update-version.asciidoc:
     name: "Update version.asciidoc"
     sourceid: latestGoVersion

diff --git a/.github/workflows/govulncheck.yml b/.github/workflows/govulncheck.yml
diff --git a/.go-version b/.go-version
@@ -1 +1 @@
-1.20.8
+1.20.9
diff --git a/.golangci.yml b/.golangci.yml
@@ -116,7 +116,7 @@ linters-settings:
 
   gosimple:
     # Select the Go version to target. The default is '1.13'.
-    go: "1.20.8"
+    go: "1.20.9"
 
   nakedret:
     # make an issue if func has more lines of code than this setting and it has naked returns; default is 30
@@ -136,17 +136,17 @@ linters-settings:
 
   staticcheck:
     # Select the Go version to target. The default is '1.13'.
-    go: "1.20.8"
+    go: "1.20.9"
     checks: ["all"]
 
   stylecheck:
     # Select the Go version to target. The default is '1.13'.
-    go: "1.20.8"
+    go: "1.20.9"
     checks: ["all"]
 
   unused:
     # Select the Go version to target. The default is '1.13'.
-    go: "1.20.8"
+    go: "1.20.9"
 
   gosec:
     excludes:

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.20.8
+ARG GO_VERSION=1.20.9
 FROM circleci/golang:${GO_VERSION}
 
 

diff --git a/Dockerfile.skaffold b/Dockerfile.skaffold
@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.20.8
+ARG GO_VERSION=1.20.9
 ARG crossbuild_image="docker.elastic.co/beats-dev/golang-crossbuild"
 ARG AGENT_VERSION=8.9.0-SNAPSHOT
 ARG AGENT_IMAGE="docker.elastic.co/beats/elastic-agent"

diff --git a/NOTICE.txt b/NOTICE.txt
@@ -923,11 +923,11 @@ these terms.
 
 --------------------------------------------------------------------------------
 Dependency : github.com/elastic/elastic-agent-autodiscover
-Version: v0.6.2
+Version: v0.6.4
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].2/LICENSE:
+Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].4/LICENSE:
 
                                  Apache License
                            Version 2.0, January 2004

diff --git a/changelog/8.10.3.asciidoc b/changelog/8.10.3.asciidoc
@@ -0,0 +1,41 @@
+// begin 8.10.3 relnotes
+
+[[release-notes-8.10.3]]
+==  8.10.3
+
+Review important information about the  8.10.3 release.
+
+
+
+
+
+
+
+
+
+[discrete]
+[[new-features-8.10.3]]
+=== New features
+
+The 8.10.3 release adds the following new and notable features.
+
+
+elastic-agent::
+
+* Improve Agent Uninstall On Windows By Adding Delay Between Retries When File Removal Is Blocked By Busy Files. {elastic-agent-pull}https://github.com/elastic/elastic-agent/pull/3431[#https://github.com/elastic/elastic-agent/pull/3431] {elastic-agent-issue}https://github.com/elastic/elastic-agent/issues/3221[#https://github.com/elastic/elastic-agent/issues/3221]
+
+
+
+
+
+
+[discrete]
+[[bug-fixes-8.10.3]]
+=== Bug fixes
+
+
+elastic-agent::
+
+* Resilient Handling Of Air Gapped Pgp Checks. {elastic-agent-pull}https://github.com/elastic/elastic-agent/pull/3427[#https://github.com/elastic/elastic-agent/pull/3427] {elastic-agent-issue}https://github.com/elastic/elastic-agent/issues/3368[#https://github.com/elastic/elastic-agent/issues/3368]
+
+// end 8.10.3 relnotes
diff --git a/changelog/8.10.3.yaml b/changelog/8.10.3.yaml
@@ -0,0 +1,26 @@
+version: 8.10.3
+entries:
+    - kind: bug-fix
+      summary: Resilient handling of air gapped PGP checks
+      description: Elastic Agent should not fail when remote PGP is specified (or official Elastic fallback PGP used) and remote is not available
+      component: elastic-agent
+      pr:
+        - https://github.com/elastic/elastic-agent/pull/3427
+      issue:
+        - https://github.com/elastic/elastic-agent/issues/3368
+      timestamp: 1695035111
+      file:
+        name: 1695035111-Resilient-handling-of-air-gapped-PGP-checks.yaml
+        checksum: 8741bfa9475a09d5901dc3fab0fed3a06b55d5bb
+    - kind: feature
+      summary: Improve Agent uninstall on Windows by adding delay between retries when file removal is blocked by busy files
+      description: ""
+      component: elastic-agent
+      pr:
+        - https://github.com/elastic/elastic-agent/pull/3431
+      issue: 
+        - https://github.com/elastic/elastic-agent/issues/3221
+      timestamp: 1695050880
+      file:
+        name: 1695050880-Improve-retry-strategy-when-uninstalling-agent.yaml
+        checksum: 45eab228dfd89392a0f3685a628f73ccce05d081
diff --git a/changelog/fragments/1695035111-Resilient-handling-of-air-gapped-PGP-checks.yaml b/changelog/fragments/1695035111-Resilient-handling-of-air-gapped-PGP-checks.yaml
diff --git a/...s/1694700201-gpg-unreachable-url-fix.yaml → ...758-bugfix-upgrade-progress-reporter.yaml b/...s/1694700201-gpg-unreachable-url-fix.yaml → ...758-bugfix-upgrade-progress-reporter.yaml
@@ -11,7 +11,7 @@
 kind: bug-fix
 
 # Change summary; a 80ish characters long description of the change.
-summary: Fix gpg verification, if one is successful upgrade should continue.
+summary: Periodically report progress of Elastic Agent artifact download during upgrade
 
 # Long description; in case the summary is not enough to describe the change
 # this field accommodate a description without length limits.
@@ -25,8 +25,8 @@ component: elastic-agent
 # If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added.
 # NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number.
 # Please provide it if you are adding a fragment for a different PR.
-pr: https://github.com/elastic/elastic-agent/pull/3426
+pr: https://github.com/elastic/elastic-agent/pull/3548
 
 # Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of).
 # If not present is automatically filled by the tooling with the issue linked to the PR number.
-issue: https://github.com/elastic/elastic-agent/issues/3368
+#issue: https://github.com/owner/repo/1234
diff --git a/...try-strategy-when-uninstalling-agent.yaml → ...t-monitoring-metrics-interval-to-60s.yaml b/...try-strategy-when-uninstalling-agent.yaml → ...t-monitoring-metrics-interval-to-60s.yaml
@@ -8,18 +8,18 @@
 # - security: impacts on the security of a product or a user’s deployment.
 # - upgrade: important information for someone upgrading from a prior version
 # - other: does not fit into any of the other categories
-kind: feature
+kind: enhancement
 
 # Change summary; a 80ish characters long description of the change.
-summary: Improve uninstall by adding some pause between retries when removal is blocked by busy files
+summary: Increase agent monitoring metrics interval from 10s to 60s to reduce load
 
 # Long description; in case the summary is not enough to describe the change
 # this field accommodate a description without length limits.
 # NOTE: This field will be rendered only for breaking-change and known-issue kinds at the moment.
 #description:
 
 # Affected component; a word indicating the component this changeset affects.
-component: elastic-agent
+component: monitoring
 
 # PR URL; optional; the PR number that added the changeset.
 # If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added.

diff --git a/...ng-server-based-on-monitoring-config.yaml → ...ents/1697111928-upgrade-to-go-1.20.9.yaml b/...ng-server-based-on-monitoring-config.yaml → ...ents/1697111928-upgrade-to-go-1.20.9.yaml
@@ -8,24 +8,25 @@
 # - security: impacts on the security of a product or a user’s deployment.
 # - upgrade: important information for someone upgrading from a prior version
 # - other: does not fit into any of the other categories
-kind: enhancement
+kind: security
 
 # Change summary; a 80ish characters long description of the change.
-summary: Start/stop monitoring server based on monitoring config
+summary: Upgrade to Go 1.20.9
 
 # Long description; in case the summary is not enough to describe the change
 # this field accommodate a description without length limits.
+# NOTE: This field will be rendered only for breaking-change and known-issue kinds at the moment.
 #description:
 
-# Affected component; a word indicating the component this changeset affects.
+# Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc.
 component: elastic-agent
 
-# PR number; optional; the PR number that added the changeset.
+# PR URL; optional; the PR number that added the changeset.
 # If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added.
 # NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number.
 # Please provide it if you are adding a fragment for a different PR.
-pr: 3492
+pr: https://github.com/elastic/elastic-agent/pull/3393
 
-# Issue number; optional; the GitHub issue related to this changeset (either closes or is part of).
+# Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of).
 # If not present is automatically filled by the tooling with the issue linked to the PR number.
-issue: 2735
+#issue: https://github.com/owner/repo/1234
diff --git a/go.mod b/go.mod
@@ -13,7 +13,7 @@ require (
 	github.com/docker/go-units v0.5.0
 	github.com/dolmen-go/contextio v0.0.0-20200217195037-68fc5150bcd5
 	github.com/elastic/e2e-testing v1.1.0
-	github.com/elastic/elastic-agent-autodiscover v0.6.2
+	github.com/elastic/elastic-agent-autodiscover v0.6.4
 	github.com/elastic/elastic-agent-client/v7 v7.4.0
 	github.com/elastic/elastic-agent-libs v0.5.0
 	github.com/elastic/elastic-agent-system-metrics v0.7.0

diff --git a/go.sum b/go.sum
@@ -778,8 +778,8 @@ github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25Kn
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/elastic/e2e-testing v1.1.0 h1:Y+K215EWkf3ojAWmBK2JrxH/rITjkKM1zR8mnwIpvLw=
 github.com/elastic/e2e-testing v1.1.0/go.mod h1:8q2d8dmwavJXISowwaoreHFBnbR/uK4qanfRGhC/W9A=
-github.com/elastic/elastic-agent-autodiscover v0.6.2 h1:7P3cbMBWXjbzA80rxitQjc+PiWyZ4I4F4LqrCYgYlNc=
-github.com/elastic/elastic-agent-autodiscover v0.6.2/go.mod h1:yXYKFAG+Py+TcE4CCR8EAbJiYb+6Dz9sCDoWgOveqtU=
+github.com/elastic/elastic-agent-autodiscover v0.6.4 h1:K+xC7OGgcy4fLXVuGgOGLs+eXCqRnRg2SQQinxP+KsA=
+github.com/elastic/elastic-agent-autodiscover v0.6.4/go.mod h1:5+7NIBAILc0GkgxYW3ckXncu5wRZfltZhTY4aZAYP4M=
 github.com/elastic/elastic-agent-client/v7 v7.4.0 h1:h75oTkkvIjgiKVm61NpvTZP4cy6QbQ3zrIpXKGigyjo=
 github.com/elastic/elastic-agent-client/v7 v7.4.0/go.mod h1:9/amG2K2y2oqx39zURcc+hnqcX+nyJ1cZrLgzsgo5c0=
 github.com/elastic/elastic-agent-libs v0.5.0 h1:8LbxSuMiGy8xhHX5NrE/dmTLsLMEuA+2AODUsiBfEcE=

diff --git a/internal/pkg/agent/application/coordinator/coordinator.go b/internal/pkg/agent/application/coordinator/coordinator.go
@@ -158,10 +158,6 @@ type ComponentsModifier func(comps []component.Component, cfg map[string]interfa
 // CoordinatorShutdownTimeout is how long the coordinator will wait during shutdown to receive a "clean" shutdown from other components
 var CoordinatorShutdownTimeout = time.Second * 5
 
-type configReloader interface {
-	Reload(*config.Config) error
-}
-
 // Coordinator manages the entire state of the Elastic Agent.
 //
 // All configuration changes, update variables, and upgrade actions are managed and controlled by the coordinator.
@@ -177,8 +173,6 @@ type Coordinator struct {
 	upgradeMgr UpgradeManager
 	monitorMgr MonitorManager
 
-	monitoringServerReloader configReloader
-
 	runtimeMgr RuntimeManager
 	configMgr  ConfigManager
 	varsMgr    VarsManager
@@ -371,10 +365,6 @@ func (c *Coordinator) State() State {
 	return c.stateBroadcaster.Get()
 }
 
-func (c *Coordinator) RegisterMonitoringServer(s configReloader) {
-	c.monitoringServerReloader = s
-}
-
 // StateSubscribe returns a channel that reports changes in Coordinator state.
 //
 // bufferLen specifies how many state changes should be queued in addition to
@@ -1018,12 +1008,6 @@ func (c *Coordinator) generateAST(cfg *config.Config) (err error) {
 		}
 	}
 
-	if c.monitoringServerReloader != nil {
-		if err := c.monitoringServerReloader.Reload(cfg); err != nil {
-			return fmt.Errorf("failed to reload monitor manager configuration: %w", err)
-		}
-	}
-
 	c.ast = rawAst
 	return nil
 }