Merge branch 'main' into feat/allow-fleet-config-override

Author: michalpristas

.buildkite/scripts/steps/validate-agentless-docker-image.sh

@@ -24,14 +24,13 @@ _SELF=$(dirname "$0")
 source "${_SELF}/../common.sh"
 
 if [ -z "$SERVICE_VERSION" ]; then
-    echo "No SHA found for environment: $ENVIRONMENT"
+    echo "SERVICE_VERSION environment variable is not set"
     exit 1
 fi
 
 DOCKER_TAG="git-${SERVICE_VERSION}"
 PRIVATE_IMAGE="${PRIVATE_REPO}:${DOCKER_TAG}"
 
-echo "Environment: ${ENVIRONMENT}"
 echo "Commit SHA: ${SERVICE_VERSION}"
 echo "Validating image: ${PRIVATE_IMAGE}"
 

.github/workflows/bump-otel-version.yml

@@ -2,8 +2,9 @@ name: bump-otel-version
 
 on:
   workflow_dispatch:
-  schedule:
-  - cron: '24 5 * * 1-5'
+  # Disabled because we do the updates manually, due to upstream dependencies like beats and elastic components
+  #schedule:
+  #- cron: '24 5 * * 1-5'
 
 permissions:
   contents: read

.mockery.yaml

@@ -17,6 +17,9 @@ packages:
   github.com/elastic/elastic-agent/internal/pkg/agent/application/info:
     interfaces:
       Agent: {}
+  github.com/elastic/elastic-agent/internal/pkg/agent/application/gateway/fleet:
+    interfaces:
+      rollbacksSource: {}
   github.com/elastic/elastic-agent/internal/pkg/agent/application/upgrade:
     interfaces:
       WatcherHelper: {}

.package-version

@@ -1,8 +1,8 @@
 {
   "version": "9.3.0-SNAPSHOT",
-  "build_id": "9.3.0-ce77dc22",
-  "manifest_url": "https://snapshots.elastic.co/9.3.0-ce77dc22/manifest-9.3.0-SNAPSHOT.json",
-  "summary_url": "https://snapshots.elastic.co/9.3.0-ce77dc22/summary-9.3.0-SNAPSHOT.html",
+  "build_id": "9.3.0-a866d8e8",
+  "manifest_url": "https://snapshots.elastic.co/9.3.0-a866d8e8/manifest-9.3.0-SNAPSHOT.json",
+  "summary_url": "https://snapshots.elastic.co/9.3.0-a866d8e8/summary-9.3.0-SNAPSHOT.html",
   "core_version": "9.3.0",
-  "stack_build_id": "9.3.0-ce77dc22-SNAPSHOT"
+  "stack_build_id": "9.3.0-a866d8e8-SNAPSHOT"
 }

NOTICE-fips.txt

@@ -0,0 +1,47 @@
+# REQUIRED
+# Kind can be one of:
+# - breaking-change: a change to previously-documented behavior
+# - deprecation: functionality that is being removed in a later release
+# - bug-fix: fixes a problem in a previous version
+# - enhancement: extends functionality but does not break or fix existing behavior
+# - feature: new functionality
+# - known-issue: problems that we are aware of in a given version
+# - 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
+
+# REQUIRED for all kinds
+# Change summary; a 80ish characters long description of the change.
+summary: set path.home for beat receivers to components directory
+
+# REQUIRED for breaking-change, deprecation, known-issue
+# Long description; in case the summary is not enough to describe the change
+# this field accommodate a description without length limits.
+# description:
+
+# REQUIRED for breaking-change, deprecation, known-issue
+# impact:
+
+# REQUIRED for breaking-change, deprecation, known-issue
+# action:
+
+# REQUIRED for all kinds
+# Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc.
+component: elastic-agent
+
+# AUTOMATED
+# OPTIONAL to manually add other PR URLs
+# PR URL: A link the PR 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/11726
+
+# AUTOMATED
+# OPTIONAL to manually add other issue URLs
+# 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/owner/repo/1234
+issue: https://github.com/elastic/beats/issues/48010

NOTICE.txt

@@ -15,6 +15,7 @@
   ],
   "maybelist": [
     "EPL-1.0",
+    "EPL-2.0",
     "GPL-3.0"
   ]
 }

changelog/fragments/1765388410-set-path.home-for-beat-receivers.yaml

