switch self monitoring count and prometheus metrics back to single pipeline

obs-gh-mattcotter · obs-gh-mattcotter · commit 609d1abc1b2e · 2025-01-10T11:17:53.000-06:00
diff --git a/packaging/docker/observe-agent/connections/self_monitoring/logs_and_metrics.yaml b/packaging/docker/observe-agent/connections/self_monitoring/logs_and_metrics.yaml
@@ -29,12 +29,7 @@ processors:
 service:
   pipelines:
     metrics/agent-internal:
-      receivers: [prometheus/agent]
-      processors: [memory_limiter, transform/truncate, resourcedetection, resourcedetection/cloud, batch]
-      exporters: [prometheusremotewrite/observe]
-
-    metrics/agent-internal-count:
-      receivers: [count]
+      receivers: [prometheus/agent, count]
       processors: [memory_limiter, transform/truncate, resourcedetection, resourcedetection/cloud, batch, deltatocumulative]
       exporters: [prometheusremotewrite/observe]
 
diff --git a/packaging/linux/etc/observe-agent/connections/self_monitoring/logs_and_metrics.yaml b/packaging/linux/etc/observe-agent/connections/self_monitoring/logs_and_metrics.yaml
@@ -29,12 +29,7 @@ processors:
 service:
   pipelines:
     metrics/agent-internal:
-      receivers: [prometheus/agent]
-      processors: [memory_limiter, transform/truncate, resourcedetection, resourcedetection/cloud, batch]
-      exporters: [prometheusremotewrite/observe]
-
-    metrics/agent-internal-count:
-      receivers: [count]
+      receivers: [prometheus/agent, count]
       processors: [memory_limiter, transform/truncate, resourcedetection, resourcedetection/cloud, batch, deltatocumulative]
       exporters: [prometheusremotewrite/observe]
 
diff --git a/packaging/macos/connections/self_monitoring/logs_and_metrics.yaml b/packaging/macos/connections/self_monitoring/logs_and_metrics.yaml
@@ -24,12 +24,7 @@ processors:
 service:
   pipelines:
     metrics/agent-internal:
-      receivers: [prometheus/agent]
-      processors: [memory_limiter, transform/truncate, resourcedetection, resourcedetection/cloud, batch]
-      exporters: [prometheusremotewrite/observe]
-
-    metrics/agent-internal-count:
-      receivers: [count]
+      receivers: [prometheus/agent, count]
       processors: [memory_limiter, transform/truncate, resourcedetection, resourcedetection/cloud, batch, deltatocumulative]
       exporters: [prometheusremotewrite/observe]
 
diff --git a/packaging/windows/connections/self_monitoring/logs_and_metrics.yaml b/packaging/windows/connections/self_monitoring/logs_and_metrics.yaml
@@ -24,12 +24,7 @@ processors:
 service:
   pipelines:
     metrics/agent-internal:
-      receivers: [prometheus/agent]
-      processors: [memory_limiter, transform/truncate, resourcedetection, resourcedetection/cloud, batch]
-      exporters: [prometheusremotewrite/observe]
-
-    metrics/agent-internal-count:
-      receivers: [count]
+      receivers: [prometheus/agent, count]
       processors: [memory_limiter, transform/truncate, resourcedetection, resourcedetection/cloud, batch, deltatocumulative]
       exporters: [prometheusremotewrite/observe]
 
