Update internal metrics prometheus reader to default values

Replicating https://github.com/open-telemetry/opentelemetry-collector/blob/main/service/telemetry/config.go#L92-L94
signalfx · Feb 21, 2025 · dca8e9b · dca8e9b
1 parent 6a505f0
commit dca8e9b
Show file tree

Hide file tree

Showing 143 changed files with 289 additions and 70 deletions.
diff --git a/examples/add-filter-processor/rendered_manifests/configmap-agent.yaml b/examples/add-filter-processor/rendered_manifests/configmap-agent.yaml
@@ -505,3 +505,6 @@ data:
                 prometheus:
                   host: localhost
                   port: 8889
+                  without_scope_info: true
+                  without_type_suffix: true
+                  without_units: true
diff --git a/examples/add-filter-processor/rendered_manifests/configmap-cluster-receiver.yaml b/examples/add-filter-processor/rendered_manifests/configmap-cluster-receiver.yaml
@@ -131,3 +131,6 @@ data:
                 prometheus:
                   host: localhost
                   port: 8889
+                  without_scope_info: true
+                  without_type_suffix: true
+                  without_units: true
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: 3be2a07bb2411698c0f94876311afe9c3c1d9d299ec67cde10009e7987e68226
+        checksum/config: 160108908dd6f92bcd20dcf457377c50b72f0a0e8bc6486f3d30b56e75fce7b2
         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: e2a0cbca0c23f30a147739b3f14c67934ea1eca7b58460b749bc3ad873a020c1
+        checksum/config: da3283eeb9708564847b3e5e075a8eb9f627547e77b40c669289d43cba155a71
     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
@@ -455,3 +455,6 @@ data:
                 prometheus:
                   host: localhost
                   port: 8889
+                  without_scope_info: true
+                  without_type_suffix: true
+                  without_units: true
diff --git a/examples/add-kafkametrics-receiver/rendered_manifests/configmap-cluster-receiver.yaml b/examples/add-kafkametrics-receiver/rendered_manifests/configmap-cluster-receiver.yaml
@@ -131,3 +131,6 @@ data:
                 prometheus:
                   host: localhost
                   port: 8889
+                  without_scope_info: true
+                  without_type_suffix: true
+                  without_units: true
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: 830ac0e98c2e0ec804426dfc769b8de358ec07a076139dd761854c01f15bcf7d
+        checksum/config: b832237dd020920ce877fac81a13b3f3511b8bc9bc5735d1c1337a60b8a34b1e
         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: e2a0cbca0c23f30a147739b3f14c67934ea1eca7b58460b749bc3ad873a020c1
+        checksum/config: da3283eeb9708564847b3e5e075a8eb9f627547e77b40c669289d43cba155a71
     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
@@ -333,3 +333,6 @@ data:
                 prometheus:
                   host: localhost
                   port: 8889
+                  without_scope_info: true
+                  without_type_suffix: true
+                  without_units: true
diff --git a/examples/add-receiver-creator/rendered_manifests/configmap-cluster-receiver.yaml b/examples/add-receiver-creator/rendered_manifests/configmap-cluster-receiver.yaml
@@ -131,3 +131,6 @@ data:
                 prometheus:
                   host: localhost
                   port: 8889
+                  without_scope_info: true
+                  without_type_suffix: true
+                  without_units: true
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: fb1750cabeab3914272086e9379dbd6c1007d2523c770608efa78b713a387c17
+        checksum/config: 42510674788262357449084d43748c56c7c3d239f36c2e09b538873a0f8b14df
         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: e2a0cbca0c23f30a147739b3f14c67934ea1eca7b58460b749bc3ad873a020c1
+        checksum/config: da3283eeb9708564847b3e5e075a8eb9f627547e77b40c669289d43cba155a71
     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
@@ -322,3 +322,6 @@ data:
                 prometheus:
                   host: localhost
                   port: 8889
+                  without_scope_info: true
+                  without_type_suffix: true
+                  without_units: true
diff --git a/examples/add-sampler/rendered_manifests/configmap-cluster-receiver.yaml b/examples/add-sampler/rendered_manifests/configmap-cluster-receiver.yaml
@@ -131,3 +131,6 @@ data:
                 prometheus:
                   host: localhost
                   port: 8889
