Merge branch 'main' into fix-group-resource

DataDog · Feb 3, 2025 · 4a15a0e · 4a15a0e
2 parents 33d5b75 + 8903391
commit 4a15a0e
Show file tree

Hide file tree

Showing 378 changed files with 6,456 additions and 3,994 deletions.
diff --git a/.ddqa/config.toml b/.ddqa/config.toml
@@ -10,20 +10,20 @@ github_team = "agent-metrics-logs"
 github_labels = ["team/agent-metrics-logs"]
 exclude_members = ["olivielpeau"]
 
-[teams."Agent Logs"]
+[teams."Agent Log Pipelines"]
 jira_project = "AGNTLOG"
 jira_issue_type = "Task"
 jira_statuses = ["To Do", "In Progress", "Done"]
-github_team = "agent-logs"
-github_labels = ["team/agent-logs"]
+github_team = "agent-log-pipelines"
+github_labels = ["team/agent-log-pipelines"]
 exclude_members = [""]
 
-[teams."Agent Metrics"]
+[teams."Agent Metric Pipelines"]
 jira_project = "AGTMETRICS"
 jira_issue_type = "Task"
 jira_statuses = ["To Do", "In Progress", "Done"]
-github_team = "agent-metrics"
-github_labels = ["team/agent-metrics"]
+github_team = "agent-metric-pipelines"
+github_labels = ["team/agent-metric-pipelines"]
 exclude_members = [""]
 
 [teams."Agent Processing and Routing"]
@@ -51,7 +51,7 @@ exclude_members = ["sgnn7", "truthbk", "cmourot"]
 # github_team = "agent-runtimes"
 # github_labels = ["team/agent-runtimes"]
 # exclude_members = ["sgnn7", "cmourot"]
-# 
+#
 # [teams."Agent Configuration"]
 # jira_project = "ACFG"
 # jira_issue_type = "QA"

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml
@@ -214,7 +214,7 @@ updates:
     directory: Dockerfiles/agent/bouncycastle-fips
     labels:
       - dependencies
-      - team/agent-metrics-logs
+      - team/agent-metric-pipelines
       - changelog/no-changelog
     schedule:
       interval: weekly
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -170,49 +170,49 @@ variables:
   # To use images from datadog-agent-buildimages dev branches, set the corresponding
   # SUFFIX variable to _test_only
   DATADOG_AGENT_BUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_BUILDIMAGES: v53759313-14a41bca
+  DATADOG_AGENT_BUILDIMAGES: v54604211-ddd886d5
   DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_WINBUILDIMAGES: v53759313-14a41bca
+  DATADOG_AGENT_WINBUILDIMAGES: v54604211-ddd886d5
   DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_ARMBUILDIMAGES: v53759313-14a41bca
+  DATADOG_AGENT_ARMBUILDIMAGES: v54604211-ddd886d5
   DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v53759313-14a41bca
+  DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v54604211-ddd886d5
   DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v53759313-14a41bca
+  DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v54604211-ddd886d5
   # New images to enable different version per image - not used yet
-  CI_IMAGE_BTF_GEN: v53759313-14a41bca
+  CI_IMAGE_BTF_GEN: v54604211-ddd886d5
   CI_IMAGE_BTF_GEN_SUFFIX: ""
-  CI_IMAGE_DEB_X64: v53759313-14a41bca
+  CI_IMAGE_DEB_X64: v54604211-ddd886d5
   CI_IMAGE_DEB_X64_SUFFIX: ""
-  CI_IMAGE_DEB_ARM64: v53759313-14a41bca
+  CI_IMAGE_DEB_ARM64: v54604211-ddd886d5
   CI_IMAGE_DEB_ARM64_SUFFIX: ""
-  CI_IMAGE_DEB_ARMHF: v53759313-14a41bca
+  CI_IMAGE_DEB_ARMHF: v54604211-ddd886d5
   CI_IMAGE_DEB_ARMHF_SUFFIX: ""
