Merge pull request #2568 from rubenvp8510/fix_otel_metrics

openshift-merge-bot[bot] · web-flow · commit d8fa202e87a6 · 2025-02-14T05:36:18.000Z
OCPBUGS-50837: Fix opentelemetry metrics to use regexp on label match
diff --git a/Documentation/data-collection.md b/Documentation/data-collection.md
@@ -856,37 +856,37 @@ data:
     # owners: (@tracing-team)
     #
     # Number of Tempo stacks with Jaeger UI enabled/disabled.
-    - '{__name__="enabled:tempo_operator_tempostack_jaeger_ui:sum",enabled="true|false"}'
+    - '{__name__="enabled:tempo_operator_tempostack_jaeger_ui:sum",enabled=~"true|false"}'
     #
     # owners: (@tracing-team)
     #
     # Number of OpenTelemetry collectors using certain receiver types.
-    - '{__name__="type:opentelemetry_collector_receivers:sum",type="jaegerreceiver|hostmetricsreceiver|opencensusreceiver|prometheusreceiver|zipkinreceiver|kafkareceiver|filelogreceiver|journaldreceiver|k8seventsreceiver|kubeletstatsreceiver|k8sclusterreceiver|k8sobjectsreceiver"}'
+    - '{__name__="type:opentelemetry_collector_receivers:sum",type=~"jaegerreceiver|hostmetricsreceiver|opencensusreceiver|prometheusreceiver|zipkinreceiver|kafkareceiver|filelogreceiver|journaldreceiver|k8seventsreceiver|kubeletstatsreceiver|k8sclusterreceiver|k8sobjectsreceiver"}'
     #
     # owners: (@tracing-team)
     #
     # Number of OpenTelemetry collectors used certain exporter type
-    - '{__name__="type:opentelemetry_collector_exporters:sum",type="debugexporter|loggingexporter|otlpexporter|otlphttpexporter|prometheusexporter|lokiexporter|kafkaexporter|awscloudwatchlogsexporter|loadbalancingexporter"}'
+    - '{__name__="type:opentelemetry_collector_exporters:sum",type=~"debugexporter|loggingexporter|otlpexporter|otlphttpexporter|prometheusexporter|lokiexporter|kafkaexporter|awscloudwatchlogsexporter|loadbalancingexporter"}'
     #
     # owners: (@tracing-team)
     #
     # Number of OpenTelemetry collectors used certain processor type
-    - '{__name__="type:opentelemetry_collector_processors:sum",type="batchprocessor|memorylimiterprocessor|attributesprocessor|resourceprocessor|spanprocessor|k8sattributesprocessor|resourcedetectionprocessor|filterprocessor|routingprocessor|cumulativetodeltaprocessor|groupbyattrsprocessor"}'
+    - '{__name__="type:opentelemetry_collector_processors:sum",type=~"batchprocessor|memorylimiterprocessor|attributesprocessor|resourceprocessor|spanprocessor|k8sattributesprocessor|resourcedetectionprocessor|filterprocessor|routingprocessor|cumulativetodeltaprocessor|groupbyattrsprocessor"}'
     #
     # owners: (@tracing-team)
     #
     # Number of OpenTelemetry collectors used certain extension type
-    - '{__name__="type:opentelemetry_collector_extensions:sum",type="zpagesextension|ballastextension|memorylimiterextension|jaegerremotesampling|healthcheckextension|pprofextension|oauth2clientauthextension|oidcauthextension|bearertokenauthextension|filestorage"}'
+    - '{__name__="type:opentelemetry_collector_extensions:sum",type=~"zpagesextension|ballastextension|memorylimiterextension|jaegerremotesampling|healthcheckextension|pprofextension|oauth2clientauthextension|oidcauthextension|bearertokenauthextension|filestorage"}'
     #
     # owners: (@tracing-team)
     #
     # Number of OpenTelemetry collectors used certain connector type
