Revert "move prometheus exporter config to use readers"

This reverts commit d04deafd03fd42b32fd44e42b1e0da0523b7cf32.
open-telemetry · Nov 14, 2024 · 5c51ff8 · 5c51ff8
1 parent d7f6f42
commit 5c51ff8
Show file tree

Hide file tree

Showing 18 changed files with 18 additions and 108 deletions.
diff --git a/...s/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap-agent.yaml b/...s/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap-agent.yaml
@@ -90,9 +90,4 @@ data:
           - zipkin
       telemetry:
         metrics:
-          readers:
-            - pull:
-                exporter:
-                  prometheus:
-                    host: ${env:MY_POD_IP}
-                    port: 8888
+          address: ${env:MY_POD_IP}:8888
diff --git a/...s/opentelemetry-collector/examples/daemonset-collector-logs/rendered/configmap-agent.yaml b/...s/opentelemetry-collector/examples/daemonset-collector-logs/rendered/configmap-agent.yaml
@@ -97,9 +97,4 @@ data:
           - zipkin
       telemetry:
         metrics:
-          readers:
-            - pull:
-                exporter:
-                  prometheus:
-                    host: ${env:MY_POD_IP}
-                    port: 8888
+          address: ${env:MY_POD_IP}:8888
diff --git a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/configmap-agent.yaml b/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/configmap-agent.yaml
@@ -130,9 +130,4 @@ data:
           - zipkin
       telemetry:
         metrics:
-          readers:
-            - pull:
-                exporter:
-                  prometheus:
-                    host: ${env:MY_POD_IP}
-                    port: 8888
+          address: ${env:MY_POD_IP}:8888
diff --git a/.../opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/configmap-agent.yaml b/.../opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/configmap-agent.yaml
@@ -83,9 +83,4 @@ data:
           - zipkin
       telemetry:
         metrics:
-          readers:
-            - pull:
-                exporter:
-                  prometheus:
-                    host: ${env:MY_POD_IP}
-                    port: 8888
+          address: ${env:MY_POD_IP}:8888
diff --git a/charts/opentelemetry-collector/examples/daemonset-only/rendered/configmap-agent.yaml b/charts/opentelemetry-collector/examples/daemonset-only/rendered/configmap-agent.yaml
@@ -83,9 +83,4 @@ data:
           - zipkin
       telemetry:
         metrics:
-          readers:
-            - pull:
-                exporter:
-                  prometheus:
-                    host: ${env:MY_POD_IP}
-                    port: 8888
+          address: ${env:MY_POD_IP}:8888
diff --git a/charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml
@@ -83,9 +83,4 @@ data:
           - zipkin
       telemetry:
         metrics:
-          readers:
-            - pull:
-                exporter:
-                  prometheus:
-                    host: ${env:MY_POD_IP}
-                    port: 8888
+          address: ${env:MY_POD_IP}:8888
diff --git a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/configmap.yaml
@@ -46,9 +46,4 @@ data:
           - otlp
       telemetry:
         metrics:
-          readers:
-            - pull:
-                exporter:
-                  prometheus:
-                    host: ${env:MY_POD_IP}
-                    port: 8888
+          address: ${env:MY_POD_IP}:8888
diff --git a/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/configmap.yaml
@@ -109,9 +109,4 @@ data:
           - zipkin
       telemetry:
         metrics:
-          readers:
-            - pull:
-                exporter:
-                  prometheus:
-                    host: ${env:MY_POD_IP}
-                    port: 8888
+          address: ${env:MY_POD_IP}:8888
diff --git a/charts/opentelemetry-collector/examples/statefulset-only/rendered/configmap-statefulset.yaml b/charts/opentelemetry-collector/examples/statefulset-only/rendered/configmap-statefulset.yaml
@@ -83,9 +83,4 @@ data:
           - zipkin
       telemetry:
         metrics:
