From 1c3de6eedcee03260847aac43e4434f0db7d1499 Mon Sep 17 00:00:00 2001 From: Steve Flanders Date: Thu, 1 Jul 2021 12:18:07 -0400 Subject: [PATCH] Remove SAPM receiver This is a complimenting change to splunk-otel-collector repo. SAPM receiver is not used by anything today so remove it. --- .../splunk-otel-collector/templates/config/_common.tpl | 2 -- .../templates/config/_otel-collector.tpl | 2 +- helm-charts/splunk-otel-collector/values.yaml | 4 ---- rendered/manifests/agent-only/configmap-otel-agent.yaml | 2 -- rendered/manifests/agent-only/daemonset.yaml | 2 +- .../manifests/gateway-only/configmap-otel-collector.yaml | 3 --- rendered/manifests/gateway-only/deployment-collector.yaml | 5 +---- rendered/manifests/gateway-only/service.yaml | 4 ---- rendered/manifests/traces-only/configmap-otel-agent.yaml | 2 -- rendered/manifests/traces-only/daemonset.yaml | 2 +- 10 files changed, 4 insertions(+), 24 deletions(-) diff --git a/helm-charts/splunk-otel-collector/templates/config/_common.tpl b/helm-charts/splunk-otel-collector/templates/config/_common.tpl index fe306ed857..2dbf1bac51 100644 --- a/helm-charts/splunk-otel-collector/templates/config/_common.tpl +++ b/helm-charts/splunk-otel-collector/templates/config/_common.tpl @@ -34,8 +34,6 @@ otlp: endpoint: 0.0.0.0:55681 {{- if .Values.tracesEnabled }} -sapm: - endpoint: 0.0.0.0:7276 jaeger: protocols: thrift_http: diff --git a/helm-charts/splunk-otel-collector/templates/config/_otel-collector.tpl b/helm-charts/splunk-otel-collector/templates/config/_otel-collector.tpl index 1282b8ef75..adaf40e507 100644 --- a/helm-charts/splunk-otel-collector/templates/config/_otel-collector.tpl +++ b/helm-charts/splunk-otel-collector/templates/config/_otel-collector.tpl @@ -86,7 +86,7 @@ service: {{- if .Values.tracesEnabled }} # default traces pipeline traces: - receivers: [otlp, jaeger, zipkin, sapm] + receivers: [otlp, jaeger, zipkin] processors: - memory_limiter - batch diff --git a/helm-charts/splunk-otel-collector/values.yaml b/helm-charts/splunk-otel-collector/values.yaml index 45b2f9256d..fbc92d1c31 100644 --- a/helm-charts/splunk-otel-collector/values.yaml +++ b/helm-charts/splunk-otel-collector/values.yaml @@ -613,10 +613,6 @@ otelCollector: containerPort: 9411 protocol: TCP enabled_for: [traces] - sapm: - containerPort: 7276 - protocol: TCP - enabled_for: [traces] signalfx: containerPort: 9943 protocol: TCP diff --git a/rendered/manifests/agent-only/configmap-otel-agent.yaml b/rendered/manifests/agent-only/configmap-otel-agent.yaml index 593f283eee..c9e462d019 100644 --- a/rendered/manifests/agent-only/configmap-otel-agent.yaml +++ b/rendered/manifests/agent-only/configmap-otel-agent.yaml @@ -118,8 +118,6 @@ data: receivers: null watch_observers: - k8s_observer - sapm: - endpoint: 0.0.0.0:7276 signalfx: endpoint: 0.0.0.0:9943 smartagent/signalfx-forwarder: diff --git a/rendered/manifests/agent-only/daemonset.yaml b/rendered/manifests/agent-only/daemonset.yaml index 9ccd565ccc..47a511a750 100644 --- a/rendered/manifests/agent-only/daemonset.yaml +++ b/rendered/manifests/agent-only/daemonset.yaml @@ -23,7 +23,7 @@ spec: app: splunk-otel-collector release: default annotations: - checksum/config: 7f0040fa217f3a2bec3ec9550abfd54f12978286dc3fd2aa62e9eed6e8afd87e + checksum/config: 56f38e3159a073143bf6ba9c93602ce9716b0c58a17f157a325770221cdb4b4d spec: hostNetwork: true dnsPolicy: ClusterFirstWithHostNet diff --git a/rendered/manifests/gateway-only/configmap-otel-collector.yaml b/rendered/manifests/gateway-only/configmap-otel-collector.yaml index 9fcea7124a..33ac10f9b2 100644 --- a/rendered/manifests/gateway-only/configmap-otel-collector.yaml +++ b/rendered/manifests/gateway-only/configmap-otel-collector.yaml @@ -67,8 +67,6 @@ data: static_configs: - targets: - ${K8S_POD_IP}:8888 - sapm: - endpoint: 0.0.0.0:7276 signalfx: access_token_passthrough: true endpoint: 0.0.0.0:9943 @@ -119,4 +117,3 @@ data: - otlp - jaeger - zipkin - - sapm diff --git a/rendered/manifests/gateway-only/deployment-collector.yaml b/rendered/manifests/gateway-only/deployment-collector.yaml index a2c18ec1b5..0751db9cc4 100644 --- a/rendered/manifests/gateway-only/deployment-collector.yaml +++ b/rendered/manifests/gateway-only/deployment-collector.yaml @@ -24,7 +24,7 @@ spec: component: otel-collector release: default annotations: - checksum/config: cca2d7d060704d5d299a98e7576b24eef7a2d42be4e90fd8245e65158c150d82 + checksum/config: 734c3b038fdc99927b69659708c156d506652fc2b450bfb93378ef20555c2f18 spec: serviceAccountName: default-splunk-otel-collector containers: @@ -65,9 +65,6 @@ spec: - name: otlp containerPort: 4317 protocol: TCP - - name: sapm - containerPort: 7276 - protocol: TCP - name: signalfx containerPort: 9943 protocol: TCP diff --git a/rendered/manifests/gateway-only/service.yaml b/rendered/manifests/gateway-only/service.yaml index 2153f5f384..af19224431 100644 --- a/rendered/manifests/gateway-only/service.yaml +++ b/rendered/manifests/gateway-only/service.yaml @@ -29,10 +29,6 @@ spec: port: 4317 targetPort: otlp protocol: TCP - - name: sapm - port: 7276 - targetPort: sapm - protocol: TCP - name: signalfx port: 9943 targetPort: signalfx diff --git a/rendered/manifests/traces-only/configmap-otel-agent.yaml b/rendered/manifests/traces-only/configmap-otel-agent.yaml index 06bd9cc1cd..666e6e4c76 100644 --- a/rendered/manifests/traces-only/configmap-otel-agent.yaml +++ b/rendered/manifests/traces-only/configmap-otel-agent.yaml @@ -88,8 +88,6 @@ data: static_configs: - targets: - ${K8S_POD_IP}:8888 - sapm: - endpoint: 0.0.0.0:7276 smartagent/signalfx-forwarder: listenAddress: 0.0.0.0:9080 type: signalfx-forwarder diff --git a/rendered/manifests/traces-only/daemonset.yaml b/rendered/manifests/traces-only/daemonset.yaml index 704d3b6e7d..72e75d7565 100644 --- a/rendered/manifests/traces-only/daemonset.yaml +++ b/rendered/manifests/traces-only/daemonset.yaml @@ -22,7 +22,7 @@ spec: app: splunk-otel-collector release: default annotations: - checksum/config: d283f5402c37424e6cf4e8ea9f86b43d393541e8905fd547292a1f6ea00a2fbc + checksum/config: 119df5d65873e60ea936fde1c9a83e4fc7eb7126f4922cc1e04b2d0900fa2318 spec: hostNetwork: true dnsPolicy: ClusterFirstWithHostNet