Skip to content

deletes old metric instance when system switched control plane #547

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bdjgs merged 1 commit into from
Dec 9, 2025
Merged

deletes old metric instance when system switched control plane #547

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions internal/controller/styra/system_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ func (r *SystemReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr
if system.Labels[labels.LabelControlPlane] == labels.LabelValueControlPlaneOCP {
r.updateMetric(req, system.Status.ID, system.Status.Ready, system.Labels[labels.LabelControlPlane])
} else {
r.updateMetric(req, system.Status.ID, system.Status.Ready, "styra-das")
r.updateMetric(req, system.Status.ID, system.Status.Ready, labels.LabelValueControlPlaneStyra)
}

} else {
Expand All @@ -141,7 +141,7 @@ func (r *SystemReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr
if system.Labels[labels.LabelControlPlane] == labels.LabelValueControlPlaneOCP {
r.updateMetric(req, system.Status.ID, system.Status.Ready, system.Labels[labels.LabelControlPlane])
} else {
r.updateMetric(req, system.Status.ID, system.Status.Ready, "styra-das")
r.updateMetric(req, system.Status.ID, system.Status.Ready, labels.LabelValueControlPlaneStyra)
}
} else {
r.deleteMetrics(req)
Expand Down Expand Up @@ -188,6 +188,26 @@ func (r *SystemReconciler) updateMetric(req ctrl.Request, systemID string, ready
value = 1
}
r.Metrics.ControllerSystemStatusReady.WithLabelValues(req.Name, req.Namespace, systemID, controlPlane).Set(value)

// If system switched control plane, we need to delete the old metric with the other control plane label
var labelToDelete string
if controlPlane == labels.LabelValueControlPlaneOCP {
labelToDelete = labels.LabelValueControlPlaneStyra
}
if controlPlane == labels.LabelValueControlPlaneStyra {
labelToDelete = labels.LabelValueControlPlaneOCP
}

// We cannot know if the metric exists before deleting it.
// Therefore, we just delete and ignore the output of DeletePartialMatch.
r.Metrics.ControllerSystemStatusReady.DeletePartialMatch(
prometheus.Labels{
"system_name": req.Name,
"namespace": req.Namespace,
"system_id": systemID,
"control_plane": labelToDelete,
},
)
}

func (r *SystemReconciler) deleteMetrics(req ctrl.Request) {
Expand Down
Loading