Skip to content

Commit 29cd37a

Browse files
committed
fix(vm): fix condition based metrics (#1069)
AwaitingRestartToApplyConfiguration, ConfigurationApplied, AgentReady and FirmwareUpToDate conditions are no longer displayed to the user unless they contain an issue or some important message for the user. However, this change was not accounted for in the metrics. It's fixed in this pr. Signed-off-by: Isteb4k <dmitry.rakitin@flant.com>
1 parent cd4f477 commit 29cd37a

1 file changed

Lines changed: 13 additions & 8 deletions

File tree

  • images/virtualization-artifact/pkg/monitoring/metrics/virtualmachine

images/virtualization-artifact/pkg/monitoring/metrics/virtualmachine/data_metric.go

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,22 +66,27 @@ func newDataMetric(vm *virtv2.VirtualMachine) *dataMetric {
6666
agentReady bool
6767
firmwareUpToDate bool
6868
)
69-
if cond, found := conditions.GetCondition(vmcondition.TypeAwaitingRestartToApplyConfiguration,
70-
vm.Status.Conditions); found && cond.Status == metav1.ConditionTrue {
69+
70+
awaitingRestartToApplyConfigurationCondition, _ := conditions.GetCondition(vmcondition.TypeAwaitingRestartToApplyConfiguration, vm.Status.Conditions)
71+
if awaitingRestartToApplyConfigurationCondition.Status == metav1.ConditionFalse {
7172
awaitingRestartToApplyConfiguration = true
7273
}
73-
if cond, found := conditions.GetCondition(vmcondition.TypeConfigurationApplied,
74-
vm.Status.Conditions); found && cond.Status == metav1.ConditionTrue {
74+
75+
configurationAppliedCondition, _ := conditions.GetCondition(vmcondition.TypeConfigurationApplied, vm.Status.Conditions)
76+
if configurationAppliedCondition.Status != metav1.ConditionFalse {
7577
configurationApplied = true
7678
}
77-
if cond, found := conditions.GetCondition(vmcondition.TypeAgentReady,
78-
vm.Status.Conditions); found && cond.Status == metav1.ConditionTrue {
79+
80+
agentReadyCondition, _ := conditions.GetCondition(vmcondition.TypeAgentReady, vm.Status.Conditions)
81+
if agentReadyCondition.Status == metav1.ConditionTrue {
7982
agentReady = true
8083
}
81-
if cond, found := conditions.GetCondition(vmcondition.TypeFirmwareUpToDate,
82-
vm.Status.Conditions); found && cond.Status == metav1.ConditionTrue {
84+
85+
firmwareUpToDateCondition, _ := conditions.GetCondition(vmcondition.TypeFirmwareUpToDate, vm.Status.Conditions)
86+
if firmwareUpToDateCondition.Status != metav1.ConditionFalse {
8387
firmwareUpToDate = true
8488
}
89+
8590
pods := make([]virtv2.VirtualMachinePod, len(vm.Status.VirtualMachinePods))
8691
for i, pod := range vm.Status.VirtualMachinePods {
8792
pods[i] = *pod.DeepCopy()

0 commit comments

Comments
 (0)