-  CI_IMAGE_DD_AGENT_TESTING: v53759313-14a41bca
+  CI_IMAGE_DD_AGENT_TESTING: v54604211-ddd886d5
   CI_IMAGE_DD_AGENT_TESTING_SUFFIX: ""
-  CI_IMAGE_DOCKER_X64: v53759313-14a41bca
+  CI_IMAGE_DOCKER_X64: v54604211-ddd886d5
   CI_IMAGE_DOCKER_X64_SUFFIX: ""
-  CI_IMAGE_DOCKER_ARM64: v53759313-14a41bca
+  CI_IMAGE_DOCKER_ARM64: v54604211-ddd886d5
   CI_IMAGE_DOCKER_ARM64_SUFFIX: ""
-  CI_IMAGE_GITLAB_AGENT_DEPLOY: v53759313-14a41bca
+  CI_IMAGE_GITLAB_AGENT_DEPLOY: v54604211-ddd886d5
   CI_IMAGE_GITLAB_AGENT_DEPLOY_SUFFIX: ""
-  CI_IMAGE_LINUX_GLIBC_2_17_X64: v53759313-14a41bca
+  CI_IMAGE_LINUX_GLIBC_2_17_X64: v54604211-ddd886d5
   CI_IMAGE_LINUX_GLIBC_2_17_X64_SUFFIX: ""
-  CI_IMAGE_LINUX_GLIBC_2_23_ARM64: v53759313-14a41bca
+  CI_IMAGE_LINUX_GLIBC_2_23_ARM64: v54604211-ddd886d5
   CI_IMAGE_LINUX_GLIBC_2_23_ARM64_SUFFIX: ""
-  CI_IMAGE_SYSTEM_PROBE_X64: v53759313-14a41bca
+  CI_IMAGE_SYSTEM_PROBE_X64: v54604211-ddd886d5
   CI_IMAGE_SYSTEM_PROBE_X64_SUFFIX: ""
-  CI_IMAGE_SYSTEM_PROBE_ARM64: v53759313-14a41bca
+  CI_IMAGE_SYSTEM_PROBE_ARM64: v54604211-ddd886d5
   CI_IMAGE_SYSTEM_PROBE_ARM64_SUFFIX: ""
-  CI_IMAGE_RPM_X64: v53759313-14a41bca
+  CI_IMAGE_RPM_X64: v54604211-ddd886d5
   CI_IMAGE_RPM_X64_SUFFIX: ""
-  CI_IMAGE_RPM_ARM64: v53759313-14a41bca
+  CI_IMAGE_RPM_ARM64: v54604211-ddd886d5
   CI_IMAGE_RPM_ARM64_SUFFIX: ""
-  CI_IMAGE_RPM_ARMHF: v53759313-14a41bca
+  CI_IMAGE_RPM_ARMHF: v54604211-ddd886d5
   CI_IMAGE_RPM_ARMHF_SUFFIX: ""
-  CI_IMAGE_WIN_1809_X64: v53759313-14a41bca
+  CI_IMAGE_WIN_1809_X64: v54604211-ddd886d5
   CI_IMAGE_WIN_1809_X64_SUFFIX: ""
-  CI_IMAGE_WIN_LTSC2022_X64: v53759313-14a41bca
+  CI_IMAGE_WIN_LTSC2022_X64: v54604211-ddd886d5
   CI_IMAGE_WIN_LTSC2022_X64_SUFFIX: ""
 
   DATADOG_AGENT_EMBEDDED_PATH: /opt/datadog-agent/embedded
@@ -704,6 +704,7 @@ workflow:
         - omnibus/config/projects/agent.rb
         - omnibus/config/software/**/*
         - omnibus/config/templates/**/*
+        - release.json
       compare_to: main # TODO: use a variable, when this is supported https://gitlab.com/gitlab-org/gitlab/-/issues/369916
 
 .except_windows_installer_changes:
@@ -876,35 +877,43 @@ workflow:
         - pkg/collector/corechecks/servicediscovery/**/*
       compare_to: main # TODO: use a variable, when this is supported https://gitlab.com/gitlab-org/gitlab/-/issues/369916
 
