Add openshift resource detector for distribution: openshift (#2330)

* Add openshift resource detector for distribution: openshift

Enable the openshift resource detection processor when distribution is set to
openshift. This provides cloud.provider, cloud.platform, cloud.region, and
k8s.cluster.name attributes via the OpenShift API (no IMDS dependency).

- Add openshift detector and resource_attributes config in _common.tpl
- Add config.openshift.io RBAC permissions to clusterRole
- Fix bug where non-EKS clusters on AWS would not have cloud attributes set

* fixes

* chlog update

* fix aks

* fix gcp and add unit tests

* update test, fix schema

* fix value for resource detector

* rm already default attr

* rm not needed extra config

* add more tests for resdet

* clean up changelog

Author: jinja2

.chloggen/fix-non-eks-aws-ec2-detector.yaml

@@ -0,0 +1,22 @@
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: bug_fix
+# The name of the component, or a single word describing the area of concern, (e.g. agent, clusterReceiver, gateway, operator, chart, other)
+component: agent, clusterReceiver, gateway
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Fix resource detection for non-EKS Kubernetes clusters on AWS
+# One or more tracking issues related to the change
+issues: [2330]
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext: |
+  For non-EKS Kubernetes clusters on AWS (cloudProvider=aws with distribution unset or
+  set to openshift), EC2 instance metadata (host.id, cloud.account.id,
+  cloud.availability_zone, etc.) was never collected. Two issues contributed to this:
+  1. The chart used the eks detector, which only works on actual EKS clusters — it checks
+     for EKS-specific signals (IRSA/Pod Identity token paths, OIDC issuer, Kubernetes
+     version string) and returns an empty resource when those are absent. Switched to the
+     ec2 detector, which works on any AWS instance with IMDS access.
+  2. This code path only matched when distribution was unset (empty string), so OpenShift
+     clusters on AWS (distribution=openshift, cloudProvider=aws) were excluded entirely.
+     Broadened the condition to also match the openshift distribution.

.chloggen/openshift-resource-detection.yaml

@@ -0,0 +1,29 @@
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: enhancement
+# The name of the component, or a single word describing the area of concern, (e.g. agent, clusterReceiver, gateway, operator, chart, other)
+component: agent, clusterReceiver, gateway
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Add OpenShift resource detection support
+# One or more tracking issues related to the change
+issues: [2330]
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext: |
+  When distribution is set to "openshift", the openshift resource detector is now enabled
+  in the resourcedetection processor. Previously, OpenShift clusters only had cloud-provider
+  detectors (azure for cloudProvider=azure, gcp for cloudProvider=gcp) but no
+  OpenShift-specific detector, and no detector at all for cloudProvider=aws (see the
+  ec2 bug fix in this release). The openshift detector auto-discovers `k8s.cluster.name`,
+  `cloud.provider`, `cloud.platform`, and `cloud.region` via the OpenShift API
+  (`config.openshift.io/v1/infrastructures`). The `cloud.platform` value reflects the
+  actual hosting environment (e.g., `aws_openshift`, `gcp_openshift`, `azure.openshift`).
+
+  Cloud-provider-specific detectors remain enabled alongside the openshift detector to
+  collect instance-level metadata: ec2 on AWS, gcp on GCP, and azure on Azure. The
+  openshift detector is listed first to ensure the correct `cloud.platform` is set before
+  cloud-provider detectors run.
+
+  The `clusterName` Helm value is now optional for OpenShift (same as EKS and GKE). When
+  not set, the openshift detector auto-discovers it from the cluster API. When explicitly
+  set, the static value takes precedence.

examples/distribution-openshift/rendered_manifests/clusterRole.yaml

@@ -22,6 +22,15 @@ rules:
   - get
   - list
   - watch
+- apiGroups:
+  - config.openshift.io
+  resources:
+  - infrastructures
+  - infrastructures/status
+  verbs:
+  - get
+  - list
+  - watch
 - apiGroups:
   - ""
   resources:

examples/distribution-openshift/rendered_manifests/configmap-agent.yaml

@@ -142,6 +142,7 @@ data:
       resourcedetection:
         detectors:
         - env
+        - openshift
         - system
         override: true
         timeout: 15s

examples/distribution-openshift/rendered_manifests/configmap-cluster-receiver.yaml

@@ -67,6 +67,7 @@ data:
       resourcedetection:
         detectors:
         - env
+        - openshift
         - system
         override: true
         timeout: 15s

examples/distribution-openshift/rendered_manifests/daemonset.yaml

@@ -31,7 +31,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: 86b9e237230bff778e5a9261f569f61444c70c0b8bbca028a6309255f08670a2
+        checksum/config: dc83bd8c776d052e99a56059e662b006ea49495536000ae73aed876f0f80157d
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

examples/distribution-openshift/rendered_manifests/deployment-cluster-receiver.yaml

@@ -30,7 +30,7 @@ spec:
         component: otel-k8s-cluster-receiver
         release: default
       annotations:
-        checksum/config: 5763ea975670663f85a27d6986d38a869f1863c466dc6e8f4c2f2123074fff45
+        checksum/config: 51aef421dc69c2e928b632dc6fad058e1003ee654fbdf24425661e5ad2ac5af2
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:

functional_tests/functional/functional_test.go

@@ -676,8 +676,8 @@ func validateResourceAttributes(t *testing.T, clientset *kubernetes.Clientset, k
 
 	internal.CopyFileFromPod(t, clientset, kubeConfig, internal.DefaultNamespace, podName, "otel-collector", podPathFile, tmpFile.Name())
 
-	actualResourceAttributes := readAndNormalizeMetrics(t, tmpFile.Name(), "k8s.cluster.name").ResourceMetrics().At(0).Resource().Attributes()
-	expectedResourceAttributes := readAndNormalizeMetrics(t, expectedResourceAttributesFile, "k8s.cluster.name").ResourceMetrics().At(0).Resource().Attributes()
+	actualResourceAttributes := readAndNormalizeMetrics(t, tmpFile.Name(), "k8s.cluster.name", "cloud.platform").ResourceMetrics().At(0).Resource().Attributes()
+	expectedResourceAttributes := readAndNormalizeMetrics(t, expectedResourceAttributesFile, "k8s.cluster.name", "cloud.platform").ResourceMetrics().At(0).Resource().Attributes()
 
 	require.True(t, expectedResourceAttributes.Equal(actualResourceAttributes), "Resource Attributes comparison failed for %s , expected values %s , actual values %s", collectorType, internal.FormatAttributes(expectedResourceAttributes), internal.FormatAttributes(actualResourceAttributes))
 

functional_tests/functional/testdata/expected_aks_values/expected_resource_attributes_agent.yaml

@@ -6,7 +6,7 @@ resourceMetrics:
             stringValue: abcd
         - key: cloud.platform
           value:
-            stringValue: abcd
+            stringValue: azure.aks
         - key: cloud.provider
           value:
             stringValue: abcd

functional_tests/functional/testdata/expected_aks_values/expected_resource_attributes_cluster_receiver.yaml

@@ -6,7 +6,7 @@ resourceMetrics:
             stringValue: abcd
         - key: cloud.platform
           value:
-            stringValue: abcd
+            stringValue: azure.aks
         - key: cloud.provider
           value:
             stringValue: abcd