fix(metric): Modify pvc namespace label name

The label `namespace` will be used by the Prometheus collector. Change it to `pvc_namespace` Signed-off-by: James Lu <jamesluhz@gmail.com> (cherry picked from commit b5e478d)
longhorn · Nov 13, 2023 · 761e3e0 · 761e3e0
1 parent ee44951
commit 761e3e0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/metrics_collector/types.go b/metrics_collector/types.go
@@ -26,7 +26,7 @@ const (
 	managerLabel         = "manager"
 	backupLabel          = "backup"
 	pvcLabel             = "pvc"
-	namespaceLabel       = "namespace"
+	pvcNamespaceLabel    = "pvc_namespace"
 )
 
 type metricInfo struct {

diff --git a/metrics_collector/volume_collector.go b/metrics_collector/volume_collector.go
@@ -51,7 +51,7 @@ func NewVolumeCollector(
 		Desc: prometheus.NewDesc(
 			prometheus.BuildFQName(longhornName, subsystemVolume, "capacity_bytes"),
 			"Configured size in bytes for this volume",
-			[]string{nodeLabel, volumeLabel, pvcLabel, namespaceLabel},
+			[]string{nodeLabel, volumeLabel, pvcLabel, pvcNamespaceLabel},
 			nil,
 		),
 		Type: prometheus.GaugeValue,
@@ -61,7 +61,7 @@ func NewVolumeCollector(
 		Desc: prometheus.NewDesc(
 			prometheus.BuildFQName(longhornName, subsystemVolume, "actual_size_bytes"),
 			"Actual space used by each replica of the volume on the corresponding node",
-			[]string{nodeLabel, volumeLabel, pvcLabel, namespaceLabel},
+			[]string{nodeLabel, volumeLabel, pvcLabel, pvcNamespaceLabel},
 			nil,
 		),
 		Type: prometheus.GaugeValue,
@@ -71,7 +71,7 @@ func NewVolumeCollector(
 		Desc: prometheus.NewDesc(
 			prometheus.BuildFQName(longhornName, subsystemVolume, "state"),
 			"State of this volume",
-			[]string{nodeLabel, volumeLabel, pvcLabel, namespaceLabel},
+			[]string{nodeLabel, volumeLabel, pvcLabel, pvcNamespaceLabel},
 			nil,
 		),
 		Type: prometheus.GaugeValue,
@@ -81,7 +81,7 @@ func NewVolumeCollector(
 		Desc: prometheus.NewDesc(
 			prometheus.BuildFQName(longhornName, subsystemVolume, "robustness"),
 			"Robustness of this volume",
-			[]string{nodeLabel, volumeLabel, pvcLabel, namespaceLabel},
+			[]string{nodeLabel, volumeLabel, pvcLabel, pvcNamespaceLabel},
 			nil,
 		),
 		Type: prometheus.GaugeValue,
@@ -91,7 +91,7 @@ func NewVolumeCollector(
 		Desc: prometheus.NewDesc(
 			prometheus.BuildFQName(longhornName, subsystemVolume, "read_throughput"),
 			"Read throughput of this volume (Bytes/s)",
-			[]string{nodeLabel, volumeLabel, pvcLabel, namespaceLabel},
+			[]string{nodeLabel, volumeLabel, pvcLabel, pvcNamespaceLabel},
 			nil,
 		),
 		Type: prometheus.GaugeValue,
@@ -101,7 +101,7 @@ func NewVolumeCollector(
 		Desc: prometheus.NewDesc(
 			prometheus.BuildFQName(longhornName, subsystemVolume, "write_throughput"),
 			"Write throughput of this volume (Bytes/s)",
-			[]string{nodeLabel, volumeLabel, pvcLabel, namespaceLabel},
+			[]string{nodeLabel, volumeLabel, pvcLabel, pvcNamespaceLabel},
 			nil,
 		),
 		Type: prometheus.GaugeValue,
@@ -111,7 +111,7 @@ func NewVolumeCollector(
 		Desc: prometheus.NewDesc(
 			prometheus.BuildFQName(longhornName, subsystemVolume, "read_iops"),
 			"Read IOPS of this volume",
-			[]string{nodeLabel, volumeLabel, pvcLabel, namespaceLabel},
+			[]string{nodeLabel, volumeLabel, pvcLabel, pvcNamespaceLabel},
 			nil,
 		),
 		Type: prometheus.GaugeValue,
@@ -121,7 +121,7 @@ func NewVolumeCollector(
 		Desc: prometheus.NewDesc(
 			prometheus.BuildFQName(longhornName, subsystemVolume, "write_iops"),
 			"Write IOPS of this volume",
-			[]string{nodeLabel, volumeLabel, pvcLabel, namespaceLabel},
+			[]string{nodeLabel, volumeLabel, pvcLabel, pvcNamespaceLabel},
 			nil,
 		),
 		Type: prometheus.GaugeValue,
@@ -131,7 +131,7 @@ func NewVolumeCollector(
 		Desc: prometheus.NewDesc(
 			prometheus.BuildFQName(longhornName, subsystemVolume, "read_latency"),
 			"Read latency of this volume (ns)",
-			[]string{nodeLabel, volumeLabel, pvcLabel, namespaceLabel},
+			[]string{nodeLabel, volumeLabel, pvcLabel, pvcNamespaceLabel},
 			nil,
 		),
 		Type: prometheus.GaugeValue,
@@ -141,7 +141,7 @@ func NewVolumeCollector(
 		Desc: prometheus.NewDesc(
 			prometheus.BuildFQName(longhornName, subsystemVolume, "write_latency"),
 			"Write latency of this volume (ns)",
-			[]string{nodeLabel, volumeLabel, pvcLabel, namespaceLabel},
+			[]string{nodeLabel, volumeLabel, pvcLabel, pvcNamespaceLabel},
 			nil,
 		),
 		Type: prometheus.GaugeValue,