-.on_aml_or_e2e_changes:
+.on_amp_or_e2e_changes:
   - !reference [.on_e2e_main_release_or_rc]
   - changes:
       paths:
-        - test/new-e2e/tests/agent-metrics-logs/**/*
+        - test/new-e2e/tests/agent-metric-pipelines/**/*
         - cmd/agent/subcommands/dogstatsd*/*
-        - cmd/agent/subcommands/streamlogs/*
         - cmd/dogstatsd/**/*
         - comp/agent/jmxlogger/**/*
         - comp/aggregator/**/*
         - comp/collector/**/*
         - comp/core/agenttelemetry/**/*
-        - comp/core/autodiscovery/providers/config_reader*.go
-        - comp/core/autodiscovery/providers/file*.go
         - comp/dogstatsd/**/*
         - comp/forwarder/**/*
-        - comp/logs/**/*
         - comp/serializer/**/*
         - pkg/aggregator/**/*
         - pkg/collector/**/*
         - pkg/commonchecks/**/*
         - pkg/jmxfetch/**/*
-        - pkg/logs/**/*
         - pkg/metrics/**/*
         - pkg/persistentcache/**/*
         - pkg/serializer/**/*
         - rtloader/**/*
       compare_to: main # TODO: use a variable, when this is supported https://gitlab.com/gitlab-org/gitlab/-/issues/369916
 
+.on_alp_or_e2e_changes:
+  - !reference [.on_e2e_main_release_or_rc]
+  - changes:
+      paths:
+        - test/new-e2e/tests/agent-log-pipelines/**/*
+        - cmd/agent/subcommands/streamlogs/*
+        - comp/core/agenttelemetry/**/*
+        - comp/core/autodiscovery/providers/config_reader*.go
+        - comp/core/autodiscovery/providers/file*.go
+        - comp/logs/**/*
+        - pkg/logs/**/*
+      compare_to: main # TODO: use a variable, when this is supported https://gitlab.com/gitlab-org/gitlab/-/issues/369916
+
 .on_cws_or_e2e_changes:
   - !reference [.on_e2e_main_release_or_rc]
   - changes:

diff --git a/.gitlab/JOBOWNERS b/.gitlab/JOBOWNERS
@@ -14,7 +14,7 @@ build_clang_*                        @DataDog/ebpf-platform
 build_processed_btfhub_archive       @DataDog/ebpf-platform
 
 # Deps fetch
-fetch_openjdk                        @DataDog/agent-metrics
+fetch_openjdk                        @DataDog/agent-metric-pipelines
 
 # Source test
 # Notifications are handled separately for more fine-grained control on go tests
@@ -165,4 +165,4 @@ pull_test_dockers*                @DataDog/universal-service-monitoring
 single_machine_performance*       @DataDog/single-machine-performance
 
 # Dependency Security
-software_composition_analysis*    @DataDog/software-integrity-and-trust
+software_composition_analysis*    @DataDog/sdlc-security
diff --git a/.gitlab/binary_build/cluster_agent.yml b/.gitlab/binary_build/cluster_agent.yml
@@ -11,7 +11,7 @@
     - inv -e cluster-agent.build --release-version "$RELEASE_VERSION_7"
     - $S3_CP_CMD $CI_PROJECT_DIR/$CLUSTER_AGENT_BINARIES_DIR/datadog-cluster-agent $S3_ARTIFACTS_URI/datadog-cluster-agent.$ARCH
     - $S3_CP_CMD $CI_PROJECT_DIR/Dockerfiles/cluster-agent/datadog-cluster.yaml $S3_ARTIFACTS_URI/datadog-cluster.yaml
