Merge branch 'main' into watcher-stream

.buildkite/scripts/steps/integration_tests.sh

@@ -5,8 +5,8 @@ source .buildkite/scripts/common.sh
 
 # Override the agent package version using a string with format <major>.<minor>.<patch>
 # NOTE: use only after version bump when the new version is not yet available, for example:
-# OVERRIDE_AGENT_PACKAGE_VERSION="8.10.3"
-OVERRIDE_AGENT_PACKAGE_VERSION="8.10.2"
+# OVERRIDE_AGENT_PACKAGE_VERSION="8.10.3" otherwise OVERRIDE_AGENT_PACKAGE_VERSION="".
+OVERRIDE_AGENT_PACKAGE_VERSION=""
 
 if [[ -n "$OVERRIDE_AGENT_PACKAGE_VERSION" ]]; then
   OVERRIDE_TEST_AGENT_VERSION=${OVERRIDE_AGENT_PACKAGE_VERSION}"-SNAPSHOT"

.go-version

@@ -1 +1 @@
-1.20.9
+1.20.10

.golangci.yml

@@ -116,7 +116,7 @@ linters-settings:
 
   gosimple:
     # Select the Go version to target. The default is '1.13'.
-    go: "1.20.9"
+    go: "1.20.10"
 
   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.9"
+    go: "1.20.10"
     checks: ["all"]
 
   stylecheck:
     # Select the Go version to target. The default is '1.13'.
-    go: "1.20.9"
+    go: "1.20.10"
     checks: ["all"]
 
   unused:
     # Select the Go version to target. The default is '1.13'.
-    go: "1.20.9"
+    go: "1.20.10"
 
   gosec:
     excludes:

Dockerfile

@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.20.9
+ARG GO_VERSION=1.20.10
 FROM circleci/golang:${GO_VERSION}
 
 

Dockerfile.skaffold

@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.20.9
+ARG GO_VERSION=1.20.10
 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"

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

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

changelog/8.10.4.asciidoc

@@ -0,0 +1,55 @@
+// begin 8.10.4 relnotes
+
+[[release-notes-8.10.4]]
+==  8.10.4
+
+Review important information about the  8.10.4 release.
+
+
+
+[discrete]
+[[breaking-changes-8.10.4]]
+=== Breaking changes
+
+Breaking changes can prevent your application from optimal operation and
+performance. Before you upgrade, review the breaking changes, then mitigate the
+impact to your application.
+
+elastic-agent::
+
+[discrete]
+[[breaking-3591]]
+.`elastic-agent-autodiscover` library has been updated to version 0.6.4, disabling metadata For `kubernetes.deployment` and `kubernetes.cronjob` fields.
+[%collapsible]
+====
+*Details* +
+The `elastic-agent-autodiscover` Kubernetes library by default comes with `add_resource_metadata.deployment=false` and `add_resource_metadata.cronjob=false`.
+*Impact* +
+Pods that will be created from deployments or cronjobs will not have the extra metadata field for `kubernetes.deployment` or `kubernetes.cronjob`, respectively. This change was made to avoid the memory impact of keeping the feature enabled in big Kubernetes clusters.
+For more information, refer to {agent-pull}3591[#3591].
+====
+
+
+
+
+
+[discrete]
+[[new-features-8.10.4]]
+=== New features
+
+The 8.10.4 release adds the following new and notable features.
+
+
+elastic-agent::
+
+* Secondary Fallback For Package Signature Verification. {elastic-agent-pull}https://github.com/elastic/elastic-agent/pull/3453[#https://github.com/elastic/elastic-agent/pull/3453] {elastic-agent-issue}https://github.com/elastic/elastic-agent/issues/3264[#https://github.com/elastic/elastic-agent/issues/3264]
++
+Ability to upgrade securely in air-gapped environment where fleet server is the only reachable URI.
+
+
+
+
+
+
+
+// end 8.10.4 relnotes

changelog/8.10.4.yaml

@@ -0,0 +1,25 @@
+version: 8.10.4
+entries:
+    - kind: feature
+      summary: Secondary fallback for package signature verification
+      description: Ability to upgrade securely in air-gapped environment where fleet server is the only reachable URI.
+      component: elastic-agent
+      pr:
+        - https://github.com/elastic/elastic-agent/pull/3453
+      issue:
+        - https://github.com/elastic/elastic-agent/issues/3264
+      timestamp: 1695289867
+      file:
+        name: 1695289867-Secondary-fallback-for-package-signature-verification.yaml
+        checksum: 8f8c39d9eef2f5b6922353bcab9c4ee1b74b1378
+    - kind: breaking-change
+      summary: Elastic-agent-autodiscover to v0.6.4. Disables metadata for deployment and cronjob
+      description: Elastic-agent-autodiscover library by default comes with add_resource_metadata.deployment=false and add_resource_metadata.cronjob=false. Pods that will be created from deployments or cronjobs will not have the extra metadata field for kubernetes.deployment or kubernetes.cronjob respectively.
+      component: elastic-agent
+      pr:
+        - https://github.com/elastic/elastic-agent/pull/3591
+      issue: []
+      timestamp: 1697102363
+      file:
+        name: 1697102363-updating_agentautodiscovery_810.yaml
+        checksum: fe9015185dc4d3fe85f9c2ebf9f47e64e26fc67d

changelog/fragments/1695035111-Resilient-handling-of-air-gapped-PGP-checks.yaml → changelog/fragments/1689328899-Elastic-Agent-container-runs-on-Azure-Container-Instances-.yaml

@@ -8,14 +8,14 @@
 # - 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: bug-fix
+kind: bug
 
 # Change summary; a 80ish characters long description of the change.
-summary: Resilient handling of air gapped PGP checks
+summary: Elastic-Agent container runs on Azure Container Instances 
 
 # Long description; in case the summary is not enough to describe the change
 # this field accommodate a description without length limits.
-description: Elastic Agent should not fail when remote PGP is specified (or official Elastic fallback PGP used) and remote is not available
+#description: 
 
 # Affected component; a word indicating the component this changeset affects.
 component: elastic-agent
@@ -24,8 +24,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: 3427
+pr: 3576
 
 # Issue number; 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: 3368
+issue: 82

changelog/fragments/1695050880-Improve-retry-strategy-when-uninstalling-agent.yaml → changelog/fragments/1693403216-Surface-errors-during-Agent's-enroll.yaml

@@ -8,24 +8,24 @@
 # - 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: bug-fix
 
 # 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: Surface errors during Agent's enroll process, failing if any happens.
 
 # 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: install/enroll
 
 # 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: https://github.com/owner/repo/1234
+pr: https://github.com/elastic/elastic-agent/pull/3207
 
 # 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.

changelog/fragments/1697111928-upgrade-to-go-1.20.9.yaml → changelog/fragments/1697229987-Upgrade-to-Go-1.20.10.yaml

@@ -11,21 +11,21 @@
 kind: security
 
 # Change summary; a 80ish characters long description of the change.
-summary: Upgrade to Go 1.20.9
+summary: Upgrade to Go 1.20.10.
 
 # 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; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc.
-component: elastic-agent
+component: "elastic-agent"
 
 # 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: https://github.com/elastic/elastic-agent/pull/3393
+pr: https://github.com/elastic/elastic-agent/pull/3601
 
 # 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.

dev-tools/mage/godaemon.go

@@ -21,7 +21,7 @@ var (
 	}
 )
 
-// BuildGoDaemon builds the go-deamon binary.
+// BuildGoDaemon builds the go-daemon binary.
 func BuildGoDaemon() error {
 	if GOOS != "linux" {
 		return errors.New("go-daemon only builds for linux")