+                  without_scope_info: true
+                  without_type_suffix: true
+                  without_units: true
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: 244a351f27bd08d69b4842d7b3a4664a39ce300d3471170d9b9c5e79b94b753c
+        checksum/config: eeb3ddae0a37c832bb7c2c55e0ee1f82e75aeb05a7eb93a54437173781fbf417
         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: e2a0cbca0c23f30a147739b3f14c67934ea1eca7b58460b749bc3ad873a020c1
+        checksum/config: da3283eeb9708564847b3e5e075a8eb9f627547e77b40c669289d43cba155a71
     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
@@ -497,3 +497,6 @@ data:
                 prometheus:
                   host: localhost
                   port: 8889
+                  without_scope_info: true
+                  without_type_suffix: true
+                  without_units: true
diff --git a/examples/autodetect-istio/rendered_manifests/configmap-cluster-receiver.yaml b/examples/autodetect-istio/rendered_manifests/configmap-cluster-receiver.yaml
@@ -131,3 +131,6 @@ data:
                 prometheus:
                   host: localhost
                   port: 8889
+                  without_scope_info: true
+                  without_type_suffix: true
+                  without_units: true
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: 1ca403871a46b270c0db977dcf4a71b88deb307dd8a458ce46ce74be56af6ddd
+        checksum/config: f942b0c6f7579a514f7b152a7a004a6ea2d749679d55b945a87af3434fbedec8
         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: e2a0cbca0c23f30a147739b3f14c67934ea1eca7b58460b749bc3ad873a020c1
+        checksum/config: da3283eeb9708564847b3e5e075a8eb9f627547e77b40c669289d43cba155a71
         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
@@ -318,3 +318,6 @@ data:
                 prometheus:
                   host: localhost
                   port: 8889
+                  without_scope_info: true
+                  without_type_suffix: true
+                  without_units: true
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: e3bfbfa9de704e67d35c45e2ddcc65bf2cc0a06aac435fe570ece898bc96bacf
+        checksum/config: 3752c67248b5e11391e1a8de2aa741d2990bfc1445d952131030976e3a87ad24
         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
@@ -302,3 +302,6 @@ data:
                 prometheus:
                   host: localhost
                   port: 8889
+                  without_scope_info: true
+                  without_type_suffix: true
+                  without_units: true
diff --git a/examples/collector-all-modes/rendered_manifests/configmap-cluster-receiver.yaml b/examples/collector-all-modes/rendered_manifests/configmap-cluster-receiver.yaml
@@ -131,3 +131,6 @@ data:
                 prometheus:
                   host: localhost
                   port: 8889
+                  without_scope_info: true
+                  without_type_suffix: true
+                  without_units: true
diff --git a/examples/collector-all-modes/rendered_manifests/configmap-gateway.yaml b/examples/collector-all-modes/rendered_manifests/configmap-gateway.yaml
@@ -229,3 +229,6 @@ data:
                 prometheus:
                   host: localhost
                   port: 8889
+                  without_scope_info: true
+                  without_type_suffix: true
+                  without_units: true
diff --git a/examples/collector-all-modes/rendered_manifests/daemonset.yaml b/examples/collector-all-modes/rendered_manifests/daemonset.yaml
@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: 83a1bf8e0d0aeb315c4e90944995239a2972459405c176c06ad35ca513ed11c8
+        checksum/config: 76bf974100c169cab53c5bbb31c0863e43fadec7405cca8d27962b7ef395b1e4
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

diff --git a/examples/collector-all-modes/rendered_manifests/deployment-cluster-receiver.yaml b/examples/collector-all-modes/rendered_manifests/deployment-cluster-receiver.yaml
@@ -31,7 +31,7 @@ spec:
         component: otel-k8s-cluster-receiver
         release: default
       annotations:
-        checksum/config: e2a0cbca0c23f30a147739b3f14c67934ea1eca7b58460b749bc3ad873a020c1
+        checksum/config: da3283eeb9708564847b3e5e075a8eb9f627547e77b40c669289d43cba155a71
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:

diff --git a/examples/collector-all-modes/rendered_manifests/deployment-gateway.yaml b/examples/collector-all-modes/rendered_manifests/deployment-gateway.yaml
@@ -31,7 +31,7 @@ spec:
         component: otel-collector
         release: default
       annotations:
