Add metrics for Node disruption type [#64]

Signed-off-by: f.bouzghaia <[email protected]>

Author: f.bouzghaia

internal/controller/metrics.go

@@ -17,49 +17,49 @@ var (
 			Name: METIC_PREFIX + "node_disruption_granted_total",
 			Help: "Total number of granted node disruptions",
 		},
-		[]string{},
+		[]string{"type"},
 	)
 	NodeDisruptionRejectedTotal = promauto.With(metrics.Registry).NewCounterVec(
 		prometheus.CounterOpts{
 			Name: METIC_PREFIX + "node_disruption_rejected_total",
 			Help: "Total number of rejected node disruptions",
 		},
-		[]string{},
+		[]string{"type"},
 	)
 	NodeDisruptionStateAsValue = promauto.With(metrics.Registry).NewGaugeVec(
 		prometheus.GaugeOpts{
 			Name: METIC_PREFIX + "node_disruption_state_value",
 			Help: "State of node disruption: pending=0, rejected=-1, accepted=1",
 		},
-		[]string{"node_disruption_name"},
+		[]string{"node_disruption_name", "type"},
 	)
 	NodeDisruptionStateAsLabel = promauto.With(metrics.Registry).NewGaugeVec(
 		prometheus.GaugeOpts{
 			Name: METIC_PREFIX + "node_disruption_state_label",
 			Help: "State of node disruption: 0 not in this state; 1 is in state",
 		},
-		[]string{"node_disruption_name", "state"},
+		[]string{"node_disruption_name", "state", "type"},
 	)
 	NodeDisruptionCreated = promauto.With(metrics.Registry).NewGaugeVec(
 		prometheus.GaugeOpts{
 			Name: METIC_PREFIX + "node_disruption_created",
 			Help: "Date of create of the node disruption",
 		},
-		[]string{"node_disruption_name"},
+		[]string{"node_disruption_name", "type"},
 	)
 	NodeDisruptionDeadline = promauto.With(metrics.Registry).NewGaugeVec(
 		prometheus.GaugeOpts{
 			Name: METIC_PREFIX + "node_disruption_deadline",
 			Help: "Date of the deadline of the node disruption (0 if unset)",
 		},
-		[]string{"node_disruption_name"},
+		[]string{"node_disruption_name", "type"},
 	)
 	NodeDisruptionImpactedNodes = promauto.With(metrics.Registry).NewGaugeVec(
 		prometheus.GaugeOpts{
 			Name: METIC_PREFIX + "node_disruption_impacted_node",
 			Help: "high cardinality: create a metric for each node impacted by a given node disruption",
 		},
-		[]string{"node_disruption_name", "node_name"},
+		[]string{"node_disruption_name", "node_name", "type"},
 	)
 	NodeDisruptionType = promauto.With(metrics.Registry).NewGaugeVec(
 		prometheus.GaugeOpts{

internal/controller/nodedisruption_controller.go

@@ -127,33 +127,32 @@ func UpdateNodeDisruptionMetrics(nd *nodedisruptionv1alpha1.NodeDisruption) {
 	nd_state := 0
 	if nd.Status.State == nodedisruptionv1alpha1.Pending {
 		nd_state = 0
-		NodeDisruptionStateAsLabel.WithLabelValues(nd.Name, string(nodedisruptionv1alpha1.Pending)).Set(1)
-		NodeDisruptionStateAsLabel.WithLabelValues(nd.Name, string(nodedisruptionv1alpha1.Granted)).Set(0)
-		NodeDisruptionStateAsLabel.WithLabelValues(nd.Name, string(nodedisruptionv1alpha1.Rejected)).Set(0)
+		NodeDisruptionStateAsLabel.WithLabelValues(nd.Name, string(nodedisruptionv1alpha1.Pending), nd.Spec.Type).Set(1)
+		NodeDisruptionStateAsLabel.WithLabelValues(nd.Name, string(nodedisruptionv1alpha1.Granted), nd.Spec.Type).Set(0)
+		NodeDisruptionStateAsLabel.WithLabelValues(nd.Name, string(nodedisruptionv1alpha1.Rejected), nd.Spec.Type).Set(0)
 	} else if nd.Status.State == nodedisruptionv1alpha1.Rejected {
 		nd_state = -1
-		NodeDisruptionStateAsLabel.WithLabelValues(nd.Name, string(nodedisruptionv1alpha1.Pending)).Set(0)
-		NodeDisruptionStateAsLabel.WithLabelValues(nd.Name, string(nodedisruptionv1alpha1.Rejected)).Set(1)
-		NodeDisruptionStateAsLabel.WithLabelValues(nd.Name, string(nodedisruptionv1alpha1.Granted)).Set(0)
+		NodeDisruptionStateAsLabel.WithLabelValues(nd.Name, string(nodedisruptionv1alpha1.Pending), nd.Spec.Type).Set(0)
+		NodeDisruptionStateAsLabel.WithLabelValues(nd.Name, string(nodedisruptionv1alpha1.Rejected), nd.Spec.Type).Set(1)
+		NodeDisruptionStateAsLabel.WithLabelValues(nd.Name, string(nodedisruptionv1alpha1.Granted), nd.Spec.Type).Set(0)
 	} else if nd.Status.State == nodedisruptionv1alpha1.Granted {
 		nd_state = 1
-		NodeDisruptionStateAsLabel.WithLabelValues(nd.Name, string(nodedisruptionv1alpha1.Pending)).Set(0)
-		NodeDisruptionStateAsLabel.WithLabelValues(nd.Name, string(nodedisruptionv1alpha1.Rejected)).Set(0)
-		NodeDisruptionStateAsLabel.WithLabelValues(nd.Name, string(nodedisruptionv1alpha1.Granted)).Set(1)
+		NodeDisruptionStateAsLabel.WithLabelValues(nd.Name, string(nodedisruptionv1alpha1.Pending), nd.Spec.Type).Set(0)
+		NodeDisruptionStateAsLabel.WithLabelValues(nd.Name, string(nodedisruptionv1alpha1.Rejected), nd.Spec.Type).Set(0)
+		NodeDisruptionStateAsLabel.WithLabelValues(nd.Name, string(nodedisruptionv1alpha1.Granted), nd.Spec.Type).Set(1)
 	}
-	NodeDisruptionStateAsValue.WithLabelValues(nd.Name).Set(float64(nd_state))
-	NodeDisruptionCreated.WithLabelValues(nd.Name).Set(float64(nd.CreationTimestamp.Unix()))
+	NodeDisruptionStateAsValue.WithLabelValues(nd.Name, nd.Spec.Type).Set(float64(nd_state))
+	NodeDisruptionCreated.WithLabelValues(nd.Name, nd.Spec.Type).Set(float64(nd.CreationTimestamp.Unix()))
 	// Deadline might not be set so it will be 0 but timestamp in Go are not Unix epoch
 	// so converting a 0 timestamp will not result in epoch 0. We override this to have nice values
 	deadline := nd.Spec.Retry.Deadline.Unix()
 	if nd.Spec.Retry.Deadline.IsZero() {
 		deadline = 0
 	}
-	NodeDisruptionDeadline.WithLabelValues(nd.Name).Set(float64(deadline))
-	NodeDisruptionType.WithLabelValues(nd.Name, nd.Spec.Type).Set(1)
+	NodeDisruptionDeadline.WithLabelValues(nd.Name, nd.Spec.Type).Set(float64(deadline))
 
 	for _, node_name := range nd.Status.DisruptedNodes {
-		NodeDisruptionImpactedNodes.WithLabelValues(nd.Name, node_name).Set(1)
+		NodeDisruptionImpactedNodes.WithLabelValues(nd.Name, node_name, nd.Spec.Type).Set(1)
 	}
 }
 
@@ -200,9 +199,9 @@ func (ndr *SingleNodeDisruptionReconciler) TryTransitionState(ctx context.Contex
 			return err
 		}
 		if ndr.NodeDisruption.Status.State == nodedisruptionv1alpha1.Granted {
-			NodeDisruptionGrantedTotal.WithLabelValues().Inc()
+			NodeDisruptionGrantedTotal.WithLabelValues(ndr.NodeDisruption.Spec.Type).Inc()
 		} else if ndr.NodeDisruption.Status.State == nodedisruptionv1alpha1.Rejected {
-			NodeDisruptionRejectedTotal.WithLabelValues().Inc()
+			NodeDisruptionRejectedTotal.WithLabelValues(ndr.NodeDisruption.Spec.Type).Inc()
 		}
 	}
 	// If the disruption is not Pending nor unknown, the state is final