diff --git a/examples/add-filter-processor/rendered_manifests/clusterRole.yaml b/examples/add-filter-processor/rendered_manifests/clusterRole.yaml index 787a48dfc..16f594c74 100644 --- a/examples/add-filter-processor/rendered_manifests/clusterRole.yaml +++ b/examples/add-filter-processor/rendered_manifests/clusterRole.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/add-filter-processor/rendered_manifests/clusterRoleBinding.yaml b/examples/add-filter-processor/rendered_manifests/clusterRoleBinding.yaml index 75e01844e..3f26df325 100644 --- a/examples/add-filter-processor/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/add-filter-processor/rendered_manifests/clusterRoleBinding.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/add-filter-processor/rendered_manifests/configmap-agent.yaml b/examples/add-filter-processor/rendered_manifests/configmap-agent.yaml index 74d900559..435022b63 100644 --- a/examples/add-filter-processor/rendered_manifests/configmap-agent.yaml +++ b/examples/add-filter-processor/rendered_manifests/configmap-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -352,11 +352,7 @@ data: - job_name: otel-agent metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -505,3 +501,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 index d2e012ce7..dc5af4330 100644 --- a/examples/add-filter-processor/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/add-filter-processor/rendered_manifests/configmap-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -82,11 +82,7 @@ data: - job_name: otel-k8s-cluster-receiver metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -131,3 +127,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 index 35336f6ef..a24b54fa3 100644 --- a/examples/add-filter-processor/rendered_manifests/daemonset.yaml +++ b/examples/add-filter-processor/rendered_manifests/daemonset.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: e881b03d9e52b770bdae0905a06a9bf05d0b90f0baf735dd66309b9623849eae + checksum/config: 54db1407564ca4bbf5d1aa1d61bb65491bd213c9d8381ebedf7df56f96737178 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -55,7 +55,7 @@ spec: operator: Exists initContainers: - name: migrate-checkpoint - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent command: ["/migratecheckpoint"] securityContext: @@ -125,7 +125,7 @@ spec: containerPort: 9411 hostPort: 9411 protocol: TCP - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent securityContext: runAsUser: 0 diff --git a/examples/add-filter-processor/rendered_manifests/deployment-cluster-receiver.yaml b/examples/add-filter-processor/rendered_manifests/deployment-cluster-receiver.yaml index 1620633de..927a205f6 100644 --- a/examples/add-filter-processor/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/add-filter-processor/rendered_manifests/deployment-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver chart: splunk-otel-collector-0.118.0 @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: f25f2d1d33bf121655e8c42b63e4f17502bae29f2cc8aaa585764447976fdde8 + checksum/config: c42cb1583d693dc14d6ad2977c155843810e3a7c1e7fb3aae3daea5d8914879d spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -41,7 +41,7 @@ spec: command: - /otelcol - --config=/conf/relay.yaml - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/add-filter-processor/rendered_manifests/secret-splunk.yaml b/examples/add-filter-processor/rendered_manifests/secret-splunk.yaml index 1f07f6a80..9a7030b40 100644 --- a/examples/add-filter-processor/rendered_manifests/secret-splunk.yaml +++ b/examples/add-filter-processor/rendered_manifests/secret-splunk.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/add-filter-processor/rendered_manifests/service-agent.yaml b/examples/add-filter-processor/rendered_manifests/service-agent.yaml index 029dcf416..4e3a02368 100644 --- a/examples/add-filter-processor/rendered_manifests/service-agent.yaml +++ b/examples/add-filter-processor/rendered_manifests/service-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 diff --git a/examples/add-filter-processor/rendered_manifests/serviceAccount.yaml b/examples/add-filter-processor/rendered_manifests/serviceAccount.yaml index 621c610a6..5bef21e83 100644 --- a/examples/add-filter-processor/rendered_manifests/serviceAccount.yaml +++ b/examples/add-filter-processor/rendered_manifests/serviceAccount.yaml @@ -11,7 +11,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/add-kafkametrics-receiver/rendered_manifests/clusterRole.yaml b/examples/add-kafkametrics-receiver/rendered_manifests/clusterRole.yaml index 787a48dfc..16f594c74 100644 --- a/examples/add-kafkametrics-receiver/rendered_manifests/clusterRole.yaml +++ b/examples/add-kafkametrics-receiver/rendered_manifests/clusterRole.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/add-kafkametrics-receiver/rendered_manifests/clusterRoleBinding.yaml b/examples/add-kafkametrics-receiver/rendered_manifests/clusterRoleBinding.yaml index 75e01844e..3f26df325 100644 --- a/examples/add-kafkametrics-receiver/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/add-kafkametrics-receiver/rendered_manifests/clusterRoleBinding.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/add-kafkametrics-receiver/rendered_manifests/configmap-agent.yaml b/examples/add-kafkametrics-receiver/rendered_manifests/configmap-agent.yaml index 468c54128..e6a9d9387 100644 --- a/examples/add-kafkametrics-receiver/rendered_manifests/configmap-agent.yaml +++ b/examples/add-kafkametrics-receiver/rendered_manifests/configmap-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -308,11 +308,7 @@ data: - job_name: otel-agent metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -455,3 +451,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 index d2e012ce7..dc5af4330 100644 --- a/examples/add-kafkametrics-receiver/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/add-kafkametrics-receiver/rendered_manifests/configmap-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -82,11 +82,7 @@ data: - job_name: otel-k8s-cluster-receiver metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -131,3 +127,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 index 3a71d6dc0..1343a88f1 100644 --- a/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml +++ b/examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 9d7bc9b2dc86c6f1fbfda895a9cdecc2142aa77419fc568cfe3ce27947143bdb + checksum/config: a4f935b0f96b241fc076e2ca1067a308af8094d320d2cfb0fd9ffb2935f8cbec kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -55,7 +55,7 @@ spec: operator: Exists initContainers: - name: migrate-checkpoint - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent command: ["/migratecheckpoint"] securityContext: @@ -125,7 +125,7 @@ spec: containerPort: 9411 hostPort: 9411 protocol: TCP - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent securityContext: runAsUser: 0 diff --git a/examples/add-kafkametrics-receiver/rendered_manifests/deployment-cluster-receiver.yaml b/examples/add-kafkametrics-receiver/rendered_manifests/deployment-cluster-receiver.yaml index 1620633de..927a205f6 100644 --- a/examples/add-kafkametrics-receiver/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/add-kafkametrics-receiver/rendered_manifests/deployment-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver chart: splunk-otel-collector-0.118.0 @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: f25f2d1d33bf121655e8c42b63e4f17502bae29f2cc8aaa585764447976fdde8 + checksum/config: c42cb1583d693dc14d6ad2977c155843810e3a7c1e7fb3aae3daea5d8914879d spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -41,7 +41,7 @@ spec: command: - /otelcol - --config=/conf/relay.yaml - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/add-kafkametrics-receiver/rendered_manifests/secret-splunk.yaml b/examples/add-kafkametrics-receiver/rendered_manifests/secret-splunk.yaml index 1f07f6a80..9a7030b40 100644 --- a/examples/add-kafkametrics-receiver/rendered_manifests/secret-splunk.yaml +++ b/examples/add-kafkametrics-receiver/rendered_manifests/secret-splunk.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/add-kafkametrics-receiver/rendered_manifests/service-agent.yaml b/examples/add-kafkametrics-receiver/rendered_manifests/service-agent.yaml index 029dcf416..4e3a02368 100644 --- a/examples/add-kafkametrics-receiver/rendered_manifests/service-agent.yaml +++ b/examples/add-kafkametrics-receiver/rendered_manifests/service-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 diff --git a/examples/add-kafkametrics-receiver/rendered_manifests/serviceAccount.yaml b/examples/add-kafkametrics-receiver/rendered_manifests/serviceAccount.yaml index 621c610a6..5bef21e83 100644 --- a/examples/add-kafkametrics-receiver/rendered_manifests/serviceAccount.yaml +++ b/examples/add-kafkametrics-receiver/rendered_manifests/serviceAccount.yaml @@ -11,7 +11,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/add-receiver-creator/rendered_manifests/clusterRole.yaml b/examples/add-receiver-creator/rendered_manifests/clusterRole.yaml index 787a48dfc..16f594c74 100644 --- a/examples/add-receiver-creator/rendered_manifests/clusterRole.yaml +++ b/examples/add-receiver-creator/rendered_manifests/clusterRole.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/add-receiver-creator/rendered_manifests/clusterRoleBinding.yaml b/examples/add-receiver-creator/rendered_manifests/clusterRoleBinding.yaml index 75e01844e..3f26df325 100644 --- a/examples/add-receiver-creator/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/add-receiver-creator/rendered_manifests/clusterRoleBinding.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/add-receiver-creator/rendered_manifests/configmap-agent.yaml b/examples/add-receiver-creator/rendered_manifests/configmap-agent.yaml index d1ce9f3ed..5d4979d47 100644 --- a/examples/add-receiver-creator/rendered_manifests/configmap-agent.yaml +++ b/examples/add-receiver-creator/rendered_manifests/configmap-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -183,11 +183,7 @@ data: - job_name: otel-agent metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -333,3 +329,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 index d2e012ce7..dc5af4330 100644 --- a/examples/add-receiver-creator/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/add-receiver-creator/rendered_manifests/configmap-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -82,11 +82,7 @@ data: - job_name: otel-k8s-cluster-receiver metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -131,3 +127,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 index a2eda9a83..060f58012 100644 --- a/examples/add-receiver-creator/rendered_manifests/daemonset.yaml +++ b/examples/add-receiver-creator/rendered_manifests/daemonset.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 4906709b9d935ca9acf53fb68b3d73dcf1e30f8e0f8c593d3f3f57de8e371454 + checksum/config: a7363d07f6199a325a0d1c7cb0d177b799e5eee2c5a88b6b14f159e8c281e344 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -86,7 +86,7 @@ spec: containerPort: 9411 hostPort: 9411 protocol: TCP - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/add-receiver-creator/rendered_manifests/deployment-cluster-receiver.yaml b/examples/add-receiver-creator/rendered_manifests/deployment-cluster-receiver.yaml index 1620633de..927a205f6 100644 --- a/examples/add-receiver-creator/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/add-receiver-creator/rendered_manifests/deployment-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver chart: splunk-otel-collector-0.118.0 @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: f25f2d1d33bf121655e8c42b63e4f17502bae29f2cc8aaa585764447976fdde8 + checksum/config: c42cb1583d693dc14d6ad2977c155843810e3a7c1e7fb3aae3daea5d8914879d spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -41,7 +41,7 @@ spec: command: - /otelcol - --config=/conf/relay.yaml - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/add-receiver-creator/rendered_manifests/secret-splunk.yaml b/examples/add-receiver-creator/rendered_manifests/secret-splunk.yaml index 1f07f6a80..9a7030b40 100644 --- a/examples/add-receiver-creator/rendered_manifests/secret-splunk.yaml +++ b/examples/add-receiver-creator/rendered_manifests/secret-splunk.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/add-receiver-creator/rendered_manifests/service-agent.yaml b/examples/add-receiver-creator/rendered_manifests/service-agent.yaml index f9d94ce64..6f56bac80 100644 --- a/examples/add-receiver-creator/rendered_manifests/service-agent.yaml +++ b/examples/add-receiver-creator/rendered_manifests/service-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 diff --git a/examples/add-receiver-creator/rendered_manifests/serviceAccount.yaml b/examples/add-receiver-creator/rendered_manifests/serviceAccount.yaml index 621c610a6..5bef21e83 100644 --- a/examples/add-receiver-creator/rendered_manifests/serviceAccount.yaml +++ b/examples/add-receiver-creator/rendered_manifests/serviceAccount.yaml @@ -11,7 +11,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/add-sampler/rendered_manifests/clusterRole.yaml b/examples/add-sampler/rendered_manifests/clusterRole.yaml index 787a48dfc..16f594c74 100644 --- a/examples/add-sampler/rendered_manifests/clusterRole.yaml +++ b/examples/add-sampler/rendered_manifests/clusterRole.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/add-sampler/rendered_manifests/clusterRoleBinding.yaml b/examples/add-sampler/rendered_manifests/clusterRoleBinding.yaml index 75e01844e..3f26df325 100644 --- a/examples/add-sampler/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/add-sampler/rendered_manifests/clusterRoleBinding.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/add-sampler/rendered_manifests/configmap-agent.yaml b/examples/add-sampler/rendered_manifests/configmap-agent.yaml index e02ad4c1f..f1c115004 100644 --- a/examples/add-sampler/rendered_manifests/configmap-agent.yaml +++ b/examples/add-sampler/rendered_manifests/configmap-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -186,11 +186,7 @@ data: - job_name: otel-agent metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -322,3 +318,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 index d2e012ce7..dc5af4330 100644 --- a/examples/add-sampler/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/add-sampler/rendered_manifests/configmap-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -82,11 +82,7 @@ data: - job_name: otel-k8s-cluster-receiver metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -131,3 +127,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 index 830f7427c..74d01a85d 100644 --- a/examples/add-sampler/rendered_manifests/daemonset.yaml +++ b/examples/add-sampler/rendered_manifests/daemonset.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: a2aff2e7ab61b5023a94d3890060d9179dd4b54075b87d287a61a45dce05ec54 + checksum/config: b0dbfae1721e0e58bac4198e1f993cc82a267e7ff8767ff1660a0f936031bb90 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -86,7 +86,7 @@ spec: containerPort: 9411 hostPort: 9411 protocol: TCP - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/add-sampler/rendered_manifests/deployment-cluster-receiver.yaml b/examples/add-sampler/rendered_manifests/deployment-cluster-receiver.yaml index 1620633de..927a205f6 100644 --- a/examples/add-sampler/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/add-sampler/rendered_manifests/deployment-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver chart: splunk-otel-collector-0.118.0 @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: f25f2d1d33bf121655e8c42b63e4f17502bae29f2cc8aaa585764447976fdde8 + checksum/config: c42cb1583d693dc14d6ad2977c155843810e3a7c1e7fb3aae3daea5d8914879d spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -41,7 +41,7 @@ spec: command: - /otelcol - --config=/conf/relay.yaml - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/add-sampler/rendered_manifests/secret-splunk.yaml b/examples/add-sampler/rendered_manifests/secret-splunk.yaml index 1f07f6a80..9a7030b40 100644 --- a/examples/add-sampler/rendered_manifests/secret-splunk.yaml +++ b/examples/add-sampler/rendered_manifests/secret-splunk.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/add-sampler/rendered_manifests/service-agent.yaml b/examples/add-sampler/rendered_manifests/service-agent.yaml index f9d94ce64..6f56bac80 100644 --- a/examples/add-sampler/rendered_manifests/service-agent.yaml +++ b/examples/add-sampler/rendered_manifests/service-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 diff --git a/examples/add-sampler/rendered_manifests/serviceAccount.yaml b/examples/add-sampler/rendered_manifests/serviceAccount.yaml index 621c610a6..5bef21e83 100644 --- a/examples/add-sampler/rendered_manifests/serviceAccount.yaml +++ b/examples/add-sampler/rendered_manifests/serviceAccount.yaml @@ -11,7 +11,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/autodetect-istio/rendered_manifests/clusterRole.yaml b/examples/autodetect-istio/rendered_manifests/clusterRole.yaml index 787a48dfc..16f594c74 100644 --- a/examples/autodetect-istio/rendered_manifests/clusterRole.yaml +++ b/examples/autodetect-istio/rendered_manifests/clusterRole.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/autodetect-istio/rendered_manifests/clusterRoleBinding.yaml b/examples/autodetect-istio/rendered_manifests/clusterRoleBinding.yaml index 75e01844e..3f26df325 100644 --- a/examples/autodetect-istio/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/autodetect-istio/rendered_manifests/clusterRoleBinding.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/autodetect-istio/rendered_manifests/configmap-agent.yaml b/examples/autodetect-istio/rendered_manifests/configmap-agent.yaml index aa7833906..b1a99e4c1 100644 --- a/examples/autodetect-istio/rendered_manifests/configmap-agent.yaml +++ b/examples/autodetect-istio/rendered_manifests/configmap-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -336,11 +336,7 @@ data: - job_name: otel-agent metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -497,3 +493,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 index d2e012ce7..dc5af4330 100644 --- a/examples/autodetect-istio/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/autodetect-istio/rendered_manifests/configmap-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -82,11 +82,7 @@ data: - job_name: otel-k8s-cluster-receiver metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -131,3 +127,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 index 50a892d04..9330f0783 100644 --- a/examples/autodetect-istio/rendered_manifests/daemonset.yaml +++ b/examples/autodetect-istio/rendered_manifests/daemonset.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 78f50f8dc786d855d30fa3c86deb33d1d3d045f9457a983bd6843566a55f0d39 + checksum/config: 337519922f986cb91fc21d6331c2ad89ce3b539f1b04bf929739d3c3f894cc74 kubectl.kubernetes.io/default-container: otel-collector sidecar.istio.io/inject: "false" spec: @@ -56,7 +56,7 @@ spec: operator: Exists initContainers: - name: migrate-checkpoint - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent command: ["/migratecheckpoint"] securityContext: @@ -126,7 +126,7 @@ spec: containerPort: 9411 hostPort: 9411 protocol: TCP - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent securityContext: runAsUser: 0 diff --git a/examples/autodetect-istio/rendered_manifests/deployment-cluster-receiver.yaml b/examples/autodetect-istio/rendered_manifests/deployment-cluster-receiver.yaml index 972440451..6b90d6e5b 100644 --- a/examples/autodetect-istio/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/autodetect-istio/rendered_manifests/deployment-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver chart: splunk-otel-collector-0.118.0 @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: f25f2d1d33bf121655e8c42b63e4f17502bae29f2cc8aaa585764447976fdde8 + checksum/config: c42cb1583d693dc14d6ad2977c155843810e3a7c1e7fb3aae3daea5d8914879d sidecar.istio.io/inject: "false" spec: serviceAccountName: default-splunk-otel-collector @@ -42,7 +42,7 @@ spec: command: - /otelcol - --config=/conf/relay.yaml - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/autodetect-istio/rendered_manifests/secret-splunk.yaml b/examples/autodetect-istio/rendered_manifests/secret-splunk.yaml index 1f07f6a80..9a7030b40 100644 --- a/examples/autodetect-istio/rendered_manifests/secret-splunk.yaml +++ b/examples/autodetect-istio/rendered_manifests/secret-splunk.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/autodetect-istio/rendered_manifests/service-agent.yaml b/examples/autodetect-istio/rendered_manifests/service-agent.yaml index 029dcf416..4e3a02368 100644 --- a/examples/autodetect-istio/rendered_manifests/service-agent.yaml +++ b/examples/autodetect-istio/rendered_manifests/service-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 diff --git a/examples/autodetect-istio/rendered_manifests/serviceAccount.yaml b/examples/autodetect-istio/rendered_manifests/serviceAccount.yaml index 621c610a6..5bef21e83 100644 --- a/examples/autodetect-istio/rendered_manifests/serviceAccount.yaml +++ b/examples/autodetect-istio/rendered_manifests/serviceAccount.yaml @@ -11,7 +11,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/collector-agent-only/rendered_manifests/clusterRole.yaml b/examples/collector-agent-only/rendered_manifests/clusterRole.yaml index 787a48dfc..16f594c74 100644 --- a/examples/collector-agent-only/rendered_manifests/clusterRole.yaml +++ b/examples/collector-agent-only/rendered_manifests/clusterRole.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/collector-agent-only/rendered_manifests/clusterRoleBinding.yaml b/examples/collector-agent-only/rendered_manifests/clusterRoleBinding.yaml index 75e01844e..3f26df325 100644 --- a/examples/collector-agent-only/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/collector-agent-only/rendered_manifests/clusterRoleBinding.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/collector-agent-only/rendered_manifests/configmap-agent.yaml b/examples/collector-agent-only/rendered_manifests/configmap-agent.yaml index 0940116c3..28f93ba71 100644 --- a/examples/collector-agent-only/rendered_manifests/configmap-agent.yaml +++ b/examples/collector-agent-only/rendered_manifests/configmap-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -183,11 +183,7 @@ data: - job_name: otel-agent metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -318,3 +314,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 index d1eac7536..ed3a52716 100644 --- a/examples/collector-agent-only/rendered_manifests/daemonset.yaml +++ b/examples/collector-agent-only/rendered_manifests/daemonset.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 5eb71401eb3a1d4c94103254afa7361a1bbaedd05ef9374123e822239e593b35 + checksum/config: 8bbe8f7b9532522201698c0426760b708a1ad608560eec39b501c4b48f6eab18 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -86,7 +86,7 @@ spec: containerPort: 9411 hostPort: 9411 protocol: TCP - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/collector-agent-only/rendered_manifests/secret-splunk.yaml b/examples/collector-agent-only/rendered_manifests/secret-splunk.yaml index 1f07f6a80..9a7030b40 100644 --- a/examples/collector-agent-only/rendered_manifests/secret-splunk.yaml +++ b/examples/collector-agent-only/rendered_manifests/secret-splunk.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/collector-agent-only/rendered_manifests/service-agent.yaml b/examples/collector-agent-only/rendered_manifests/service-agent.yaml index f9d94ce64..6f56bac80 100644 --- a/examples/collector-agent-only/rendered_manifests/service-agent.yaml +++ b/examples/collector-agent-only/rendered_manifests/service-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 diff --git a/examples/collector-agent-only/rendered_manifests/serviceAccount.yaml b/examples/collector-agent-only/rendered_manifests/serviceAccount.yaml index 621c610a6..5bef21e83 100644 --- a/examples/collector-agent-only/rendered_manifests/serviceAccount.yaml +++ b/examples/collector-agent-only/rendered_manifests/serviceAccount.yaml @@ -11,7 +11,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/collector-all-modes/rendered_manifests/clusterRole.yaml b/examples/collector-all-modes/rendered_manifests/clusterRole.yaml index 787a48dfc..16f594c74 100644 --- a/examples/collector-all-modes/rendered_manifests/clusterRole.yaml +++ b/examples/collector-all-modes/rendered_manifests/clusterRole.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/collector-all-modes/rendered_manifests/clusterRoleBinding.yaml b/examples/collector-all-modes/rendered_manifests/clusterRoleBinding.yaml index 75e01844e..3f26df325 100644 --- a/examples/collector-all-modes/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/collector-all-modes/rendered_manifests/clusterRoleBinding.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/collector-all-modes/rendered_manifests/configmap-agent.yaml b/examples/collector-all-modes/rendered_manifests/configmap-agent.yaml index 8d529cf3a..effb74076 100644 --- a/examples/collector-all-modes/rendered_manifests/configmap-agent.yaml +++ b/examples/collector-all-modes/rendered_manifests/configmap-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -167,11 +167,7 @@ data: - job_name: otel-agent metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -302,3 +298,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 index d2e012ce7..dc5af4330 100644 --- a/examples/collector-all-modes/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/collector-all-modes/rendered_manifests/configmap-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -82,11 +82,7 @@ data: - job_name: otel-k8s-cluster-receiver metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -131,3 +127,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 index f38d55a3f..412da38ea 100644 --- a/examples/collector-all-modes/rendered_manifests/configmap-gateway.yaml +++ b/examples/collector-all-modes/rendered_manifests/configmap-gateway.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -152,11 +152,7 @@ data: - job_name: otel-collector metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -229,3 +225,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 index 87ceb2efd..02a1a9fb2 100644 --- a/examples/collector-all-modes/rendered_manifests/daemonset.yaml +++ b/examples/collector-all-modes/rendered_manifests/daemonset.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: c3c3646f943ab0e09a502968b0230e74cd7e1f251f53861a4bf5432241107771 + checksum/config: a62a9e0d95fed550005c63bf8d3b64615d5d96bc741252e926a56973d37c42d6 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -86,7 +86,7 @@ spec: containerPort: 9411 hostPort: 9411 protocol: TCP - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/collector-all-modes/rendered_manifests/deployment-cluster-receiver.yaml b/examples/collector-all-modes/rendered_manifests/deployment-cluster-receiver.yaml index 1620633de..927a205f6 100644 --- a/examples/collector-all-modes/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/collector-all-modes/rendered_manifests/deployment-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver chart: splunk-otel-collector-0.118.0 @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: f25f2d1d33bf121655e8c42b63e4f17502bae29f2cc8aaa585764447976fdde8 + checksum/config: c42cb1583d693dc14d6ad2977c155843810e3a7c1e7fb3aae3daea5d8914879d spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -41,7 +41,7 @@ spec: command: - /otelcol - --config=/conf/relay.yaml - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/collector-all-modes/rendered_manifests/deployment-gateway.yaml b/examples/collector-all-modes/rendered_manifests/deployment-gateway.yaml index 9bd40448e..c374abc1d 100644 --- a/examples/collector-all-modes/rendered_manifests/deployment-gateway.yaml +++ b/examples/collector-all-modes/rendered_manifests/deployment-gateway.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector chart: splunk-otel-collector-0.118.0 @@ -31,7 +31,7 @@ spec: component: otel-collector release: default annotations: - checksum/config: 2e2ed1bab47a74d37928c5441caae457dd8ead382e4265821197c4ee81c082cc + checksum/config: 955506cc82b2523739f96aa63de8d1ad9aace977dd3acbabe56b572eb81a8083 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -41,7 +41,7 @@ spec: command: - /otelcol - --config=/conf/relay.yaml - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/collector-all-modes/rendered_manifests/secret-splunk.yaml b/examples/collector-all-modes/rendered_manifests/secret-splunk.yaml index 1f07f6a80..9a7030b40 100644 --- a/examples/collector-all-modes/rendered_manifests/secret-splunk.yaml +++ b/examples/collector-all-modes/rendered_manifests/secret-splunk.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/collector-all-modes/rendered_manifests/service-agent.yaml b/examples/collector-all-modes/rendered_manifests/service-agent.yaml index f9d94ce64..6f56bac80 100644 --- a/examples/collector-all-modes/rendered_manifests/service-agent.yaml +++ b/examples/collector-all-modes/rendered_manifests/service-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 diff --git a/examples/collector-all-modes/rendered_manifests/service.yaml b/examples/collector-all-modes/rendered_manifests/service.yaml index 1ab962ecc..ed82afd5a 100644 --- a/examples/collector-all-modes/rendered_manifests/service.yaml +++ b/examples/collector-all-modes/rendered_manifests/service.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector chart: splunk-otel-collector-0.118.0 diff --git a/examples/collector-all-modes/rendered_manifests/serviceAccount.yaml b/examples/collector-all-modes/rendered_manifests/serviceAccount.yaml index 621c610a6..5bef21e83 100644 --- a/examples/collector-all-modes/rendered_manifests/serviceAccount.yaml +++ b/examples/collector-all-modes/rendered_manifests/serviceAccount.yaml @@ -11,7 +11,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/collector-cluster-receiver-only/rendered_manifests/clusterRole.yaml b/examples/collector-cluster-receiver-only/rendered_manifests/clusterRole.yaml index 787a48dfc..16f594c74 100644 --- a/examples/collector-cluster-receiver-only/rendered_manifests/clusterRole.yaml +++ b/examples/collector-cluster-receiver-only/rendered_manifests/clusterRole.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/collector-cluster-receiver-only/rendered_manifests/clusterRoleBinding.yaml b/examples/collector-cluster-receiver-only/rendered_manifests/clusterRoleBinding.yaml index 75e01844e..3f26df325 100644 --- a/examples/collector-cluster-receiver-only/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/collector-cluster-receiver-only/rendered_manifests/clusterRoleBinding.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default 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 index 18ae0674c..53fa6535a 100644 --- a/examples/collector-cluster-receiver-only/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/collector-cluster-receiver-only/rendered_manifests/configmap-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -124,11 +124,7 @@ data: - job_name: otel-k8s-cluster-receiver metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -185,3 +181,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 index 38dd8df57..a792c9ebf 100644 --- a/examples/collector-cluster-receiver-only/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/collector-cluster-receiver-only/rendered_manifests/deployment-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver chart: splunk-otel-collector-0.118.0 @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 65b9dd0b49618c3448ff225468b06eb130558231a5d1a87c62b080875bf80da4 + checksum/config: a9e1979e431670b7ac4e39c5cdba1d967d1cbdb5fa5e2058c0d689731f962199 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -41,7 +41,7 @@ spec: command: - /otelcol - --config=/conf/relay.yaml - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/collector-cluster-receiver-only/rendered_manifests/secret-splunk.yaml b/examples/collector-cluster-receiver-only/rendered_manifests/secret-splunk.yaml index 1f07f6a80..9a7030b40 100644 --- a/examples/collector-cluster-receiver-only/rendered_manifests/secret-splunk.yaml +++ b/examples/collector-cluster-receiver-only/rendered_manifests/secret-splunk.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/collector-cluster-receiver-only/rendered_manifests/serviceAccount.yaml b/examples/collector-cluster-receiver-only/rendered_manifests/serviceAccount.yaml index 621c610a6..5bef21e83 100644 --- a/examples/collector-cluster-receiver-only/rendered_manifests/serviceAccount.yaml +++ b/examples/collector-cluster-receiver-only/rendered_manifests/serviceAccount.yaml @@ -11,7 +11,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/collector-gateway-only/rendered_manifests/clusterRole.yaml b/examples/collector-gateway-only/rendered_manifests/clusterRole.yaml index 787a48dfc..16f594c74 100644 --- a/examples/collector-gateway-only/rendered_manifests/clusterRole.yaml +++ b/examples/collector-gateway-only/rendered_manifests/clusterRole.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/collector-gateway-only/rendered_manifests/clusterRoleBinding.yaml b/examples/collector-gateway-only/rendered_manifests/clusterRoleBinding.yaml index 75e01844e..3f26df325 100644 --- a/examples/collector-gateway-only/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/collector-gateway-only/rendered_manifests/clusterRoleBinding.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/collector-gateway-only/rendered_manifests/configmap-gateway.yaml b/examples/collector-gateway-only/rendered_manifests/configmap-gateway.yaml index f38d55a3f..412da38ea 100644 --- a/examples/collector-gateway-only/rendered_manifests/configmap-gateway.yaml +++ b/examples/collector-gateway-only/rendered_manifests/configmap-gateway.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -152,11 +152,7 @@ data: - job_name: otel-collector metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -229,3 +225,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 index fbfa91987..2cad3bedc 100644 --- a/examples/collector-gateway-only/rendered_manifests/deployment-gateway.yaml +++ b/examples/collector-gateway-only/rendered_manifests/deployment-gateway.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector chart: splunk-otel-collector-0.118.0 @@ -31,7 +31,7 @@ spec: component: otel-collector release: default annotations: - checksum/config: 2e2ed1bab47a74d37928c5441caae457dd8ead382e4265821197c4ee81c082cc + checksum/config: 955506cc82b2523739f96aa63de8d1ad9aace977dd3acbabe56b572eb81a8083 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -41,7 +41,7 @@ spec: command: - /otelcol - --config=/conf/relay.yaml - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/collector-gateway-only/rendered_manifests/secret-splunk.yaml b/examples/collector-gateway-only/rendered_manifests/secret-splunk.yaml index 1f07f6a80..9a7030b40 100644 --- a/examples/collector-gateway-only/rendered_manifests/secret-splunk.yaml +++ b/examples/collector-gateway-only/rendered_manifests/secret-splunk.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/collector-gateway-only/rendered_manifests/service.yaml b/examples/collector-gateway-only/rendered_manifests/service.yaml index 1ab962ecc..ed82afd5a 100644 --- a/examples/collector-gateway-only/rendered_manifests/service.yaml +++ b/examples/collector-gateway-only/rendered_manifests/service.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector chart: splunk-otel-collector-0.118.0 diff --git a/examples/collector-gateway-only/rendered_manifests/serviceAccount.yaml b/examples/collector-gateway-only/rendered_manifests/serviceAccount.yaml index 621c610a6..5bef21e83 100644 --- a/examples/collector-gateway-only/rendered_manifests/serviceAccount.yaml +++ b/examples/collector-gateway-only/rendered_manifests/serviceAccount.yaml @@ -11,7 +11,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/controlplane-histogram-metrics/rendered_manifests/clusterRole.yaml b/examples/controlplane-histogram-metrics/rendered_manifests/clusterRole.yaml index 787a48dfc..16f594c74 100644 --- a/examples/controlplane-histogram-metrics/rendered_manifests/clusterRole.yaml +++ b/examples/controlplane-histogram-metrics/rendered_manifests/clusterRole.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/controlplane-histogram-metrics/rendered_manifests/clusterRoleBinding.yaml b/examples/controlplane-histogram-metrics/rendered_manifests/clusterRoleBinding.yaml index 75e01844e..3f26df325 100644 --- a/examples/controlplane-histogram-metrics/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/controlplane-histogram-metrics/rendered_manifests/clusterRoleBinding.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/controlplane-histogram-metrics/rendered_manifests/configmap-agent.yaml b/examples/controlplane-histogram-metrics/rendered_manifests/configmap-agent.yaml index 2f6eaeae6..24331aded 100644 --- a/examples/controlplane-histogram-metrics/rendered_manifests/configmap-agent.yaml +++ b/examples/controlplane-histogram-metrics/rendered_manifests/configmap-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -188,11 +188,7 @@ data: - job_name: otel-agent metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -358,3 +354,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 index d2e012ce7..dc5af4330 100644 --- a/examples/controlplane-histogram-metrics/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/controlplane-histogram-metrics/rendered_manifests/configmap-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -82,11 +82,7 @@ data: - job_name: otel-k8s-cluster-receiver metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -131,3 +127,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 index 1f2914248..97077a938 100644 --- a/examples/controlplane-histogram-metrics/rendered_manifests/daemonset.yaml +++ b/examples/controlplane-histogram-metrics/rendered_manifests/daemonset.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 23aa422db1d2bd758e4e63599dec7e319f67ea1630352bbb88369a97e5841423 + checksum/config: 0e256de2e1dd7b17df9758802f3c4a00509a7b531270fb642384694e3d079b98 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -86,7 +86,7 @@ spec: containerPort: 9411 hostPort: 9411 protocol: TCP - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/controlplane-histogram-metrics/rendered_manifests/deployment-cluster-receiver.yaml b/examples/controlplane-histogram-metrics/rendered_manifests/deployment-cluster-receiver.yaml index 1620633de..927a205f6 100644 --- a/examples/controlplane-histogram-metrics/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/controlplane-histogram-metrics/rendered_manifests/deployment-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver chart: splunk-otel-collector-0.118.0 @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: f25f2d1d33bf121655e8c42b63e4f17502bae29f2cc8aaa585764447976fdde8 + checksum/config: c42cb1583d693dc14d6ad2977c155843810e3a7c1e7fb3aae3daea5d8914879d spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -41,7 +41,7 @@ spec: command: - /otelcol - --config=/conf/relay.yaml - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/controlplane-histogram-metrics/rendered_manifests/secret-splunk.yaml b/examples/controlplane-histogram-metrics/rendered_manifests/secret-splunk.yaml index 1f07f6a80..9a7030b40 100644 --- a/examples/controlplane-histogram-metrics/rendered_manifests/secret-splunk.yaml +++ b/examples/controlplane-histogram-metrics/rendered_manifests/secret-splunk.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/controlplane-histogram-metrics/rendered_manifests/service-agent.yaml b/examples/controlplane-histogram-metrics/rendered_manifests/service-agent.yaml index f9d94ce64..6f56bac80 100644 --- a/examples/controlplane-histogram-metrics/rendered_manifests/service-agent.yaml +++ b/examples/controlplane-histogram-metrics/rendered_manifests/service-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 diff --git a/examples/controlplane-histogram-metrics/rendered_manifests/serviceAccount.yaml b/examples/controlplane-histogram-metrics/rendered_manifests/serviceAccount.yaml index 621c610a6..5bef21e83 100644 --- a/examples/controlplane-histogram-metrics/rendered_manifests/serviceAccount.yaml +++ b/examples/controlplane-histogram-metrics/rendered_manifests/serviceAccount.yaml @@ -11,7 +11,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/crio-logging/rendered_manifests/clusterRole.yaml b/examples/crio-logging/rendered_manifests/clusterRole.yaml index 787a48dfc..16f594c74 100644 --- a/examples/crio-logging/rendered_manifests/clusterRole.yaml +++ b/examples/crio-logging/rendered_manifests/clusterRole.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/crio-logging/rendered_manifests/clusterRoleBinding.yaml b/examples/crio-logging/rendered_manifests/clusterRoleBinding.yaml index 75e01844e..3f26df325 100644 --- a/examples/crio-logging/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/crio-logging/rendered_manifests/clusterRoleBinding.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/crio-logging/rendered_manifests/configmap-agent.yaml b/examples/crio-logging/rendered_manifests/configmap-agent.yaml index 0940116c3..28f93ba71 100644 --- a/examples/crio-logging/rendered_manifests/configmap-agent.yaml +++ b/examples/crio-logging/rendered_manifests/configmap-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -183,11 +183,7 @@ data: - job_name: otel-agent metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -318,3 +314,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 index d2e012ce7..dc5af4330 100644 --- a/examples/crio-logging/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/crio-logging/rendered_manifests/configmap-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -82,11 +82,7 @@ data: - job_name: otel-k8s-cluster-receiver metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -131,3 +127,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 index d1eac7536..ed3a52716 100644 --- a/examples/crio-logging/rendered_manifests/daemonset.yaml +++ b/examples/crio-logging/rendered_manifests/daemonset.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 5eb71401eb3a1d4c94103254afa7361a1bbaedd05ef9374123e822239e593b35 + checksum/config: 8bbe8f7b9532522201698c0426760b708a1ad608560eec39b501c4b48f6eab18 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -86,7 +86,7 @@ spec: containerPort: 9411 hostPort: 9411 protocol: TCP - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/crio-logging/rendered_manifests/deployment-cluster-receiver.yaml b/examples/crio-logging/rendered_manifests/deployment-cluster-receiver.yaml index 1620633de..927a205f6 100644 --- a/examples/crio-logging/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/crio-logging/rendered_manifests/deployment-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver chart: splunk-otel-collector-0.118.0 @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: f25f2d1d33bf121655e8c42b63e4f17502bae29f2cc8aaa585764447976fdde8 + checksum/config: c42cb1583d693dc14d6ad2977c155843810e3a7c1e7fb3aae3daea5d8914879d spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -41,7 +41,7 @@ spec: command: - /otelcol - --config=/conf/relay.yaml - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/crio-logging/rendered_manifests/secret-splunk.yaml b/examples/crio-logging/rendered_manifests/secret-splunk.yaml index 1f07f6a80..9a7030b40 100644 --- a/examples/crio-logging/rendered_manifests/secret-splunk.yaml +++ b/examples/crio-logging/rendered_manifests/secret-splunk.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/crio-logging/rendered_manifests/service-agent.yaml b/examples/crio-logging/rendered_manifests/service-agent.yaml index f9d94ce64..6f56bac80 100644 --- a/examples/crio-logging/rendered_manifests/service-agent.yaml +++ b/examples/crio-logging/rendered_manifests/service-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 diff --git a/examples/crio-logging/rendered_manifests/serviceAccount.yaml b/examples/crio-logging/rendered_manifests/serviceAccount.yaml index 621c610a6..5bef21e83 100644 --- a/examples/crio-logging/rendered_manifests/serviceAccount.yaml +++ b/examples/crio-logging/rendered_manifests/serviceAccount.yaml @@ -11,7 +11,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/default/rendered_manifests/clusterRole.yaml b/examples/default/rendered_manifests/clusterRole.yaml index 787a48dfc..16f594c74 100644 --- a/examples/default/rendered_manifests/clusterRole.yaml +++ b/examples/default/rendered_manifests/clusterRole.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/default/rendered_manifests/clusterRoleBinding.yaml b/examples/default/rendered_manifests/clusterRoleBinding.yaml index 75e01844e..3f26df325 100644 --- a/examples/default/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/default/rendered_manifests/clusterRoleBinding.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/default/rendered_manifests/configmap-agent.yaml b/examples/default/rendered_manifests/configmap-agent.yaml index 0940116c3..28f93ba71 100644 --- a/examples/default/rendered_manifests/configmap-agent.yaml +++ b/examples/default/rendered_manifests/configmap-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -183,11 +183,7 @@ data: - job_name: otel-agent metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -318,3 +314,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 index d2e012ce7..dc5af4330 100644 --- a/examples/default/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/default/rendered_manifests/configmap-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -82,11 +82,7 @@ data: - job_name: otel-k8s-cluster-receiver metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -131,3 +127,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 index d1eac7536..ed3a52716 100644 --- a/examples/default/rendered_manifests/daemonset.yaml +++ b/examples/default/rendered_manifests/daemonset.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 5eb71401eb3a1d4c94103254afa7361a1bbaedd05ef9374123e822239e593b35 + checksum/config: 8bbe8f7b9532522201698c0426760b708a1ad608560eec39b501c4b48f6eab18 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -86,7 +86,7 @@ spec: containerPort: 9411 hostPort: 9411 protocol: TCP - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/default/rendered_manifests/deployment-cluster-receiver.yaml b/examples/default/rendered_manifests/deployment-cluster-receiver.yaml index 1620633de..927a205f6 100644 --- a/examples/default/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/default/rendered_manifests/deployment-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver chart: splunk-otel-collector-0.118.0 @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: f25f2d1d33bf121655e8c42b63e4f17502bae29f2cc8aaa585764447976fdde8 + checksum/config: c42cb1583d693dc14d6ad2977c155843810e3a7c1e7fb3aae3daea5d8914879d spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -41,7 +41,7 @@ spec: command: - /otelcol - --config=/conf/relay.yaml - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/default/rendered_manifests/secret-splunk.yaml b/examples/default/rendered_manifests/secret-splunk.yaml index 1f07f6a80..9a7030b40 100644 --- a/examples/default/rendered_manifests/secret-splunk.yaml +++ b/examples/default/rendered_manifests/secret-splunk.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/default/rendered_manifests/service-agent.yaml b/examples/default/rendered_manifests/service-agent.yaml index f9d94ce64..6f56bac80 100644 --- a/examples/default/rendered_manifests/service-agent.yaml +++ b/examples/default/rendered_manifests/service-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 diff --git a/examples/default/rendered_manifests/serviceAccount.yaml b/examples/default/rendered_manifests/serviceAccount.yaml index 621c610a6..5bef21e83 100644 --- a/examples/default/rendered_manifests/serviceAccount.yaml +++ b/examples/default/rendered_manifests/serviceAccount.yaml @@ -11,7 +11,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/clusterRole.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/clusterRole.yaml index 787a48dfc..16f594c74 100644 --- a/examples/disable-persistence-queue-traces/rendered_manifests/clusterRole.yaml +++ b/examples/disable-persistence-queue-traces/rendered_manifests/clusterRole.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/clusterRoleBinding.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/clusterRoleBinding.yaml index 75e01844e..3f26df325 100644 --- a/examples/disable-persistence-queue-traces/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/disable-persistence-queue-traces/rendered_manifests/clusterRoleBinding.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/configmap-agent.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/configmap-agent.yaml index 44e52c2b4..d498b216e 100644 --- a/examples/disable-persistence-queue-traces/rendered_manifests/configmap-agent.yaml +++ b/examples/disable-persistence-queue-traces/rendered_manifests/configmap-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -389,11 +389,7 @@ data: - job_name: otel-agent metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -538,3 +534,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 index 3625e5e75..f31e7c727 100644 --- a/examples/disable-persistence-queue-traces/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/disable-persistence-queue-traces/rendered_manifests/configmap-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -126,11 +126,7 @@ data: - job_name: otel-k8s-cluster-receiver metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -177,3 +173,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 index 781c5a187..21f8a5a0e 100644 --- a/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml +++ b/examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 910964220545ba83d7c5681f8c06779655893f943b28b32e167fcdfd02e2ee3c + checksum/config: f4ffbb032038ad98c94327f190ee4764163f658a93b632ed408bcb1f3376cabf kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -55,7 +55,7 @@ spec: operator: Exists initContainers: - name: migrate-checkpoint - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent command: ["/migratecheckpoint"] securityContext: @@ -125,7 +125,7 @@ spec: containerPort: 9411 hostPort: 9411 protocol: TCP - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent securityContext: runAsUser: 0 diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/deployment-cluster-receiver.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/deployment-cluster-receiver.yaml index d9badea13..85a9a19c0 100644 --- a/examples/disable-persistence-queue-traces/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/disable-persistence-queue-traces/rendered_manifests/deployment-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver chart: splunk-otel-collector-0.118.0 @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: dc4a0f1c2390351f7216a170b12488d1537ec4584cf63480a7d0b8dd2f6f0fbe + checksum/config: e33bfc582d5659771518c4063ea8f37bd3e378c7ce1f172ee304b3b8d21cf95d spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -41,7 +41,7 @@ spec: command: - /otelcol - --config=/conf/relay.yaml - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/secret-splunk.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/secret-splunk.yaml index 8dd2c8032..03481643a 100644 --- a/examples/disable-persistence-queue-traces/rendered_manifests/secret-splunk.yaml +++ b/examples/disable-persistence-queue-traces/rendered_manifests/secret-splunk.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/service-agent.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/service-agent.yaml index 029dcf416..4e3a02368 100644 --- a/examples/disable-persistence-queue-traces/rendered_manifests/service-agent.yaml +++ b/examples/disable-persistence-queue-traces/rendered_manifests/service-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 diff --git a/examples/disable-persistence-queue-traces/rendered_manifests/serviceAccount.yaml b/examples/disable-persistence-queue-traces/rendered_manifests/serviceAccount.yaml index 621c610a6..5bef21e83 100644 --- a/examples/disable-persistence-queue-traces/rendered_manifests/serviceAccount.yaml +++ b/examples/disable-persistence-queue-traces/rendered_manifests/serviceAccount.yaml @@ -11,7 +11,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/discovery-mode/rendered_manifests/clusterRole.yaml b/examples/discovery-mode/rendered_manifests/clusterRole.yaml index 787a48dfc..16f594c74 100644 --- a/examples/discovery-mode/rendered_manifests/clusterRole.yaml +++ b/examples/discovery-mode/rendered_manifests/clusterRole.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/discovery-mode/rendered_manifests/clusterRoleBinding.yaml b/examples/discovery-mode/rendered_manifests/clusterRoleBinding.yaml index 75e01844e..3f26df325 100644 --- a/examples/discovery-mode/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/discovery-mode/rendered_manifests/clusterRoleBinding.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/discovery-mode/rendered_manifests/configmap-agent.yaml b/examples/discovery-mode/rendered_manifests/configmap-agent.yaml index e9fc29bef..3e9390bd5 100644 --- a/examples/discovery-mode/rendered_manifests/configmap-agent.yaml +++ b/examples/discovery-mode/rendered_manifests/configmap-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -183,11 +183,7 @@ data: - job_name: otel-agent metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -318,6 +314,9 @@ data: prometheus: host: localhost port: 8889 + without_scope_info: true + without_type_suffix: true + without_units: true discovery.properties: | splunk.discovery: extensions: diff --git a/examples/discovery-mode/rendered_manifests/daemonset.yaml b/examples/discovery-mode/rendered_manifests/daemonset.yaml index f7491859d..6f00bd821 100644 --- a/examples/discovery-mode/rendered_manifests/daemonset.yaml +++ b/examples/discovery-mode/rendered_manifests/daemonset.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 1f9d5ca120b16438e2bd9d7f711dea2d9be5d31a049608f26bff5bfe8ed8d599 + checksum/config: 3436942314e342d90a4f7d878c4494b6dd8298f54f6f4307cb05692c02c0f268 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -87,7 +87,7 @@ spec: containerPort: 9411 hostPort: 9411 protocol: TCP - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/discovery-mode/rendered_manifests/secret-splunk.yaml b/examples/discovery-mode/rendered_manifests/secret-splunk.yaml index 1f07f6a80..9a7030b40 100644 --- a/examples/discovery-mode/rendered_manifests/secret-splunk.yaml +++ b/examples/discovery-mode/rendered_manifests/secret-splunk.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/discovery-mode/rendered_manifests/service-agent.yaml b/examples/discovery-mode/rendered_manifests/service-agent.yaml index f9d94ce64..6f56bac80 100644 --- a/examples/discovery-mode/rendered_manifests/service-agent.yaml +++ b/examples/discovery-mode/rendered_manifests/service-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 diff --git a/examples/discovery-mode/rendered_manifests/serviceAccount.yaml b/examples/discovery-mode/rendered_manifests/serviceAccount.yaml index 621c610a6..5bef21e83 100644 --- a/examples/discovery-mode/rendered_manifests/serviceAccount.yaml +++ b/examples/discovery-mode/rendered_manifests/serviceAccount.yaml @@ -11,7 +11,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/distribution-aks/rendered_manifests/clusterRole.yaml b/examples/distribution-aks/rendered_manifests/clusterRole.yaml index 787a48dfc..16f594c74 100644 --- a/examples/distribution-aks/rendered_manifests/clusterRole.yaml +++ b/examples/distribution-aks/rendered_manifests/clusterRole.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/distribution-aks/rendered_manifests/clusterRoleBinding.yaml b/examples/distribution-aks/rendered_manifests/clusterRoleBinding.yaml index 75e01844e..3f26df325 100644 --- a/examples/distribution-aks/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/distribution-aks/rendered_manifests/clusterRoleBinding.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/distribution-aks/rendered_manifests/configmap-agent.yaml b/examples/distribution-aks/rendered_manifests/configmap-agent.yaml index fc6230872..d9a41be81 100644 --- a/examples/distribution-aks/rendered_manifests/configmap-agent.yaml +++ b/examples/distribution-aks/rendered_manifests/configmap-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -185,11 +185,7 @@ data: - job_name: otel-agent metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -276,3 +272,6 @@ data: prometheus: host: localhost port: 8889 + without_scope_info: true + without_type_suffix: true + without_units: true diff --git a/examples/distribution-aks/rendered_manifests/configmap-cluster-receiver.yaml b/examples/distribution-aks/rendered_manifests/configmap-cluster-receiver.yaml index 0dd38b5ba..fad4d4478 100644 --- a/examples/distribution-aks/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/distribution-aks/rendered_manifests/configmap-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -84,11 +84,7 @@ data: - job_name: otel-k8s-cluster-receiver metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -133,3 +129,6 @@ data: prometheus: host: localhost port: 8889 + without_scope_info: true + without_type_suffix: true + without_units: true diff --git a/examples/distribution-aks/rendered_manifests/daemonset.yaml b/examples/distribution-aks/rendered_manifests/daemonset.yaml index 025449c17..9119f8bdf 100644 --- a/examples/distribution-aks/rendered_manifests/daemonset.yaml +++ b/examples/distribution-aks/rendered_manifests/daemonset.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 76e569260306d33459de8d8d45884fac5719d63ada65dffa86625f3239fe5f31 + checksum/config: a85aa5c5f1ef777f998c5133729e1e35acedc8db4626b36fa7c04bb41e8b6d7c kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -86,7 +86,7 @@ spec: containerPort: 9411 hostPort: 9411 protocol: TCP - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/distribution-aks/rendered_manifests/deployment-cluster-receiver.yaml b/examples/distribution-aks/rendered_manifests/deployment-cluster-receiver.yaml index d9bb1332a..29519e65a 100644 --- a/examples/distribution-aks/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/distribution-aks/rendered_manifests/deployment-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver chart: splunk-otel-collector-0.118.0 @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 1c0dff9a01988246e217285106fc86b0901a8a4439701a07f0bbf9e0e5d31439 + checksum/config: 24da87fc5b73f6050a77e3cb6f51e9a6ad57f212f68213b5934ff8d79a91126b spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -41,7 +41,7 @@ spec: command: - /otelcol - --config=/conf/relay.yaml - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/distribution-aks/rendered_manifests/secret-splunk.yaml b/examples/distribution-aks/rendered_manifests/secret-splunk.yaml index 1f07f6a80..9a7030b40 100644 --- a/examples/distribution-aks/rendered_manifests/secret-splunk.yaml +++ b/examples/distribution-aks/rendered_manifests/secret-splunk.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/distribution-aks/rendered_manifests/service-agent.yaml b/examples/distribution-aks/rendered_manifests/service-agent.yaml index f9d94ce64..6f56bac80 100644 --- a/examples/distribution-aks/rendered_manifests/service-agent.yaml +++ b/examples/distribution-aks/rendered_manifests/service-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 diff --git a/examples/distribution-aks/rendered_manifests/serviceAccount.yaml b/examples/distribution-aks/rendered_manifests/serviceAccount.yaml index 621c610a6..5bef21e83 100644 --- a/examples/distribution-aks/rendered_manifests/serviceAccount.yaml +++ b/examples/distribution-aks/rendered_manifests/serviceAccount.yaml @@ -11,7 +11,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/distribution-eks-fargate/rendered_manifests/clusterRole.yaml b/examples/distribution-eks-fargate/rendered_manifests/clusterRole.yaml index 3a5770f98..b046918fa 100644 --- a/examples/distribution-eks-fargate/rendered_manifests/clusterRole.yaml +++ b/examples/distribution-eks-fargate/rendered_manifests/clusterRole.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/distribution-eks-fargate/rendered_manifests/clusterRoleBinding.yaml b/examples/distribution-eks-fargate/rendered_manifests/clusterRoleBinding.yaml index 75e01844e..3f26df325 100644 --- a/examples/distribution-eks-fargate/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/distribution-eks-fargate/rendered_manifests/clusterRoleBinding.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/distribution-eks-fargate/rendered_manifests/configmap-cluster-receiver-node-discoverer-script.yaml b/examples/distribution-eks-fargate/rendered_manifests/configmap-cluster-receiver-node-discoverer-script.yaml index eeeab3b52..d12b7a7b0 100644 --- a/examples/distribution-eks-fargate/rendered_manifests/configmap-cluster-receiver-node-discoverer-script.yaml +++ b/examples/distribution-eks-fargate/rendered_manifests/configmap-cluster-receiver-node-discoverer-script.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/distribution-eks-fargate/rendered_manifests/configmap-cluster-receiver.yaml b/examples/distribution-eks-fargate/rendered_manifests/configmap-cluster-receiver.yaml index a4df437a8..1143bfbe2 100644 --- a/examples/distribution-eks-fargate/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/distribution-eks-fargate/rendered_manifests/configmap-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -87,11 +87,7 @@ data: - job_name: otel-k8s-cluster-receiver metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -162,3 +158,6 @@ data: prometheus: host: localhost port: 8889 + without_scope_info: true + without_type_suffix: true + without_units: true diff --git a/examples/distribution-eks-fargate/rendered_manifests/configmap-gateway.yaml b/examples/distribution-eks-fargate/rendered_manifests/configmap-gateway.yaml index 1af015c0c..a4cbbe034 100644 --- a/examples/distribution-eks-fargate/rendered_manifests/configmap-gateway.yaml +++ b/examples/distribution-eks-fargate/rendered_manifests/configmap-gateway.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -154,11 +154,7 @@ data: - job_name: otel-collector metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -231,3 +227,6 @@ data: prometheus: host: localhost port: 8889 + without_scope_info: true + without_type_suffix: true + without_units: true diff --git a/examples/distribution-eks-fargate/rendered_manifests/deployment-cluster-receiver.yaml b/examples/distribution-eks-fargate/rendered_manifests/deployment-cluster-receiver.yaml index 13d237417..fbdbb2b01 100644 --- a/examples/distribution-eks-fargate/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/distribution-eks-fargate/rendered_manifests/deployment-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver chart: splunk-otel-collector-0.118.0 @@ -33,7 +33,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 56147c527f0631d92437c53590e226c6b6ee0a6531a203777cfc037e535c2177 + checksum/config: d5547521237fe6a7191f916fda1fd8d7705a72fdc34ce8eb883669897bf710f9 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -74,7 +74,7 @@ spec: command: - /otelcol - --config=/splunk-messages/config.yaml - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/distribution-eks-fargate/rendered_manifests/deployment-gateway.yaml b/examples/distribution-eks-fargate/rendered_manifests/deployment-gateway.yaml index 4c08d9a2a..49e6a9486 100644 --- a/examples/distribution-eks-fargate/rendered_manifests/deployment-gateway.yaml +++ b/examples/distribution-eks-fargate/rendered_manifests/deployment-gateway.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector chart: splunk-otel-collector-0.118.0 @@ -31,7 +31,7 @@ spec: component: otel-collector release: default annotations: - checksum/config: a4e8460e21b72eab321d81cab09134fb0747498bcd0858d57bb1b3b77cf057e2 + checksum/config: 882113ec3a588153c65aa9749a19a5e7ccea86ed8e585d1d9bd2a2229ad5d2f9 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -41,7 +41,7 @@ spec: command: - /otelcol - --config=/conf/relay.yaml - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/distribution-eks-fargate/rendered_manifests/secret-splunk.yaml b/examples/distribution-eks-fargate/rendered_manifests/secret-splunk.yaml index 1f07f6a80..9a7030b40 100644 --- a/examples/distribution-eks-fargate/rendered_manifests/secret-splunk.yaml +++ b/examples/distribution-eks-fargate/rendered_manifests/secret-splunk.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/distribution-eks-fargate/rendered_manifests/service.yaml b/examples/distribution-eks-fargate/rendered_manifests/service.yaml index 1ab962ecc..ed82afd5a 100644 --- a/examples/distribution-eks-fargate/rendered_manifests/service.yaml +++ b/examples/distribution-eks-fargate/rendered_manifests/service.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector chart: splunk-otel-collector-0.118.0 diff --git a/examples/distribution-eks-fargate/rendered_manifests/serviceAccount.yaml b/examples/distribution-eks-fargate/rendered_manifests/serviceAccount.yaml index 621c610a6..5bef21e83 100644 --- a/examples/distribution-eks-fargate/rendered_manifests/serviceAccount.yaml +++ b/examples/distribution-eks-fargate/rendered_manifests/serviceAccount.yaml @@ -11,7 +11,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/distribution-eks/rendered_manifests/clusterRole.yaml b/examples/distribution-eks/rendered_manifests/clusterRole.yaml index a98fb1432..586a0cf74 100644 --- a/examples/distribution-eks/rendered_manifests/clusterRole.yaml +++ b/examples/distribution-eks/rendered_manifests/clusterRole.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/distribution-eks/rendered_manifests/clusterRoleBinding.yaml b/examples/distribution-eks/rendered_manifests/clusterRoleBinding.yaml index 75e01844e..3f26df325 100644 --- a/examples/distribution-eks/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/distribution-eks/rendered_manifests/clusterRoleBinding.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/distribution-eks/rendered_manifests/configmap-agent.yaml b/examples/distribution-eks/rendered_manifests/configmap-agent.yaml index 88cbaa4e2..0814f5aff 100644 --- a/examples/distribution-eks/rendered_manifests/configmap-agent.yaml +++ b/examples/distribution-eks/rendered_manifests/configmap-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -185,11 +185,7 @@ data: - job_name: otel-agent metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -276,3 +272,6 @@ data: prometheus: host: localhost port: 8889 + without_scope_info: true + without_type_suffix: true + without_units: true diff --git a/examples/distribution-eks/rendered_manifests/configmap-cluster-receiver.yaml b/examples/distribution-eks/rendered_manifests/configmap-cluster-receiver.yaml index 682c52f8a..fc5d9d4df 100644 --- a/examples/distribution-eks/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/distribution-eks/rendered_manifests/configmap-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -102,11 +102,7 @@ data: - job_name: otel-k8s-cluster-receiver metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -152,3 +148,6 @@ data: prometheus: host: localhost port: 8889 + without_scope_info: true + without_type_suffix: true + without_units: true diff --git a/examples/distribution-eks/rendered_manifests/daemonset.yaml b/examples/distribution-eks/rendered_manifests/daemonset.yaml index b92e23311..3e47dac12 100644 --- a/examples/distribution-eks/rendered_manifests/daemonset.yaml +++ b/examples/distribution-eks/rendered_manifests/daemonset.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 9c24898293930e63c86ad8cda5b587621474fbcc675374fb66a6f6f925ebd95c + checksum/config: 91bff57b714f4d53d19d7f6c50172cc761d477086bcb292ca03f87b9b0c27427 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -86,7 +86,7 @@ spec: containerPort: 9411 hostPort: 9411 protocol: TCP - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/distribution-eks/rendered_manifests/deployment-cluster-receiver.yaml b/examples/distribution-eks/rendered_manifests/deployment-cluster-receiver.yaml index 9039e28f4..6eebd34e2 100644 --- a/examples/distribution-eks/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/distribution-eks/rendered_manifests/deployment-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver chart: splunk-otel-collector-0.118.0 @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 15aa65e71fe6ffb23929a7ea2796a3a5872c0bcb07375cab2bf0bf22c9ba1bc3 + checksum/config: 2725c802bf21aa43f1db63b2e4f20e5c2ac704afa2e6ba63d41370d7d5cfb60c spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -41,7 +41,7 @@ spec: command: - /otelcol - --config=/conf/relay.yaml - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/distribution-eks/rendered_manifests/secret-splunk.yaml b/examples/distribution-eks/rendered_manifests/secret-splunk.yaml index 1f07f6a80..9a7030b40 100644 --- a/examples/distribution-eks/rendered_manifests/secret-splunk.yaml +++ b/examples/distribution-eks/rendered_manifests/secret-splunk.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/distribution-eks/rendered_manifests/service-agent.yaml b/examples/distribution-eks/rendered_manifests/service-agent.yaml index f9d94ce64..6f56bac80 100644 --- a/examples/distribution-eks/rendered_manifests/service-agent.yaml +++ b/examples/distribution-eks/rendered_manifests/service-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 diff --git a/examples/distribution-eks/rendered_manifests/serviceAccount.yaml b/examples/distribution-eks/rendered_manifests/serviceAccount.yaml index 621c610a6..5bef21e83 100644 --- a/examples/distribution-eks/rendered_manifests/serviceAccount.yaml +++ b/examples/distribution-eks/rendered_manifests/serviceAccount.yaml @@ -11,7 +11,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/distribution-gke-autopilot/rendered_manifests/clusterRole.yaml b/examples/distribution-gke-autopilot/rendered_manifests/clusterRole.yaml index 787a48dfc..16f594c74 100644 --- a/examples/distribution-gke-autopilot/rendered_manifests/clusterRole.yaml +++ b/examples/distribution-gke-autopilot/rendered_manifests/clusterRole.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/distribution-gke-autopilot/rendered_manifests/clusterRoleBinding.yaml b/examples/distribution-gke-autopilot/rendered_manifests/clusterRoleBinding.yaml index 75e01844e..3f26df325 100644 --- a/examples/distribution-gke-autopilot/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/distribution-gke-autopilot/rendered_manifests/clusterRoleBinding.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/distribution-gke-autopilot/rendered_manifests/configmap-agent.yaml b/examples/distribution-gke-autopilot/rendered_manifests/configmap-agent.yaml index 30c010e8d..5f0d23d94 100644 --- a/examples/distribution-gke-autopilot/rendered_manifests/configmap-agent.yaml +++ b/examples/distribution-gke-autopilot/rendered_manifests/configmap-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -184,11 +184,7 @@ data: - job_name: otel-agent metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -275,3 +271,6 @@ data: prometheus: host: localhost port: 8889 + without_scope_info: true + without_type_suffix: true + without_units: true diff --git a/examples/distribution-gke-autopilot/rendered_manifests/configmap-cluster-receiver.yaml b/examples/distribution-gke-autopilot/rendered_manifests/configmap-cluster-receiver.yaml index 104b691ad..5df4694fd 100644 --- a/examples/distribution-gke-autopilot/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/distribution-gke-autopilot/rendered_manifests/configmap-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -83,11 +83,7 @@ data: - job_name: otel-k8s-cluster-receiver metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -132,3 +128,6 @@ data: prometheus: host: localhost port: 8889 + without_scope_info: true + without_type_suffix: true + without_units: true diff --git a/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml b/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml index c66501872..977892dee 100644 --- a/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml +++ b/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 93c7680d2bc7cf29accc6587d3f39adcbc3126bdfd02b125d538cc87022bb9ab + checksum/config: 01ec9ec10f4152df81484fb7badde3111c34876094e79cb2d8d4fd6632f4bd48 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -86,7 +86,7 @@ spec: containerPort: 9411 hostPort: 9411 protocol: TCP - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/distribution-gke-autopilot/rendered_manifests/deployment-cluster-receiver.yaml b/examples/distribution-gke-autopilot/rendered_manifests/deployment-cluster-receiver.yaml index ec34d8ef4..80c23fbf3 100644 --- a/examples/distribution-gke-autopilot/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/distribution-gke-autopilot/rendered_manifests/deployment-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver chart: splunk-otel-collector-0.118.0 @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 458e5b5e644093c37be8fe9994456eff9205e68e430a32596b17971992a1adf5 + checksum/config: 95d95497d20d8e029408aec3081b6e5185b102d8a82a66b16c4e0db462a2973b spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -41,7 +41,7 @@ spec: command: - /otelcol - --config=/conf/relay.yaml - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/distribution-gke-autopilot/rendered_manifests/secret-splunk.yaml b/examples/distribution-gke-autopilot/rendered_manifests/secret-splunk.yaml index 1f07f6a80..9a7030b40 100644 --- a/examples/distribution-gke-autopilot/rendered_manifests/secret-splunk.yaml +++ b/examples/distribution-gke-autopilot/rendered_manifests/secret-splunk.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/distribution-gke-autopilot/rendered_manifests/service-agent.yaml b/examples/distribution-gke-autopilot/rendered_manifests/service-agent.yaml index f9d94ce64..6f56bac80 100644 --- a/examples/distribution-gke-autopilot/rendered_manifests/service-agent.yaml +++ b/examples/distribution-gke-autopilot/rendered_manifests/service-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 diff --git a/examples/distribution-gke-autopilot/rendered_manifests/serviceAccount.yaml b/examples/distribution-gke-autopilot/rendered_manifests/serviceAccount.yaml index 621c610a6..5bef21e83 100644 --- a/examples/distribution-gke-autopilot/rendered_manifests/serviceAccount.yaml +++ b/examples/distribution-gke-autopilot/rendered_manifests/serviceAccount.yaml @@ -11,7 +11,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/distribution-gke/rendered_manifests/clusterRole.yaml b/examples/distribution-gke/rendered_manifests/clusterRole.yaml index 787a48dfc..16f594c74 100644 --- a/examples/distribution-gke/rendered_manifests/clusterRole.yaml +++ b/examples/distribution-gke/rendered_manifests/clusterRole.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/distribution-gke/rendered_manifests/clusterRoleBinding.yaml b/examples/distribution-gke/rendered_manifests/clusterRoleBinding.yaml index 75e01844e..3f26df325 100644 --- a/examples/distribution-gke/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/distribution-gke/rendered_manifests/clusterRoleBinding.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/distribution-gke/rendered_manifests/configmap-agent.yaml b/examples/distribution-gke/rendered_manifests/configmap-agent.yaml index ad3cedfe5..318ce8cc4 100644 --- a/examples/distribution-gke/rendered_manifests/configmap-agent.yaml +++ b/examples/distribution-gke/rendered_manifests/configmap-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -184,11 +184,7 @@ data: - job_name: otel-agent metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -275,3 +271,6 @@ data: prometheus: host: localhost port: 8889 + without_scope_info: true + without_type_suffix: true + without_units: true diff --git a/examples/distribution-gke/rendered_manifests/configmap-cluster-receiver.yaml b/examples/distribution-gke/rendered_manifests/configmap-cluster-receiver.yaml index 104b691ad..5df4694fd 100644 --- a/examples/distribution-gke/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/distribution-gke/rendered_manifests/configmap-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -83,11 +83,7 @@ data: - job_name: otel-k8s-cluster-receiver metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -132,3 +128,6 @@ data: prometheus: host: localhost port: 8889 + without_scope_info: true + without_type_suffix: true + without_units: true diff --git a/examples/distribution-gke/rendered_manifests/daemonset.yaml b/examples/distribution-gke/rendered_manifests/daemonset.yaml index a2e3e10a4..46d1b1a3a 100644 --- a/examples/distribution-gke/rendered_manifests/daemonset.yaml +++ b/examples/distribution-gke/rendered_manifests/daemonset.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: d63fef8284d7f4d9e9a1e47650d63e212087e827fb37c7d8c6558dc97bd739ba + checksum/config: 37f8caff2abc330d788225383b246ee66bba4904a0eb9e4d053687b772930dbe kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -86,7 +86,7 @@ spec: containerPort: 9411 hostPort: 9411 protocol: TCP - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/distribution-gke/rendered_manifests/deployment-cluster-receiver.yaml b/examples/distribution-gke/rendered_manifests/deployment-cluster-receiver.yaml index ec34d8ef4..80c23fbf3 100644 --- a/examples/distribution-gke/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/distribution-gke/rendered_manifests/deployment-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver chart: splunk-otel-collector-0.118.0 @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 458e5b5e644093c37be8fe9994456eff9205e68e430a32596b17971992a1adf5 + checksum/config: 95d95497d20d8e029408aec3081b6e5185b102d8a82a66b16c4e0db462a2973b spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -41,7 +41,7 @@ spec: command: - /otelcol - --config=/conf/relay.yaml - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/distribution-gke/rendered_manifests/secret-splunk.yaml b/examples/distribution-gke/rendered_manifests/secret-splunk.yaml index 1f07f6a80..9a7030b40 100644 --- a/examples/distribution-gke/rendered_manifests/secret-splunk.yaml +++ b/examples/distribution-gke/rendered_manifests/secret-splunk.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/distribution-gke/rendered_manifests/service-agent.yaml b/examples/distribution-gke/rendered_manifests/service-agent.yaml index f9d94ce64..6f56bac80 100644 --- a/examples/distribution-gke/rendered_manifests/service-agent.yaml +++ b/examples/distribution-gke/rendered_manifests/service-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 diff --git a/examples/distribution-gke/rendered_manifests/serviceAccount.yaml b/examples/distribution-gke/rendered_manifests/serviceAccount.yaml index 621c610a6..5bef21e83 100644 --- a/examples/distribution-gke/rendered_manifests/serviceAccount.yaml +++ b/examples/distribution-gke/rendered_manifests/serviceAccount.yaml @@ -11,7 +11,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/distribution-openshift/rendered_manifests/clusterRole.yaml b/examples/distribution-openshift/rendered_manifests/clusterRole.yaml index dee253606..8b22afdd3 100644 --- a/examples/distribution-openshift/rendered_manifests/clusterRole.yaml +++ b/examples/distribution-openshift/rendered_manifests/clusterRole.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/distribution-openshift/rendered_manifests/clusterRoleBinding.yaml b/examples/distribution-openshift/rendered_manifests/clusterRoleBinding.yaml index 75e01844e..3f26df325 100644 --- a/examples/distribution-openshift/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/distribution-openshift/rendered_manifests/clusterRoleBinding.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/distribution-openshift/rendered_manifests/configmap-agent.yaml b/examples/distribution-openshift/rendered_manifests/configmap-agent.yaml index 08943a664..2e9afd170 100644 --- a/examples/distribution-openshift/rendered_manifests/configmap-agent.yaml +++ b/examples/distribution-openshift/rendered_manifests/configmap-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -183,11 +183,7 @@ data: - job_name: otel-agent metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -326,3 +322,6 @@ data: prometheus: host: localhost port: 8889 + without_scope_info: true + without_type_suffix: true + without_units: true diff --git a/examples/distribution-openshift/rendered_manifests/configmap-cluster-receiver.yaml b/examples/distribution-openshift/rendered_manifests/configmap-cluster-receiver.yaml index c22a781b2..7d70f9a0d 100644 --- a/examples/distribution-openshift/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/distribution-openshift/rendered_manifests/configmap-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -83,11 +83,7 @@ data: - job_name: otel-k8s-cluster-receiver metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -132,3 +128,6 @@ data: prometheus: host: localhost port: 8889 + without_scope_info: true + without_type_suffix: true + without_units: true diff --git a/examples/distribution-openshift/rendered_manifests/daemonset.yaml b/examples/distribution-openshift/rendered_manifests/daemonset.yaml index 39920472e..3e884ea10 100644 --- a/examples/distribution-openshift/rendered_manifests/daemonset.yaml +++ b/examples/distribution-openshift/rendered_manifests/daemonset.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 277f3d7f5676ba28a8354b153b8911497f5ba8b922f4317b0228cec0d4063ae0 + checksum/config: 1575adc9bb53f81387306f3737d866bf1001dbfa63fc8f5c2bfecef0a042cc3d kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -86,7 +86,7 @@ spec: containerPort: 9411 hostPort: 9411 protocol: TCP - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/distribution-openshift/rendered_manifests/deployment-cluster-receiver.yaml b/examples/distribution-openshift/rendered_manifests/deployment-cluster-receiver.yaml index 2338d9be3..4897c772c 100644 --- a/examples/distribution-openshift/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/distribution-openshift/rendered_manifests/deployment-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver chart: splunk-otel-collector-0.118.0 @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: db4a97ee9dc1412d0a2d9768d7e719863ff4f2f76ad544f6164b1c7ad3c9ca0e + checksum/config: 5a20e51d9fdf8af930158fc4b07e7012dc20e60726c1b4ddcda4ca00b6f25b76 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -41,7 +41,7 @@ spec: command: - /otelcol - --config=/conf/relay.yaml - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/distribution-openshift/rendered_manifests/secret-splunk.yaml b/examples/distribution-openshift/rendered_manifests/secret-splunk.yaml index 1f07f6a80..9a7030b40 100644 --- a/examples/distribution-openshift/rendered_manifests/secret-splunk.yaml +++ b/examples/distribution-openshift/rendered_manifests/secret-splunk.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/distribution-openshift/rendered_manifests/securityContextConstraints.yaml b/examples/distribution-openshift/rendered_manifests/securityContextConstraints.yaml index 6ecd5a5d9..af077f132 100644 --- a/examples/distribution-openshift/rendered_manifests/securityContextConstraints.yaml +++ b/examples/distribution-openshift/rendered_manifests/securityContextConstraints.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/distribution-openshift/rendered_manifests/service-agent.yaml b/examples/distribution-openshift/rendered_manifests/service-agent.yaml index f9d94ce64..6f56bac80 100644 --- a/examples/distribution-openshift/rendered_manifests/service-agent.yaml +++ b/examples/distribution-openshift/rendered_manifests/service-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 diff --git a/examples/distribution-openshift/rendered_manifests/serviceAccount.yaml b/examples/distribution-openshift/rendered_manifests/serviceAccount.yaml index 621c610a6..5bef21e83 100644 --- a/examples/distribution-openshift/rendered_manifests/serviceAccount.yaml +++ b/examples/distribution-openshift/rendered_manifests/serviceAccount.yaml @@ -11,7 +11,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/clusterRole.yaml b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/clusterRole.yaml index 787a48dfc..16f594c74 100644 --- a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/clusterRole.yaml +++ b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/clusterRole.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/clusterRoleBinding.yaml b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/clusterRoleBinding.yaml index 75e01844e..3f26df325 100644 --- a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/clusterRoleBinding.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/configmap-agent.yaml b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/configmap-agent.yaml index 5aff2def2..07c26ae81 100644 --- a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/configmap-agent.yaml +++ b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/configmap-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -306,11 +306,7 @@ data: - job_name: otel-agent metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -459,3 +455,6 @@ data: prometheus: host: localhost port: 8889 + without_scope_info: true + without_type_suffix: true + without_units: true diff --git a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/configmap-cluster-receiver.yaml b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/configmap-cluster-receiver.yaml index 81a3e4a09..704ffd1dc 100644 --- a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/configmap-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -82,11 +82,7 @@ data: - job_name: otel-k8s-cluster-receiver metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -131,3 +127,6 @@ data: prometheus: host: localhost port: 8889 + without_scope_info: true + without_type_suffix: true + without_units: true diff --git a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/daemonset.yaml b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/daemonset.yaml index daac60d14..a9b3aba82 100644 --- a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/daemonset.yaml +++ b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/daemonset.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: abcac6d611b5d772f7560f99ba18a94d6c065d607707b684cba5ca5d58e799d8 + checksum/config: a0fc79abd5f824cd26622c6006dc68b6fbd1747363c5cfd60e00b4a1bfaf44b9 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -55,7 +55,7 @@ spec: operator: Exists initContainers: - name: migrate-checkpoint - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent command: ["/migratecheckpoint"] securityContext: @@ -125,7 +125,7 @@ spec: containerPort: 9411 hostPort: 9411 protocol: TCP - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent securityContext: runAsUser: 0 diff --git a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/deployment-cluster-receiver.yaml b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/deployment-cluster-receiver.yaml index fd2f84bf4..fc5cab471 100644 --- a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/deployment-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver chart: splunk-otel-collector-0.118.0 @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 3036fe3ee485f6d7db493ef6623d06bb2662cb7cd582c14974b0bd067b4d300b + checksum/config: 0fa6769b4840257819d12e5e8637442587ba3e56eb1f850b1bfa083cb305906d spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -41,7 +41,7 @@ spec: command: - /otelcol - --config=/conf/relay.yaml - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/operator/instrumentation.yaml b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/operator/instrumentation.yaml index e336a63cc..6cbc61018 100644 --- a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/operator/instrumentation.yaml +++ b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/operator/instrumentation.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-operator chart: splunk-otel-collector-0.118.0 diff --git a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/secret-splunk.yaml b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/secret-splunk.yaml index 1f07f6a80..9a7030b40 100644 --- a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/secret-splunk.yaml +++ b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/secret-splunk.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/service-agent.yaml b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/service-agent.yaml index 029dcf416..4e3a02368 100644 --- a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/service-agent.yaml +++ b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/service-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 diff --git a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/serviceAccount.yaml b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/serviceAccount.yaml index 621c610a6..5bef21e83 100644 --- a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/serviceAccount.yaml +++ b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/serviceAccount.yaml @@ -11,7 +11,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/enable-persistence-queue/rendered_manifests/clusterRole.yaml b/examples/enable-persistence-queue/rendered_manifests/clusterRole.yaml index 787a48dfc..16f594c74 100644 --- a/examples/enable-persistence-queue/rendered_manifests/clusterRole.yaml +++ b/examples/enable-persistence-queue/rendered_manifests/clusterRole.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/enable-persistence-queue/rendered_manifests/clusterRoleBinding.yaml b/examples/enable-persistence-queue/rendered_manifests/clusterRoleBinding.yaml index 75e01844e..3f26df325 100644 --- a/examples/enable-persistence-queue/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/enable-persistence-queue/rendered_manifests/clusterRoleBinding.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/enable-persistence-queue/rendered_manifests/configmap-agent.yaml b/examples/enable-persistence-queue/rendered_manifests/configmap-agent.yaml index 95fff26b7..251802e48 100644 --- a/examples/enable-persistence-queue/rendered_manifests/configmap-agent.yaml +++ b/examples/enable-persistence-queue/rendered_manifests/configmap-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -389,11 +389,7 @@ data: - job_name: otel-agent metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -538,3 +534,6 @@ data: prometheus: host: localhost port: 8889 + without_scope_info: true + without_type_suffix: true + without_units: true diff --git a/examples/enable-persistence-queue/rendered_manifests/configmap-cluster-receiver.yaml b/examples/enable-persistence-queue/rendered_manifests/configmap-cluster-receiver.yaml index 3625e5e75..f31e7c727 100644 --- a/examples/enable-persistence-queue/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/enable-persistence-queue/rendered_manifests/configmap-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -126,11 +126,7 @@ data: - job_name: otel-k8s-cluster-receiver metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -177,3 +173,6 @@ data: prometheus: host: localhost port: 8889 + without_scope_info: true + without_type_suffix: true + without_units: true diff --git a/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml b/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml index 5adea621c..ba829918d 100644 --- a/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml +++ b/examples/enable-persistence-queue/rendered_manifests/daemonset.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 1c1ee6f0547bf3378a6461791baa5e18048748974cdbc9515662f6a09b4a63a0 + checksum/config: 62bf87773486ebb55aa97d60d6a3a2bdaf8b4b22630398328e34254704e4152b kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -55,7 +55,7 @@ spec: operator: Exists initContainers: - name: migrate-checkpoint - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent command: ["/migratecheckpoint"] securityContext: @@ -125,7 +125,7 @@ spec: containerPort: 9411 hostPort: 9411 protocol: TCP - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent securityContext: runAsUser: 0 diff --git a/examples/enable-persistence-queue/rendered_manifests/deployment-cluster-receiver.yaml b/examples/enable-persistence-queue/rendered_manifests/deployment-cluster-receiver.yaml index d9badea13..85a9a19c0 100644 --- a/examples/enable-persistence-queue/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/enable-persistence-queue/rendered_manifests/deployment-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver chart: splunk-otel-collector-0.118.0 @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: dc4a0f1c2390351f7216a170b12488d1537ec4584cf63480a7d0b8dd2f6f0fbe + checksum/config: e33bfc582d5659771518c4063ea8f37bd3e378c7ce1f172ee304b3b8d21cf95d spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -41,7 +41,7 @@ spec: command: - /otelcol - --config=/conf/relay.yaml - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/enable-persistence-queue/rendered_manifests/secret-splunk.yaml b/examples/enable-persistence-queue/rendered_manifests/secret-splunk.yaml index 8dd2c8032..03481643a 100644 --- a/examples/enable-persistence-queue/rendered_manifests/secret-splunk.yaml +++ b/examples/enable-persistence-queue/rendered_manifests/secret-splunk.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/enable-persistence-queue/rendered_manifests/service-agent.yaml b/examples/enable-persistence-queue/rendered_manifests/service-agent.yaml index 029dcf416..4e3a02368 100644 --- a/examples/enable-persistence-queue/rendered_manifests/service-agent.yaml +++ b/examples/enable-persistence-queue/rendered_manifests/service-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 diff --git a/examples/enable-persistence-queue/rendered_manifests/serviceAccount.yaml b/examples/enable-persistence-queue/rendered_manifests/serviceAccount.yaml index 621c610a6..5bef21e83 100644 --- a/examples/enable-persistence-queue/rendered_manifests/serviceAccount.yaml +++ b/examples/enable-persistence-queue/rendered_manifests/serviceAccount.yaml @@ -11,7 +11,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/enable-trace-sampling/rendered_manifests/clusterRole.yaml b/examples/enable-trace-sampling/rendered_manifests/clusterRole.yaml index 787a48dfc..16f594c74 100644 --- a/examples/enable-trace-sampling/rendered_manifests/clusterRole.yaml +++ b/examples/enable-trace-sampling/rendered_manifests/clusterRole.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/enable-trace-sampling/rendered_manifests/clusterRoleBinding.yaml b/examples/enable-trace-sampling/rendered_manifests/clusterRoleBinding.yaml index 75e01844e..3f26df325 100644 --- a/examples/enable-trace-sampling/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/enable-trace-sampling/rendered_manifests/clusterRoleBinding.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/enable-trace-sampling/rendered_manifests/configmap-agent.yaml b/examples/enable-trace-sampling/rendered_manifests/configmap-agent.yaml index 73ac5afb7..d0402f618 100644 --- a/examples/enable-trace-sampling/rendered_manifests/configmap-agent.yaml +++ b/examples/enable-trace-sampling/rendered_manifests/configmap-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -160,11 +160,7 @@ data: - job_name: otel-agent metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -231,3 +227,6 @@ data: prometheus: host: localhost port: 8889 + without_scope_info: true + without_type_suffix: true + without_units: true diff --git a/examples/enable-trace-sampling/rendered_manifests/daemonset.yaml b/examples/enable-trace-sampling/rendered_manifests/daemonset.yaml index 2cd7df7c9..1c15f79d1 100644 --- a/examples/enable-trace-sampling/rendered_manifests/daemonset.yaml +++ b/examples/enable-trace-sampling/rendered_manifests/daemonset.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 605b79d5be864f35c5176985141d1508de8c323a0cf1078dfc04eb1775acae7d + checksum/config: 08eaf0c730e3ab3cbd96a03884b1eff29f1b562e35a7a571f697b4ce3c76c7a8 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -82,7 +82,7 @@ spec: containerPort: 9411 hostPort: 9411 protocol: TCP - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/enable-trace-sampling/rendered_manifests/secret-splunk.yaml b/examples/enable-trace-sampling/rendered_manifests/secret-splunk.yaml index 1f07f6a80..9a7030b40 100644 --- a/examples/enable-trace-sampling/rendered_manifests/secret-splunk.yaml +++ b/examples/enable-trace-sampling/rendered_manifests/secret-splunk.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/enable-trace-sampling/rendered_manifests/service-agent.yaml b/examples/enable-trace-sampling/rendered_manifests/service-agent.yaml index 6748282f4..3209fc87e 100644 --- a/examples/enable-trace-sampling/rendered_manifests/service-agent.yaml +++ b/examples/enable-trace-sampling/rendered_manifests/service-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 diff --git a/examples/enable-trace-sampling/rendered_manifests/serviceAccount.yaml b/examples/enable-trace-sampling/rendered_manifests/serviceAccount.yaml index 621c610a6..5bef21e83 100644 --- a/examples/enable-trace-sampling/rendered_manifests/serviceAccount.yaml +++ b/examples/enable-trace-sampling/rendered_manifests/serviceAccount.yaml @@ -11,7 +11,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/enabled-pprof-extension/rendered_manifests/clusterRole.yaml b/examples/enabled-pprof-extension/rendered_manifests/clusterRole.yaml index 787a48dfc..16f594c74 100644 --- a/examples/enabled-pprof-extension/rendered_manifests/clusterRole.yaml +++ b/examples/enabled-pprof-extension/rendered_manifests/clusterRole.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/enabled-pprof-extension/rendered_manifests/clusterRoleBinding.yaml b/examples/enabled-pprof-extension/rendered_manifests/clusterRoleBinding.yaml index 75e01844e..3f26df325 100644 --- a/examples/enabled-pprof-extension/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/enabled-pprof-extension/rendered_manifests/clusterRoleBinding.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/enabled-pprof-extension/rendered_manifests/configmap-agent.yaml b/examples/enabled-pprof-extension/rendered_manifests/configmap-agent.yaml index 8f5e654eb..bdea1393b 100644 --- a/examples/enabled-pprof-extension/rendered_manifests/configmap-agent.yaml +++ b/examples/enabled-pprof-extension/rendered_manifests/configmap-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -184,11 +184,7 @@ data: - job_name: otel-agent metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -320,3 +316,6 @@ data: prometheus: host: localhost port: 8889 + without_scope_info: true + without_type_suffix: true + without_units: true diff --git a/examples/enabled-pprof-extension/rendered_manifests/configmap-cluster-receiver.yaml b/examples/enabled-pprof-extension/rendered_manifests/configmap-cluster-receiver.yaml index d2e012ce7..dc5af4330 100644 --- a/examples/enabled-pprof-extension/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/enabled-pprof-extension/rendered_manifests/configmap-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -82,11 +82,7 @@ data: - job_name: otel-k8s-cluster-receiver metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -131,3 +127,6 @@ data: prometheus: host: localhost port: 8889 + without_scope_info: true + without_type_suffix: true + without_units: true diff --git a/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml b/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml index e7572b952..3a81e444d 100644 --- a/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml +++ b/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 8f05cb52638cb7af67c888b0ba83386cc4928dc476e7f39d15635bcc05d92c2a + checksum/config: 6c017f70f07beac6bc3a06e64dd6ed9688edceba388942fe380428f2cc8dc0d3 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -86,7 +86,7 @@ spec: containerPort: 9411 hostPort: 9411 protocol: TCP - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/enabled-pprof-extension/rendered_manifests/deployment-cluster-receiver.yaml b/examples/enabled-pprof-extension/rendered_manifests/deployment-cluster-receiver.yaml index 1620633de..927a205f6 100644 --- a/examples/enabled-pprof-extension/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/enabled-pprof-extension/rendered_manifests/deployment-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver chart: splunk-otel-collector-0.118.0 @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: f25f2d1d33bf121655e8c42b63e4f17502bae29f2cc8aaa585764447976fdde8 + checksum/config: c42cb1583d693dc14d6ad2977c155843810e3a7c1e7fb3aae3daea5d8914879d spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -41,7 +41,7 @@ spec: command: - /otelcol - --config=/conf/relay.yaml - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/enabled-pprof-extension/rendered_manifests/secret-splunk.yaml b/examples/enabled-pprof-extension/rendered_manifests/secret-splunk.yaml index 1f07f6a80..9a7030b40 100644 --- a/examples/enabled-pprof-extension/rendered_manifests/secret-splunk.yaml +++ b/examples/enabled-pprof-extension/rendered_manifests/secret-splunk.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/enabled-pprof-extension/rendered_manifests/service-agent.yaml b/examples/enabled-pprof-extension/rendered_manifests/service-agent.yaml index f9d94ce64..6f56bac80 100644 --- a/examples/enabled-pprof-extension/rendered_manifests/service-agent.yaml +++ b/examples/enabled-pprof-extension/rendered_manifests/service-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 diff --git a/examples/enabled-pprof-extension/rendered_manifests/serviceAccount.yaml b/examples/enabled-pprof-extension/rendered_manifests/serviceAccount.yaml index 621c610a6..5bef21e83 100644 --- a/examples/enabled-pprof-extension/rendered_manifests/serviceAccount.yaml +++ b/examples/enabled-pprof-extension/rendered_manifests/serviceAccount.yaml @@ -11,7 +11,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/clusterRole.yaml b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/clusterRole.yaml index 787a48dfc..16f594c74 100644 --- a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/clusterRole.yaml +++ b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/clusterRole.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/clusterRoleBinding.yaml b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/clusterRoleBinding.yaml index 75e01844e..3f26df325 100644 --- a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/clusterRoleBinding.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-agent.yaml b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-agent.yaml index f1951c3ac..369e5b489 100644 --- a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-agent.yaml +++ b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -201,11 +201,7 @@ data: - job_name: otel-agent metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -351,3 +347,6 @@ data: prometheus: host: localhost port: 8889 + without_scope_info: true + without_type_suffix: true + without_units: true diff --git a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-cluster-receiver.yaml b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-cluster-receiver.yaml index d2e012ce7..dc5af4330 100644 --- a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -82,11 +82,7 @@ data: - job_name: otel-k8s-cluster-receiver metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -131,3 +127,6 @@ data: prometheus: host: localhost port: 8889 + without_scope_info: true + without_type_suffix: true + without_units: true diff --git a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-fluentd-json.yaml b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-fluentd-json.yaml index 3f2edd63e..f6a5a8816 100644 --- a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-fluentd-json.yaml +++ b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-fluentd-json.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-fluentd.yaml b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-fluentd.yaml index 0d1a5017c..ec1659774 100644 --- a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-fluentd.yaml +++ b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/configmap-fluentd.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/daemonset.yaml b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/daemonset.yaml index a048a6e0e..29a52f656 100644 --- a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/daemonset.yaml +++ b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/daemonset.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 @@ -33,7 +33,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 0f2bd9b8d0051928f92ddcd40e4badd8edf6c2e8c9e10a2723481176bff268ca + checksum/config: 551376260283bda11d3c34f893402ca802da5caf613ddb8d6e118bd243cc19fe kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -159,7 +159,7 @@ spec: containerPort: 9411 hostPort: 9411 protocol: TCP - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/deployment-cluster-receiver.yaml b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/deployment-cluster-receiver.yaml index 1620633de..927a205f6 100644 --- a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/deployment-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver chart: splunk-otel-collector-0.118.0 @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: f25f2d1d33bf121655e8c42b63e4f17502bae29f2cc8aaa585764447976fdde8 + checksum/config: c42cb1583d693dc14d6ad2977c155843810e3a7c1e7fb3aae3daea5d8914879d spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -41,7 +41,7 @@ spec: command: - /otelcol - --config=/conf/relay.yaml - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/secret-splunk.yaml b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/secret-splunk.yaml index 1f07f6a80..9a7030b40 100644 --- a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/secret-splunk.yaml +++ b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/secret-splunk.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/service-agent.yaml b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/service-agent.yaml index 029dcf416..4e3a02368 100644 --- a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/service-agent.yaml +++ b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/service-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 diff --git a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/serviceAccount.yaml b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/serviceAccount.yaml index 621c610a6..5bef21e83 100644 --- a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/serviceAccount.yaml +++ b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/serviceAccount.yaml @@ -11,7 +11,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/fluentd-refresh-interval/rendered_manifests/clusterRole.yaml b/examples/fluentd-refresh-interval/rendered_manifests/clusterRole.yaml index 787a48dfc..16f594c74 100644 --- a/examples/fluentd-refresh-interval/rendered_manifests/clusterRole.yaml +++ b/examples/fluentd-refresh-interval/rendered_manifests/clusterRole.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/fluentd-refresh-interval/rendered_manifests/clusterRoleBinding.yaml b/examples/fluentd-refresh-interval/rendered_manifests/clusterRoleBinding.yaml index 75e01844e..3f26df325 100644 --- a/examples/fluentd-refresh-interval/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/fluentd-refresh-interval/rendered_manifests/clusterRoleBinding.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/fluentd-refresh-interval/rendered_manifests/configmap-agent.yaml b/examples/fluentd-refresh-interval/rendered_manifests/configmap-agent.yaml index f1951c3ac..369e5b489 100644 --- a/examples/fluentd-refresh-interval/rendered_manifests/configmap-agent.yaml +++ b/examples/fluentd-refresh-interval/rendered_manifests/configmap-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -201,11 +201,7 @@ data: - job_name: otel-agent metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -351,3 +347,6 @@ data: prometheus: host: localhost port: 8889 + without_scope_info: true + without_type_suffix: true + without_units: true diff --git a/examples/fluentd-refresh-interval/rendered_manifests/configmap-cluster-receiver.yaml b/examples/fluentd-refresh-interval/rendered_manifests/configmap-cluster-receiver.yaml index d2e012ce7..dc5af4330 100644 --- a/examples/fluentd-refresh-interval/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/fluentd-refresh-interval/rendered_manifests/configmap-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -82,11 +82,7 @@ data: - job_name: otel-k8s-cluster-receiver metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -131,3 +127,6 @@ data: prometheus: host: localhost port: 8889 + without_scope_info: true + without_type_suffix: true + without_units: true diff --git a/examples/fluentd-refresh-interval/rendered_manifests/configmap-fluentd-json.yaml b/examples/fluentd-refresh-interval/rendered_manifests/configmap-fluentd-json.yaml index 3f2edd63e..f6a5a8816 100644 --- a/examples/fluentd-refresh-interval/rendered_manifests/configmap-fluentd-json.yaml +++ b/examples/fluentd-refresh-interval/rendered_manifests/configmap-fluentd-json.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/fluentd-refresh-interval/rendered_manifests/configmap-fluentd.yaml b/examples/fluentd-refresh-interval/rendered_manifests/configmap-fluentd.yaml index ca9b91a8a..61943b7f2 100644 --- a/examples/fluentd-refresh-interval/rendered_manifests/configmap-fluentd.yaml +++ b/examples/fluentd-refresh-interval/rendered_manifests/configmap-fluentd.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/fluentd-refresh-interval/rendered_manifests/daemonset.yaml b/examples/fluentd-refresh-interval/rendered_manifests/daemonset.yaml index 92bb7ccf7..f75276c02 100644 --- a/examples/fluentd-refresh-interval/rendered_manifests/daemonset.yaml +++ b/examples/fluentd-refresh-interval/rendered_manifests/daemonset.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 @@ -33,7 +33,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 2cff4dfd4c2135d98298167b438f78d7ae2b9911d35b3611d96251f8df0c6b29 + checksum/config: 3325aa24b4f11d07fb1ee0a39a85484a1ff7a0183ec0229f7feb33e75e7d6e47 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -159,7 +159,7 @@ spec: containerPort: 9411 hostPort: 9411 protocol: TCP - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/fluentd-refresh-interval/rendered_manifests/deployment-cluster-receiver.yaml b/examples/fluentd-refresh-interval/rendered_manifests/deployment-cluster-receiver.yaml index 1620633de..927a205f6 100644 --- a/examples/fluentd-refresh-interval/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/fluentd-refresh-interval/rendered_manifests/deployment-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver chart: splunk-otel-collector-0.118.0 @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: f25f2d1d33bf121655e8c42b63e4f17502bae29f2cc8aaa585764447976fdde8 + checksum/config: c42cb1583d693dc14d6ad2977c155843810e3a7c1e7fb3aae3daea5d8914879d spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -41,7 +41,7 @@ spec: command: - /otelcol - --config=/conf/relay.yaml - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/fluentd-refresh-interval/rendered_manifests/secret-splunk.yaml b/examples/fluentd-refresh-interval/rendered_manifests/secret-splunk.yaml index 1f07f6a80..9a7030b40 100644 --- a/examples/fluentd-refresh-interval/rendered_manifests/secret-splunk.yaml +++ b/examples/fluentd-refresh-interval/rendered_manifests/secret-splunk.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/fluentd-refresh-interval/rendered_manifests/service-agent.yaml b/examples/fluentd-refresh-interval/rendered_manifests/service-agent.yaml index 029dcf416..4e3a02368 100644 --- a/examples/fluentd-refresh-interval/rendered_manifests/service-agent.yaml +++ b/examples/fluentd-refresh-interval/rendered_manifests/service-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 diff --git a/examples/fluentd-refresh-interval/rendered_manifests/serviceAccount.yaml b/examples/fluentd-refresh-interval/rendered_manifests/serviceAccount.yaml index 621c610a6..5bef21e83 100644 --- a/examples/fluentd-refresh-interval/rendered_manifests/serviceAccount.yaml +++ b/examples/fluentd-refresh-interval/rendered_manifests/serviceAccount.yaml @@ -11,7 +11,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/kubernetes-windows-nodes/rendered_manifests/clusterRole.yaml b/examples/kubernetes-windows-nodes/rendered_manifests/clusterRole.yaml index 787a48dfc..16f594c74 100644 --- a/examples/kubernetes-windows-nodes/rendered_manifests/clusterRole.yaml +++ b/examples/kubernetes-windows-nodes/rendered_manifests/clusterRole.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/kubernetes-windows-nodes/rendered_manifests/clusterRoleBinding.yaml b/examples/kubernetes-windows-nodes/rendered_manifests/clusterRoleBinding.yaml index 75e01844e..3f26df325 100644 --- a/examples/kubernetes-windows-nodes/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/kubernetes-windows-nodes/rendered_manifests/clusterRoleBinding.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/kubernetes-windows-nodes/rendered_manifests/configmap-agent.yaml b/examples/kubernetes-windows-nodes/rendered_manifests/configmap-agent.yaml index a5a9a136f..dbe908471 100644 --- a/examples/kubernetes-windows-nodes/rendered_manifests/configmap-agent.yaml +++ b/examples/kubernetes-windows-nodes/rendered_manifests/configmap-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -305,11 +305,7 @@ data: - job_name: otel-agent metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -457,3 +453,6 @@ data: prometheus: host: localhost port: 8889 + without_scope_info: true + without_type_suffix: true + without_units: true diff --git a/examples/kubernetes-windows-nodes/rendered_manifests/configmap-cluster-receiver.yaml b/examples/kubernetes-windows-nodes/rendered_manifests/configmap-cluster-receiver.yaml index d2e012ce7..dc5af4330 100644 --- a/examples/kubernetes-windows-nodes/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/kubernetes-windows-nodes/rendered_manifests/configmap-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -82,11 +82,7 @@ data: - job_name: otel-k8s-cluster-receiver metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -131,3 +127,6 @@ data: prometheus: host: localhost port: 8889 + without_scope_info: true + without_type_suffix: true + without_units: true diff --git a/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml b/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml index 70aba6e02..68c756c24 100644 --- a/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml +++ b/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: db7f8592f13ad4dc17302781e9430a0d4c13dcebe4430c1a26a8c478765f5496 + checksum/config: 90804beecc3138487071d39a8acc6cb156244c0ee01e9f6e4e321d913a2bbb2a kubectl.kubernetes.io/default-container: otel-collector spec: dnsPolicy: ClusterFirstWithHostNet @@ -91,7 +91,7 @@ spec: containerPort: 9411 hostPort: 9411 protocol: TCP - image: quay.io/signalfx/splunk-otel-collector-windows:0.118.0 + image: quay.io/signalfx/splunk-otel-collector-windows:0.119.0 imagePullPolicy: IfNotPresent securityContext: windowsOptions: diff --git a/examples/kubernetes-windows-nodes/rendered_manifests/deployment-cluster-receiver.yaml b/examples/kubernetes-windows-nodes/rendered_manifests/deployment-cluster-receiver.yaml index e3a58ec86..2bd2d8baa 100644 --- a/examples/kubernetes-windows-nodes/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/kubernetes-windows-nodes/rendered_manifests/deployment-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver chart: splunk-otel-collector-0.118.0 @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: f25f2d1d33bf121655e8c42b63e4f17502bae29f2cc8aaa585764447976fdde8 + checksum/config: c42cb1583d693dc14d6ad2977c155843810e3a7c1e7fb3aae3daea5d8914879d spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -43,7 +43,7 @@ spec: - -command - .\otelcol.exe - --config=C:\\conf\relay.yaml - image: quay.io/signalfx/splunk-otel-collector-windows:0.118.0 + image: quay.io/signalfx/splunk-otel-collector-windows:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/kubernetes-windows-nodes/rendered_manifests/secret-splunk.yaml b/examples/kubernetes-windows-nodes/rendered_manifests/secret-splunk.yaml index 1f07f6a80..9a7030b40 100644 --- a/examples/kubernetes-windows-nodes/rendered_manifests/secret-splunk.yaml +++ b/examples/kubernetes-windows-nodes/rendered_manifests/secret-splunk.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/kubernetes-windows-nodes/rendered_manifests/service-agent.yaml b/examples/kubernetes-windows-nodes/rendered_manifests/service-agent.yaml index 029dcf416..4e3a02368 100644 --- a/examples/kubernetes-windows-nodes/rendered_manifests/service-agent.yaml +++ b/examples/kubernetes-windows-nodes/rendered_manifests/service-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 diff --git a/examples/kubernetes-windows-nodes/rendered_manifests/serviceAccount.yaml b/examples/kubernetes-windows-nodes/rendered_manifests/serviceAccount.yaml index 621c610a6..5bef21e83 100644 --- a/examples/kubernetes-windows-nodes/rendered_manifests/serviceAccount.yaml +++ b/examples/kubernetes-windows-nodes/rendered_manifests/serviceAccount.yaml @@ -11,7 +11,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/multi-metrics/rendered_manifests/clusterRole.yaml b/examples/multi-metrics/rendered_manifests/clusterRole.yaml index 787a48dfc..16f594c74 100644 --- a/examples/multi-metrics/rendered_manifests/clusterRole.yaml +++ b/examples/multi-metrics/rendered_manifests/clusterRole.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/multi-metrics/rendered_manifests/clusterRoleBinding.yaml b/examples/multi-metrics/rendered_manifests/clusterRoleBinding.yaml index 75e01844e..3f26df325 100644 --- a/examples/multi-metrics/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/multi-metrics/rendered_manifests/clusterRoleBinding.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/multi-metrics/rendered_manifests/configmap-agent.yaml b/examples/multi-metrics/rendered_manifests/configmap-agent.yaml index 4a1c8c31f..2417cfa90 100644 --- a/examples/multi-metrics/rendered_manifests/configmap-agent.yaml +++ b/examples/multi-metrics/rendered_manifests/configmap-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -355,11 +355,7 @@ data: - job_name: otel-agent metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -488,3 +484,6 @@ data: prometheus: host: localhost port: 8889 + without_scope_info: true + without_type_suffix: true + without_units: true diff --git a/examples/multi-metrics/rendered_manifests/configmap-cluster-receiver.yaml b/examples/multi-metrics/rendered_manifests/configmap-cluster-receiver.yaml index 3625e5e75..f31e7c727 100644 --- a/examples/multi-metrics/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/multi-metrics/rendered_manifests/configmap-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -126,11 +126,7 @@ data: - job_name: otel-k8s-cluster-receiver metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -177,3 +173,6 @@ data: prometheus: host: localhost port: 8889 + without_scope_info: true + without_type_suffix: true + without_units: true diff --git a/examples/multi-metrics/rendered_manifests/daemonset.yaml b/examples/multi-metrics/rendered_manifests/daemonset.yaml index 7052c589a..00d5513e8 100644 --- a/examples/multi-metrics/rendered_manifests/daemonset.yaml +++ b/examples/multi-metrics/rendered_manifests/daemonset.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 88b937ca61dcba36afcf02b059f05b28d568ed4ee237653722313c3e6f52b940 + checksum/config: 55af00156f935751c55baaa9691be6d63e61d21fe5e61597df229d0b9bcce416 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -55,7 +55,7 @@ spec: operator: Exists initContainers: - name: migrate-checkpoint - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent command: ["/migratecheckpoint"] securityContext: @@ -109,7 +109,7 @@ spec: containerPort: 9943 hostPort: 9943 protocol: TCP - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent securityContext: runAsUser: 0 diff --git a/examples/multi-metrics/rendered_manifests/deployment-cluster-receiver.yaml b/examples/multi-metrics/rendered_manifests/deployment-cluster-receiver.yaml index d9badea13..85a9a19c0 100644 --- a/examples/multi-metrics/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/multi-metrics/rendered_manifests/deployment-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver chart: splunk-otel-collector-0.118.0 @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: dc4a0f1c2390351f7216a170b12488d1537ec4584cf63480a7d0b8dd2f6f0fbe + checksum/config: e33bfc582d5659771518c4063ea8f37bd3e378c7ce1f172ee304b3b8d21cf95d spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -41,7 +41,7 @@ spec: command: - /otelcol - --config=/conf/relay.yaml - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/multi-metrics/rendered_manifests/secret-splunk.yaml b/examples/multi-metrics/rendered_manifests/secret-splunk.yaml index 8dd2c8032..03481643a 100644 --- a/examples/multi-metrics/rendered_manifests/secret-splunk.yaml +++ b/examples/multi-metrics/rendered_manifests/secret-splunk.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/multi-metrics/rendered_manifests/service-agent.yaml b/examples/multi-metrics/rendered_manifests/service-agent.yaml index b4c4e8aa0..8f18edf69 100644 --- a/examples/multi-metrics/rendered_manifests/service-agent.yaml +++ b/examples/multi-metrics/rendered_manifests/service-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 diff --git a/examples/multi-metrics/rendered_manifests/serviceAccount.yaml b/examples/multi-metrics/rendered_manifests/serviceAccount.yaml index 621c610a6..5bef21e83 100644 --- a/examples/multi-metrics/rendered_manifests/serviceAccount.yaml +++ b/examples/multi-metrics/rendered_manifests/serviceAccount.yaml @@ -11,7 +11,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/only-logs-fluentd/rendered_manifests/clusterRole.yaml b/examples/only-logs-fluentd/rendered_manifests/clusterRole.yaml index 787a48dfc..16f594c74 100644 --- a/examples/only-logs-fluentd/rendered_manifests/clusterRole.yaml +++ b/examples/only-logs-fluentd/rendered_manifests/clusterRole.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/only-logs-fluentd/rendered_manifests/clusterRoleBinding.yaml b/examples/only-logs-fluentd/rendered_manifests/clusterRoleBinding.yaml index 75e01844e..3f26df325 100644 --- a/examples/only-logs-fluentd/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/only-logs-fluentd/rendered_manifests/clusterRoleBinding.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/only-logs-fluentd/rendered_manifests/configmap-agent.yaml b/examples/only-logs-fluentd/rendered_manifests/configmap-agent.yaml index ae4f0c311..9275a94dd 100644 --- a/examples/only-logs-fluentd/rendered_manifests/configmap-agent.yaml +++ b/examples/only-logs-fluentd/rendered_manifests/configmap-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -164,11 +164,7 @@ data: - job_name: otel-agent metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -230,3 +226,6 @@ data: prometheus: host: localhost port: 8889 + without_scope_info: true + without_type_suffix: true + without_units: true diff --git a/examples/only-logs-fluentd/rendered_manifests/configmap-fluentd-json.yaml b/examples/only-logs-fluentd/rendered_manifests/configmap-fluentd-json.yaml index 3f2edd63e..f6a5a8816 100644 --- a/examples/only-logs-fluentd/rendered_manifests/configmap-fluentd-json.yaml +++ b/examples/only-logs-fluentd/rendered_manifests/configmap-fluentd-json.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/only-logs-fluentd/rendered_manifests/configmap-fluentd.yaml b/examples/only-logs-fluentd/rendered_manifests/configmap-fluentd.yaml index bb2913d6b..0ecaccadf 100644 --- a/examples/only-logs-fluentd/rendered_manifests/configmap-fluentd.yaml +++ b/examples/only-logs-fluentd/rendered_manifests/configmap-fluentd.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/only-logs-fluentd/rendered_manifests/daemonset.yaml b/examples/only-logs-fluentd/rendered_manifests/daemonset.yaml index 22b24deb9..6359dcdf3 100644 --- a/examples/only-logs-fluentd/rendered_manifests/daemonset.yaml +++ b/examples/only-logs-fluentd/rendered_manifests/daemonset.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 @@ -33,7 +33,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: af5b388db451839c79ea5a7cf0c1802da356137818ddf96caeecfdf118968a61 + checksum/config: b037c9bb6ca04926181d8b2d77f638aa62d54681d614bddfd087870cbf381d20 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -139,7 +139,7 @@ spec: - name: otlp-http containerPort: 4318 protocol: TCP - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/only-logs-fluentd/rendered_manifests/secret-splunk.yaml b/examples/only-logs-fluentd/rendered_manifests/secret-splunk.yaml index 1f07f6a80..9a7030b40 100644 --- a/examples/only-logs-fluentd/rendered_manifests/secret-splunk.yaml +++ b/examples/only-logs-fluentd/rendered_manifests/secret-splunk.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/only-logs-fluentd/rendered_manifests/service-agent.yaml b/examples/only-logs-fluentd/rendered_manifests/service-agent.yaml index 318a706b1..04d530c8a 100644 --- a/examples/only-logs-fluentd/rendered_manifests/service-agent.yaml +++ b/examples/only-logs-fluentd/rendered_manifests/service-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 diff --git a/examples/only-logs-fluentd/rendered_manifests/serviceAccount.yaml b/examples/only-logs-fluentd/rendered_manifests/serviceAccount.yaml index 621c610a6..5bef21e83 100644 --- a/examples/only-logs-fluentd/rendered_manifests/serviceAccount.yaml +++ b/examples/only-logs-fluentd/rendered_manifests/serviceAccount.yaml @@ -11,7 +11,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/only-logs-otel/rendered_manifests/clusterRole.yaml b/examples/only-logs-otel/rendered_manifests/clusterRole.yaml index 787a48dfc..16f594c74 100644 --- a/examples/only-logs-otel/rendered_manifests/clusterRole.yaml +++ b/examples/only-logs-otel/rendered_manifests/clusterRole.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/only-logs-otel/rendered_manifests/clusterRoleBinding.yaml b/examples/only-logs-otel/rendered_manifests/clusterRoleBinding.yaml index 75e01844e..3f26df325 100644 --- a/examples/only-logs-otel/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/only-logs-otel/rendered_manifests/clusterRoleBinding.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/only-logs-otel/rendered_manifests/configmap-agent.yaml b/examples/only-logs-otel/rendered_manifests/configmap-agent.yaml index caae4f876..21ca4acfc 100644 --- a/examples/only-logs-otel/rendered_manifests/configmap-agent.yaml +++ b/examples/only-logs-otel/rendered_manifests/configmap-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -299,11 +299,7 @@ data: - job_name: otel-agent metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -366,3 +362,6 @@ data: prometheus: host: localhost port: 8889 + without_scope_info: true + without_type_suffix: true + without_units: true diff --git a/examples/only-logs-otel/rendered_manifests/daemonset.yaml b/examples/only-logs-otel/rendered_manifests/daemonset.yaml index a83ece179..14b14c945 100644 --- a/examples/only-logs-otel/rendered_manifests/daemonset.yaml +++ b/examples/only-logs-otel/rendered_manifests/daemonset.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 38bd67a2d2e789695c3d6eec7ac93f489c0b24bb85aff7aa94cf54e0ebd8fd08 + checksum/config: 88235c76c8d4b5f0c1c025ce9bba496beb0871bbd98edd1ed3d897dd9d4cb497 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -55,7 +55,7 @@ spec: operator: Exists initContainers: - name: migrate-checkpoint - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent command: ["/migratecheckpoint"] securityContext: @@ -105,7 +105,7 @@ spec: - name: otlp-http containerPort: 4318 protocol: TCP - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent securityContext: runAsUser: 0 diff --git a/examples/only-logs-otel/rendered_manifests/secret-splunk.yaml b/examples/only-logs-otel/rendered_manifests/secret-splunk.yaml index 1f07f6a80..9a7030b40 100644 --- a/examples/only-logs-otel/rendered_manifests/secret-splunk.yaml +++ b/examples/only-logs-otel/rendered_manifests/secret-splunk.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/only-logs-otel/rendered_manifests/service-agent.yaml b/examples/only-logs-otel/rendered_manifests/service-agent.yaml index 318a706b1..04d530c8a 100644 --- a/examples/only-logs-otel/rendered_manifests/service-agent.yaml +++ b/examples/only-logs-otel/rendered_manifests/service-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 diff --git a/examples/only-logs-otel/rendered_manifests/serviceAccount.yaml b/examples/only-logs-otel/rendered_manifests/serviceAccount.yaml index 621c610a6..5bef21e83 100644 --- a/examples/only-logs-otel/rendered_manifests/serviceAccount.yaml +++ b/examples/only-logs-otel/rendered_manifests/serviceAccount.yaml @@ -11,7 +11,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/only-logs-with-extra-file-logs/rendered_manifests/clusterRole.yaml b/examples/only-logs-with-extra-file-logs/rendered_manifests/clusterRole.yaml index 787a48dfc..16f594c74 100644 --- a/examples/only-logs-with-extra-file-logs/rendered_manifests/clusterRole.yaml +++ b/examples/only-logs-with-extra-file-logs/rendered_manifests/clusterRole.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/only-logs-with-extra-file-logs/rendered_manifests/clusterRoleBinding.yaml b/examples/only-logs-with-extra-file-logs/rendered_manifests/clusterRoleBinding.yaml index 75e01844e..3f26df325 100644 --- a/examples/only-logs-with-extra-file-logs/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/only-logs-with-extra-file-logs/rendered_manifests/clusterRoleBinding.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/only-logs-with-extra-file-logs/rendered_manifests/configmap-agent.yaml b/examples/only-logs-with-extra-file-logs/rendered_manifests/configmap-agent.yaml index fa6454a31..f0087bd38 100644 --- a/examples/only-logs-with-extra-file-logs/rendered_manifests/configmap-agent.yaml +++ b/examples/only-logs-with-extra-file-logs/rendered_manifests/configmap-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -292,11 +292,7 @@ data: - job_name: otel-agent metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -369,3 +365,6 @@ data: prometheus: host: localhost port: 8889 + without_scope_info: true + without_type_suffix: true + without_units: true diff --git a/examples/only-logs-with-extra-file-logs/rendered_manifests/daemonset.yaml b/examples/only-logs-with-extra-file-logs/rendered_manifests/daemonset.yaml index 9979c6544..491dd5ff1 100644 --- a/examples/only-logs-with-extra-file-logs/rendered_manifests/daemonset.yaml +++ b/examples/only-logs-with-extra-file-logs/rendered_manifests/daemonset.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: a9f4d7674f21d009b7de7d51d2afaf740996f4ba7b438761273d67597b64dafc + checksum/config: aec915a30547233b593d8c48f6090f2ee017d714fa97a602c05af9db82f905fd kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -55,7 +55,7 @@ spec: operator: Exists initContainers: - name: migrate-checkpoint - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent command: ["/migratecheckpoint"] securityContext: @@ -105,7 +105,7 @@ spec: - name: otlp-http containerPort: 4318 protocol: TCP - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent securityContext: runAsUser: 0 diff --git a/examples/only-logs-with-extra-file-logs/rendered_manifests/secret-splunk.yaml b/examples/only-logs-with-extra-file-logs/rendered_manifests/secret-splunk.yaml index 1f07f6a80..9a7030b40 100644 --- a/examples/only-logs-with-extra-file-logs/rendered_manifests/secret-splunk.yaml +++ b/examples/only-logs-with-extra-file-logs/rendered_manifests/secret-splunk.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/only-logs-with-extra-file-logs/rendered_manifests/service-agent.yaml b/examples/only-logs-with-extra-file-logs/rendered_manifests/service-agent.yaml index 318a706b1..04d530c8a 100644 --- a/examples/only-logs-with-extra-file-logs/rendered_manifests/service-agent.yaml +++ b/examples/only-logs-with-extra-file-logs/rendered_manifests/service-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 diff --git a/examples/only-logs-with-extra-file-logs/rendered_manifests/serviceAccount.yaml b/examples/only-logs-with-extra-file-logs/rendered_manifests/serviceAccount.yaml index 621c610a6..5bef21e83 100644 --- a/examples/only-logs-with-extra-file-logs/rendered_manifests/serviceAccount.yaml +++ b/examples/only-logs-with-extra-file-logs/rendered_manifests/serviceAccount.yaml @@ -11,7 +11,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/only-metrics-platform/rendered_manifests/clusterRole.yaml b/examples/only-metrics-platform/rendered_manifests/clusterRole.yaml index 787a48dfc..16f594c74 100644 --- a/examples/only-metrics-platform/rendered_manifests/clusterRole.yaml +++ b/examples/only-metrics-platform/rendered_manifests/clusterRole.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/only-metrics-platform/rendered_manifests/clusterRoleBinding.yaml b/examples/only-metrics-platform/rendered_manifests/clusterRoleBinding.yaml index 75e01844e..3f26df325 100644 --- a/examples/only-metrics-platform/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/only-metrics-platform/rendered_manifests/clusterRoleBinding.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/only-metrics-platform/rendered_manifests/configmap-agent.yaml b/examples/only-metrics-platform/rendered_manifests/configmap-agent.yaml index f3d63c388..f364f1deb 100644 --- a/examples/only-metrics-platform/rendered_manifests/configmap-agent.yaml +++ b/examples/only-metrics-platform/rendered_manifests/configmap-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -218,11 +218,7 @@ data: - job_name: otel-agent metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -335,3 +331,6 @@ data: prometheus: host: localhost port: 8889 + without_scope_info: true + without_type_suffix: true + without_units: true diff --git a/examples/only-metrics-platform/rendered_manifests/configmap-cluster-receiver.yaml b/examples/only-metrics-platform/rendered_manifests/configmap-cluster-receiver.yaml index 3625e5e75..f31e7c727 100644 --- a/examples/only-metrics-platform/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/only-metrics-platform/rendered_manifests/configmap-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -126,11 +126,7 @@ data: - job_name: otel-k8s-cluster-receiver metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -177,3 +173,6 @@ data: prometheus: host: localhost port: 8889 + without_scope_info: true + without_type_suffix: true + without_units: true diff --git a/examples/only-metrics-platform/rendered_manifests/daemonset.yaml b/examples/only-metrics-platform/rendered_manifests/daemonset.yaml index 54502f7fe..f0a4e2778 100644 --- a/examples/only-metrics-platform/rendered_manifests/daemonset.yaml +++ b/examples/only-metrics-platform/rendered_manifests/daemonset.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 7d85bbe4bf372577b9da3d11ca84157b697b9d281afc5bc23efac3d965f85db8 + checksum/config: 8da38b1c97209a3cbde27deee1c1bb4722617348f007fe18634edfeb4c0dab69 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -70,7 +70,7 @@ spec: containerPort: 9943 hostPort: 9943 protocol: TCP - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/only-metrics-platform/rendered_manifests/deployment-cluster-receiver.yaml b/examples/only-metrics-platform/rendered_manifests/deployment-cluster-receiver.yaml index d9badea13..85a9a19c0 100644 --- a/examples/only-metrics-platform/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/only-metrics-platform/rendered_manifests/deployment-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver chart: splunk-otel-collector-0.118.0 @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: dc4a0f1c2390351f7216a170b12488d1537ec4584cf63480a7d0b8dd2f6f0fbe + checksum/config: e33bfc582d5659771518c4063ea8f37bd3e378c7ce1f172ee304b3b8d21cf95d spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -41,7 +41,7 @@ spec: command: - /otelcol - --config=/conf/relay.yaml - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/only-metrics-platform/rendered_manifests/secret-splunk.yaml b/examples/only-metrics-platform/rendered_manifests/secret-splunk.yaml index 8dd2c8032..03481643a 100644 --- a/examples/only-metrics-platform/rendered_manifests/secret-splunk.yaml +++ b/examples/only-metrics-platform/rendered_manifests/secret-splunk.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/only-metrics-platform/rendered_manifests/service-agent.yaml b/examples/only-metrics-platform/rendered_manifests/service-agent.yaml index 682479ee3..7a6660541 100644 --- a/examples/only-metrics-platform/rendered_manifests/service-agent.yaml +++ b/examples/only-metrics-platform/rendered_manifests/service-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 diff --git a/examples/only-metrics-platform/rendered_manifests/serviceAccount.yaml b/examples/only-metrics-platform/rendered_manifests/serviceAccount.yaml index 621c610a6..5bef21e83 100644 --- a/examples/only-metrics-platform/rendered_manifests/serviceAccount.yaml +++ b/examples/only-metrics-platform/rendered_manifests/serviceAccount.yaml @@ -11,7 +11,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/only-metrics/rendered_manifests/clusterRole.yaml b/examples/only-metrics/rendered_manifests/clusterRole.yaml index 787a48dfc..16f594c74 100644 --- a/examples/only-metrics/rendered_manifests/clusterRole.yaml +++ b/examples/only-metrics/rendered_manifests/clusterRole.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/only-metrics/rendered_manifests/clusterRoleBinding.yaml b/examples/only-metrics/rendered_manifests/clusterRoleBinding.yaml index 75e01844e..3f26df325 100644 --- a/examples/only-metrics/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/only-metrics/rendered_manifests/clusterRoleBinding.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/only-metrics/rendered_manifests/configmap-agent.yaml b/examples/only-metrics/rendered_manifests/configmap-agent.yaml index 30390eaee..d98447fbe 100644 --- a/examples/only-metrics/rendered_manifests/configmap-agent.yaml +++ b/examples/only-metrics/rendered_manifests/configmap-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -172,11 +172,7 @@ data: - job_name: otel-agent metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -287,3 +283,6 @@ data: prometheus: host: localhost port: 8889 + without_scope_info: true + without_type_suffix: true + without_units: true diff --git a/examples/only-metrics/rendered_manifests/configmap-cluster-receiver.yaml b/examples/only-metrics/rendered_manifests/configmap-cluster-receiver.yaml index d2e012ce7..dc5af4330 100644 --- a/examples/only-metrics/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/only-metrics/rendered_manifests/configmap-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -82,11 +82,7 @@ data: - job_name: otel-k8s-cluster-receiver metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -131,3 +127,6 @@ data: prometheus: host: localhost port: 8889 + without_scope_info: true + without_type_suffix: true + without_units: true diff --git a/examples/only-metrics/rendered_manifests/daemonset.yaml b/examples/only-metrics/rendered_manifests/daemonset.yaml index b643b8ace..5226538ea 100644 --- a/examples/only-metrics/rendered_manifests/daemonset.yaml +++ b/examples/only-metrics/rendered_manifests/daemonset.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: e80b3b8ffe35188a7fd25c9b8d214db621ee8f5ae2968c9b0704b3aff535a2e2 + checksum/config: 3627150b9bbcd4667a47e1c64ede968f29c98c716b6269999ebbb09ee920e37e kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -70,7 +70,7 @@ spec: containerPort: 9943 hostPort: 9943 protocol: TCP - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/only-metrics/rendered_manifests/deployment-cluster-receiver.yaml b/examples/only-metrics/rendered_manifests/deployment-cluster-receiver.yaml index 1620633de..927a205f6 100644 --- a/examples/only-metrics/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/only-metrics/rendered_manifests/deployment-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver chart: splunk-otel-collector-0.118.0 @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: f25f2d1d33bf121655e8c42b63e4f17502bae29f2cc8aaa585764447976fdde8 + checksum/config: c42cb1583d693dc14d6ad2977c155843810e3a7c1e7fb3aae3daea5d8914879d spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -41,7 +41,7 @@ spec: command: - /otelcol - --config=/conf/relay.yaml - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/only-metrics/rendered_manifests/secret-splunk.yaml b/examples/only-metrics/rendered_manifests/secret-splunk.yaml index 1f07f6a80..9a7030b40 100644 --- a/examples/only-metrics/rendered_manifests/secret-splunk.yaml +++ b/examples/only-metrics/rendered_manifests/secret-splunk.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/only-metrics/rendered_manifests/service-agent.yaml b/examples/only-metrics/rendered_manifests/service-agent.yaml index 682479ee3..7a6660541 100644 --- a/examples/only-metrics/rendered_manifests/service-agent.yaml +++ b/examples/only-metrics/rendered_manifests/service-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 diff --git a/examples/only-metrics/rendered_manifests/serviceAccount.yaml b/examples/only-metrics/rendered_manifests/serviceAccount.yaml index 621c610a6..5bef21e83 100644 --- a/examples/only-metrics/rendered_manifests/serviceAccount.yaml +++ b/examples/only-metrics/rendered_manifests/serviceAccount.yaml @@ -11,7 +11,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/only-traces/rendered_manifests/clusterRole.yaml b/examples/only-traces/rendered_manifests/clusterRole.yaml index 787a48dfc..16f594c74 100644 --- a/examples/only-traces/rendered_manifests/clusterRole.yaml +++ b/examples/only-traces/rendered_manifests/clusterRole.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/only-traces/rendered_manifests/clusterRoleBinding.yaml b/examples/only-traces/rendered_manifests/clusterRoleBinding.yaml index 75e01844e..3f26df325 100644 --- a/examples/only-traces/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/only-traces/rendered_manifests/clusterRoleBinding.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/only-traces/rendered_manifests/configmap-agent.yaml b/examples/only-traces/rendered_manifests/configmap-agent.yaml index 49e6a4485..000c8e2f0 100644 --- a/examples/only-traces/rendered_manifests/configmap-agent.yaml +++ b/examples/only-traces/rendered_manifests/configmap-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -157,11 +157,7 @@ data: - job_name: otel-agent metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -227,3 +223,6 @@ data: prometheus: host: localhost port: 8889 + without_scope_info: true + without_type_suffix: true + without_units: true diff --git a/examples/only-traces/rendered_manifests/daemonset.yaml b/examples/only-traces/rendered_manifests/daemonset.yaml index df54b515c..ae435ea35 100644 --- a/examples/only-traces/rendered_manifests/daemonset.yaml +++ b/examples/only-traces/rendered_manifests/daemonset.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 73ae2ec4b01a52f0b2d1d009a3de3065eae3af9a8f32b04ec617bcb8b68ec9a4 + checksum/config: 719f4e043d94bb6ce4e60328d28d13c38326ea5224783875ac417de03868afea kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -82,7 +82,7 @@ spec: containerPort: 9411 hostPort: 9411 protocol: TCP - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/only-traces/rendered_manifests/secret-splunk.yaml b/examples/only-traces/rendered_manifests/secret-splunk.yaml index 1f07f6a80..9a7030b40 100644 --- a/examples/only-traces/rendered_manifests/secret-splunk.yaml +++ b/examples/only-traces/rendered_manifests/secret-splunk.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/only-traces/rendered_manifests/service-agent.yaml b/examples/only-traces/rendered_manifests/service-agent.yaml index 6748282f4..3209fc87e 100644 --- a/examples/only-traces/rendered_manifests/service-agent.yaml +++ b/examples/only-traces/rendered_manifests/service-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 diff --git a/examples/only-traces/rendered_manifests/serviceAccount.yaml b/examples/only-traces/rendered_manifests/serviceAccount.yaml index 621c610a6..5bef21e83 100644 --- a/examples/only-traces/rendered_manifests/serviceAccount.yaml +++ b/examples/only-traces/rendered_manifests/serviceAccount.yaml @@ -11,7 +11,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/clusterRole.yaml b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/clusterRole.yaml index 787a48dfc..16f594c74 100644 --- a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/clusterRole.yaml +++ b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/clusterRole.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/clusterRoleBinding.yaml b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/clusterRoleBinding.yaml index 75e01844e..3f26df325 100644 --- a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/clusterRoleBinding.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/configmap-agent.yaml b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/configmap-agent.yaml index fbd09b3a5..c47a92d89 100644 --- a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/configmap-agent.yaml +++ b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/configmap-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -187,11 +187,7 @@ data: - job_name: otel-agent metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -325,3 +321,6 @@ data: prometheus: host: localhost port: 8889 + without_scope_info: true + without_type_suffix: true + without_units: true diff --git a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/configmap-cluster-receiver.yaml b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/configmap-cluster-receiver.yaml index 5f431339e..5b9347f40 100644 --- a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/configmap-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -82,11 +82,7 @@ data: - job_name: otel-k8s-cluster-receiver metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -131,3 +127,6 @@ data: prometheus: host: localhost port: 8889 + without_scope_info: true + without_type_suffix: true + without_units: true diff --git a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/daemonset.yaml b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/daemonset.yaml index 9cd2ab9ed..6edee52f2 100644 --- a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/daemonset.yaml +++ b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/daemonset.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 6166ecb8708d5dea5940836a6d99a02194b5eebd319a354adcdacd25237bcba4 + checksum/config: 9b20567ac5c9e6777143f3b170eadd55927de8d3cdc24c604435906d275a50c7 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -86,7 +86,7 @@ spec: containerPort: 9411 hostPort: 9411 protocol: TCP - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/deployment-cluster-receiver.yaml b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/deployment-cluster-receiver.yaml index df1592f65..f5da4da9c 100644 --- a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/deployment-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver chart: splunk-otel-collector-0.118.0 @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: 2d30104c1725bfc46d21422a78e2ebf2739ebca5499b79cf5b57362c722add65 + checksum/config: 80ec5a8462ae498443c59562679040d99fc9abbd5f4cfde791357c3b4a839f86 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -41,7 +41,7 @@ spec: command: - /otelcol - --config=/conf/relay.yaml - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/secret-splunk.yaml b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/secret-splunk.yaml index 1f07f6a80..9a7030b40 100644 --- a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/secret-splunk.yaml +++ b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/secret-splunk.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/service-agent.yaml b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/service-agent.yaml index f9d94ce64..6f56bac80 100644 --- a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/service-agent.yaml +++ b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/service-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 diff --git a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/serviceAccount.yaml b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/serviceAccount.yaml index 621c610a6..5bef21e83 100644 --- a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/serviceAccount.yaml +++ b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/serviceAccount.yaml @@ -11,7 +11,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/secret-validation/rendered_manifests/clusterRole.yaml b/examples/secret-validation/rendered_manifests/clusterRole.yaml index 787a48dfc..16f594c74 100644 --- a/examples/secret-validation/rendered_manifests/clusterRole.yaml +++ b/examples/secret-validation/rendered_manifests/clusterRole.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/secret-validation/rendered_manifests/clusterRoleBinding.yaml b/examples/secret-validation/rendered_manifests/clusterRoleBinding.yaml index 75e01844e..3f26df325 100644 --- a/examples/secret-validation/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/secret-validation/rendered_manifests/clusterRoleBinding.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/secret-validation/rendered_manifests/configmap-agent.yaml b/examples/secret-validation/rendered_manifests/configmap-agent.yaml index da1ed4ae2..878cb30a5 100644 --- a/examples/secret-validation/rendered_manifests/configmap-agent.yaml +++ b/examples/secret-validation/rendered_manifests/configmap-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -264,11 +264,7 @@ data: - job_name: otel-agent metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -331,3 +327,6 @@ data: prometheus: host: localhost port: 8889 + without_scope_info: true + without_type_suffix: true + without_units: true diff --git a/examples/secret-validation/rendered_manifests/daemonset.yaml b/examples/secret-validation/rendered_manifests/daemonset.yaml index dafdc5fc7..d5dd411e4 100644 --- a/examples/secret-validation/rendered_manifests/daemonset.yaml +++ b/examples/secret-validation/rendered_manifests/daemonset.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 2b3f1f12b71f67ff6f5925a78164f653a4fd71701765d682f002bd5a6fb729d4 + checksum/config: f9ca3f5951a1db5c1c5a16a6d119ef09f2b367b4a498f266cf808199c117fc55 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -55,7 +55,7 @@ spec: operator: Exists initContainers: - name: migrate-checkpoint - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent command: ["/migratecheckpoint"] securityContext: @@ -105,7 +105,7 @@ spec: - name: otlp-http containerPort: 4318 protocol: TCP - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent securityContext: runAsUser: 0 diff --git a/examples/secret-validation/rendered_manifests/secret-splunk-validation-hook.yaml b/examples/secret-validation/rendered_manifests/secret-splunk-validation-hook.yaml index 76e691d6f..d4687a2dc 100644 --- a/examples/secret-validation/rendered_manifests/secret-splunk-validation-hook.yaml +++ b/examples/secret-validation/rendered_manifests/secret-splunk-validation-hook.yaml @@ -12,7 +12,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" annotations: "helm.sh/hook": pre-upgrade,pre-install "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded diff --git a/examples/secret-validation/rendered_manifests/service-agent.yaml b/examples/secret-validation/rendered_manifests/service-agent.yaml index 318a706b1..04d530c8a 100644 --- a/examples/secret-validation/rendered_manifests/service-agent.yaml +++ b/examples/secret-validation/rendered_manifests/service-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 diff --git a/examples/secret-validation/rendered_manifests/serviceAccount.yaml b/examples/secret-validation/rendered_manifests/serviceAccount.yaml index 621c610a6..5bef21e83 100644 --- a/examples/secret-validation/rendered_manifests/serviceAccount.yaml +++ b/examples/secret-validation/rendered_manifests/serviceAccount.yaml @@ -11,7 +11,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/splunk-enterprise-index-routing/rendered_manifests/clusterRole.yaml b/examples/splunk-enterprise-index-routing/rendered_manifests/clusterRole.yaml index 787a48dfc..16f594c74 100644 --- a/examples/splunk-enterprise-index-routing/rendered_manifests/clusterRole.yaml +++ b/examples/splunk-enterprise-index-routing/rendered_manifests/clusterRole.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/splunk-enterprise-index-routing/rendered_manifests/clusterRoleBinding.yaml b/examples/splunk-enterprise-index-routing/rendered_manifests/clusterRoleBinding.yaml index 75e01844e..3f26df325 100644 --- a/examples/splunk-enterprise-index-routing/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/splunk-enterprise-index-routing/rendered_manifests/clusterRoleBinding.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/splunk-enterprise-index-routing/rendered_manifests/configmap-agent.yaml b/examples/splunk-enterprise-index-routing/rendered_manifests/configmap-agent.yaml index a2578cb6d..1c02d62d5 100644 --- a/examples/splunk-enterprise-index-routing/rendered_manifests/configmap-agent.yaml +++ b/examples/splunk-enterprise-index-routing/rendered_manifests/configmap-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -279,11 +279,7 @@ data: - job_name: otel-agent metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -334,3 +330,6 @@ data: prometheus: host: localhost port: 8889 + without_scope_info: true + without_type_suffix: true + without_units: true diff --git a/examples/splunk-enterprise-index-routing/rendered_manifests/daemonset.yaml b/examples/splunk-enterprise-index-routing/rendered_manifests/daemonset.yaml index bd2a92842..246378464 100644 --- a/examples/splunk-enterprise-index-routing/rendered_manifests/daemonset.yaml +++ b/examples/splunk-enterprise-index-routing/rendered_manifests/daemonset.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 337b62ab6e26e59337eb748710c0020c704126443416cef3db07f902f26ea6b5 + checksum/config: 8feace46ae7f20dcc8b8dad9eaaf575b86579a7673bbaa02f80828e4c18deafa kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -55,7 +55,7 @@ spec: operator: Exists initContainers: - name: migrate-checkpoint - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent command: ["/migratecheckpoint"] securityContext: @@ -105,7 +105,7 @@ spec: - name: otlp-http containerPort: 4318 protocol: TCP - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent securityContext: runAsUser: 0 diff --git a/examples/splunk-enterprise-index-routing/rendered_manifests/secret-splunk.yaml b/examples/splunk-enterprise-index-routing/rendered_manifests/secret-splunk.yaml index 8dd2c8032..03481643a 100644 --- a/examples/splunk-enterprise-index-routing/rendered_manifests/secret-splunk.yaml +++ b/examples/splunk-enterprise-index-routing/rendered_manifests/secret-splunk.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/splunk-enterprise-index-routing/rendered_manifests/service-agent.yaml b/examples/splunk-enterprise-index-routing/rendered_manifests/service-agent.yaml index 318a706b1..04d530c8a 100644 --- a/examples/splunk-enterprise-index-routing/rendered_manifests/service-agent.yaml +++ b/examples/splunk-enterprise-index-routing/rendered_manifests/service-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 diff --git a/examples/splunk-enterprise-index-routing/rendered_manifests/serviceAccount.yaml b/examples/splunk-enterprise-index-routing/rendered_manifests/serviceAccount.yaml index 621c610a6..5bef21e83 100644 --- a/examples/splunk-enterprise-index-routing/rendered_manifests/serviceAccount.yaml +++ b/examples/splunk-enterprise-index-routing/rendered_manifests/serviceAccount.yaml @@ -11,7 +11,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/target-allocator/rendered_manifests/clusterRole.yaml b/examples/target-allocator/rendered_manifests/clusterRole.yaml index 787a48dfc..16f594c74 100644 --- a/examples/target-allocator/rendered_manifests/clusterRole.yaml +++ b/examples/target-allocator/rendered_manifests/clusterRole.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/target-allocator/rendered_manifests/clusterRoleBinding.yaml b/examples/target-allocator/rendered_manifests/clusterRoleBinding.yaml index 75e01844e..3f26df325 100644 --- a/examples/target-allocator/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/target-allocator/rendered_manifests/clusterRoleBinding.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/target-allocator/rendered_manifests/configmap-agent.yaml b/examples/target-allocator/rendered_manifests/configmap-agent.yaml index 4b17bb59b..c6bb6126f 100644 --- a/examples/target-allocator/rendered_manifests/configmap-agent.yaml +++ b/examples/target-allocator/rendered_manifests/configmap-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -183,11 +183,7 @@ data: - job_name: otel-agent metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -326,3 +322,6 @@ data: prometheus: host: localhost port: 8889 + without_scope_info: true + without_type_suffix: true + without_units: true diff --git a/examples/target-allocator/rendered_manifests/configmap-cluster-receiver.yaml b/examples/target-allocator/rendered_manifests/configmap-cluster-receiver.yaml index d2e012ce7..dc5af4330 100644 --- a/examples/target-allocator/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/target-allocator/rendered_manifests/configmap-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -82,11 +82,7 @@ data: - job_name: otel-k8s-cluster-receiver metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -131,3 +127,6 @@ data: prometheus: host: localhost port: 8889 + without_scope_info: true + without_type_suffix: true + without_units: true diff --git a/examples/target-allocator/rendered_manifests/daemonset.yaml b/examples/target-allocator/rendered_manifests/daemonset.yaml index f935fe14c..283294049 100644 --- a/examples/target-allocator/rendered_manifests/daemonset.yaml +++ b/examples/target-allocator/rendered_manifests/daemonset.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 40d2922b85afbb24c334a3d1a7b547e82c3d17029f07d5a772f6e8751a9b8a57 + checksum/config: 59546f3c10f2036f1443f0d45ec59f253e0f9ca070e1bf100b5f6a51fea84a4b kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -86,7 +86,7 @@ spec: containerPort: 9411 hostPort: 9411 protocol: TCP - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/target-allocator/rendered_manifests/deployment-cluster-receiver.yaml b/examples/target-allocator/rendered_manifests/deployment-cluster-receiver.yaml index 1620633de..927a205f6 100644 --- a/examples/target-allocator/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/target-allocator/rendered_manifests/deployment-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver chart: splunk-otel-collector-0.118.0 @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: f25f2d1d33bf121655e8c42b63e4f17502bae29f2cc8aaa585764447976fdde8 + checksum/config: c42cb1583d693dc14d6ad2977c155843810e3a7c1e7fb3aae3daea5d8914879d spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -41,7 +41,7 @@ spec: command: - /otelcol - --config=/conf/relay.yaml - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/target-allocator/rendered_manifests/secret-splunk.yaml b/examples/target-allocator/rendered_manifests/secret-splunk.yaml index 1f07f6a80..9a7030b40 100644 --- a/examples/target-allocator/rendered_manifests/secret-splunk.yaml +++ b/examples/target-allocator/rendered_manifests/secret-splunk.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/target-allocator/rendered_manifests/service-agent.yaml b/examples/target-allocator/rendered_manifests/service-agent.yaml index f9d94ce64..6f56bac80 100644 --- a/examples/target-allocator/rendered_manifests/service-agent.yaml +++ b/examples/target-allocator/rendered_manifests/service-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 diff --git a/examples/target-allocator/rendered_manifests/serviceAccount.yaml b/examples/target-allocator/rendered_manifests/serviceAccount.yaml index 621c610a6..5bef21e83 100644 --- a/examples/target-allocator/rendered_manifests/serviceAccount.yaml +++ b/examples/target-allocator/rendered_manifests/serviceAccount.yaml @@ -11,7 +11,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/use-proxy/rendered_manifests/clusterRole.yaml b/examples/use-proxy/rendered_manifests/clusterRole.yaml index 787a48dfc..16f594c74 100644 --- a/examples/use-proxy/rendered_manifests/clusterRole.yaml +++ b/examples/use-proxy/rendered_manifests/clusterRole.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/use-proxy/rendered_manifests/clusterRoleBinding.yaml b/examples/use-proxy/rendered_manifests/clusterRoleBinding.yaml index 75e01844e..3f26df325 100644 --- a/examples/use-proxy/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/use-proxy/rendered_manifests/clusterRoleBinding.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/use-proxy/rendered_manifests/configmap-agent.yaml b/examples/use-proxy/rendered_manifests/configmap-agent.yaml index 0940116c3..28f93ba71 100644 --- a/examples/use-proxy/rendered_manifests/configmap-agent.yaml +++ b/examples/use-proxy/rendered_manifests/configmap-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -183,11 +183,7 @@ data: - job_name: otel-agent metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -318,3 +314,6 @@ data: prometheus: host: localhost port: 8889 + without_scope_info: true + without_type_suffix: true + without_units: true diff --git a/examples/use-proxy/rendered_manifests/configmap-cluster-receiver.yaml b/examples/use-proxy/rendered_manifests/configmap-cluster-receiver.yaml index d2e012ce7..dc5af4330 100644 --- a/examples/use-proxy/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/use-proxy/rendered_manifests/configmap-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -82,11 +82,7 @@ data: - job_name: otel-k8s-cluster-receiver metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -131,3 +127,6 @@ data: prometheus: host: localhost port: 8889 + without_scope_info: true + without_type_suffix: true + without_units: true diff --git a/examples/use-proxy/rendered_manifests/daemonset.yaml b/examples/use-proxy/rendered_manifests/daemonset.yaml index 19223e53c..866f88479 100644 --- a/examples/use-proxy/rendered_manifests/daemonset.yaml +++ b/examples/use-proxy/rendered_manifests/daemonset.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 5eb71401eb3a1d4c94103254afa7361a1bbaedd05ef9374123e822239e593b35 + checksum/config: 8bbe8f7b9532522201698c0426760b708a1ad608560eec39b501c4b48f6eab18 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -86,7 +86,7 @@ spec: containerPort: 9411 hostPort: 9411 protocol: TCP - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/use-proxy/rendered_manifests/deployment-cluster-receiver.yaml b/examples/use-proxy/rendered_manifests/deployment-cluster-receiver.yaml index ffad2821b..e5d6bb636 100644 --- a/examples/use-proxy/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/use-proxy/rendered_manifests/deployment-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver chart: splunk-otel-collector-0.118.0 @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: f25f2d1d33bf121655e8c42b63e4f17502bae29f2cc8aaa585764447976fdde8 + checksum/config: c42cb1583d693dc14d6ad2977c155843810e3a7c1e7fb3aae3daea5d8914879d spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -41,7 +41,7 @@ spec: command: - /otelcol - --config=/conf/relay.yaml - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/use-proxy/rendered_manifests/secret-splunk.yaml b/examples/use-proxy/rendered_manifests/secret-splunk.yaml index 1f07f6a80..9a7030b40 100644 --- a/examples/use-proxy/rendered_manifests/secret-splunk.yaml +++ b/examples/use-proxy/rendered_manifests/secret-splunk.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/use-proxy/rendered_manifests/service-agent.yaml b/examples/use-proxy/rendered_manifests/service-agent.yaml index f9d94ce64..6f56bac80 100644 --- a/examples/use-proxy/rendered_manifests/service-agent.yaml +++ b/examples/use-proxy/rendered_manifests/service-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 diff --git a/examples/use-proxy/rendered_manifests/serviceAccount.yaml b/examples/use-proxy/rendered_manifests/serviceAccount.yaml index 621c610a6..5bef21e83 100644 --- a/examples/use-proxy/rendered_manifests/serviceAccount.yaml +++ b/examples/use-proxy/rendered_manifests/serviceAccount.yaml @@ -11,7 +11,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/with-target-allocator/rendered_manifests/clusterRole.yaml b/examples/with-target-allocator/rendered_manifests/clusterRole.yaml index 787a48dfc..16f594c74 100644 --- a/examples/with-target-allocator/rendered_manifests/clusterRole.yaml +++ b/examples/with-target-allocator/rendered_manifests/clusterRole.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/with-target-allocator/rendered_manifests/clusterRoleBinding.yaml b/examples/with-target-allocator/rendered_manifests/clusterRoleBinding.yaml index 75e01844e..3f26df325 100644 --- a/examples/with-target-allocator/rendered_manifests/clusterRoleBinding.yaml +++ b/examples/with-target-allocator/rendered_manifests/clusterRoleBinding.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/with-target-allocator/rendered_manifests/configmap-agent.yaml b/examples/with-target-allocator/rendered_manifests/configmap-agent.yaml index 3535b5ac8..b6172401b 100644 --- a/examples/with-target-allocator/rendered_manifests/configmap-agent.yaml +++ b/examples/with-target-allocator/rendered_manifests/configmap-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -183,11 +183,7 @@ data: - job_name: otel-agent metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -327,3 +323,6 @@ data: prometheus: host: localhost port: 8889 + without_scope_info: true + without_type_suffix: true + without_units: true diff --git a/examples/with-target-allocator/rendered_manifests/configmap-cluster-receiver.yaml b/examples/with-target-allocator/rendered_manifests/configmap-cluster-receiver.yaml index d2e012ce7..dc5af4330 100644 --- a/examples/with-target-allocator/rendered_manifests/configmap-cluster-receiver.yaml +++ b/examples/with-target-allocator/rendered_manifests/configmap-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default @@ -82,11 +82,7 @@ data: - job_name: otel-k8s-cluster-receiver metric_relabel_configs: - action: drop - regex: otelcol_rpc_.* - source_labels: - - __name__ - - action: drop - regex: otelcol_http_.* + regex: promhttp_metric_handler_errors.* source_labels: - __name__ - action: drop @@ -131,3 +127,6 @@ data: prometheus: host: localhost port: 8889 + without_scope_info: true + without_type_suffix: true + without_units: true diff --git a/examples/with-target-allocator/rendered_manifests/daemonset.yaml b/examples/with-target-allocator/rendered_manifests/daemonset.yaml index 513e0fb80..f369ff8b2 100644 --- a/examples/with-target-allocator/rendered_manifests/daemonset.yaml +++ b/examples/with-target-allocator/rendered_manifests/daemonset.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 @@ -32,7 +32,7 @@ spec: component: otel-collector-agent release: default annotations: - checksum/config: 6422bd347912cec6c9da2acf721602d737528c85e75e171b1455fa8a739b6ab3 + checksum/config: 054ff803341ebe66a111e8fbb5fbc44a28bef8871ad46e3afe7e50a8d8d53f80 kubectl.kubernetes.io/default-container: otel-collector spec: hostNetwork: true @@ -86,7 +86,7 @@ spec: containerPort: 9411 hostPort: 9411 protocol: TCP - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/with-target-allocator/rendered_manifests/deployment-cluster-receiver.yaml b/examples/with-target-allocator/rendered_manifests/deployment-cluster-receiver.yaml index 1620633de..927a205f6 100644 --- a/examples/with-target-allocator/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/with-target-allocator/rendered_manifests/deployment-cluster-receiver.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-k8s-cluster-receiver chart: splunk-otel-collector-0.118.0 @@ -31,7 +31,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: f25f2d1d33bf121655e8c42b63e4f17502bae29f2cc8aaa585764447976fdde8 + checksum/config: c42cb1583d693dc14d6ad2977c155843810e3a7c1e7fb3aae3daea5d8914879d spec: serviceAccountName: default-splunk-otel-collector nodeSelector: @@ -41,7 +41,7 @@ spec: command: - /otelcol - --config=/conf/relay.yaml - image: quay.io/signalfx/splunk-otel-collector:0.118.0 + image: quay.io/signalfx/splunk-otel-collector:0.119.0 imagePullPolicy: IfNotPresent env: - name: SPLUNK_MEMORY_TOTAL_MIB diff --git a/examples/with-target-allocator/rendered_manifests/secret-splunk.yaml b/examples/with-target-allocator/rendered_manifests/secret-splunk.yaml index 1f07f6a80..9a7030b40 100644 --- a/examples/with-target-allocator/rendered_manifests/secret-splunk.yaml +++ b/examples/with-target-allocator/rendered_manifests/secret-splunk.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/with-target-allocator/rendered_manifests/service-agent.yaml b/examples/with-target-allocator/rendered_manifests/service-agent.yaml index f9d94ce64..6f56bac80 100644 --- a/examples/with-target-allocator/rendered_manifests/service-agent.yaml +++ b/examples/with-target-allocator/rendered_manifests/service-agent.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector component: otel-collector-agent chart: splunk-otel-collector-0.118.0 diff --git a/examples/with-target-allocator/rendered_manifests/serviceAccount.yaml b/examples/with-target-allocator/rendered_manifests/serviceAccount.yaml index 621c610a6..5bef21e83 100644 --- a/examples/with-target-allocator/rendered_manifests/serviceAccount.yaml +++ b/examples/with-target-allocator/rendered_manifests/serviceAccount.yaml @@ -11,7 +11,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/with-target-allocator/rendered_manifests/targetAllocator-clusterRoleBinding.yaml b/examples/with-target-allocator/rendered_manifests/targetAllocator-clusterRoleBinding.yaml index 230bca3cd..de3076673 100644 --- a/examples/with-target-allocator/rendered_manifests/targetAllocator-clusterRoleBinding.yaml +++ b/examples/with-target-allocator/rendered_manifests/targetAllocator-clusterRoleBinding.yaml @@ -9,7 +9,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/with-target-allocator/rendered_manifests/targetAllocator-configmap.yaml b/examples/with-target-allocator/rendered_manifests/targetAllocator-configmap.yaml index 1b2d72d1f..8ee9ace88 100644 --- a/examples/with-target-allocator/rendered_manifests/targetAllocator-configmap.yaml +++ b/examples/with-target-allocator/rendered_manifests/targetAllocator-configmap.yaml @@ -10,7 +10,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/examples/with-target-allocator/rendered_manifests/targetAllocator-serviceAccount.yaml b/examples/with-target-allocator/rendered_manifests/targetAllocator-serviceAccount.yaml index f1aef15a3..e4881282e 100644 --- a/examples/with-target-allocator/rendered_manifests/targetAllocator-serviceAccount.yaml +++ b/examples/with-target-allocator/rendered_manifests/targetAllocator-serviceAccount.yaml @@ -11,7 +11,7 @@ metadata: helm.sh/chart: splunk-otel-collector-0.118.0 app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: default - app.kubernetes.io/version: "0.118.0" + app.kubernetes.io/version: "0.119.0" app: splunk-otel-collector chart: splunk-otel-collector-0.118.0 release: default diff --git a/helm-charts/splunk-otel-collector/Chart.yaml b/helm-charts/splunk-otel-collector/Chart.yaml index c0e6af51f..58ac91992 100644 --- a/helm-charts/splunk-otel-collector/Chart.yaml +++ b/helm-charts/splunk-otel-collector/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: splunk-otel-collector version: 0.118.0 -appVersion: 0.118.0 +appVersion: 0.119.0 description: Splunk OpenTelemetry Collector for Kubernetes icon: https://github.com/signalfx/splunk-otel-collector-chart/tree/main/splunk.png type: application diff --git a/helm-charts/splunk-otel-collector/templates/config/_common.tpl b/helm-charts/splunk-otel-collector/templates/config/_common.tpl index 9e40a9206..554d95f0a 100644 --- a/helm-charts/splunk-otel-collector/templates/config/_common.tpl +++ b/helm-charts/splunk-otel-collector/templates/config/_common.tpl @@ -415,10 +415,8 @@ splunk_hec/platform_logs: {{- if .addPersistentStorage }} storage: file_storage/persistent_queue {{- end }} - {{- if not .Values.featureGates.noDropLogsPipeline }} num_consumers: {{ .Values.splunkPlatform.sendingQueue.numConsumers }} - {{- else }} - num_consumers: 25 + {{- if .Values.featureGates.noDropLogsPipeline }} batcher: enabled: true flush_timeout: 200ms @@ -545,11 +543,7 @@ prometheus/{{ $receiver }}: - job_name: "otel-{{ $job }}" metric_relabel_configs: - action: drop - regex: "otelcol_rpc_.*" - source_labels: - - __name__ - - action: drop - regex: "otelcol_http_.*" + regex: "promhttp_metric_handler_errors.*" source_labels: - __name__ - action: drop diff --git a/helm-charts/splunk-otel-collector/templates/config/_otel-agent.tpl b/helm-charts/splunk-otel-collector/templates/config/_otel-agent.tpl index 5f5992cf9..239bc990c 100644 --- a/helm-charts/splunk-otel-collector/templates/config/_otel-agent.tpl +++ b/helm-charts/splunk-otel-collector/templates/config/_otel-agent.tpl @@ -860,6 +860,9 @@ service: prometheus: host: localhost port: 8889 + without_scope_info: true + without_units: true + without_type_suffix: true extensions: {{- if and (eq (include "splunk-otel-collector.logsEnabled" .) "true") (eq .Values.logsEngine "otel") }} - file_storage diff --git a/helm-charts/splunk-otel-collector/templates/config/_otel-collector.tpl b/helm-charts/splunk-otel-collector/templates/config/_otel-collector.tpl index 2b3221e9b..2d753b485 100644 --- a/helm-charts/splunk-otel-collector/templates/config/_otel-collector.tpl +++ b/helm-charts/splunk-otel-collector/templates/config/_otel-collector.tpl @@ -150,6 +150,9 @@ service: prometheus: host: localhost port: 8889 + without_scope_info: true + without_units: true + without_type_suffix: true extensions: - health_check - zpages diff --git a/helm-charts/splunk-otel-collector/templates/config/_otel-k8s-cluster-receiver-config.tpl b/helm-charts/splunk-otel-collector/templates/config/_otel-k8s-cluster-receiver-config.tpl index d10f9d9d4..f6376bd45 100644 --- a/helm-charts/splunk-otel-collector/templates/config/_otel-k8s-cluster-receiver-config.tpl +++ b/helm-charts/splunk-otel-collector/templates/config/_otel-k8s-cluster-receiver-config.tpl @@ -225,6 +225,9 @@ service: prometheus: host: localhost port: 8889 + without_scope_info: true + without_units: true + without_type_suffix: true {{- if eq (include "splunk-otel-collector.distribution" .) "eks/fargate" }} extensions: [health_check, k8s_observer] {{- else }}