-    - '{__name__="type:opentelemetry_collector_connectors:sum",type="spanmetricsconnector|forwardconnector"}'
+    - '{__name__="type:opentelemetry_collector_connectors:sum",type=~"spanmetricsconnector|forwardconnector"}'
     #
     # owners: (@tracing-team)
     #
     # Number of OpenTelemetry collectors deployed using certain deployment type
-    - '{__name__="type:opentelemetry_collector_info:sum",type="deployment|daemonset|sidecar|statefulset"}'
+    - '{__name__="type:opentelemetry_collector_info:sum",type=~"deployment|daemonset|sidecar|statefulset"}'
     #
     # owners: (https://github.com/redhat-developer/application-services-metering-operator)
     #
diff --git a/manifests/0000_50_cluster-monitoring-operator_04-config.yaml b/manifests/0000_50_cluster-monitoring-operator_04-config.yaml
@@ -848,37 +848,37 @@ data:
     # owners: (@tracing-team)
     #
     # Number of Tempo stacks with Jaeger UI enabled/disabled.
-    - '{__name__="enabled:tempo_operator_tempostack_jaeger_ui:sum",enabled="true|false"}'
+    - '{__name__="enabled:tempo_operator_tempostack_jaeger_ui:sum",enabled=~"true|false"}'
     #
     # owners: (@tracing-team)
     #
     # Number of OpenTelemetry collectors using certain receiver types.
-    - '{__name__="type:opentelemetry_collector_receivers:sum",type="jaegerreceiver|hostmetricsreceiver|opencensusreceiver|prometheusreceiver|zipkinreceiver|kafkareceiver|filelogreceiver|journaldreceiver|k8seventsreceiver|kubeletstatsreceiver|k8sclusterreceiver|k8sobjectsreceiver"}'
+    - '{__name__="type:opentelemetry_collector_receivers:sum",type=~"jaegerreceiver|hostmetricsreceiver|opencensusreceiver|prometheusreceiver|zipkinreceiver|kafkareceiver|filelogreceiver|journaldreceiver|k8seventsreceiver|kubeletstatsreceiver|k8sclusterreceiver|k8sobjectsreceiver"}'
     #
     # owners: (@tracing-team)
     #
     # Number of OpenTelemetry collectors used certain exporter type
-    - '{__name__="type:opentelemetry_collector_exporters:sum",type="debugexporter|loggingexporter|otlpexporter|otlphttpexporter|prometheusexporter|lokiexporter|kafkaexporter|awscloudwatchlogsexporter|loadbalancingexporter"}'
+    - '{__name__="type:opentelemetry_collector_exporters:sum",type=~"debugexporter|loggingexporter|otlpexporter|otlphttpexporter|prometheusexporter|lokiexporter|kafkaexporter|awscloudwatchlogsexporter|loadbalancingexporter"}'
     #
     # owners: (@tracing-team)
     #
     # Number of OpenTelemetry collectors used certain processor type
-    - '{__name__="type:opentelemetry_collector_processors:sum",type="batchprocessor|memorylimiterprocessor|attributesprocessor|resourceprocessor|spanprocessor|k8sattributesprocessor|resourcedetectionprocessor|filterprocessor|routingprocessor|cumulativetodeltaprocessor|groupbyattrsprocessor"}'
+    - '{__name__="type:opentelemetry_collector_processors:sum",type=~"batchprocessor|memorylimiterprocessor|attributesprocessor|resourceprocessor|spanprocessor|k8sattributesprocessor|resourcedetectionprocessor|filterprocessor|routingprocessor|cumulativetodeltaprocessor|groupbyattrsprocessor"}'
     #
     # owners: (@tracing-team)
     #
     # Number of OpenTelemetry collectors used certain extension type
-    - '{__name__="type:opentelemetry_collector_extensions:sum",type="zpagesextension|ballastextension|memorylimiterextension|jaegerremotesampling|healthcheckextension|pprofextension|oauth2clientauthextension|oidcauthextension|bearertokenauthextension|filestorage"}'
+    - '{__name__="type:opentelemetry_collector_extensions:sum",type=~"zpagesextension|ballastextension|memorylimiterextension|jaegerremotesampling|healthcheckextension|pprofextension|oauth2clientauthextension|oidcauthextension|bearertokenauthextension|filestorage"}'
     #
     # owners: (@tracing-team)
     #
     # Number of OpenTelemetry collectors used certain connector type
-    - '{__name__="type:opentelemetry_collector_connectors:sum",type="spanmetricsconnector|forwardconnector"}'
+    - '{__name__="type:opentelemetry_collector_connectors:sum",type=~"spanmetricsconnector|forwardconnector"}'
     #
     # owners: (@tracing-team)
     #
     # Number of OpenTelemetry collectors deployed using certain deployment type
-    - '{__name__="type:opentelemetry_collector_info:sum",type="deployment|daemonset|sidecar|statefulset"}'
+    - '{__name__="type:opentelemetry_collector_info:sum",type=~"deployment|daemonset|sidecar|statefulset"}'
     #
     # owners: (https://github.com/redhat-developer/application-services-metering-operator)
     #

Original file line number	Diff line number	Diff line change
`@@ -856,37 +856,37 @@ data:`
`856`	`856`	`# owners: (@tracing-team)`
`857`	`857`	`#`
`858`	`858`	`# Number of Tempo stacks with Jaeger UI enabled/disabled.`
`859`		`- - '{__name__="enabled:tempo_operator_tempostack_jaeger_ui:sum",enabled="true\|false"}'`
	`859`	`+ - '{__name__="enabled:tempo_operator_tempostack_jaeger_ui:sum",enabled=~"true\|false"}'`
`860`	`860`	`#`
`861`	`861`	`# owners: (@tracing-team)`
`862`	`862`	`#`
`863`	`863`	`# Number of OpenTelemetry collectors using certain receiver types.`
`864`		`- - '{__name__="type:opentelemetry_collector_receivers:sum",type="jaegerreceiver\|hostmetricsreceiver\|opencensusreceiver\|prometheusreceiver\|zipkinreceiver\|kafkareceiver\|filelogreceiver\|journaldreceiver\|k8seventsreceiver\|kubeletstatsreceiver\|k8sclusterreceiver\|k8sobjectsreceiver"}'`
	`864`	`+ - '{__name__="type:opentelemetry_collector_receivers:sum",type=~"jaegerreceiver\|hostmetricsreceiver\|opencensusreceiver\|prometheusreceiver\|zipkinreceiver\|kafkareceiver\|filelogreceiver\|journaldreceiver\|k8seventsreceiver\|kubeletstatsreceiver\|k8sclusterreceiver\|k8sobjectsreceiver"}'`
`865`	`865`	`#`
`866`	`866`	`# owners: (@tracing-team)`
`867`	`867`	`#`
`868`	`868`	`# Number of OpenTelemetry collectors used certain exporter type`
`869`		`- - '{__name__="type:opentelemetry_collector_exporters:sum",type="debugexporter\|loggingexporter\|otlpexporter\|otlphttpexporter\|prometheusexporter\|lokiexporter\|kafkaexporter\|awscloudwatchlogsexporter\|loadbalancingexporter"}'`
	`869`	`+ - '{__name__="type:opentelemetry_collector_exporters:sum",type=~"debugexporter\|loggingexporter\|otlpexporter\|otlphttpexporter\|prometheusexporter\|lokiexporter\|kafkaexporter\|awscloudwatchlogsexporter\|loadbalancingexporter"}'`
`870`	`870`	`#`
`871`	`871`	`# owners: (@tracing-team)`
`872`	`872`	`#`
`873`	`873`	`# Number of OpenTelemetry collectors used certain processor type`
`874`		`- - '{__name__="type:opentelemetry_collector_processors:sum",type="batchprocessor\|memorylimiterprocessor\|attributesprocessor\|resourceprocessor\|spanprocessor\|k8sattributesprocessor\|resourcedetectionprocessor\|filterprocessor\|routingprocessor\|cumulativetodeltaprocessor\|groupbyattrsprocessor"}'`
	`874`	`+ - '{__name__="type:opentelemetry_collector_processors:sum",type=~"batchprocessor\|memorylimiterprocessor\|attributesprocessor\|resourceprocessor\|spanprocessor\|k8sattributesprocessor\|resourcedetectionprocessor\|filterprocessor\|routingprocessor\|cumulativetodeltaprocessor\|groupbyattrsprocessor"}'`
`875`	`875`	`#`
`876`	`876`	`# owners: (@tracing-team)`
`877`	`877`	`#`
`878`	`878`	`# Number of OpenTelemetry collectors used certain extension type`
`879`		`- - '{__name__="type:opentelemetry_collector_extensions:sum",type="zpagesextension\|ballastextension\|memorylimiterextension\|jaegerremotesampling\|healthcheckextension\|pprofextension\|oauth2clientauthextension\|oidcauthextension\|bearertokenauthextension\|filestorage"}'`
	`879`	`+ - '{__name__="type:opentelemetry_collector_extensions:sum",type=~"zpagesextension\|ballastextension\|memorylimiterextension\|jaegerremotesampling\|healthcheckextension\|pprofextension\|oauth2clientauthextension\|oidcauthextension\|bearertokenauthextension\|filestorage"}'`
`880`	`880`	`#`
`881`	`881`	`# owners: (@tracing-team)`
`882`	`882`	`#`
`883`	`883`	`# Number of OpenTelemetry collectors used certain connector type`
`884`		`- - '{__name__="type:opentelemetry_collector_connectors:sum",type="spanmetricsconnector\|forwardconnector"}'`
	`884`	`+ - '{__name__="type:opentelemetry_collector_connectors:sum",type=~"spanmetricsconnector\|forwardconnector"}'`
`885`	`885`	`#`
`886`	`886`	`# owners: (@tracing-team)`
`887`	`887`	`#`
`888`	`888`	`# Number of OpenTelemetry collectors deployed using certain deployment type`
`889`		`- - '{__name__="type:opentelemetry_collector_info:sum",type="deployment\|daemonset\|sidecar\|statefulset"}'`
	`889`	`+ - '{__name__="type:opentelemetry_collector_info:sum",type=~"deployment\|daemonset\|sidecar\|statefulset"}'`
`890`	`890`	`#`
`891`	`891`	`# owners: (https://github.com/redhat-developer/application-services-metering-operator)`
`892`	`892`	`#`
Original file line number	Diff line number	Diff line change
`@@ -848,37 +848,37 @@ data:`
`848`	`848`	`# owners: (@tracing-team)`
`849`	`849`	`#`
`850`	`850`	`# Number of Tempo stacks with Jaeger UI enabled/disabled.`
`851`		`- - '{__name__="enabled:tempo_operator_tempostack_jaeger_ui:sum",enabled="true\|false"}'`
	`851`	`+ - '{__name__="enabled:tempo_operator_tempostack_jaeger_ui:sum",enabled=~"true\|false"}'`
`852`	`852`	`#`
`853`	`853`	`# owners: (@tracing-team)`
`854`	`854`	`#`
`855`	`855`	`# Number of OpenTelemetry collectors using certain receiver types.`
`856`		`- - '{__name__="type:opentelemetry_collector_receivers:sum",type="jaegerreceiver\|hostmetricsreceiver\|opencensusreceiver\|prometheusreceiver\|zipkinreceiver\|kafkareceiver\|filelogreceiver\|journaldreceiver\|k8seventsreceiver\|kubeletstatsreceiver\|k8sclusterreceiver\|k8sobjectsreceiver"}'`
	`856`	`+ - '{__name__="type:opentelemetry_collector_receivers:sum",type=~"jaegerreceiver\|hostmetricsreceiver\|opencensusreceiver\|prometheusreceiver\|zipkinreceiver\|kafkareceiver\|filelogreceiver\|journaldreceiver\|k8seventsreceiver\|kubeletstatsreceiver\|k8sclusterreceiver\|k8sobjectsreceiver"}'`
`857`	`857`	`#`
`858`	`858`	`# owners: (@tracing-team)`
`859`	`859`	`#`
`860`	`860`	`# Number of OpenTelemetry collectors used certain exporter type`
`861`		`- - '{__name__="type:opentelemetry_collector_exporters:sum",type="debugexporter\|loggingexporter\|otlpexporter\|otlphttpexporter\|prometheusexporter\|lokiexporter\|kafkaexporter\|awscloudwatchlogsexporter\|loadbalancingexporter"}'`
	`861`	`+ - '{__name__="type:opentelemetry_collector_exporters:sum",type=~"debugexporter\|loggingexporter\|otlpexporter\|otlphttpexporter\|prometheusexporter\|lokiexporter\|kafkaexporter\|awscloudwatchlogsexporter\|loadbalancingexporter"}'`
`862`	`862`	`#`
`863`	`863`	`# owners: (@tracing-team)`
`864`	`864`	`#`
`865`	`865`	`# Number of OpenTelemetry collectors used certain processor type`
`866`		`- - '{__name__="type:opentelemetry_collector_processors:sum",type="batchprocessor\|memorylimiterprocessor\|attributesprocessor\|resourceprocessor\|spanprocessor\|k8sattributesprocessor\|resourcedetectionprocessor\|filterprocessor\|routingprocessor\|cumulativetodeltaprocessor\|groupbyattrsprocessor"}'`
	`866`	`+ - '{__name__="type:opentelemetry_collector_processors:sum",type=~"batchprocessor\|memorylimiterprocessor\|attributesprocessor\|resourceprocessor\|spanprocessor\|k8sattributesprocessor\|resourcedetectionprocessor\|filterprocessor\|routingprocessor\|cumulativetodeltaprocessor\|groupbyattrsprocessor"}'`
`867`	`867`	`#`
`868`	`868`	`# owners: (@tracing-team)`
`869`	`869`	`#`
`870`	`870`	`# Number of OpenTelemetry collectors used certain extension type`
`871`		`- - '{__name__="type:opentelemetry_collector_extensions:sum",type="zpagesextension\|ballastextension\|memorylimiterextension\|jaegerremotesampling\|healthcheckextension\|pprofextension\|oauth2clientauthextension\|oidcauthextension\|bearertokenauthextension\|filestorage"}'`
	`871`	`+ - '{__name__="type:opentelemetry_collector_extensions:sum",type=~"zpagesextension\|ballastextension\|memorylimiterextension\|jaegerremotesampling\|healthcheckextension\|pprofextension\|oauth2clientauthextension\|oidcauthextension\|bearertokenauthextension\|filestorage"}'`
`872`	`872`	`#`
`873`	`873`	`# owners: (@tracing-team)`
`874`	`874`	`#`
`875`	`875`	`# Number of OpenTelemetry collectors used certain connector type`
`876`		`- - '{__name__="type:opentelemetry_collector_connectors:sum",type="spanmetricsconnector\|forwardconnector"}'`
	`876`	`+ - '{__name__="type:opentelemetry_collector_connectors:sum",type=~"spanmetricsconnector\|forwardconnector"}'`
`877`	`877`	`#`
`878`	`878`	`# owners: (@tracing-team)`
`879`	`879`	`#`
`880`	`880`	`# Number of OpenTelemetry collectors deployed using certain deployment type`
`881`		`- - '{__name__="type:opentelemetry_collector_info:sum",type="deployment\|daemonset\|sidecar\|statefulset"}'`
	`881`	`+ - '{__name__="type:opentelemetry_collector_info:sum",type=~"deployment\|daemonset\|sidecar\|statefulset"}'`
`882`	`882`	`#`
`883`	`883`	`# owners: (https://github.com/redhat-developer/application-services-metering-operator)`
`884`	`884`	`#`