fix(application): restore metrics when app status is successed (#2016)

Co-authored-by: xdonggao <[email protected]>
tkestack · Aug 4, 2022 · 446af1b · 446af1b
1 parent 159feb8
commit 446af1b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 0 deletions.
diff --git a/pkg/application/controller/app/action/install.go b/pkg/application/controller/app/action/install.go
@@ -119,6 +119,8 @@ func Install(ctx context.Context,
 			newStatus.Reason = ""
 			newStatus.LastTransitionTime = metav1.Now()
 			metrics.GaugeApplicationInstallFailed.WithLabelValues(app.Spec.TargetCluster, app.Name).Set(0)
+			metrics.GaugeApplicationUpgradeFailed.WithLabelValues(app.Spec.TargetCluster, app.Name).Set(0)
+			metrics.GaugeApplicationRollbackFailed.WithLabelValues(app.Spec.TargetCluster, app.Name).Set(0)
 		}
 		newApp, updateStatusErr = updateStatusFunc(ctx, newApp, &newApp.Status, newStatus)
 		if updateStatusErr != nil {

diff --git a/pkg/application/controller/app/action/rollback.go b/pkg/application/controller/app/action/rollback.go
@@ -70,6 +70,8 @@ func Rollback(ctx context.Context,
 			newStatus.Reason = ""
 			newStatus.LastTransitionTime = metav1.Now()
 			newStatus.RollbackRevision = 0 // clean revision
+			metrics.GaugeApplicationInstallFailed.WithLabelValues(app.Spec.TargetCluster, app.Name).Set(0)
+			metrics.GaugeApplicationUpgradeFailed.WithLabelValues(app.Spec.TargetCluster, app.Name).Set(0)
 			metrics.GaugeApplicationRollbackFailed.WithLabelValues(app.Spec.TargetCluster, app.Name).Set(0)
 		}
 		app, updateStatusErr = updateStatusFunc(ctx, app, &app.Status, newStatus)

diff --git a/pkg/application/controller/app/action/upgrade.go b/pkg/application/controller/app/action/upgrade.go
@@ -119,7 +119,9 @@ func Upgrade(ctx context.Context,
 			newStatus.Message = ""
 			newStatus.Reason = ""
 			newStatus.LastTransitionTime = metav1.Now()
+			metrics.GaugeApplicationInstallFailed.WithLabelValues(app.Spec.TargetCluster, app.Name).Set(0)
 			metrics.GaugeApplicationUpgradeFailed.WithLabelValues(app.Spec.TargetCluster, app.Name).Set(0)
+			metrics.GaugeApplicationRollbackFailed.WithLabelValues(app.Spec.TargetCluster, app.Name).Set(0)
 		}
 		newApp, updateStatusErr = updateStatusFunc(ctx, newApp, &newApp.Status, newStatus)
 		if updateStatusErr != nil {

diff --git a/pkg/application/controller/app/app_controller.go b/pkg/application/controller/app/app_controller.go
@@ -260,6 +260,10 @@ func (c *Controller) syncItem(key string) error {
 				log.String("name", name))
 			_ = c.processDeletion(key)
 			err = c.appResourcesDeleter.Delete(context.Background(), namespace, name)
+			metrics.GaugeApplicationInstallFailed.WithLabelValues(app.Spec.TargetCluster, app.Name).Set(0)
+			metrics.GaugeApplicationUpgradeFailed.WithLabelValues(app.Spec.TargetCluster, app.Name).Set(0)
+			metrics.GaugeApplicationRollbackFailed.WithLabelValues(app.Spec.TargetCluster, app.Name).Set(0)
+			metrics.GaugeApplicationSyncFailed.WithLabelValues(app.Spec.TargetCluster, app.Name).Set(0)
 			// If err is not nil, do not update object status when phase is Terminating.
 			// DeletionTimestamp is not empty and object will be deleted when you request updateStatus
 		} else {
@@ -405,6 +409,9 @@ func (c *Controller) syncAppFromRelease(ctx context.Context, cachedApp *cachedAp
 	newStatus.Reason = ""
 	newStatus.LastTransitionTime = metav1.Now()
 	metrics.GaugeApplicationSyncFailed.WithLabelValues(app.Spec.TargetCluster, app.Name).Set(0)
+	metrics.GaugeApplicationInstallFailed.WithLabelValues(app.Spec.TargetCluster, app.Name).Set(0)
+	metrics.GaugeApplicationUpgradeFailed.WithLabelValues(app.Spec.TargetCluster, app.Name).Set(0)
+	metrics.GaugeApplicationRollbackFailed.WithLabelValues(app.Spec.TargetCluster, app.Name).Set(0)
 
 	newStatus.ReleaseStatus = string(rel.Info.Status)
 	newStatus.Revision = int64(rel.Version)