Add recurring job label to backup metrics or empty value

longhorn · Jul 26, 2024 · 7906c65 · 7906c65
1 parent a999bb9
commit 7906c65
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/metrics_collector/backup_collector.go b/metrics_collector/backup_collector.go
@@ -32,7 +32,7 @@ func NewBackupCollector(
 		Desc: prometheus.NewDesc(
 			prometheus.BuildFQName(longhornName, subsystemBackup, "actual_size_bytes"),
 			"Actual size of this backup",
-			[]string{volumeLabel, backupLabel},
+			[]string{volumeLabel, backupLabel, recurringJobLabel},
 			nil,
 		),
 		Type: prometheus.GaugeValue,
@@ -42,7 +42,7 @@ func NewBackupCollector(
 		Desc: prometheus.NewDesc(
 			prometheus.BuildFQName(longhornName, subsystemBackup, "state"),
 			"State of this backup",
-			[]string{volumeLabel, backupLabel},
+			[]string{volumeLabel, backupLabel, recurringJobLabel},
 			nil,
 		),
 		Type: prometheus.GaugeValue,
@@ -79,8 +79,9 @@ func (bc *BackupCollector) Collect(ch chan<- prometheus.Metric) {
 			if !ok {
 				bc.logger.WithError(err).Warn("Error get backup volume label")
 			}
-			ch <- prometheus.MustNewConstMetric(bc.sizeMetric.Desc, bc.sizeMetric.Type, size, backupVolumeName, backup.Name)
-			ch <- prometheus.MustNewConstMetric(bc.stateMetric.Desc, bc.stateMetric.Type, float64(getBackupStateValue(backup)), backupVolumeName, backup.Name)
+			backupRecurringJobName := backup.Labels[types.RecurringJobLabel]
+			ch <- prometheus.MustNewConstMetric(bc.sizeMetric.Desc, bc.sizeMetric.Type, size, backupVolumeName, backup.Name, backupRecurringJobName)
+			ch <- prometheus.MustNewConstMetric(bc.stateMetric.Desc, bc.stateMetric.Type, float64(getBackupStateValue(backup)), backupVolumeName, backup.Name, backupRecurringJobName)
 		}
 	}
 }

diff --git a/metrics_collector/types.go b/metrics_collector/types.go
@@ -34,6 +34,7 @@ const (
 	userCreatedLabel        = "user_created"
 	backingImageLabel       = "backing_image"
 	backupBackingImageLabel = "backup_backing_image"
+	recurringJobLabel       = "recurring_job"
 )
 
 type metricInfo struct {