-        checksum/config: 19cd1514c64ab91b7245b48440679d989451e2ac4313413591e7791e00f55aa7
+        checksum/config: 9609c86818da346f149502af201c15f63c115be92d95a6978fa0e9c29daae1bc
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:

diff --git a/examples/collector-cluster-receiver-only/rendered_manifests/configmap-cluster-receiver.yaml b/examples/collector-cluster-receiver-only/rendered_manifests/configmap-cluster-receiver.yaml
@@ -185,3 +185,6 @@ data:
                 prometheus:
                   host: localhost
                   port: 8889
+                  without_scope_info: true
+                  without_type_suffix: true
+                  without_units: true
diff --git a/examples/collector-cluster-receiver-only/rendered_manifests/deployment-cluster-receiver.yaml b/examples/collector-cluster-receiver-only/rendered_manifests/deployment-cluster-receiver.yaml
@@ -31,7 +31,7 @@ spec:
         component: otel-k8s-cluster-receiver
         release: default
       annotations:
-        checksum/config: 4dcb5615d142bc66b2d5be9f00981f58618ef36d00d255ba735665f1edfbf922
+        checksum/config: 40dc38d6f82bbdd83bbc0e7cf9d62e992f15b7a2d403fd5b64d5ea8aec00e023
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:

diff --git a/examples/collector-gateway-only/rendered_manifests/configmap-gateway.yaml b/examples/collector-gateway-only/rendered_manifests/configmap-gateway.yaml
@@ -229,3 +229,6 @@ data:
                 prometheus:
                   host: localhost
                   port: 8889
+                  without_scope_info: true
+                  without_type_suffix: true
+                  without_units: true
diff --git a/examples/collector-gateway-only/rendered_manifests/deployment-gateway.yaml b/examples/collector-gateway-only/rendered_manifests/deployment-gateway.yaml
@@ -31,7 +31,7 @@ spec:
         component: otel-collector
         release: default
       annotations:
-        checksum/config: 19cd1514c64ab91b7245b48440679d989451e2ac4313413591e7791e00f55aa7
+        checksum/config: 9609c86818da346f149502af201c15f63c115be92d95a6978fa0e9c29daae1bc
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:

diff --git a/examples/controlplane-histogram-metrics/rendered_manifests/configmap-agent.yaml b/examples/controlplane-histogram-metrics/rendered_manifests/configmap-agent.yaml
@@ -358,3 +358,6 @@ data:
                 prometheus:
                   host: localhost
                   port: 8889
+                  without_scope_info: true
+                  without_type_suffix: true
+                  without_units: true
diff --git a/examples/controlplane-histogram-metrics/rendered_manifests/configmap-cluster-receiver.yaml b/examples/controlplane-histogram-metrics/rendered_manifests/configmap-cluster-receiver.yaml
@@ -131,3 +131,6 @@ data:
                 prometheus:
                   host: localhost
                   port: 8889
+                  without_scope_info: true
+                  without_type_suffix: true
+                  without_units: true
diff --git a/examples/controlplane-histogram-metrics/rendered_manifests/daemonset.yaml b/examples/controlplane-histogram-metrics/rendered_manifests/daemonset.yaml
@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: c5aef578c23e91a4625944656d312b01cf355e9ba40886441e2e457f39cf5e96
+        checksum/config: 898522bb08d9654c1f6651b899ab755e2571b7a7db9a8b98f1ee8088c378d1c1
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

diff --git a/examples/controlplane-histogram-metrics/rendered_manifests/deployment-cluster-receiver.yaml b/examples/controlplane-histogram-metrics/rendered_manifests/deployment-cluster-receiver.yaml
@@ -31,7 +31,7 @@ spec:
         component: otel-k8s-cluster-receiver
         release: default
       annotations:
-        checksum/config: e2a0cbca0c23f30a147739b3f14c67934ea1eca7b58460b749bc3ad873a020c1
+        checksum/config: da3283eeb9708564847b3e5e075a8eb9f627547e77b40c669289d43cba155a71
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:

diff --git a/examples/crio-logging/rendered_manifests/configmap-agent.yaml b/examples/crio-logging/rendered_manifests/configmap-agent.yaml
@@ -318,3 +318,6 @@ data:
                 prometheus:
                   host: localhost
                   port: 8889
