fix(metrics): snapshot size was collected before with the same name a…

…nd label values ref: 5869 Signed-off-by: Chin-Ya Huang <chin-ya.huang@suse.com>
longhorn · Dec 22, 2023 · db28aba · db28aba
1 parent cc7f120
commit db28aba
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/metrics_collector/snapshot_collector.go b/metrics_collector/snapshot_collector.go
@@ -28,7 +28,7 @@ func NewSnapshotCollector(
 		Desc: prometheus.NewDesc(
 			prometheus.BuildFQName(longhornName, subsystemSnapshot, "actual_size_bytes"),
 			"Actual size of this snapshot",
-			[]string{volumeLabel, userCreatedLabel},
+			[]string{snapshotLabel, volumeLabel, userCreatedLabel},
 			nil,
 		),
 		Type: prometheus.GaugeValue,
@@ -75,6 +75,6 @@ func (c *SnapshotCollector) Collect(ch chan<- prometheus.Metric) {
 			isUserCreated = "true"
 		}
 
-		ch <- prometheus.MustNewConstMetric(c.sizeMetric.Desc, c.sizeMetric.Type, float64(snapshot.Status.Size), volume.Name, isUserCreated)
+		ch <- prometheus.MustNewConstMetric(c.sizeMetric.Desc, c.sizeMetric.Type, float64(snapshot.Status.Size), snapshot.Name, volume.Name, isUserCreated)
 	}
 }
diff --git a/metrics_collector/types.go b/metrics_collector/types.go
@@ -26,6 +26,7 @@ const (
 	instanceManagerType  = "instance_manager_type"
 	managerLabel         = "manager"
 	backupLabel          = "backup"
+	snapshotLabel        = "snapshot"
 	pvcLabel             = "pvc"
 	pvcNamespaceLabel    = "pvc_namespace"
 	userCreatedLabel     = "user_created"