ConnectionMaster
diff --git a/‎kueue/README.md‎
Lines changed: 19 additions & 0 deletions b/‎kueue/README.md‎
Lines changed: 19 additions & 0 deletions
diff --git a/‎kueue/assets/configuration/spec.yaml‎
Lines changed: 5 additions & 0 deletions b/‎kueue/assets/configuration/spec.yaml‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎kueue/changelog.d/24700.added‎
Lines changed: 2 additions & 0 deletions b/‎kueue/changelog.d/24700.added‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎kueue/changelog.d/24700.fixed‎
Lines changed: 3 additions & 0 deletions b/‎kueue/changelog.d/24700.fixed‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎kueue/datadog_checks/kueue/check.py‎
Lines changed: 7 additions & 6 deletions b/‎kueue/datadog_checks/kueue/check.py‎
Lines changed: 7 additions & 6 deletions
diff --git a/‎kueue/datadog_checks/kueue/data/conf.yaml.example‎
Lines changed: 20 additions & 0 deletions b/‎kueue/datadog_checks/kueue/data/conf.yaml.example‎
Lines changed: 20 additions & 0 deletions
diff --git a/‎kueue/datadog_checks/kueue/metrics.py‎
Lines changed: 1 addition & 4 deletions b/‎kueue/datadog_checks/kueue/metrics.py‎
Lines changed: 1 addition & 4 deletions
@@ -54,6 +54,24 @@ Kueue is a cluster-level service. Configure this integration as a Cluster Agent
 
 See the [sample kueue.d/conf.yaml][4] for all available configuration options.
 