@@ -21,7 +21,7 @@ The {{edot}} (EDOT) Collector includes embedded Collector components from the [O
 The components included in the EDOT Collector are categorized into **[Core]** and **[Extended]** components. The following table describes the current components included in the EDOT Collector, their source, and support status.
 
 ::::{note}
-Components marked as "Deprecated" in the table are retained in EDOT Collector 9.x to maintain backwards compatibility during the official deprecation window. If you're running EDOT Collector 9.x with {{product.elastic-stack}} 8.18 or 8.19, continue using these deprecated components as specified in the configuration for your Stack version. For more details, refer to [Configuration compatibility with {{product.elastic-stack}} versions](/reference/edot-collector/config/default-config-standalone.md#configuration-compatibility-with-elastic-stack-versions).
+Components marked as "Deprecated" in the table are retained in EDOT Collector 9.x to maintain backwards compatibility during the official deprecation window. If you're running EDOT Collector 9.x with {{product.elastic-stack}} 8.18 or 8.19, continue using these deprecated components as specified in the configuration for your Stack version. For more details, refer to [Configuration compatibility with {{product.elastic-stack}} versions](/reference/edot-collector/config/default-config-standalone.md#configuration-compatibility-with-elastic-stack-versions). To migrate your configuration to the new components, refer to [Migrate components](/reference/edot-collector/components/migrate-components.md).
 ::::
 
 % The following table is automatically generated from the EDOT Collector source code.

dev-tools/notice/rules.json

@@ -0,0 +1,73 @@
+---
+navigation_title: Migrate components
+description: How to migrate from deprecated EDOT Collector components to their replacements.
+applies_to:
+  stack:
+  serverless:
+    observability:
+  product:
+    edot_collector: ga
+type: how-to
+products:
+  - id: cloud-serverless
+  - id: observability
+  - id: edot-collector
+---
+
+# Migrate from deprecated components
+
+This guide explains how to migrate from deprecated EDOT Collector components to their replacements.
+
+## Before you begin
+
+- Make sure your {{product.elastic-stack}} is running version {{version.stack.base}}. If you're using {{product.elastic-stack}} version 8.18 or 8.19, continue using the deprecated components as specified in the configuration for your Stack version.
+- Have access to a staging environment where you can test the new configuration before deploying to production.
+
+## Migrate your configuration
+
+Follow these steps to migrate your existing EDOT Collector configuration.
+
+:::::{stepper}
+
+::::{step} Download the latest default configuration
+Download the configuration sample that matches your use case from the [default configuration samples](/reference/edot-collector/config/default-config-standalone.md#agent-mode). For Gateway mode, refer to the [Gateway mode section](/reference/edot-collector/config/default-config-standalone.md#gateway-mode).
+
+The latest configurations for {{product.elastic-stack}} 9.x use the latest components instead of the deprecated ones.
+::::
+
+::::{step} Test the new configuration in staging
+Before deploying to production, validate the new configuration in a staging environment:
+
+1. Deploy the EDOT Collector with the new configuration to your staging environment.
+2. Verify that telemetry data (logs, metrics, and traces) is being collected and exported correctly.
+3. Check that the data appears correctly in the {{product.observability}} UIs in {{product.kibana}}.
+4. Test any custom pipelines or configurations you might have added on top of the default configuration.
+
+:::{tip}
+If you have custom configurations, compare your existing configuration with the new default to identify which sections need updating.
+:::
+::::
+
+::::{step} Apply the new configuration in production
+After validating the configuration in staging:
+
+1. Schedule a maintenance window for the update if necessary.
+2. Back up your existing EDOT Collector configuration.
+3. Deploy the new configuration to your production collectors.
+4. Monitor the {{product.observability}} UIs to ensure data continues to flow correctly.
+::::
+
+:::::
+
+::::{important}
+If you're upgrading EDOT Collector to 9.x but keeping your {{product.elastic-stack}} on 8.18 or 8.19:
+
+- Use the configuration examples for your Stack version (8.18 or 8.19), not the latest 9.x configuration.
+- Continue using deprecated components that are included in the configuration for your Stack version.
+- These deprecated components are retained in EDOT Collector 9.x specifically to maintain backwards compatibility during the official deprecation window.
+::::
+
+## Related pages
+
+- [Default configuration (standalone)](/reference/edot-collector/config/default-config-standalone.md)
+- [Components included in the EDOT Collector](/reference/edot-collector/components.md)