rebuild metric for current status phase (#1058)

Author: Duciwuci

pkg/util/provider/machinecontroller/metrics.go

@@ -19,6 +19,7 @@ import (
 // Describe is method required to implement the prometheus.Collect interface.
 func (c *controller) Describe(ch chan<- *prometheus.Desc) {
 	ch <- metrics.MachineCountDesc
+	ch <- metrics.MachineCSPhase
 }
 
 // Collect is method required to implement the prometheus.Collect interface.
@@ -41,7 +42,7 @@ func (c *controller) CollectMachineMetrics(ch chan<- prometheus.Metric) {
 		mSpec := machine.Spec
 		updateMachineInfoMetric(mMeta, mSpec)
 		updateMachineStatusConditionMetric(machine, mMeta)
-		updateMachineCSPhaseMetric(machine, mMeta)
+		updateMachineCSPhaseMetric(machine, mMeta, ch)
 	}
 
 	updateMachineCountMetric(ch, machineList)
@@ -70,7 +71,7 @@ func updateMachineCountMetric(ch chan<- prometheus.Metric, machineList []*v1alph
 	ch <- metric
 }
 
-func updateMachineCSPhaseMetric(machine *v1alpha1.Machine, mMeta metav1.ObjectMeta) {
+func updateMachineCSPhaseMetric(machine *v1alpha1.Machine, mMeta metav1.ObjectMeta, ch chan<- prometheus.Metric) {
 	var phase float64
 	switch machine.Status.CurrentStatus.Phase {
 	case v1alpha1.MachineTerminating:
@@ -86,10 +87,14 @@ func updateMachineCSPhaseMetric(machine *v1alpha1.Machine, mMeta metav1.ObjectMe
 	case v1alpha1.MachineRunning:
 		phase = 1
 	}
-	metrics.MachineCSPhase.With(prometheus.Labels{
-		"name":      mMeta.Name,
-		"namespace": mMeta.Namespace,
-	}).Set(phase)
+
+	ch <- prometheus.MustNewConstMetric(
+		metrics.MachineCSPhase,
+		prometheus.GaugeValue,
+		phase,
+		mMeta.Name,
+		mMeta.Namespace,
+	)
 }
 
 func updateMachineStatusConditionMetric(machine *v1alpha1.Machine, mMeta metav1.ObjectMeta) {

pkg/util/provider/metrics/metrics.go

@@ -24,12 +24,11 @@ var (
 	MachineCountDesc = prometheus.NewDesc("mcm_machine_items_total", "Count of machines currently managed by the mcm.", nil, nil)
 
 	// MachineCSPhase Current status phase of the Machines currently managed by the mcm.
-	MachineCSPhase = prometheus.NewGaugeVec(prometheus.GaugeOpts{
-		Namespace: namespace,
-		Subsystem: machineSubsystem,
-		Name:      "current_status_phase",
-		Help:      "Current status phase of the Machines currently managed by the mcm.",
-	}, []string{"name", "namespace"})
+	MachineCSPhase = prometheus.NewDesc(
+		prometheus.BuildFQName(namespace, machineSubsystem, "current_status_phase"),
+		"Current status phase of the Machines currently managed by the mcm.",
+		[]string{"name", "namespace"},
+		nil)
 
 	// MachineInfo Information of the Machines currently managed by the mcm.
 	MachineInfo = prometheus.NewGaugeVec(prometheus.GaugeOpts{
@@ -112,7 +111,6 @@ var (
 func registerMachineSubsystemMetrics() {
 	prometheus.MustRegister(MachineInfo)
 	prometheus.MustRegister(MachineStatusCondition)
-	prometheus.MustRegister(MachineCSPhase)
 }
 
 func registerCloudAPISubsystemMetrics() {