Skip to content

Fix mcm_machine_set_failed_machines metric to more accurately reflect current state #1025

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
aaronfern merged 2 commits into from
Aug 14, 2025
Merged

Fix mcm_machine_set_failed_machines metric to more accurately reflect current state #1025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f97f3cf
Clear metric before repopulating, change status variable to reflect m…
gagan16k Aug 7, 2025
965a6fd
Update comment
gagan16k Aug 11, 2025
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
8 changes: 3 additions & 5 deletions pkg/controller/deployment_machineset_util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,13 +126,11 @@ func calculateMachineSetStatus(is *v1alpha1.MachineSet, filteredMachines []*v1al
}
}

// Update the FailedMachines field only if we see new failures
// Clear FailedMachines if ready replicas equals total replicas,
// which means the machineset doesn't have any machine objects which are in any failed state
// #nosec G115 -- number of machines will not exceed MaxInt32
// Update the FailedMachines field when we see new failures
// Clear FailedMachines if there are no failed machines.
if len(failedMachines) > 0 {
newStatus.FailedMachines = &failedMachines
} else if int32(readyReplicasCount) == is.Status.Replicas {
} else {
newStatus.FailedMachines = nil
}

Expand Down
5 changes: 5 additions & 0 deletions pkg/controller/metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,11 @@ func updateMachineSetStatusRelatedMetric(machineSet *v1alpha1.MachineSet, msMeta
}

func updateMachineSetStatusFailedMachinesMetric(machineSet *v1alpha1.MachineSet, msMeta metav1.ObjectMeta) {
metrics.MachineSetStatusFailedMachines.DeletePartialMatch(prometheus.Labels{
"name": msMeta.Name,
"namespace": msMeta.Namespace,
})

if machineSet.Status.FailedMachines != nil {
for _, failedMachine := range *machineSet.Status.FailedMachines {
metrics.MachineSetStatusFailedMachines.With(prometheus.Labels{
Expand Down
Loading