Skip to content

[CSPM] Rename host_ccrid to ccrid in compliance events - #58778

Merged
gh-worker-dd-mergequeue-cf854d[bot] merged 6 commits into
mainfrom
cspm-rename-host-ccrid-to-ccrid
Oct 28, 2026
Merged

gh-worker-dd-mergequeue-cf854d[bot] merged 6 commits into
mainfrom
cspm-rename-host-ccrid-to-ccrid

Conversation

@mohamed-challal

Copy link
Copy Markdown
Collaborator

What does this PR do?

Renames the CCRID field of CSPM compliance events and resource logs from host_ccrid to ccrid, introduced in #56657:

  • JSON field host_ccrid -> ccrid on CheckEvent and ResourceLog
  • Tag host_ccrid: -> ccrid: on the checks status metric
  • AgentOptions.HostCCRID -> CCRID and FetchHostCCRID -> FetchCCRID
  • fakeintake ComplianceFinding and the CSPM e2e test follow the rename
  • The release note of [CSPM] Report host CCRID in compliance events #56657 is updated since it is not released yet

Motivation

The Agentless scanner emits the same field as ccrid (Agentless CCRID unification RFC), so a single name can carry the CCRID of any resource type for both producers, and consumers read one field.

Additional Notes

host_ccrid is not part of any released Agent version (it is only in the 7.86 dev cycle, no 7.86 release branch yet), so no compatibility is kept. This should land before the 7.86 branch is cut. The logs-compliance-reducer consumer side is handled by its team.

@mohamed-challal mohamed-challal added the changelog/no-changelog No changelog entry needed label Oct 23, 2026
@mohamed-challal
mohamed-challal requested review from a team as code owners October 23, 2026 13:42
@mohamed-challal mohamed-challal removed the changelog/no-changelog No changelog entry needed label Oct 23, 2026
@github-actions

github-actions Bot commented Oct 23, 2026 •

Copy link
Copy Markdown
Contributor

All contributors have signed the CLA ✍️ ✅
Posted by the CLA Assistant Lite bot.

@dd-octo-sts dd-octo-sts Bot added the internal Identify a non-fork PR label Oct 23, 2026
@github-actions github-actions Bot added the medium review PR review might take time label Oct 23, 2026

@github-actions github-actions Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AI review by Codex (OpenAI) - workflow run

patch is correct. The rename is consistent across producers, metric tags, fakeintake decoding, tests, and release notes. No actionable issues found. Tests were not run in the read-only environment.

@mohamed-challal

Copy link
Copy Markdown
Collaborator Author

I have read the CLA Document and I hereby sign the CLA

@datadog-datadog-prod-us1-2

datadog-datadog-prod-us1-2 Bot commented Oct 23, 2026 •

Copy link
Copy Markdown
Contributor

🎯 Code Coverage (details)
• Patch Coverage: 90.91%
• Overall Coverage: 64.63% (+4.01%)

This comment will be updated automatically if new data arrives.
🔗 Commit SHA: 852152a | Docs | Give us feedback!

@dd-octo-sts

dd-octo-sts Bot commented Oct 23, 2026 •

Copy link
Copy Markdown
Contributor

Static quality checks

✅ Please find below the results from static quality gates
Comparison made with ancestor 84f25c9
📊 Static Quality Gates Dashboard
🔗 SQG Job

Successful checks

Info

Quality gate Change Size (prev → curr → max)
✅ agent_rpm_arm64 +4.0 KiB (0.00% increase, -0.04% of buffer) 725.243 → 725.246 → 735.060
✅ agent_rpm_arm64_fips +4.01 KiB (0.00% increase, -0.04% of buffer) 662.167 → 662.171 → 672.790
✅ agent_suse_arm64 +4.0 KiB (0.00% increase, -0.04% of buffer) 725.243 → 725.246 → 735.060
✅ agent_suse_arm64_fips +4.01 KiB (0.00% increase, -0.04% of buffer) 662.167 → 662.171 → 672.790
✅ docker_agent_arm64 +4.0 KiB (0.00% increase, -0.04% of buffer) 805.924 → 805.928 → 815.930
✅ docker_agent_jmx_arm64 +4.01 KiB (0.00% increase, -0.04% of buffer) 985.572 → 985.576 → 995.580
✅ docker_cluster_agent_amd64 +4.01 KiB (0.00% increase, -0.17% of buffer) 216.204 → 216.207 → 218.460
26 successful checks with minimal change (< 2 KiB)
Quality gate Current Size
✅ agent_deb_amd64 755.508 MiB
✅ agent_deb_amd64_fips 686.764 MiB
✅ agent_heroku_amd64 312.875 MiB
✅ agent_msi 664.035 MiB
✅ agent_rpm_amd64 755.492 MiB
✅ agent_rpm_amd64_fips 686.748 MiB
✅ agent_suse_amd64 755.492 MiB
✅ agent_suse_amd64_fips 686.748 MiB
✅ docker_agent_amd64 811.570 MiB
✅ docker_agent_jmx_amd64 1002.434 MiB
✅ docker_cws_instrumentation_amd64 7.451 MiB
✅ docker_cws_instrumentation_arm64 6.877 MiB
✅ docker_dogstatsd_amd64 40.198 MiB
✅ docker_dogstatsd_arm64 38.194 MiB
✅ docker_host_profiler_amd64 314.231 MiB
✅ docker_host_profiler_arm64 324.964 MiB
✅ dogstatsd_deb_amd64 30.953 MiB
✅ dogstatsd_deb_arm64 28.887 MiB
✅ dogstatsd_rpm_amd64 30.953 MiB
✅ dogstatsd_suse_amd64 30.953 MiB
✅ iot_agent_deb_amd64 47.902 MiB
✅ iot_agent_deb_arm64 44.318 MiB
✅ iot_agent_deb_armhf 45.135 MiB
✅ iot_agent_rpm_amd64 47.903 MiB
✅ iot_agent_suse_amd64 47.902 MiB
✅ docker_cluster_agent_arm64 228.930 MiB

