Rename velero.backup and velero.restore metrics (#19904) (#19905)

* Rename backup and restore metrics

* Add changelog

(cherry picked from commit 6f3ab90)

Co-authored-by: dkirov-dd <166512750+dkirov-dd@users.noreply.github.com>

Author: datadog-agent-integrations-bot[bot]

velero/changelog.d/19904.changed

@@ -0,0 +1 @@
+Rename `velero.backup` and `velero.restore` metrics

velero/datadog_checks/velero/metrics.py

@@ -26,7 +26,7 @@
     'velero_backup_partial_failure': 'backup.partial_failure',
     'velero_backup_success': 'backup.success',
     'velero_backup_tarball_size_bytes': 'backup.tarball_size_bytes',
-    'velero_backup_total': 'backup',
+    'velero_backup_total': 'backup.amount',
     'velero_backup_validation_failure': 'backup.validation_failure',
     'velero_backup_warning': 'backup.warning',
     'velero_csi_snapshot_attempt': 'csi_snapshot.attempt',
@@ -36,7 +36,7 @@
     'velero_restore_failed': 'restore.failed',
     'velero_restore_partial_failure': 'restore.partial_failure',
     'velero_restore_success': 'restore.success',
-    'velero_restore_total': 'restore',
+    'velero_restore_total': 'restore.amount',
     'velero_restore_validation_failed': 'restore.validation_failed',
     'velero_volume_snapshot_attempt': 'volume_snapshot.attempt',
     'velero_volume_snapshot_failure': 'volume_snapshot.failure',

velero/metadata.csv

@@ -1,5 +1,5 @@
 metric_name,metric_type,interval,unit_name,per_unit_name,description,orientation,integration,short_name,curated_metric,sample_tags
-velero.backup,gauge,,,,Current number of existent backups,0,velero,,,
+velero.backup.amount,gauge,,,,Current number of existent backups,0,velero,,,
 velero.backup.attempt.count,count,,,,Total number of attempted backups,0,velero,,,
 velero.backup.deletion.attempt.count,count,,,,Total number of attempted backup deletions,0,velero,,,
 velero.backup.deletion.failure.count,count,,,,Total number of failed backup deletions,0,velero,,,
@@ -32,7 +32,7 @@ velero.pod_volume.operation_latency.seconds.bucket,count,,,,"Histogram bucket fo
 velero.pod_volume.operation_latency.seconds.count,count,,,,Count aggregation for time taken to complete pod volume operations,0,velero,,,
 velero.pod_volume.operation_latency.seconds.gauge,gauge,,,,"Gauge metric indicating time taken, in seconds, to perform pod volume operations",0,velero,,,
 velero.pod_volume.operation_latency.seconds.sum,count,,,,"Sum aggregation for time taken to complete pod volume operations, in seconds",0,velero,,,
-velero.restore,gauge,,,,Current number of existent restores,0,velero,,,
+velero.restore.amount,gauge,,,,Current number of existent restores,0,velero,,,
 velero.restore.attempt.count,count,,,,Total number of attempted restores,0,velero,,,
 velero.restore.failed.count,count,,,,Total number of failed restores,0,velero,,,
 velero.restore.partial_failure.count,count,,,,Total number of partially failed restores,0,velero,,,

velero/tests/common.py

@@ -40,7 +40,7 @@ def get_fixture_path(filename):
     'velero.backup.last_status': 'gauge',
     'velero.backup.partial_failure.count': 'monotonic_count',
     'velero.backup.success.count': 'monotonic_count',
-    'velero.backup': 'gauge',
+    'velero.backup.amount': 'gauge',
     'velero.backup.validation_failure.count': 'monotonic_count',
     'velero.backup.warning.count': 'monotonic_count',
     'velero.csi_snapshot.attempt.count': 'monotonic_count',
@@ -50,7 +50,7 @@ def get_fixture_path(filename):
     'velero.restore.failed.count': 'monotonic_count',
     'velero.restore.partial_failure.count': 'monotonic_count',
     'velero.restore.success.count': 'monotonic_count',
-    'velero.restore': 'gauge',
+    'velero.restore.amount': 'gauge',
     'velero.restore.validation_failed.count': 'monotonic_count',
     'velero.volume_snapshot.attempt.count': 'monotonic_count',
     'velero.volume_snapshot.failure.count': 'monotonic_count',