Merge pull request #10001 from machadovilaca/fix-missing-label-kubevi…

…rt_vmi_phase_count Fix kubevirt_vmi_phase_count not being created
kubevirt · Jul 5, 2023 · 534bda1 · 534bda1
2 parents 8e14269 + dc57225
commit 534bda1
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 11 deletions.
diff --git a/pkg/monitoring/vmistats/collector.go b/pkg/monitoring/vmistats/collector.go
@@ -250,7 +250,7 @@ func (co *VMICollector) updateVMIsPhase(vmis []*k6tv1.VirtualMachineInstance, ch
 		mv, err := prometheus.NewConstMetric(
 			vmiCountDesc, prometheus.GaugeValue,
 			float64(count),
-			vmc.NodeName, vmc.Phase, vmc.OS, vmc.Workload, vmc.Flavor, vmc.InstanceType,
+			vmc.NodeName, vmc.Phase, vmc.OS, vmc.Workload, vmc.Flavor, vmc.InstanceType, vmc.Preference,
 		)
 		if err != nil {
 			log.Log.Reason(err).Errorf("Failed to create metric for VMIs phase")

diff --git a/pkg/monitoring/vmistats/collector_test.go b/pkg/monitoring/vmistats/collector_test.go
@@ -242,12 +242,24 @@ var _ = Describe("Utility functions", func() {
 				},
 			}
 
-			countMap := co.makeVMICountMetricMap(vmis)
-			Expect(countMap).To(HaveLen(1))
+			ch := make(chan prometheus.Metric, 1)
+			defer close(ch)
+			co.updateVMIsPhase(vmis, ch)
+
+			Expect(ch).To(HaveLen(1), "Expected 1 metric")
+			result := <-ch
+			dto := &io_prometheus_client.Metric{}
+			result.Write(dto)
 
-			for metric, count := range countMap {
-				Expect(metric.InstanceType).To(Equal(expected))
-				Expect(count).To(Equal(uint64(1)))
+			Expect(result).ToNot(BeNil())
+			Expect(result.Desc().String()).To(ContainSubstring("kubevirt_vmi_phase_count"))
+			Expect(dto.Gauge.GetValue()).To(BeEquivalentTo(1))
+			Expect(dto.Label).To(HaveLen(7))
+			for _, pair := range dto.Label {
+				if pair.GetName() == "instance_type" {
+					Expect(pair.GetValue()).To(Equal(expected))
+					return
+				}
 			}
 		},
 			Entry("with no instance type expect <none>", k6tv1.InstancetypeAnnotation, "", "<none>"),
@@ -273,12 +285,24 @@ var _ = Describe("Utility functions", func() {
 				},
 			}
 
-			countMap := co.makeVMICountMetricMap(vmis)
-			Expect(countMap).To(HaveLen(1))
+			ch := make(chan prometheus.Metric, 1)
+			defer close(ch)
+			co.updateVMIsPhase(vmis, ch)
+
+			Expect(ch).To(HaveLen(1), "Expected 1 metric")
+			result := <-ch
+			dto := &io_prometheus_client.Metric{}
+			result.Write(dto)
 
-			for metric, count := range countMap {
-				Expect(metric.Preference).To(Equal(expected))
-				Expect(count).To(Equal(uint64(1)))
+			Expect(result).ToNot(BeNil())
+			Expect(result.Desc().String()).To(ContainSubstring("kubevirt_vmi_phase_count"))
+			Expect(dto.Gauge.GetValue()).To(BeEquivalentTo(1))
+			Expect(dto.Label).To(HaveLen(7))
+			for _, pair := range dto.Label {
+				if pair.GetName() == "preference" {
+					Expect(pair.GetValue()).To(Equal(expected))
+					return
+				}
 			}
 		},
 			Entry("with no preference expect <none>", k6tv1.PreferenceAnnotation, "", "<none>"),