@cit-pr-commenter-54b7da

cit-pr-commenter-54b7da Bot commented Oct 23, 2026 •

Copy link
Copy Markdown

Regression Detector

Regression Detector Results

Metrics dashboard
Target profiles
Job ID: 71121367-ad55-4278-b524-f509d82b532c

Baseline: 0c6b399
Comparison: 2744310
Diff

Optimization Goals: ✅ No significant changes detected

Fine details of change detection per experiment

perf experiment goal Δ mean % Δ mean % CI trials links
➖ quality_gate_logs % cpu utilization +4.45 [+3.51, +5.39] 1 Logs bounds checks dashboard
➖ dsd_uds_client_drop_detector_cpu % cpu utilization +2.37 [+1.81, +2.93] 1 Logs
➖ quality_gate_security_mean_fs_load memory utilization +0.40 [+0.35, +0.45] 1 Logs bounds checks dashboard
➖ quality_gate_security_idle memory utilization +0.26 [+0.23, +0.29] 1 Logs bounds checks dashboard
➖ quality_gate_idle_all_features memory utilization +0.15 [+0.08, +0.23] 1 Logs bounds checks dashboard
➖ python_openmetrics % cpu utilization +0.09 [-0.57, +0.74] 1 Logs bounds checks dashboard
➖ quality_gate_security_no_fs_load memory utilization -0.10 [-0.17, -0.04] 1 Logs bounds checks dashboard
➖ quality_gate_idle memory utilization -0.18 [-0.22, -0.14] 1 Logs bounds checks dashboard
➖ quality_gate_private_action_runner memory utilization -0.32 [-0.44, -0.19] 1 Logs bounds checks dashboard
➖ dsd_uds_10mb_3k_timestamped_contexts_cpu % cpu utilization -0.33 [-0.59, -0.08] 1 Logs
➖ quality_gate_metrics_logs memory utilization -0.38 [-0.61, -0.16] 1 Logs bounds checks dashboard
➖ dsd_uds_10mb_3k_timestamped_contexts_memory memory utilization -0.66 [-0.86, -0.45] 1 Logs

Bounds Checks: ✅ Passed

perf experiment bounds_check_name replicates_passed observed_value links
✅ python_openmetrics checks_execution_time 10/10 73.76 ≤ 100 bounds checks dashboard
✅ python_openmetrics cpu_usage 10/10 1351.71 ≤ 1500 bounds checks dashboard
✅ python_openmetrics memory_usage 10/10 4.31GiB ≤ 4.75GiB bounds checks dashboard
✅ quality_gate_idle intake_connections 10/10 4 ≤ 5 bounds checks dashboard
✅ quality_gate_idle memory_usage 10/10 180.37MiB ≤ 181MiB bounds checks dashboard
✅ quality_gate_idle total_bytes_received 10/10 771.92KiB ≤ 819.20KiB bounds checks dashboard
✅ quality_gate_idle_all_features intake_connections 10/10 2 ≤ 5 bounds checks dashboard
✅ quality_gate_idle_all_features memory_usage 10/10 482.13MiB ≤ 542MiB bounds checks dashboard
✅ quality_gate_idle_all_features total_bytes_received 10/10 1.16MiB ≤ 1.25MiB bounds checks dashboard
✅ quality_gate_logs intake_connections 10/10 16 ≤ 40 bounds checks dashboard
✅ quality_gate_logs memory_usage 10/10 216.25MiB ≤ 228MiB bounds checks dashboard
✅ quality_gate_logs missed_bytes 10/10 0B = 0B bounds checks dashboard
✅ quality_gate_logs total_bytes_received 10/10 264.10MiB ≤ 292MiB bounds checks dashboard
✅ quality_gate_metrics_logs cpu_usage 10/10 365.77 ≤ 2000 bounds checks dashboard
✅ quality_gate_metrics_logs intake_connections 10/10 21 ≤ 40 bounds checks dashboard
✅ quality_gate_metrics_logs memory_usage 10/10 440.46MiB ≤ 455MiB bounds checks dashboard
✅ quality_gate_metrics_logs missed_bytes 10/10 0B = 0B bounds checks dashboard
✅ quality_gate_metrics_logs total_bytes_received 10/10 0.95GiB ≤ 1.04GiB bounds checks dashboard
✅ quality_gate_private_action_runner memory_usage 10/10 75.22MiB ≤ 77MiB bounds checks dashboard
✅ quality_gate_security_idle cpu_usage 10/10 27.87 ≤ 100 bounds checks dashboard
✅ quality_gate_security_idle memory_usage 10/10 336.60MiB ≤ 357MiB bounds checks dashboard
✅ quality_gate_security_mean_fs_load cpu_usage 10/10 40.24 ≤ 200 bounds checks dashboard
✅ quality_gate_security_mean_fs_load memory_usage 10/10 320.28MiB ≤ 337MiB bounds checks dashboard
✅ quality_gate_security_no_fs_load cpu_usage 10/10 22.85 ≤ 100 bounds checks dashboard
✅ quality_gate_security_no_fs_load memory_usage 10/10 317.48MiB ≤ 348MiB bounds checks dashboard

