add new counter metrics for backup deletion (#1280)

* compute backup deletion metrics (attempt, success, fail)

Signed-off-by: fabito <fuechi@ciandt.com>

pkg/controller/backup_deletion_controller.go

@@ -37,6 +37,7 @@ import (
 	velerov1client "github.com/heptio/velero/pkg/generated/clientset/versioned/typed/velero/v1"
 	informers "github.com/heptio/velero/pkg/generated/informers/externalversions/velero/v1"
 	listers "github.com/heptio/velero/pkg/generated/listers/velero/v1"
+	"github.com/heptio/velero/pkg/metrics"
 	"github.com/heptio/velero/pkg/persistence"
 	"github.com/heptio/velero/pkg/plugin/clientmgmt"
 	"github.com/heptio/velero/pkg/plugin/velero"
@@ -63,6 +64,7 @@ type backupDeletionController struct {
 	clock                     clock.Clock
 	newPluginManager          func(logrus.FieldLogger) clientmgmt.Manager
 	newBackupStore            func(*v1.BackupStorageLocation, persistence.ObjectStoreGetter, logrus.FieldLogger) (persistence.BackupStore, error)
+	metrics                   *metrics.ServerMetrics
 }
 
 // NewBackupDeletionController creates a new backup deletion controller.
@@ -79,6 +81,7 @@ func NewBackupDeletionController(
 	backupLocationInformer informers.BackupStorageLocationInformer,
 	snapshotLocationInformer informers.VolumeSnapshotLocationInformer,
 	newPluginManager func(logrus.FieldLogger) clientmgmt.Manager,
+	metrics *metrics.ServerMetrics,
 ) Interface {
 	c := &backupDeletionController{
 		genericController:         newGenericController("backup-deletion", logger),
@@ -92,7 +95,7 @@ func NewBackupDeletionController(
 		podvolumeBackupLister:     podvolumeBackupInformer.Lister(),
 		backupLocationLister:      backupLocationInformer.Lister(),
 		snapshotLocationLister:    snapshotLocationInformer.Lister(),
-
+		metrics:                   metrics,
 		// use variables to refer to these functions so they can be
 		// replaced with fakes for testing.
 		newPluginManager: newPluginManager,
@@ -234,6 +237,9 @@ func (c *backupDeletionController) processRequest(req *v1.DeleteBackupRequest) e
 		return err
 	}
 
+	backupScheduleName := backup.GetLabels()[v1.ScheduleNameLabel]
+	c.metrics.RegisterBackupDeletionAttempt(backupScheduleName)
+
 	var errs []string
 
 	pluginManager := c.newPluginManager(log)
@@ -339,6 +345,12 @@ func (c *backupDeletionController) processRequest(req *v1.DeleteBackupRequest) e
 		}
 	}
 
+	if len(errs) == 0 {
+		c.metrics.RegisterBackupDeletionSuccess(backupScheduleName)
+	} else {
+		c.metrics.RegisterBackupDeletionFailed(backupScheduleName)
+	}
+
 	// Update status to processed and record errors
 	req, err = c.patchDeleteBackupRequest(req, func(r *v1.DeleteBackupRequest) {
 		r.Status.Phase = v1.DeleteBackupRequestPhaseProcessed

pkg/controller/backup_deletion_controller_test.go

@@ -36,6 +36,7 @@ import (
 	pkgbackup "github.com/heptio/velero/pkg/backup"
 	"github.com/heptio/velero/pkg/generated/clientset/versioned/fake"
 	informers "github.com/heptio/velero/pkg/generated/informers/externalversions"
+	"github.com/heptio/velero/pkg/metrics"
 	"github.com/heptio/velero/pkg/persistence"
 	persistencemocks "github.com/heptio/velero/pkg/persistence/mocks"
 	"github.com/heptio/velero/pkg/plugin/clientmgmt"
@@ -61,6 +62,7 @@ func TestBackupDeletionControllerProcessQueueItem(t *testing.T) {
 		sharedInformers.Velero().V1().BackupStorageLocations(),
 		sharedInformers.Velero().V1().VolumeSnapshotLocations(),
 		nil, // new plugin manager func
+		metrics.NewServerMetrics(),
 	).(*backupDeletionController)
 
 	// Error splitting key
@@ -147,6 +149,7 @@ func setupBackupDeletionControllerTest(objects ...runtime.Object) *backupDeletio
 			sharedInformers.Velero().V1().BackupStorageLocations(),
 			sharedInformers.Velero().V1().VolumeSnapshotLocations(),
 			func(logrus.FieldLogger) clientmgmt.Manager { return pluginManager },
+			metrics.NewServerMetrics(),
 		).(*backupDeletionController),
 
 		req: req,
@@ -723,6 +726,7 @@ func TestBackupDeletionControllerDeleteExpiredRequests(t *testing.T) {
 				sharedInformers.Velero().V1().BackupStorageLocations(),
 				sharedInformers.Velero().V1().VolumeSnapshotLocations(),
 				nil, // new plugin manager func
+				metrics.NewServerMetrics(),
 			).(*backupDeletionController)
 
 			fakeClock := &clock.FakeClock{}