Merge branch 'main' into nicolas.schweitzer/renovate-deps-validator

Author: chouetz

.gitattributes

@@ -19,6 +19,9 @@ pkg/config/schema/*.yaml text eol=lf
 pkg/config/schema/compressed/*.zstd binary -diff -merge linguist-generated=true
 pkg/security/probe/constantfetch/btfhub/constants.json -diff -merge linguist-generated=true
 pkg/security/seclwin/** -diff -merge linguist-generated=true
+# CWS doc JSON is generated as LF on Linux; force LF on Windows too 
+# so Bazel's byte-exact diff_test doesn't trip on core.autocrlf-rewritten CRLF.
+docs/cloud-workload-security/** text eol=lf
 # Fixtures should have LF line endings because they are checked against OCI packages built on Linux
 pkg/fleet/installer/fixtures/** text=auto eol=lf
 

.github/CODEOWNERS

@@ -362,11 +362,13 @@
 /comp/checks/winregistry @DataDog/windows-products
 /comp/core/autodiscovery @DataDog/container-platform
 /comp/core/config @DataDog/agent-configuration
-/comp/core/configstream @DataDog/agent-metric-pipelines @DataDog/agent-configuration
+/comp/core/configstream @DataDog/agent-configuration
+/comp/core/configstreamconsumer @DataDog/agent-configuration
 /comp/core/configsync @DataDog/agent-configuration
 /comp/core/flare @DataDog/agent-configuration
 /comp/core/gui @DataDog/agent-configuration
 /comp/core/profiler @DataDog/agent-configuration
+/comp/core/remoteflags @DataDog/agent-configuration
 /comp/core/secrets @DataDog/agent-configuration
 /comp/core/settings @DataDog/agent-configuration
 /comp/core/status @DataDog/agent-configuration
@@ -398,7 +400,6 @@
 /comp/haagent @DataDog/network-device-monitoring-core
 /comp/languagedetection/client @DataDog/container-platform
 /comp/logonduration @DataDog/windows-products
-/comp/networkconfigmanagement @DataDog/ndm-integrations
 /comp/notableevents @DataDog/windows-products
 /comp/offlinereporter @DataDog/agent-metric-pipelines
 /comp/privateactionrunner @DataDog/action-platform
@@ -596,6 +597,7 @@
 /pkg/proto/datadog/trace                @DataDog/agent-apm
 /pkg/proto/datadog/workloadmeta         @DataDog/container-platform
 /pkg/remoteconfig/                      @DataDog/remote-config
+/pkg/remoteflags/                       @DataDog/agent-configuration
 /pkg/runtime/                           @DataDog/agent-runtimes
 /pkg/redact/                            @DataDog/kubernetes-experiences
 /pkg/system-probe/                      @DataDog/ebpf-platform
@@ -770,6 +772,7 @@
 /tasks/kernel_matrix_testing/           @DataDog/ebpf-platform
 /tasks/ebpf_verifier/                   @DataDog/ebpf-platform
 /tasks/trace_agent.py                   @DataDog/agent-apm
+/tasks/protobuf.py                      @DataDog/agent-build
 /tasks/quality_gates.py                 @DataDog/agent-build
 /tasks/static_quality_gates/            @DataDog/agent-build
 /tasks/files_inventory.py               @DataDog/agent-build
@@ -897,7 +900,6 @@
 /test/regression/                             @DataDog/single-machine-performance
 /test/regression/ebpf                         @DataDog/single-machine-performance @DataDog/ebpf-platform
 /test/regression/cases/docker_containers*     @DataDog/single-machine-performance @DataDog/container-integrations
-/test/regression/cases/quality_gate_security_* @DataDog/single-machine-performance @DataDog/agent-security
 
 /tools/                                 @DataDog/agent-devx
 /tools/host-profiler/                   @DataDog/profiling-full-host

.gitlab-ci.yml

@@ -318,8 +318,6 @@ variables:
   CHOCOLATEY_API_KEY: ci.datadog-agent.chocolatey_api_key # windows-products
   CODECOV_TOKEN: ci.datadog-agent.codecov_token # agent-devx
   CRC_PULL_SECRET: ci.datadog-agent.crc-pull-secret # container-integrations
-  DOCKER_REGISTRY_LOGIN: ci.datadog-agent.docker_hub_login # container-integrations
-  DOCKER_REGISTRY_PWD: ci.datadog-agent.docker_hub_pwd # container-integrations
   VCPKG_BLOB_SAS_URL: ci.datadog-agent-buildimages.vcpkg_blob_sas_url # windows-products
   WINGET_PAT: ci.datadog-agent.winget_pat # windows-products
   # End aws ssm variables

.gitlab/JOBOWNERS

@@ -140,6 +140,7 @@ deploy_host_profiler_to_reliability_env_*  @DataDog/profiling-full-host
 deploy_installer*                      @DataDog/agent-delivery
 deploy_ddot_oci*                       @DataDog/agent-delivery
 deploy_packages*                       @DataDog/agent-delivery
+deploy_macos_install_script            @DataDog/agent-delivery
 deploy_staging*                        @DataDog/agent-delivery
 publish_winget*                        @DataDog/windows-products
 powershell_script_signing              @DataDog/windows-products

.gitlab/deploy/deploy_packages/deploy_common.yml

@@ -42,6 +42,19 @@
   script:
     - $S3_CP_CMD --recursive --exclude "*" --include "$ARTIFACT_NAME_PATTERN" "$OMNIBUS_PACKAGE_DIR" "${S3_RELEASE_ARTIFACTS_URI}/${PACKAGE_TYPE}/${PACKAGE_ARCH}/"
 
+deploy_macos_install_script:
+  rules:
+    - !reference [.on_deploy]
+  image: registry.ddbuild.io/ci/datadog-agent-buildimages/gitlab_agent_deploy$CI_IMAGE_GITLAB_AGENT_DEPLOY_SUFFIX:$CI_IMAGE_GITLAB_AGENT_DEPLOY
+  stage: deploy_packages
+  # Wait for the deploy guard (check_already_deployed_version_7) so we don't
+  # upload a script for a version that's already shipped. Same .on_deploy
+  # rules, so they're always co-eligible.
+  needs: [check_already_deployed_version_7]
+  tags: ["arch:amd64", "specific:true"]
+  script:
+    - $S3_CP_CMD --content-type "text/x-shellscript" "cmd/agent/macos/install_mac_os.sh" "${S3_RELEASE_ARTIFACTS_URI}/scripts/install_mac_os.sh"
+
 # Datadog Installer
 .deploy_installer_deb:
   extends: .deploy_packages

.gitlab/deploy/e2e_testing_deploy/e2e_deploy.yml

@@ -63,7 +63,6 @@ deploy_deb_testing-a7_x64:
       "agent_heroku_deb-x64-a7",
       "iot_agent_deb-x64",
       "dogstatsd_deb-x64",
-      "lint_linux-x64",
       "ddot_deb-x64",
     ]
   script:
@@ -88,7 +87,7 @@ deploy_deb_testing-a7_arm64:
     - !reference [.manual]
   extends:
     - .deploy_deb_testing-a7
-  needs: ["installer_deb-arm64", "agent_deb-arm64-a7", "agent_deb-arm64-a7-fips", "lint_linux-arm64", "ddot_deb-arm64"]
+  needs: ["installer_deb-arm64", "agent_deb-arm64-a7", "agent_deb-arm64-a7-fips", "ddot_deb-arm64"]
   script:
     # setup_signing_keys_package must be done *before* setup_signing
     # because setup_signing replaces gpg with gpg-vault
@@ -125,7 +124,6 @@ deploy_rpm_testing-a7_x64:
       "agent_rpm-x64-a7-fips",
       "iot_agent_rpm-x64",
       "dogstatsd_rpm-x64",
-      "lint_linux-x64",
       "ddot_rpm-x64",
     ]
   script:
@@ -143,7 +141,7 @@ deploy_rpm_testing-a7_arm64:
     - !reference [.manual]
   extends:
     - .deploy_rpm_testing-a7
-  needs: ["installer_rpm-arm64", "agent_rpm-arm64-a7", "agent_rpm-arm64-a7-fips", "lint_linux-arm64", "ddot_rpm-arm64"]
+  needs: ["installer_rpm-arm64", "agent_rpm-arm64-a7", "agent_rpm-arm64-a7-fips", "ddot_rpm-arm64"]
   script:
     - *setup_signing
     - |
@@ -167,7 +165,6 @@ deploy_suse_rpm_testing_x64-a7:
       "iot_agent_suse-x64",
       "dogstatsd_suse-x64",
       "agent_suse-x64-a7-fips",
-      "lint_linux-x64",
       "ddot_suse_rpm-x64",
     ]
   variables:
@@ -190,7 +187,7 @@ deploy_suse_rpm_testing_arm64-a7:
   stage: e2e_deploy
   image: registry.ddbuild.io/ci/datadog-agent-buildimages/gitlab_agent_deploy$CI_IMAGE_GITLAB_AGENT_DEPLOY_SUFFIX:$CI_IMAGE_GITLAB_AGENT_DEPLOY
   tags: ["arch:amd64", "specific:true"]
-  needs: ["installer_suse_rpm-arm64", "agent_suse-arm64-a7", "agent_suse-arm64-a7-fips", "lint_linux-arm64", "ddot_suse_rpm-arm64"]
+  needs: ["installer_suse_rpm-arm64", "agent_suse-arm64-a7", "agent_suse-arm64-a7-fips", "ddot_suse_rpm-arm64"]
   variables:
     DD_PIPELINE_ID: $CI_PIPELINE_ID-a7
   before_script: