PTEUDO-1179: adjusting reported dbclaims metrics (#342)

pkg/databaseclaim/databaseclaim.go

@@ -150,6 +150,9 @@ func (r *DatabaseClaimReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 
 	if err := validateDBClaim(&dbClaim); err != nil {
 		res, err := r.manageError(ctx, &dbClaim, err)
+		if dbClaim.Status.Error != "" {
+			metrics.ErrorStateClaims.Inc()
+		}
 		// TerminalError, do not requeue
 		return res, reconcile.TerminalError(err)
 	}
@@ -169,15 +172,19 @@ func (r *DatabaseClaimReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 
 	reqInfo, err := NewRequestInfo(ctx, r.Config.Viper, &dbClaim)
 	if err != nil {
-		return r.manageError(ctx, &dbClaim, err)
+		res, err := r.manageError(ctx, &dbClaim, err)
+		if dbClaim.Status.Error != "" {
+			metrics.ErrorStateClaims.Inc()
+		}
+		return res, err
 	}
 
 	// name of our custom finalizer
 	dbFinalizerName := "databaseclaims.persistance.atlas.infoblox.com/finalizer"
 
 	if !dbClaim.ObjectMeta.DeletionTimestamp.IsZero() {
 		// Increment total claims count.
-		metrics.TotalDatabaseClaims.Dec()
+		metrics.TotalDatabaseClaimsDeleted.Inc()
 
 		// The object is being deleted
 		if controllerutil.ContainsFinalizer(&dbClaim, dbFinalizerName) {
@@ -234,14 +241,12 @@ func (r *DatabaseClaimReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 	}
 	res, err := r.executeDbClaimRequest(ctx, &reqInfo, &dbClaim)
 	if err != nil {
+		if dbClaim.Status.Error != "" {
+			metrics.ErrorStateClaims.Inc()
+		}
 		return res, err
 	}
 
-	// Track claims in error state.
-	if dbClaim.Status.Error != "" {
-		metrics.ErrorStateClaims.Inc()
-	}
-
 	// Track migration state.
 	if dbClaim.Status.MigrationState != "" {
 		metrics.MigrationStateClaims.WithLabelValues(dbClaim.Status.MigrationState).Inc()

pkg/metrics/metrics.go

@@ -88,6 +88,12 @@ var (
 			Help: "Total number of database claims",
 		},
 	)
+	TotalDatabaseClaimsDeleted = prometheus.NewGauge(
+		prometheus.GaugeOpts{
+			Name: "dbcontroller_total_database_claims_deleted",
+			Help: "Total number of database claims marked for deletion",
+		},
+	)
 	ExistingSourceClaims = prometheus.NewGaugeVec(
 		prometheus.GaugeOpts{
 			Name: "dbcontroller_existing_source_claims",