patch

signalfx · Jun 16, 2023 · 578ee6a · 578ee6a
1 parent 5c5e7fb
commit 578ee6a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,7 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### Changed
 
-- Update the Kubernetes Proxy monitor for OpenShift clusters to stop using insecure port 29101 and start using secure port 9101 with authentication [#810](https://github.com/signalfx/splunk-otel-collector-chart/pull/810)
+- Update the Kubernetes Proxy monitor for OpenShift clusters to start using secure ports 9101 or 29101 with authentication [#810](https://github.com/signalfx/splunk-otel-collector-chart/pull/810)
 
 ## [0.78.0] - 2023-06-07
 

diff --git a/examples/distribution-openshift/rendered_manifests/configmap-agent.yaml b/examples/distribution-openshift/rendered_manifests/configmap-agent.yaml
@@ -214,12 +214,13 @@ data:
             config:
               extraDimensions:
                 metric_source: kubernetes-proxy
-              port: 9101
+              port: '`port`'
               skipVerify: true
               type: kubernetes-proxy
               useHTTPS: true
               useServiceAccount: true
-            rule: type == "pod" && labels["app"] == "sdn"
+            rule: type == "port" && pod.labels["app"] == "sdn" && (port == 9101 || port
+              == 29101)
           smartagent/kubernetes-scheduler:
             config:
               extraDimensions:

diff --git a/examples/distribution-openshift/rendered_manifests/daemonset.yaml b/examples/distribution-openshift/rendered_manifests/daemonset.yaml
@@ -29,7 +29,7 @@ spec:
         app: splunk-otel-collector
         release: default
       annotations:
-        checksum/config: d7d81f2cb9d13b66936f052dcd335a1a72037a201b8cbef376b618231627caf2
+        checksum/config: eab2f7931d01526a7ed2c3c65a484363de2fd4b77dbb09e33c4eb447e246eb47
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

diff --git a/helm-charts/splunk-otel-collector/templates/config/_otel-agent.tpl b/helm-charts/splunk-otel-collector/templates/config/_otel-agent.tpl
@@ -173,7 +173,7 @@ receivers:
       {{- if .Values.agent.controlPlaneMetrics.proxy.enabled }}
       smartagent/kubernetes-proxy:
         {{- if eq .Values.distribution "openshift" }}
-        rule: type == "pod" && labels["app"] == "sdn"
+        rule: type == "port" && pod.labels["app"] == "sdn" && (port == 9101 || port == 29101)
         {{- else }}
         rule: type == "pod" && labels["k8s-app"] == "kube-proxy"
         {{- end }}
@@ -185,7 +185,6 @@ receivers:
           skipVerify: true
           useHTTPS: true
           useServiceAccount: true
-          port: 9101
           {{- else }}
           port: 10249
           {{- end }}