-    - $S3_CP_CMD $CI_PROJECT_DIR/Dockerfiles/cluster-agent/security-agent-policies $S3_ARTIFACTS_URI/security-agent-policies --recursive
+    - $S3_CP_CMD $CI_PROJECT_DIR/Dockerfiles/cluster-agent/security-agent-policies $S3_ARTIFACTS_URI/security-agent-policies --recursive --exclude '.git/*' --exclude '.github/*'
   variables:
     KUBERNETES_MEMORY_REQUEST: "8Gi"
     KUBERNETES_MEMORY_LIMIT: "8Gi"

diff --git a/.gitlab/common/test_infra_version.yml b/.gitlab/common/test_infra_version.yml
@@ -5,5 +5,5 @@
 
 ---
 variables:
-  TEST_INFRA_DEFINITIONS_BUILDIMAGES: f92dca10d03c
+  TEST_INFRA_DEFINITIONS_BUILDIMAGES: 1724b27f8091
   TEST_INFRA_DEFINITIONS_BUILDIMAGES_SUFFIX: ''
diff --git a/.gitlab/e2e/e2e.yml b/.gitlab/e2e/e2e.yml
@@ -217,6 +217,10 @@ new-e2e-fips-compliance-test:
   variables:
     TARGETS: ./tests/fips-compliance
     TEAM: agent-runtimes
+  parallel:
+    matrix:
+      - EXTRA_PARAMS: --run "TestFIPSCiphersLinuxSuite$"
+      - EXTRA_PARAMS: --run "TestLinuxFIPSComplianceSuite$"
 
 new-e2e-windows-fips-compliance-test:
   extends: .new_e2e_template
@@ -233,6 +237,7 @@ new-e2e-windows-fips-compliance-test:
   parallel:
     matrix:
       - EXTRA_PARAMS: --run "TestWindowsVM$"
+      - EXTRA_PARAMS: --run "TestFIPSCiphersWindowsSuite$"
 
 new-e2e-windows-service-test:
   extends: .new_e2e_template
@@ -324,7 +329,24 @@ new-e2e-npm-eks:
     EXTRA_PARAMS: --run "TestEKSVMSuite"
     E2E_PRE_INITIALIZED: "true"
 
-new-e2e-aml:
+new-e2e-amp:
+  extends: .new_e2e_template
+  needs:
+    - !reference [.needs_new_e2e_template]
+    - deploy_deb_testing-a7_x64
+    - deploy_windows_testing-a7
+    - qa_agent
+    - qa_agent_jmx
+    - qa_agent_fips_jmx
+    - qa_dca
+  rules:
+    - !reference [.on_amp_or_e2e_changes]
+    - !reference [.manual]
+  variables:
+    TARGETS: ./tests/agent-metric-pipelines
+    TEAM: agent-metric-pipelines
+
+new-e2e-alp:
   extends: .new_e2e_template
   needs:
     - !reference [.needs_new_e2e_template]
@@ -335,11 +357,11 @@ new-e2e-aml:
     - qa_agent_fips_jmx
     - qa_dca
   rules:
-    - !reference [.on_aml_or_e2e_changes]
+    - !reference [.on_alp_or_e2e_changes]
     - !reference [.manual]
   variables:
-    TARGETS: ./tests/agent-metrics-logs
-    TEAM: agent-metrics-logs
+    TARGETS: ./tests/agent-log-pipelines
+    TEAM: agent-log-pipelines
 
 new-e2e-cws:
   extends: .new_e2e_template

diff --git a/.gitlab/integration_test/otel.yml b/.gitlab/integration_test/otel.yml
@@ -57,28 +57,29 @@ docker_image_build_otel:
     - when: always
 
 
