Use same scrapers as OCK

Specifically don't need process scraper which doesn't collect default metrics.
signalfx · Mar 10, 2021 · 902f008 · 902f008
1 parent 0a22935
commit 902f008
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 9 deletions.
diff --git a/cmd/otelcol/config/collector/agent_config.yaml b/cmd/otelcol/config/collector/agent_config.yaml
@@ -24,13 +24,17 @@ receivers:
     scrapers:
       cpu:
       disk:
-      load:
       filesystem:
       memory:
       network:
-      process:
-      processes:
+      # System load average metrics https://en.wikipedia.org/wiki/Load_(computing)
+      load:
+      # Paging/Swap space utilization and I/O metrics
       paging:
+      # Aggregated system process count metrics
+      processes:
+      # System processes metrics, disabled by default
+      # process:
   jaeger:
     protocols:
       grpc:

diff --git a/cmd/otelcol/config/collector/full_config_linux.yaml b/cmd/otelcol/config/collector/full_config_linux.yaml
@@ -104,12 +104,17 @@ receivers:
     scrapers:
       cpu:
       disk:
-      load:
       filesystem:
       memory:
       network:
-      processes:
+      # System load average metrics https://en.wikipedia.org/wiki/Load_(computing)
+      load:
+      # Paging/Swap space utilization and I/O metrics
       paging:
+      # Aggregated system process count metrics
+      processes:
+      # System processes metrics, disabled by default
+      # process:
 
   # Enables the prometheus receiver -- should only be used for local metric collection
   # This section is used to collect the OpenTelemetry Collector metrics

diff --git a/examples/kubernetes-yaml/splunk-otel-collector-agent.yaml b/examples/kubernetes-yaml/splunk-otel-collector-agent.yaml
@@ -21,12 +21,17 @@ data:
         scrapers:
           cpu:
           disk:
-          load:
           filesystem:
           memory:
           network:
-          processes:
+          # System load average metrics https://en.wikipedia.org/wiki/Load_(computing)
+          load:
+          # Paging/Swap space utilization and I/O metrics
           paging:
+          # Aggregated system process count metrics
+          processes:
+          # System processes metrics, disabled by default
+          # process:
       jaeger:
         protocols:
           grpc:

diff --git a/examples/kubernetes-yaml/splunk-otel-collector-gateway.yaml b/examples/kubernetes-yaml/splunk-otel-collector-gateway.yaml
@@ -21,12 +21,17 @@ data:
         scrapers:
           cpu:
           disk:
-          load:
           filesystem:
           memory:
           network:
-          processes:
+          # System load average metrics https://en.wikipedia.org/wiki/Load_(computing)
+          load:
+          # Paging/Swap space utilization and I/O metrics
           paging:
+          # Aggregated system process count metrics
+          processes:
+          # System processes metrics, disabled by default
+          # process:
       jaeger:
         protocols:
           grpc: