fixes

Author: jinja2

.chloggen/openshift-resource-detection.yaml

@@ -5,7 +5,7 @@ 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 using the openshift and ec2 detectors
 # One or more tracking issues related to the change
-issues: []
+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.

functional_tests/functional/testdata/expected_aks_values/expected_resource_attributes_agent.yaml

@@ -6,7 +6,7 @@ resourceMetrics:
             stringValue: abcd
         - key: cloud.platform
           value:
-            stringValue: azure.aks
+            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: azure.aks
+            stringValue: azure_aks
         - key: cloud.provider
           value:
             stringValue: abcd

functional_tests/functional/testdata/values/rosa_upgrade_from_previous_release_values.yaml

@@ -1,5 +1,6 @@
 cloudProvider: aws
 distribution: openshift
+clusterName: rosa-test-htcpw
 environment: dev
 splunkObservability:
   realm: us0

helm-charts/splunk-otel-collector/templates/config/_common.tpl

@@ -74,7 +74,7 @@ resourcedetection:
     {{- if eq .Values.cloudProvider "azure" }}
     - azure
     {{- end }}
-    {{- if or (eq (include "splunk-otel-collector.isNonEKSonAWS" .) "true") (and (eq .Values.distribution "openshift") (eq .Values.cloudProvider "aws")) }}
+    {{- if eq (include "splunk-otel-collector.isNonEKSonAWS" .) "true" }}
     - ec2
     {{- end }}
     # The `system` detector goes last so it can't preclude cloud detectors from setting host/os info.
@@ -120,7 +120,7 @@ resourcedetection:
       cloud.region:
         enabled: true
   {{- end }}
-  {{- if or (eq (include "splunk-otel-collector.isNonEKSonAWS" .) "true") (and (eq .Values.distribution "openshift") (eq .Values.cloudProvider "aws")) }}
+  {{- if eq (include "splunk-otel-collector.isNonEKSonAWS" .) "true" }}
   ec2:
     resource_attributes:
       host.id: