Update config for setting up internal metrics scraper (#1573)

Update config for scraping internal metrics to use new config interface and loopback address. This also drops redundant attributes reported with the internal metrics: `net.host.name` and `server.address`.
signalfx · Dec 13, 2024 · bc73797 · bc73797
1 parent 8ed08fb
commit bc73797
Show file tree

Hide file tree

Showing 145 changed files with 591 additions and 215 deletions.
diff --git a/.chloggen/update-service-telemetry-endpoint.yaml b/.chloggen/update-service-telemetry-endpoint.yaml
@@ -0,0 +1,12 @@
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: enhancement
+# The name of the component, or a single word describing the area of concern, (e.g. agent, clusterReceiver, gateway, operator, chart, other)
+component: agent, clusterReceiver, gateway
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Update config for scraping internal metrics to use new config interface and loopback address.
+# One or more tracking issues related to the change
+issues: [1573]
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext: "This also drops redundant attributes reported with the internal metrics: `net.host.name` and `server.address`"
diff --git a/examples/add-filter-processor/rendered_manifests/configmap-agent.yaml b/examples/add-filter-processor/rendered_manifests/configmap-agent.yaml
@@ -361,7 +361,7 @@ data:
             scrape_interval: 10s
             static_configs:
             - targets:
-              - ${K8S_POD_IP}:8889
+              - localhost:8889
       receiver_creator:
         receivers:
           smartagent/coredns:
@@ -493,4 +493,9 @@ data:
           - zipkin
       telemetry:
         metrics:
-          address: 0.0.0.0:8889
+          readers:
+          - pull:
+              exporter:
+                prometheus:
+                  host: localhost
+                  port: 8889
diff --git a/examples/add-filter-processor/rendered_manifests/configmap-cluster-receiver.yaml b/examples/add-filter-processor/rendered_manifests/configmap-cluster-receiver.yaml
@@ -91,7 +91,7 @@ data:
             scrape_interval: 10s
             static_configs:
             - targets:
-              - ${K8S_POD_IP}:8889
+              - localhost:8889
     service:
       extensions:
       - health_check
@@ -119,4 +119,9 @@ data:
           - prometheus/k8s_cluster_receiver
       telemetry:
         metrics:
-          address: 0.0.0.0:8889
+          readers:
+          - pull:
+              exporter:
+                prometheus:
+                  host: localhost
+                  port: 8889
diff --git a/examples/add-filter-processor/rendered_manifests/daemonset.yaml b/examples/add-filter-processor/rendered_manifests/daemonset.yaml
@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: 599ae6240b728a0f8301552303b8efc55a0040caac39ecba1e04d4fe41f879ac
+        checksum/config: e62f6ee4ef1ba1d8771d4056077ed10afe5d3bc6b4052980b2a7cc9f15a2bcdd
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

diff --git a/examples/add-filter-processor/rendered_manifests/deployment-cluster-receiver.yaml b/examples/add-filter-processor/rendered_manifests/deployment-cluster-receiver.yaml
@@ -31,7 +31,7 @@ spec:
         component: otel-k8s-cluster-receiver
         release: default
       annotations:
-        checksum/config: 4b62199b9bbcfb6f7dc9ae4dd0ec6fc45a2a5953d7002ed90e884883b6f0ad4b
+        checksum/config: ff5ed57ffd6eaabc34c61f909a53c3ead6cf13539461c69ae410cc955d467a21
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:

diff --git a/examples/add-kafkametrics-receiver/rendered_manifests/configmap-agent.yaml b/examples/add-kafkametrics-receiver/rendered_manifests/configmap-agent.yaml
@@ -317,7 +317,7 @@ data:
             scrape_interval: 10s
             static_configs:
             - targets:
-              - ${K8S_POD_IP}:8889
+              - localhost:8889
       receiver_creator:
         receivers:
           smartagent/coredns:
@@ -443,4 +443,9 @@ data:
           - zipkin
       telemetry:
         metrics:
-          address: 0.0.0.0:8889
+          readers:
+          - pull:
+              exporter:
+                prometheus:
+                  host: localhost
+                  port: 8889
diff --git a/examples/add-kafkametrics-receiver/rendered_manifests/configmap-cluster-receiver.yaml b/examples/add-kafkametrics-receiver/rendered_manifests/configmap-cluster-receiver.yaml
@@ -91,7 +91,7 @@ data:
             scrape_interval: 10s
             static_configs:
             - targets:
-              - ${K8S_POD_IP}:8889
+              - localhost:8889
     service:
       extensions:
       - health_check
@@ -119,4 +119,9 @@ data:
           - prometheus/k8s_cluster_receiver
       telemetry:
         metrics:
-          address: 0.0.0.0:8889
+          readers:
+          - pull:
+              exporter:
+                prometheus:
+                  host: localhost
+                  port: 8889
diff --git a/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml b/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml
@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: f1de5c58c5e1dade0ae34291f7c2052ec977104cd591d80af085e46119c7a4c1
+        checksum/config: e8ae8de67a024a79ab31a0ac261fdb0c85fd63b509681242d93917bfc29b8a76
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

diff --git a/examples/add-kafkametrics-receiver/rendered_manifests/deployment-cluster-receiver.yaml b/examples/add-kafkametrics-receiver/rendered_manifests/deployment-cluster-receiver.yaml
@@ -31,7 +31,7 @@ spec:
         component: otel-k8s-cluster-receiver
         release: default
       annotations:
-        checksum/config: 4b62199b9bbcfb6f7dc9ae4dd0ec6fc45a2a5953d7002ed90e884883b6f0ad4b
+        checksum/config: ff5ed57ffd6eaabc34c61f909a53c3ead6cf13539461c69ae410cc955d467a21
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:

diff --git a/examples/add-receiver-creator/rendered_manifests/configmap-agent.yaml b/examples/add-receiver-creator/rendered_manifests/configmap-agent.yaml
@@ -192,7 +192,7 @@ data:
             scrape_interval: 10s
             static_configs:
             - targets:
-              - ${K8S_POD_IP}:8889
+              - localhost:8889
       receiver_creator:
         receivers:
           postgresql:
@@ -321,4 +321,9 @@ data:
           - zipkin
       telemetry:
         metrics:
-          address: 0.0.0.0:8889
+          readers:
+          - pull:
+              exporter:
+                prometheus:
+                  host: localhost
+                  port: 8889
diff --git a/examples/add-receiver-creator/rendered_manifests/configmap-cluster-receiver.yaml b/examples/add-receiver-creator/rendered_manifests/configmap-cluster-receiver.yaml
@@ -91,7 +91,7 @@ data:
             scrape_interval: 10s
             static_configs:
             - targets:
-              - ${K8S_POD_IP}:8889
+              - localhost:8889
     service:
       extensions:
       - health_check
@@ -119,4 +119,9 @@ data:
           - prometheus/k8s_cluster_receiver
       telemetry:
         metrics:
-          address: 0.0.0.0:8889
+          readers:
+          - pull:
+              exporter:
+                prometheus:
+                  host: localhost
+                  port: 8889
diff --git a/examples/add-receiver-creator/rendered_manifests/daemonset.yaml b/examples/add-receiver-creator/rendered_manifests/daemonset.yaml
@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: 879c032d48dac95fa58dae345063f3209037b6b8f1f2941bc3799ccfa343cb43
+        checksum/config: 46b8ba55ad9b9c54254be9211b0396df3cd0d3a71dbc20fb3ba8893b6318ad88
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

diff --git a/examples/add-receiver-creator/rendered_manifests/deployment-cluster-receiver.yaml b/examples/add-receiver-creator/rendered_manifests/deployment-cluster-receiver.yaml
@@ -31,7 +31,7 @@ spec:
         component: otel-k8s-cluster-receiver
         release: default
       annotations:
-        checksum/config: 4b62199b9bbcfb6f7dc9ae4dd0ec6fc45a2a5953d7002ed90e884883b6f0ad4b
+        checksum/config: ff5ed57ffd6eaabc34c61f909a53c3ead6cf13539461c69ae410cc955d467a21
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:

diff --git a/examples/add-sampler/rendered_manifests/configmap-agent.yaml b/examples/add-sampler/rendered_manifests/configmap-agent.yaml
@@ -195,7 +195,7 @@ data:
             scrape_interval: 10s
             static_configs:
             - targets:
-              - ${K8S_POD_IP}:8889
+              - localhost:8889
       receiver_creator:
         receivers:
           smartagent/coredns:
@@ -310,4 +310,9 @@ data:
           - zipkin
       telemetry:
         metrics:
-          address: 0.0.0.0:8889
+          readers:
+          - pull:
+              exporter:
+                prometheus:
+                  host: localhost
+                  port: 8889
diff --git a/examples/add-sampler/rendered_manifests/configmap-cluster-receiver.yaml b/examples/add-sampler/rendered_manifests/configmap-cluster-receiver.yaml
@@ -91,7 +91,7 @@ data:
             scrape_interval: 10s
             static_configs:
             - targets:
-              - ${K8S_POD_IP}:8889
+              - localhost:8889
     service:
       extensions:
       - health_check
@@ -119,4 +119,9 @@ data:
           - prometheus/k8s_cluster_receiver
       telemetry:
         metrics:
-          address: 0.0.0.0:8889
+          readers:
+          - pull:
+              exporter:
+                prometheus:
+                  host: localhost
+                  port: 8889
diff --git a/examples/add-sampler/rendered_manifests/daemonset.yaml b/examples/add-sampler/rendered_manifests/daemonset.yaml
@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: ea59bab11b6951542d0951611791b361ddad62449c19bb69ebb2d43ca14869e3
+        checksum/config: 4a6276e318600d9ea3e76c91b6670f201c626ba375a03af94eac9d8efcf71cdb
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

diff --git a/examples/add-sampler/rendered_manifests/deployment-cluster-receiver.yaml b/examples/add-sampler/rendered_manifests/deployment-cluster-receiver.yaml
@@ -31,7 +31,7 @@ spec:
         component: otel-k8s-cluster-receiver
         release: default
       annotations:
-        checksum/config: 4b62199b9bbcfb6f7dc9ae4dd0ec6fc45a2a5953d7002ed90e884883b6f0ad4b
+        checksum/config: ff5ed57ffd6eaabc34c61f909a53c3ead6cf13539461c69ae410cc955d467a21
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:

diff --git a/examples/autodetect-istio/rendered_manifests/configmap-agent.yaml b/examples/autodetect-istio/rendered_manifests/configmap-agent.yaml
@@ -345,7 +345,7 @@ data:
             scrape_interval: 10s
             static_configs:
             - targets:
-              - ${K8S_POD_IP}:8889
+              - localhost:8889
       receiver_creator:
         receivers:
           prometheus_simple:
@@ -485,4 +485,9 @@ data:
           - zipkin
       telemetry:
         metrics:
-          address: 0.0.0.0:8889
+          readers:
+          - pull:
+              exporter:
+                prometheus:
+                  host: localhost
+                  port: 8889
diff --git a/examples/autodetect-istio/rendered_manifests/configmap-cluster-receiver.yaml b/examples/autodetect-istio/rendered_manifests/configmap-cluster-receiver.yaml
@@ -91,7 +91,7 @@ data:
             scrape_interval: 10s
             static_configs:
             - targets:
-              - ${K8S_POD_IP}:8889
+              - localhost:8889
     service:
       extensions:
       - health_check
@@ -119,4 +119,9 @@ data:
           - prometheus/k8s_cluster_receiver
       telemetry:
         metrics:
-          address: 0.0.0.0:8889
+          readers:
+          - pull:
+              exporter:
+                prometheus:
+                  host: localhost
+                  port: 8889
diff --git a/examples/autodetect-istio/rendered_manifests/daemonset.yaml b/examples/autodetect-istio/rendered_manifests/daemonset.yaml
@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: cec7fb80a25b44aac4bbe1a98c3a7dbec489c2cf18f28d68a5f932c0f2879257
+        checksum/config: c22db802040791e7ed72c236060ae18ce39720b23c968d35bd6d8aac1fb07295
         kubectl.kubernetes.io/default-container: otel-collector
         sidecar.istio.io/inject: "false"
     spec:

diff --git a/examples/autodetect-istio/rendered_manifests/deployment-cluster-receiver.yaml b/examples/autodetect-istio/rendered_manifests/deployment-cluster-receiver.yaml
@@ -31,7 +31,7 @@ spec:
         component: otel-k8s-cluster-receiver
         release: default
       annotations:
-        checksum/config: 4b62199b9bbcfb6f7dc9ae4dd0ec6fc45a2a5953d7002ed90e884883b6f0ad4b
+        checksum/config: ff5ed57ffd6eaabc34c61f909a53c3ead6cf13539461c69ae410cc955d467a21
         sidecar.istio.io/inject: "false"
     spec:
       serviceAccountName: default-splunk-otel-collector

diff --git a/examples/collector-agent-only/rendered_manifests/configmap-agent.yaml b/examples/collector-agent-only/rendered_manifests/configmap-agent.yaml
@@ -192,7 +192,7 @@ data:
             scrape_interval: 10s
             static_configs:
             - targets:
-              - ${K8S_POD_IP}:8889
+              - localhost:8889
       receiver_creator:
         receivers:
           smartagent/coredns:
@@ -306,4 +306,9 @@ data:
           - zipkin
       telemetry:
         metrics:
-          address: 0.0.0.0:8889
+          readers:
+          - pull:
+              exporter:
+                prometheus:
+                  host: localhost
+                  port: 8889
diff --git a/examples/collector-agent-only/rendered_manifests/daemonset.yaml b/examples/collector-agent-only/rendered_manifests/daemonset.yaml
@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: f1c0ed384f3dcb0048464394fbcac49f7ade4ffe0a21cada1479371bced3c829
+        checksum/config: 1d6330c88154a12a7ef72f47ff1fe38ad8ab08eb47f5116a2b16c13f735ade30
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

diff --git a/examples/collector-all-modes/rendered_manifests/configmap-agent.yaml b/examples/collector-all-modes/rendered_manifests/configmap-agent.yaml
@@ -176,7 +176,7 @@ data:
             scrape_interval: 10s
             static_configs:
             - targets:
-              - ${K8S_POD_IP}:8889
+              - localhost:8889
       receiver_creator:
         receivers:
           smartagent/coredns:
@@ -290,4 +290,9 @@ data:
           - zipkin
       telemetry:
         metrics:
-          address: 0.0.0.0:8889
+          readers:
+          - pull:
+              exporter:
+                prometheus:
+                  host: localhost
+                  port: 8889
diff --git a/examples/collector-all-modes/rendered_manifests/configmap-cluster-receiver.yaml b/examples/collector-all-modes/rendered_manifests/configmap-cluster-receiver.yaml
@@ -91,7 +91,7 @@ data:
             scrape_interval: 10s
             static_configs:
             - targets:
-              - ${K8S_POD_IP}:8889
+              - localhost:8889
     service:
       extensions:
       - health_check
@@ -119,4 +119,9 @@ data:
           - prometheus/k8s_cluster_receiver
       telemetry:
         metrics:
-          address: 0.0.0.0:8889
+          readers:
+          - pull:
+              exporter:
+                prometheus:
+                  host: localhost
+                  port: 8889
diff --git a/examples/collector-all-modes/rendered_manifests/configmap-gateway.yaml b/examples/collector-all-modes/rendered_manifests/configmap-gateway.yaml
@@ -161,7 +161,7 @@ data:
             scrape_interval: 10s
             static_configs:
             - targets:
-              - ${K8S_POD_IP}:8889
+              - localhost:8889
       signalfx:
         access_token_passthrough: true
         endpoint: 0.0.0.0:9943
@@ -216,4 +216,9 @@ data:
           - zipkin
       telemetry:
         metrics:
-          address: 0.0.0.0:8889
+          readers:
+          - pull:
+              exporter:
+                prometheus:
+                  host: localhost
+                  port: 8889