[pull] master from DataDog:master

.github/CODEOWNERS

@@ -319,6 +319,11 @@ datadog_checks_base/datadog_checks/base/checks/windows/              @DataDog/wi
 /incident_io/manifest.json                                           @DataDog/saas-integrations @DataDog/documentation
 /incident_io/assets/logs/                                            @DataDog/saas-integrations @DataDog/documentation @DataDog/logs-integrations-reviewers
 
+/kandji/                                                             @DataDog/saas-integrations
+/kandji/*.md                                                         @DataDog/saas-integrations @DataDog/documentation
+/kandji/manifest.json                                                @DataDog/saas-integrations @DataDog/documentation
+/kandji/assets/logs/                                                 @DataDog/saas-integrations @DataDog/documentation @DataDog/logs-backend
+
 /keeper/                                                             @DataDog/saas-integrations
 /keeper/*.md                                                         @DataDog/saas-integrations @DataDog/documentation
 /keeper/manifest.json                                                @DataDog/saas-integrations @DataDog/documentation

.github/workflows/config/labeler.yml

@@ -361,6 +361,8 @@ integration/kafka_consumer:
 - kafka_consumer/**/*
 integration/karpenter:
 - karpenter/**/*
+integration/kandji:
+- kandji/**/*
 integration/keda:
 - keda/**/*
 integration/keeper:

ddev/changelog.d/21774.fixed

@@ -0,0 +1 @@
+Fixes duplicate results when filtering specific artifacts in the `ddev size` command

ddev/src/ddev/cli/size/utils/common_funcs.py

@@ -995,7 +995,7 @@ def get_last_dependency_sizes_artifact(
     size of that commit.
     '''
     size_type = 'compressed' if compressed else 'uncompressed'
-    app.display(f"Retrieving dependency sizes for {commit} ({platform}, py{py_version}, {size_type})")
+    app.display(f"\nRetrieving dependency sizes for {commit} ({platform}, py{py_version}, {size_type})")
 
     dep_sizes_json = get_dep_sizes_json(app, commit, platform, py_version)
     if not dep_sizes_json:
@@ -1033,6 +1033,11 @@ def get_dep_sizes_json(app: Application, current_commit: str, platform: str, py_
 def get_run_id(app: Application, commit: str, workflow: str) -> str | None:
     app.display_debug(f"Fetching workflow run ID for {commit} ({os.path.basename(workflow)})")
 
+    if workflow == MEASURE_DISK_USAGE_WORKFLOW:
+        jq = f'.[] | select(.name == "Measure Disk Usage [{commit}]") | .databaseId'
+    else:
+        jq = '.[-1].databaseId'
+
     result = subprocess.run(
         [
             'gh',
@@ -1043,14 +1048,13 @@ def get_run_id(app: Application, commit: str, workflow: str) -> str | None:
             '-c',
             commit,
             '--json',
-            'databaseId',
+            'databaseId,name',
             '--jq',
-            '.[-1].databaseId',
+            jq,
         ],
         capture_output=True,
         text=True,
     )
-
     run_id = result.stdout.strip() if result.stdout else None
     if run_id:
         app.display_debug(f"Workflow run ID: {run_id}")
@@ -1065,7 +1069,7 @@ def get_current_sizes_json(app: Application, run_id: str, platform: str, py_vers
     '''
     Downloads the dependency sizes json for a given run id and platform when dependencies were resolved.
     '''
-    app.display(f"Retrieving dependency sizes artifact (run={run_id}, platform={platform})")
+    app.display(f"\nRetrieving dependency sizes artifact (run={run_id}, platform={platform})")
     with tempfile.TemporaryDirectory() as tmpdir:
         app.display_debug(f"Downloading artifacts to {tmpdir}...")
         try:

kandji/CHANGELOG.md

@@ -0,0 +1,7 @@
+# CHANGELOG - kandji
+
+## 1.0.0 / 2025-10-14
+
+***Added***:
+
+* Initial Release

kandji/README.md

@@ -0,0 +1,39 @@
+# Agent Check: kandji
+
+## Overview
+
+This check monitors [kandji][1].
+
+## Setup
+
+### Installation
+
+The kandji check is included in the [Datadog Agent][2] package.
+No additional installation is needed on your server.
+
+### Configuration
+
+!!! Add list of steps to set up this integration !!!
+
+### Validation
+
+!!! Add steps to validate integration is functioning as expected !!!
+
+## Data Collected
+
+### Metrics
+
+kandji does not include any metrics.
+
+### Events
+
+kandji does not include any events.
+
+## Troubleshooting
+
+Need help? Contact [Datadog support][3].
+
+[1]: **LINK_TO_INTEGRATION_SITE**
+[2]: https://app.datadoghq.com/account/settings/agent/latest
+[3]: https://docs.datadoghq.com/help/
+

kandji/manifest.json

@@ -0,0 +1,40 @@
+{
+  "manifest_version": "2.0.0",
+  "app_uuid": "3677fa0b-49e4-49df-b0f2-6a3a983d6637",
+  "app_id": "kandji",
+  "display_on_public_website": false,
+  "tile": {
+    "overview": "README.md#Overview",
+    "configuration": "README.md#Setup",
+    "support": "README.md#Support",
+    "changelog": "CHANGELOG.md",
+    "description": "<FILL IN - A brief description of what this offering provides>",
+    "title": "Kandji",
+    "media": [],
+    "classifier_tags": [
+      "Category::Cloud",
+      "Category::Log Collection",
+      "Category::Security",
+      "Category::OS & System",
+      "Category::Automation",
+      "Offering::Integration",
+      "Submitted Data Type::Logs"
+    ]
+  },
+  "assets": {
+    "integration": {
+      "auto_install": false,
+      "source_type_id": 58021352,
+      "source_type_name": "kandji",
+      "events": {
+        "creates_events": false
+      }
+    }
+  },
+  "author": {
+    "support_email": "help@datadoghq.com",
+    "name": "Datadog",
+    "homepage": "https://www.datadoghq.com",
+    "sales_email": "info@datadoghq.com"
+  }
+}