+                  without_scope_info: true
+                  without_type_suffix: true
+                  without_units: true
diff --git a/examples/crio-logging/rendered_manifests/configmap-cluster-receiver.yaml b/examples/crio-logging/rendered_manifests/configmap-cluster-receiver.yaml
@@ -131,3 +131,6 @@ data:
                 prometheus:
                   host: localhost
                   port: 8889
+                  without_scope_info: true
+                  without_type_suffix: true
+                  without_units: true
diff --git a/examples/crio-logging/rendered_manifests/daemonset.yaml b/examples/crio-logging/rendered_manifests/daemonset.yaml
@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: e3bfbfa9de704e67d35c45e2ddcc65bf2cc0a06aac435fe570ece898bc96bacf
+        checksum/config: 3752c67248b5e11391e1a8de2aa741d2990bfc1445d952131030976e3a87ad24
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

diff --git a/examples/crio-logging/rendered_manifests/deployment-cluster-receiver.yaml b/examples/crio-logging/rendered_manifests/deployment-cluster-receiver.yaml
@@ -31,7 +31,7 @@ spec:
         component: otel-k8s-cluster-receiver
         release: default
       annotations:
-        checksum/config: e2a0cbca0c23f30a147739b3f14c67934ea1eca7b58460b749bc3ad873a020c1
+        checksum/config: da3283eeb9708564847b3e5e075a8eb9f627547e77b40c669289d43cba155a71
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:

diff --git a/examples/default/rendered_manifests/configmap-agent.yaml b/examples/default/rendered_manifests/configmap-agent.yaml
@@ -318,3 +318,6 @@ data:
                 prometheus:
                   host: localhost
                   port: 8889
+                  without_scope_info: true
+                  without_type_suffix: true
+                  without_units: true
diff --git a/examples/default/rendered_manifests/configmap-cluster-receiver.yaml b/examples/default/rendered_manifests/configmap-cluster-receiver.yaml
@@ -131,3 +131,6 @@ data:
                 prometheus:
                   host: localhost
                   port: 8889
+                  without_scope_info: true
+                  without_type_suffix: true
+                  without_units: true
diff --git a/examples/default/rendered_manifests/daemonset.yaml b/examples/default/rendered_manifests/daemonset.yaml
@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: e3bfbfa9de704e67d35c45e2ddcc65bf2cc0a06aac435fe570ece898bc96bacf
+        checksum/config: 3752c67248b5e11391e1a8de2aa741d2990bfc1445d952131030976e3a87ad24
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

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

diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/configmap-agent.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/configmap-agent.yaml
@@ -538,3 +538,6 @@ data:
                 prometheus:
                   host: localhost
                   port: 8889
+                  without_scope_info: true
+                  without_type_suffix: true
+                  without_units: true
diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/configmap-cluster-receiver.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/configmap-cluster-receiver.yaml
@@ -177,3 +177,6 @@ data:
                 prometheus:
                   host: localhost
                   port: 8889
+                  without_scope_info: true
+                  without_type_suffix: true
+                  without_units: true
diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml
@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: db29ff5a8c401883e5fc79fa9407ce9d1ee9dc52d5942ebdef411cc111f1a09a
+        checksum/config: ceb5d680c4fadc647358bc5995cded59a38cf9ec071f968d54e786d90bf76460
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

diff --git a/...ples/disable-persistence-queue-traces/rendered_manifests/deployment-cluster-receiver.yaml b/...ples/disable-persistence-queue-traces/rendered_manifests/deployment-cluster-receiver.yaml
@@ -31,7 +31,7 @@ spec:
         component: otel-k8s-cluster-receiver
         release: default
       annotations:
-        checksum/config: 62cef7e39915ab7e2e0cbc16a5a858565022f980bdd9f1000200da5b4b7e7b2b
+        checksum/config: d529fea5e625426b1904abf754ba7423e298551ad19546ddc5e154fc4e4fa1e6
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:

diff --git a/examples/discovery-mode/rendered_manifests/configmap-agent.yaml b/examples/discovery-mode/rendered_manifests/configmap-agent.yaml
@@ -318,6 +318,9 @@ data:
                 prometheus:
                   host: localhost
                   port: 8889
+                  without_scope_info: true
+                  without_type_suffix: true
+                  without_units: true
   discovery.properties: |
     splunk.discovery:
       extensions: