Merge pull request #2529 from xperimental/fix-logging-telemetry-4.19

openshift-merge-bot[bot] · web-flow · commit 4d9bb6ae9c51 · 2024-12-04T10:22:22.000Z
OCPBUGS-45179: Use explicit name label for logging telemetry metrics
diff --git a/Documentation/data-collection.md b/Documentation/data-collection.md
@@ -1020,27 +1020,27 @@ data:
     # owners: (@openshift/team-logging)
     #
     # openshift_logging:log_forwarder_pipelines:sum number of logging pipelines in each namespace
-    - 'openshift_logging:log_forwarder_pipelines:sum'
+    - '{__name__="openshift_logging:log_forwarder_pipelines:sum"}'
     #
     # owners: (@openshift/team-logging)
     #
     # openshift_logging:log_forwarders:sum number of ClusterLogForwarder instances in each namespace
-    - 'openshift_logging:log_forwarders:sum'
+    - '{__name__="openshift_logging:log_forwarders:sum"}'
     #
     # owners: (@openshift/team-logging)
     #
     # openshift_logging:log_forwarder_input_type:sum number of inputs per namespace
-    - 'openshift_logging:log_forwarder_input_type:sum'
+    - '{__name__="openshift_logging:log_forwarder_input_type:sum"}'
     #
     # owners: (@openshift/team-logging)
     #
     # openshift_logging:log_forwarder_output_type:sum number of outputs per namespace
-    - 'openshift_logging:log_forwarder_output_type:sum'
+    - '{__name__="openshift_logging:log_forwarder_output_type:sum"}'
     #
     # owners: (@openshift/team-logging)
     #
     # openshift_logging:vector_component_received_bytes_total:rate5m total number of collected log bytes per namespace
-    - 'openshift_logging:vector_component_received_bytes_total:rate5m'
+    - '{__name__="openshift_logging:vector_component_received_bytes_total:rate5m"}'
     #
     # owners: (@openshift/sandboxed-containers-operator)
     #
diff --git a/manifests/0000_50_cluster-monitoring-operator_04-config.yaml b/manifests/0000_50_cluster-monitoring-operator_04-config.yaml
@@ -1012,27 +1012,27 @@ data:
     # owners: (@openshift/team-logging)
     #
     # openshift_logging:log_forwarder_pipelines:sum number of logging pipelines in each namespace
-    - 'openshift_logging:log_forwarder_pipelines:sum'
+    - '{__name__="openshift_logging:log_forwarder_pipelines:sum"}'
     #
     # owners: (@openshift/team-logging)
     #
     # openshift_logging:log_forwarders:sum number of ClusterLogForwarder instances in each namespace
-    - 'openshift_logging:log_forwarders:sum'
+    - '{__name__="openshift_logging:log_forwarders:sum"}'
     #
     # owners: (@openshift/team-logging)
     #
     # openshift_logging:log_forwarder_input_type:sum number of inputs per namespace
-    - 'openshift_logging:log_forwarder_input_type:sum'
+    - '{__name__="openshift_logging:log_forwarder_input_type:sum"}'
     #
     # owners: (@openshift/team-logging)
     #
     # openshift_logging:log_forwarder_output_type:sum number of outputs per namespace
-    - 'openshift_logging:log_forwarder_output_type:sum'
+    - '{__name__="openshift_logging:log_forwarder_output_type:sum"}'
     #
     # owners: (@openshift/team-logging)
     #
     # openshift_logging:vector_component_received_bytes_total:rate5m total number of collected log bytes per namespace
-    - 'openshift_logging:vector_component_received_bytes_total:rate5m'
+    - '{__name__="openshift_logging:vector_component_received_bytes_total:rate5m"}'
     #
     # owners: (@openshift/sandboxed-containers-operator)
     #

Original file line number	Diff line number	Diff line change
`@@ -1020,27 +1020,27 @@ data:`
`1020`	`1020`	`# owners: (@openshift/team-logging)`
`1021`	`1021`	`#`
`1022`	`1022`	`# openshift_logging:log_forwarder_pipelines:sum number of logging pipelines in each namespace`
`1023`		`- - 'openshift_logging:log_forwarder_pipelines:sum'`
	`1023`	`+ - '{__name__="openshift_logging:log_forwarder_pipelines:sum"}'`
`1024`	`1024`	`#`
`1025`	`1025`	`# owners: (@openshift/team-logging)`
`1026`	`1026`	`#`
`1027`	`1027`	`# openshift_logging:log_forwarders:sum number of ClusterLogForwarder instances in each namespace`
`1028`		`- - 'openshift_logging:log_forwarders:sum'`
	`1028`	`+ - '{__name__="openshift_logging:log_forwarders:sum"}'`
`1029`	`1029`	`#`
`1030`	`1030`	`# owners: (@openshift/team-logging)`
`1031`	`1031`	`#`
`1032`	`1032`	`# openshift_logging:log_forwarder_input_type:sum number of inputs per namespace`
`1033`		`- - 'openshift_logging:log_forwarder_input_type:sum'`
	`1033`	`+ - '{__name__="openshift_logging:log_forwarder_input_type:sum"}'`
`1034`	`1034`	`#`
`1035`	`1035`	`# owners: (@openshift/team-logging)`
`1036`	`1036`	`#`
`1037`	`1037`	`# openshift_logging:log_forwarder_output_type:sum number of outputs per namespace`
`1038`		`- - 'openshift_logging:log_forwarder_output_type:sum'`
	`1038`	`+ - '{__name__="openshift_logging:log_forwarder_output_type:sum"}'`
`1039`	`1039`	`#`
`1040`	`1040`	`# owners: (@openshift/team-logging)`
`1041`	`1041`	`#`
`1042`	`1042`	`# openshift_logging:vector_component_received_bytes_total:rate5m total number of collected log bytes per namespace`
`1043`		`- - 'openshift_logging:vector_component_received_bytes_total:rate5m'`
	`1043`	`+ - '{__name__="openshift_logging:vector_component_received_bytes_total:rate5m"}'`
`1044`	`1044`	`#`
`1045`	`1045`	`# owners: (@openshift/sandboxed-containers-operator)`
`1046`	`1046`	`#`
Original file line number	Diff line number	Diff line change
`@@ -1012,27 +1012,27 @@ data:`
`1012`	`1012`	`# owners: (@openshift/team-logging)`
`1013`	`1013`	`#`
`1014`	`1014`	`# openshift_logging:log_forwarder_pipelines:sum number of logging pipelines in each namespace`
`1015`		`- - 'openshift_logging:log_forwarder_pipelines:sum'`
	`1015`	`+ - '{__name__="openshift_logging:log_forwarder_pipelines:sum"}'`
`1016`	`1016`	`#`
`1017`	`1017`	`# owners: (@openshift/team-logging)`
`1018`	`1018`	`#`
`1019`	`1019`	`# openshift_logging:log_forwarders:sum number of ClusterLogForwarder instances in each namespace`
`1020`		`- - 'openshift_logging:log_forwarders:sum'`
	`1020`	`+ - '{__name__="openshift_logging:log_forwarders:sum"}'`
`1021`	`1021`	`#`
`1022`	`1022`	`# owners: (@openshift/team-logging)`
`1023`	`1023`	`#`
`1024`	`1024`	`# openshift_logging:log_forwarder_input_type:sum number of inputs per namespace`
`1025`		`- - 'openshift_logging:log_forwarder_input_type:sum'`
	`1025`	`+ - '{__name__="openshift_logging:log_forwarder_input_type:sum"}'`
`1026`	`1026`	`#`
`1027`	`1027`	`# owners: (@openshift/team-logging)`
`1028`	`1028`	`#`
`1029`	`1029`	`# openshift_logging:log_forwarder_output_type:sum number of outputs per namespace`
`1030`		`- - 'openshift_logging:log_forwarder_output_type:sum'`
	`1030`	`+ - '{__name__="openshift_logging:log_forwarder_output_type:sum"}'`
`1031`	`1031`	`#`
`1032`	`1032`	`# owners: (@openshift/team-logging)`
`1033`	`1033`	`#`
`1034`	`1034`	`# openshift_logging:vector_component_received_bytes_total:rate5m total number of collected log bytes per namespace`
`1035`		`- - 'openshift_logging:vector_component_received_bytes_total:rate5m'`
	`1035`	`+ - '{__name__="openshift_logging:vector_component_received_bytes_total:rate5m"}'`
`1036`	`1036`	`#`
`1037`	`1037`	`# owners: (@openshift/sandboxed-containers-operator)`
`1038`	`1038`	`#`