From 3bd7df9ee4047859426f8423cb29018204c9a438 Mon Sep 17 00:00:00 2001
From: shelby spees <sspees@equinix.com>
Date: Wed, 9 Aug 2023 14:54:53 -0700
Subject: [PATCH] Remove remaining spanmetrics references. (#65)

Also rename "prometheus-collector-metrics" to "collector-metrics"
because the prometheus part is redundant in our actual monitoring.
---
 templates/deployment.yaml      | 3 ---
 templates/service-monitor.yaml | 4 +---
 templates/service.yaml         | 6 +-----
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/templates/deployment.yaml b/templates/deployment.yaml
index 9a503f2..74a70dc 100644
--- a/templates/deployment.yaml
+++ b/templates/deployment.yaml
@@ -46,9 +46,6 @@ spec:
             - name: otlp-grpc
               containerPort: 4317
               protocol: TCP
-            - name: prometheus-exp
-              containerPort: 8889
-              protocol: TCP
           volumeMounts:
             - name: opentelemetry-collector-config
               mountPath: /conf
diff --git a/templates/service-monitor.yaml b/templates/service-monitor.yaml
index fc394c0..f140c34 100644
--- a/templates/service-monitor.yaml
+++ b/templates/service-monitor.yaml
@@ -11,8 +11,6 @@ spec:
     matchLabels:
       k8s-app: opentelemetry-collector
   endpoints:
-  - port: prometheus-collector-metrics
-    interval: 15s
-  - port: prometheus-spanmetrics
+  - port: collector-metrics
     interval: 15s
 {{- end }}
diff --git a/templates/service.yaml b/templates/service.yaml
index 8bd0c1c..977f122 100644
--- a/templates/service.yaml
+++ b/templates/service.yaml
@@ -22,11 +22,7 @@ spec:
     port: 55681
     protocol: TCP
     targetPort: otlp-http
-  - name: prometheus-collector-metrics
+  - name: collector-metrics
     port: 8888
     protocol: TCP
     targetPort: 8888
-  - name: prometheus-spanmetrics
-    port: 9090
-    protocol: TCP
-    targetPort: 9090