Explanation

Confidence level: 90.00%
Effect size tolerance: |Δ mean %| ≥ 5.00%

Performance changes are noted in the perf column of each table:

  • ✅ = significantly better comparison variant performance
  • ❌ = significantly worse comparison variant performance
  • ➖ = no significant change in performance

A regression test is an A/B test of target performance in a repeatable rig, where "performance" is measured as "comparison variant minus baseline variant" for an optimization goal (e.g., ingress throughput). Due to intrinsic variability in measuring that goal, we can only estimate its mean value for each experiment; we report uncertainty in that value as a 90.00% confidence interval denoted "Δ mean % CI".

For each experiment, we decide whether a change in performance is a "regression" -- a change worth investigating further -- if all of the following criteria are true:

  1. Its estimated |Δ mean %| ≥ 5.00%, indicating the change is big enough to merit a closer look.

  2. Its 90.00% confidence interval "Δ mean % CI" does not contain zero, indicating that if our statistical model is accurate, there is at least a 90.00% chance there is a difference in performance between baseline and comparison variants.

  3. Its configuration does not mark it "erratic".

CI Pass/Fail Decision

✅ Passed. All Quality Gates passed.

  • quality_gate_logs, bounds check intake_connections: 10/10 replicas passed. Gate passed.
  • quality_gate_logs, bounds check missed_bytes: 10/10 replicas passed. Gate passed.
  • quality_gate_logs, bounds check total_bytes_received: 10/10 replicas passed. Gate passed.
  • quality_gate_logs, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_security_idle, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_security_idle, bounds check cpu_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_security_no_fs_load, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_security_no_fs_load, bounds check cpu_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_idle_all_features, bounds check total_bytes_received: 10/10 replicas passed. Gate passed.
  • quality_gate_idle_all_features, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_idle_all_features, bounds check intake_connections: 10/10 replicas passed. Gate passed.
  • quality_gate_idle, bounds check intake_connections: 10/10 replicas passed. Gate passed.
  • quality_gate_idle, bounds check total_bytes_received: 10/10 replicas passed. Gate passed.
  • quality_gate_idle, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_security_mean_fs_load, bounds check cpu_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_security_mean_fs_load, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_metrics_logs, bounds check missed_bytes: 10/10 replicas passed. Gate passed.
  • quality_gate_metrics_logs, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_metrics_logs, bounds check total_bytes_received: 10/10 replicas passed. Gate passed.
  • quality_gate_metrics_logs, bounds check cpu_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_metrics_logs, bounds check intake_connections: 10/10 replicas passed. Gate passed.
  • quality_gate_private_action_runner, bounds check memory_usage: 10/10 replicas passed. Gate passed.

@mohamed-challal mohamed-challal self-assigned this Oct 23, 2026
@mohamed-challal mohamed-challal added the qa/done QA done before merge and regressions are covered by tests label Oct 23, 2026
Comment thread pkg/compliance/agent.go
Comment thread pkg/compliance/agent.go Outdated
Comment thread pkg/compliance/compliance.go Outdated
Align the compliance events CCRID field with the agentless scanner output so it can carry the CCRID of any resource type. The field was introduced in #56657 and is not part of any agent release yet.
@mohamed-challal
mohamed-challal force-pushed the cspm-rename-host-ccrid-to-ccrid branch from a435331 to 9d51823 Compare October 26, 2026 20:13
…ters

The host CCRID only identifies host level resources. Payloads about docker_container, db_* and kubernetes_cluster resources no longer carry it.
@0intro
0intro self-requested a review October 27, 2026 22:19
@gh-worker-dd-mergequeue-cf854d
gh-worker-dd-mergequeue-cf854d Bot merged commit 2744310 into main Oct 28, 2026
559 checks passed
@gh-worker-dd-mergequeue-cf854d
gh-worker-dd-mergequeue-cf854d Bot deleted the cspm-rename-host-ccrid-to-ccrid branch October 28, 2026 14:50
@github-actions github-actions Bot added this to the 7.86.0 milestone Oct 28, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

component/system-probe internal Identify a non-fork PR medium review PR review might take time qa/done QA done before merge and regressions are covered by tests team/agent-cspm team/agent-devx team/agent-security team/container-platform The Container Platform Team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants