Merge pull request #961 from assafad/add-labels

Add guest OS labels to cnv:vmi_status_running:count
kubevirt · Apr 17, 2024 · 1b184ef · 1b184ef
2 parents ad7c7b2 + 6a64fd0
commit 1b184ef
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/docs/metrics.md b/docs/metrics.md
@@ -1,7 +1,7 @@
 # SSP Operator metrics
 
 ### cnv:vmi_status_running:count
-The total number of running VMIs by status. Type: Gauge.
+The total number of running VMIs, labeled with node, instance type, preference and guest OS information. Type: Gauge.
 
 ### kubevirt_ssp_common_templates_restored_increase
 The increase in the number of common templates restored by the operator back to their original state, over the last hour. Type: Gauge.

diff --git a/pkg/monitoring/rules/recordingrules/vmi.go b/pkg/monitoring/rules/recordingrules/vmi.go
@@ -10,9 +10,10 @@ var vmiRecordingRules = []operatorrules.RecordingRule{
 	{
 		MetricsOpts: operatormetrics.MetricOpts{
 			Name: "cnv:vmi_status_running:count",
-			Help: "The total number of running VMIs by status",
+			Help: "The total number of running VMIs, labeled with node, instance type, preference and guest OS information",
 		},
 		MetricType: operatormetrics.GaugeType,
-		Expr:       intstr.FromString("sum(kubevirt_vmi_phase_count{phase=\"running\"}) by (node,os,workload,flavor,instance_type,preference)"),
+		Expr: intstr.FromString("sum(kubevirt_vmi_phase_count{phase=\"running\"}) by " +
+			"(node,os,workload,flavor,instance_type,preference,guest_os_kernel_release,guest_os_machine,guest_os_name,guest_os_version_id)"),
 	},
 }