-          readers:
-            - pull:
-                exporter:
-                  prometheus:
-                    host: ${env:MY_POD_IP}
-                    port: 8888
+          address: ${env:MY_POD_IP}:8888
diff --git a/...opentelemetry-collector/examples/statefulset-with-pvc/rendered/configmap-statefulset.yaml b/...opentelemetry-collector/examples/statefulset-with-pvc/rendered/configmap-statefulset.yaml
@@ -83,9 +83,4 @@ data:
           - zipkin
       telemetry:
         metrics:
-          readers:
-            - pull:
-                exporter:
-                  prometheus:
-                    host: ${env:MY_POD_IP}
-                    port: 8888
+          address: ${env:MY_POD_IP}:8888
diff --git a/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/using-GOMEMLIMIT/rendered/configmap.yaml
@@ -83,9 +83,4 @@ data:
           - zipkin
       telemetry:
         metrics:
-          readers:
-            - pull:
-                exporter:
-                  prometheus:
-                    host: ${env:MY_POD_IP}
-                    port: 8888
+          address: ${env:MY_POD_IP}:8888
diff --git a/charts/opentelemetry-collector/examples/using-shared-processes/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/using-shared-processes/rendered/configmap.yaml
@@ -83,9 +83,4 @@ data:
           - zipkin
       telemetry:
         metrics:
-          readers:
-            - pull:
-                exporter:
-                  prometheus:
-                    host: ${env:MY_POD_IP}
-                    port: 8888
+          address: ${env:MY_POD_IP}:8888
diff --git a/charts/opentelemetry-collector/values.yaml b/charts/opentelemetry-collector/values.yaml
@@ -137,12 +137,7 @@ config:
   service:
     telemetry:
       metrics:
-        readers:
-          - pull:
-              exporter:
-                prometheus:
-                  host: ${env:MY_POD_IP}
-                  port: 8888
+        address: ${env:MY_POD_IP}:8888
     extensions:
       - health_check
     pipelines:

diff --git a/...emo/examples/collector-as-daemonset/rendered/opentelemetry-collector/configmap-agent.yaml b/...emo/examples/collector-as-daemonset/rendered/opentelemetry-collector/configmap-agent.yaml
@@ -159,9 +159,4 @@ data:
           - zipkin
       telemetry:
         metrics:
-          readers:
-            - pull:
-                exporter:
-                  prometheus:
-                    host: ${env:MY_POD_IP}
-                    port: 8888
+          address: ${env:MY_POD_IP}:8888
diff --git a/...emo/examples/custom-environment-variables/rendered/opentelemetry-collector/configmap.yaml b/...emo/examples/custom-environment-variables/rendered/opentelemetry-collector/configmap.yaml
@@ -166,9 +166,4 @@ data:
           - zipkin
       telemetry:
         metrics:
-          readers:
-            - pull:
-                exporter:
-                  prometheus:
-                    host: ${env:MY_POD_IP}
-                    port: 8888
+          address: ${env:MY_POD_IP}:8888
diff --git a/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/configmap.yaml b/charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/configmap.yaml
@@ -157,9 +157,4 @@ data:
           - zipkin
       telemetry:
         metrics:
-          readers:
-            - pull:
-                exporter:
-                  prometheus:
-                    host: ${env:MY_POD_IP}
-                    port: 8888
+          address: ${env:MY_POD_IP}:8888
diff --git a/...xamples/kubernetes-infra-monitoring/rendered/opentelemetry-collector/configmap-agent.yaml b/...xamples/kubernetes-infra-monitoring/rendered/opentelemetry-collector/configmap-agent.yaml
@@ -230,9 +230,4 @@ data:
           - zipkin
       telemetry:
         metrics:
-          readers:
-            - pull:
-                exporter:
-                  prometheus:
-                    host: ${env:MY_POD_IP}
-                    port: 8888
+          address: ${env:MY_POD_IP}:8888
diff --git a/...metry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/configmap.yaml b/...metry-demo/examples/public-hosted-ingress/rendered/opentelemetry-collector/configmap.yaml
@@ -157,9 +157,4 @@ data:
           - zipkin
       telemetry:
         metrics:
-          readers:
-            - pull:
-                exporter:
-                  prometheus:
-                    host: ${env:MY_POD_IP}
-                    port: 8888
+          address: ${env:MY_POD_IP}:8888