Telemetry metrics - minor changes

Signed-off-by: Bella Khizgiyaev <[email protected]>
bkhizgiy · Jun 27, 2024 · 50a2566 · 50a2566
1 parent 0887c14
commit 50a2566
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 24 deletions.
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -54,7 +54,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: kubev2v/forkliftci
-          ref: v15.0
+          ref: v16.0
 
       - name: Build and setup everything with bazel
         id: forkliftci

diff --git a/pkg/monitoring/metrics/forklift-controller/metrics.go b/pkg/monitoring/metrics/forklift-controller/metrics.go
@@ -22,13 +22,13 @@ const (
 )
 
 var (
-	// 'status' - [ succeeded, failed, Executing, Canceled]
-	// 'provider' - [oVirt, vSphere, Openstack, OVA, openshift]
+	// 'status' - [ Succeeded, Failed, Executing, Canceled]
+	// 'provider' - [oVirt, VSphere, Openstack, OVA, Openshift]
 	// 'mode' - [Cold, Warm]
 	// 'target' - [Local, Remote]
-	migratioStatusCounter = promauto.NewGaugeVec(prometheus.GaugeOpts{
+	migrationStatusGauge = promauto.NewGaugeVec(prometheus.GaugeOpts{
 		Name: "mtv_migrations_status",
-		Help: "VM Migrations sorted by status status, provider, mode and destination",
+		Help: "VM Migrations sorted by status, provider, mode and destination",
 	},
 		[]string{
 			"status",
@@ -38,11 +38,11 @@ var (
 		},
 	)
 
-	// 'status' - [ succeeded, failed, Executing, Running, Pending, Canceled, Blocked, Deleted]
-	// 'provider' - [oVirt, vSphere, Openstack, OVA, openshift]
+	// 'status' - [ Succeeded, Failed, Executing, Running, Pending, Canceled, Blocked, Deleted]
+	// 'provider' - [oVirt, VSphere, Openstack, OVA, Openshift]
 	// 'mode' - [Cold, Warm]
 	// 'target' - [Local, Remote]
-	planStatusCounter = promauto.NewGaugeVec(prometheus.GaugeOpts{
+	planStatusGauge = promauto.NewGaugeVec(prometheus.GaugeOpts{
 		Name: "mtv_plans_status",
 		Help: "VM migration Plans sorted by status, provider, mode and destination",
 	},
@@ -54,24 +54,24 @@ var (
 		},
 	)
 
-	// 'status' - [ succeeded, failed, Executing, Canceled]
-	// 'provider' - [oVirt, vSphere, Openstack, OVA, openshift]
+	// 'status' - [ Succeeded, Failed, Executing, Canceled]
+	// 'provider' - [oVirt, VSphere, Openstack, OVA, Openshift]
 	// 'mode' - [Cold, Warm]
 	// 'target' - [Local, Remote]
 	// 'plan' - [Id]
 	migrationDurationGauge = promauto.NewGaugeVec(prometheus.GaugeOpts{
-		Name: "mtv_migration_duration_in_seconds",
+		Name: "mtv_migration_duration_seconds",
 		Help: "Duration of VM migrations in seconds",
 	},
 		[]string{"provider", "mode", "target", "plan"},
 	)
 
-	// 'provider' - [oVirt, vSphere, Openstack, OVA, openshift]
+	// 'provider' - [oVirt, VSphere, Openstack, OVA, Openshift]
 	// 'mode' - [Cold, Warm]
 	// 'target' - [Local, Remote]
 	// 'plan' - [Id]
 	dataTransferredGauge = promauto.NewGaugeVec(prometheus.GaugeOpts{
-		Name: "mtv_data_transferred_in_bytes",
+		Name: "mtv_migration_data_transferred_bytes",
 		Help: "Total data transferred during VM migrations in bytes",
 	},
 		[]string{
@@ -82,14 +82,14 @@ var (
 		},
 	)
 
-	// 'status' - [ succeeded, failed, Executing, Canceled]
-	// 'provider' - [oVirt, vSphere, Openstack, OVA, openshift]
+	// 'status' - [ Succeeded, Failed, Executing, Canceled]
+	// 'provider' - [oVirt, VSphere, Openstack, OVA, Openshift]
 	// 'mode' - [Cold, Warm]
 	// 'target' - [Local, Remote]
 	// 'plan' - [Id]
-	migratioPlanCorolationStatusnCounter = promauto.NewGaugeVec(prometheus.GaugeOpts{
-		Name: "mtv_workload_migrations_status_plan_correlation",
-		Help: "VM Migrations by status, provider type and plan",
+	migrationPlanCorrelationStatusGauge = promauto.NewGaugeVec(prometheus.GaugeOpts{
+		Name: "mtv_workload_migrations_status",
+		Help: "VM Migrations status by provider, mode, destination and plan",
 	},
 		[]string{
 			"status",
@@ -100,11 +100,11 @@ var (
 		},
 	)
 
-	// 'provider' - [oVirt, vSphere, Openstack, OVA, openshift]
+	// 'provider' - [oVirt, VSphere, Openstack, OVA, Openshift]
 	// 'mode' - [Cold, Warm]
 	// 'target' - [Local, Remote]
 	migrationDurationHistogram = promauto.NewHistogramVec(prometheus.HistogramOpts{
-		Name:    "mtv_migration_duration_in_seconds_bucket",
+		Name:    "mtv_migrations_duration_seconds",
 		Help:    "Histogram of VM migrations duration in seconds",
 		Buckets: []float64{1 * 3600, 2 * 3600, 5 * 3600, 10 * 3600, 24 * 3600, 48 * 3600}, // 1, 2, 5, 10, 24, 48 hours in seconds
 	},

diff --git a/pkg/monitoring/metrics/forklift-controller/migration_metrics.go b/pkg/monitoring/metrics/forklift-controller/migration_metrics.go
@@ -111,8 +111,8 @@ func RecordMigrationMetrics(c client.Client) {
 
 			for key, value := range counterMap {
 				parts := strings.Split(key, "|")
-				migratioStatusCounter.With(prometheus.Labels{"status": parts[0], "provider": parts[1], "mode": parts[2], "target": parts[3]}).Set(value)
-				migratioPlanCorolationStatusnCounter.With(prometheus.Labels{"status": parts[0], "provider": parts[1], "mode": parts[2], "target": parts[3], "plan": parts[4]}).Set(value)
+				migrationStatusGauge.With(prometheus.Labels{"status": parts[0], "provider": parts[1], "mode": parts[2], "target": parts[3]}).Set(value)
+				migrationPlanCorrelationStatusGauge.With(prometheus.Labels{"status": parts[0], "provider": parts[1], "mode": parts[2], "target": parts[3], "plan": parts[4]}).Set(value)
 			}
 		}
 	}()

diff --git a/pkg/monitoring/metrics/forklift-controller/plan_metrics.go b/pkg/monitoring/metrics/forklift-controller/plan_metrics.go
@@ -17,7 +17,7 @@ func RecordPlanMetrics(c client.Client) {
 		for {
 			time.Sleep(10 * time.Second)
 
-			// get all migration objects
+			// get all plans objects
 			plans := api.PlanList{}
 			err := c.List(context.TODO(), &plans)
 
@@ -96,7 +96,7 @@ func RecordPlanMetrics(c client.Client) {
 
 			for key, value := range plansCounterMap {
 				parts := strings.Split(key, "|")
-				planStatusCounter.With(prometheus.Labels{"status": parts[0], "provider": parts[1], "mode": parts[2], "target": parts[3]}).Set(value)
+				planStatusGauge.With(prometheus.Labels{"status": parts[0], "provider": parts[1], "mode": parts[2], "target": parts[3]}).Set(value)
 			}
 		}
 	}()