-datadog_otel_components_ocb_build:
-  stage: integration_test
-  image: registry.ddbuild.io/ci/datadog-agent-buildimages/deb_x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
-  tags: ["arch:amd64"]
-  needs: ["go_deps"]
-  artifacts:
-    paths:
-      - ocb-output.log
-      - otelcol-custom.log
-      - flare-info.log
-    when: always
-  before_script:
-    - !reference [.retrieve_linux_go_deps]
-  script:
-    - echo "Building custom collector with datadog components"
-    - test/otel/testdata/ocb_build_script.sh
-    - echo "see artifacts for job logs"
-  rules:
-    - if: $CI_PIPELINE_SOURCE =~ /^schedule.*$/
-      when: never
-    - if: $CI_COMMIT_MESSAGE =~ /.*\[skip cancel\].*/
-      when: never
-    - if: $CI_COMMIT_REF_NAME =~ /.*-skip-cancel$/
-      when: never
-    - when: always
+# datadog_otel_components_ocb_build:
+#   stage: integration_test
+#   image: registry.ddbuild.io/ci/datadog-agent-buildimages/deb_x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
+#   tags: ["arch:amd64"]
+#   needs: ["go_deps"]
+#   artifacts:
+#     paths:
+#       - ocb-output.log
+#       - otelcol-custom.log
+#       - flare-info.log
+#     when: always
+#   before_script:
+#     - !reference [.retrieve_linux_go_deps]
+#   script:
+#     - echo "Building custom collector with datadog components"
+#     - test/otel/testdata/ocb_build_script.sh
+#     - echo "see artifacts for job logs"
+#   rules:
+#     - if: $CI_PIPELINE_SOURCE =~ /^schedule.*$/
+#       when: never
+#     - if: $CI_COMMIT_MESSAGE =~ /.*\[skip cancel\].*/
+#       when: never
+#     - if: $CI_COMMIT_REF_NAME =~ /.*-skip-cancel$/
+#       when: never
+#     - when: always
+#   timeout: 15 minutes
diff --git a/CHANGELOG-DCA.rst b/CHANGELOG-DCA.rst
@@ -2,6 +2,70 @@
 Release Notes
 =============
 
+.. _Release Notes_7.62.1:
+
+7.62.1
+======
+
+.. _Release Notes_7.62.1_Prelude:
+
+Prelude
+-------
+
+Released on: 2025-02-03
+Pinned to datadog-agent v7.62.1: `CHANGELOG <https://github.com/DataDog/datadog-agent/blob/main/CHANGELOG.rst#7621>`_.
+
+.. _Release Notes_7.62.0:
+
+7.62.0
+======
+
+.. _Release Notes_7.62.0_Prelude:
+
+Prelude
+-------
+
+Released on: 2025-01-29
+Pinned to datadog-agent v7.62.0: `CHANGELOG <https://github.com/DataDog/datadog-agent/blob/main/CHANGELOG.rst#7620>`_.
+
+.. _Release Notes_7.62.0_Enhancement Notes:
+
+Enhancement Notes
+-----------------
+
+- Added support for EndpointSlices in the metadata controller. This feature,
+  enabled by setting `kubernetesUseEndpointSlices` to `true`, resolves limitations
+  of Endpoints resources, particularly for services with more than 1000 addresses.
+  Must add `endpointslices` to DCA cluster role.
+
+- The `kubernetes_state_core` check now collects only metadata for configmaps,
+  reducing memory, CPU, and network usage in the Cluster Agent while preserving
+  full metric functionality.
+
+- The Datadog Cluster Agent admission controller agent sidecar injection now sets up
+  Agent sidecars to run with securityContext of `readOnlyRootFilesystem:false` by default.
+  Advanced users can customize the securityContext via clusterAgent.admissionController.agentSidecarInjection.profiles.
+
+
+.. _Release Notes_7.62.0_Bug Fixes:
+
+Bug Fixes
+---------
+
+- Resolved a bug where `kube_service` tags were not properly deleted when a
+  service's ties to pods on a specific node were removed but the service itself
+  was not deleted.
+
+- Add mapping for apiservices and customresourcedefinitions to KSM check to
+  prevent errors on startup with discovering resources.
+
+- Include `gpu_vendor` pod tags on the Datadog Cluster Agent when
+  enabling datadog.clusterTagger.collectKubernetesTags.
+
+- When the Datadog Cluster Agent injects the Datadog Agent as a sidecar
+  on a Job, the agent will now exit when the main Job completes.
+
+
 .. _Release Notes_7.61.0:
 
 7.61.0