+### Log collection
+
+The Kueue controller manager writes logs to its container output, which Kubernetes captures as container logs. Collecting logs is disabled by default in the Datadog Agent. To enable it, see [Kubernetes Log Collection][12]. Logs are collected by the node Agent running on the node that hosts the Kueue controller manager, not by the Cluster Agent that runs this cluster check.
+
+After log collection has been enabled, set the Kueue log configuration as an Autodiscovery annotation on the controller manager's pod template. This allows it to persist despite pod restarts. Add it under `spec.template.metadata.annotations` of the `kueue-controller-manager` deployment, or set `controllerManager.manager.podAnnotations` if you install Kueue with the Helm chart:
+
+```yaml
+ad.datadoghq.com/manager.logs: |
+  [
+    {
+      "source": "kueue",
+      "service": "<SERVICE>"
+    }
+  ]
+```
+
+This annotation targets the container named `manager`, which is the container name used by both the Kueue release manifests and the Helm chart. Replace `manager` with the name (`.spec.containers[i].name`) of your Kueue container if you use a different name.
+
 ### Validation
 
 [Run the Cluster Agent's `clusterchecks` subcommand][11] and look for `kueue` under the Checks section.
@@ -96,3 +114,4 @@ Need help? Contact [Datadog support][8].
 [8]: https://docs.datadoghq.com/help/
 [10]: https://docs.datadoghq.com/containers/cluster_agent/clusterchecks/?tab=helm#configuration-from-configuration-files
 [11]: https://docs.datadoghq.com/containers/troubleshooting/cluster-and-endpoint-checks/#dispatching-logic-in-the-cluster-agent
+[12]: https://docs.datadoghq.com/containers/kubernetes/log/
@@ -61,3 +61,8 @@ files:
         type: object
         example:
           example.com/fpga: fpga
+  - template: logs
+    example:
+    - type: docker
+      source: kueue
+      service: <SERVICE>
@@ -0,0 +1,2 @@
+Add support for Kueue log collection.
+Collect the cumulative ``kueue.finished_workloads.count`` counter.
@@ -0,0 +1,3 @@
+Correct metric metadata so counters, histograms, and gauges resolve in dashboards, and remove a metric that Kueue does not emit.
+Fix the ``kueue_preempted_by`` workload event tag value, which appended the preempting Job UID to the Workload UID.
+Stop emitting the ``kueue_preempted_by`` workload event tag on evictions caused by resource flavor migration rather than preemption.
@@ -15,7 +15,7 @@
 
 RESOURCE_METRIC_PATTERN = '^(' + '|'.join(re.escape(k) for k in RESOURCE_METRIC_MAP) + ')$'
 LOCAL_QUEUE_METRIC_PATTERN = '^(' + '|'.join(re.escape(k) for k in LOCAL_QUEUE_METRIC_MAP) + ')$'
-PREEMPTING_WORKLOAD_UID_PATTERN = re.compile(r'\bworkload \(UID: ([^)]+)\)', re.IGNORECASE)
+PREEMPTING_WORKLOAD_UID_PATTERN = re.compile(r'\bworkload \(UID: ([^),\s]+)', re.IGNORECASE)
 
 RESOURCE_NAME_MAP = {
     'cpu': 'cpu',
@@ -366,11 +366,12 @@ def workload_event_tags(
         if transition == 'evicted' and condition:
             if reason := condition.get('reason'):
                 tags.append(f'kueue_eviction_reason:{reason}')
-            preempted_condition = self.get_condition(workload, 'Preempted')
-            if reason == 'Preempted' and preempted_condition and preempted_condition.get('reason'):
-                tags.append(f'kueue_preemption_reason:{preempted_condition["reason"]}')
-            if preempted_by := self.preempting_workload_uid(condition, preempted_condition):
-                tags.append(f'kueue_preempted_by:{preempted_by}')
+            if reason == 'Preempted':
+                preempted_condition = self.get_condition(workload, 'Preempted')
+                if preempted_condition and preempted_condition.get('reason'):
+                    tags.append(f'kueue_preemption_reason:{preempted_condition["reason"]}')
+                if preempted_by := self.preempting_workload_uid(condition, preempted_condition):
+                    tags.append(f'kueue_preempted_by:{preempted_by}')
 
         return tags
 
 
@@ -680,3 +680,23 @@ instances:
     #
     # resource_name_map:
     #   example.com/fpga: fpga
+
+## Log Section
+##
+## type - required - Type of log input source (tcp / udp / file / windows_event).
+## port / path / channel_path - required - Set port if type is tcp or udp.
+##                                         Set path if type is file.
+##                                         Set channel_path if type is windows_event.
+## source  - required - Attribute that defines which integration sent the logs.
+## encoding - optional - For file specifies the file encoding. Default is utf-8. Other
+##                       possible values are utf-16-le and utf-16-be.
+## service - optional - The name of the service that generates the log.
+##                      Overrides any `service` defined in the `init_config` section.
+## tags - optional - Add tags to the collected logs.
+##
+## Discover Datadog log collection: https://docs.datadoghq.com/logs/log_collection/
+#
+# logs:
+#   - type: docker
+#     source: kueue
+#     service: <SERVICE>
@@ -26,7 +26,6 @@
     'kueue_local_queue_admitted_workloads': 'local_queue.admitted.workloads',
     'kueue_local_queue_evicted_workloads': 'local_queue.evicted_workloads',
     'kueue_local_queue_finished_workloads': 'local_queue.finished_workloads',
-    'kueue_local_queue_finished_workloads_total': 'local_queue.finished_workloads',
     'kueue_local_queue_pending_workloads': 'local_queue.pending_workloads',
     'kueue_local_queue_quota_reserved_wait_time_seconds': 'local_queue.quota_reserved.wait_time.seconds',
     'kueue_local_queue_quota_reserved_workloads': 'local_queue.quota_reserved.workloads',
@@ -99,16 +98,14 @@
     'kueue_cohort_weighted_share': 'cohort.weighted_share',
     'kueue_evicted_workloads': 'evicted_workloads',
     'kueue_evicted_workloads_once': 'evicted_workloads_once',
-    'kueue_finished_workloads': 'finished_workloads',
-    'kueue_finished_workloads_total': 'finished_workloads',
+    'kueue_finished_workloads': {'name': 'finished_workloads', 'type': 'native_dynamic'},
     'kueue_pending_workloads': 'pending_workloads',
     'kueue_pods_ready_to_evicted_time_seconds': 'pods_ready_to_evicted_time.seconds',
     'kueue_preempted_workloads': 'preempted_workloads',
     'kueue_quota_reserved_wait_time_seconds': 'quota_reserved.wait_time.seconds',
     'kueue_quota_reserved_workloads': 'quota_reserved.workloads',
     'kueue_ready_wait_time_seconds': 'ready_wait_time.seconds',
     'kueue_replaced_workload_slices': 'replaced_workload_slices',
-    'kueue_resource_flavor_quota_reserved_workloads': 'resource_flavor.quota_reserved_workloads',
     'kueue_reserving_active_workloads': 'reserving.active_workloads',
     'kueue_workload_creation_latency_seconds': 'workload.creation_latency.seconds',
     'kueue_workload_eviction_latency_seconds': 'workload.eviction_latency.seconds',
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Add support for Kueue log collection.`
	`2`	+Collect the cumulative ``kueue.finished_workloads.count`` counter.
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+Correct metric metadata so counters, histograms, and gauges resolve in dashboards, and remove a metric that Kueue does not emit.`
	`2`	+Fix the ``kueue_preempted_by`` workload event tag value, which appended the preempting Job UID to the Workload UID.
	`3`	+Stop emitting the ``kueue_preempted_by`` workload event tag on evictions caused by resource flavor migration rather than preemption.