feat: adjust cluster state metrics

kubewharf · Dec 17, 2024 · 2ce7086 · 2ce7086
1 parent 26a5bcb
commit 2ce7086
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 29 deletions.
diff --git a/pkg/controllers/federatedcluster/clusterstatus.go b/pkg/controllers/federatedcluster/clusterstatus.go
@@ -483,39 +483,32 @@ func shouldCollectClusterStatus(cluster *fedcorev1a1.FederatedCluster, collectIn
 }
 
 func (c *FederatedClusterController) recordClusterStatus(cluster *fedcorev1a1.FederatedCluster, startTime time.Time) {
-	readyReason, joinedReason, offlineReason := clusterutil.GetClusterConditionReasons(&cluster.Status)
 	if clusterutil.IsClusterReady(&cluster.Status) {
 		c.metrics.Store(metrics.ClusterReadyState,
 			1,
-			stats.Tag{Name: "cluster_name", Value: cluster.Name},
-			stats.Tag{Name: "reason", Value: readyReason})
+			stats.Tag{Name: "cluster_name", Value: cluster.Name})
 	} else {
 		c.metrics.Store(metrics.ClusterReadyState,
 			0,
-			stats.Tag{Name: "cluster_name", Value: cluster.Name},
-			stats.Tag{Name: "reason", Value: readyReason})
+			stats.Tag{Name: "cluster_name", Value: cluster.Name})
 	}
 	if clusterutil.IsClusterOffline(&cluster.Status) {
 		c.metrics.Store(metrics.ClusterOfflineState,
 			1,
-			stats.Tag{Name: "cluster_name", Value: cluster.Name},
-			stats.Tag{Name: "reason", Value: offlineReason})
+			stats.Tag{Name: "cluster_name", Value: cluster.Name})
 	} else {
 		c.metrics.Store(metrics.ClusterOfflineState,
 			0,
-			stats.Tag{Name: "cluster_name", Value: cluster.Name},
-			stats.Tag{Name: "reason", Value: offlineReason})
+			stats.Tag{Name: "cluster_name", Value: cluster.Name})
 	}
 	if clusterutil.IsClusterJoined(&cluster.Status) {
 		c.metrics.Store(metrics.ClusterJoinedState,
 			1,
-			stats.Tag{Name: "cluster_name", Value: cluster.Name},
-			stats.Tag{Name: "reason", Value: joinedReason})
+			stats.Tag{Name: "cluster_name", Value: cluster.Name})
 	} else {
 		c.metrics.Store(metrics.ClusterJoinedState,
 			0,
-			stats.Tag{Name: "cluster_name", Value: cluster.Name},
-			stats.Tag{Name: "reason", Value: joinedReason})
+			stats.Tag{Name: "cluster_name", Value: cluster.Name})
 	}
 	c.metrics.Duration(metrics.ClusterSyncStatusDuration,
 		startTime,

diff --git a/pkg/util/cluster/util.go b/pkg/util/cluster/util.go
@@ -54,19 +54,3 @@ func IsClusterOffline(clusterStatus *fedcorev1a1.FederatedClusterStatus) bool {
 	}
 	return false
 }
-
-func GetClusterConditionReasons(clusterStatus *fedcorev1a1.FederatedClusterStatus) (readyReason, joinedReason, offlineReason string) {
-	for _, condition := range clusterStatus.Conditions {
-		switch condition.Type {
-		case fedcorev1a1.ClusterReady:
-			readyReason = condition.Reason
-		case fedcorev1a1.ClusterJoined:
-			joinedReason = condition.Reason
-		case fedcorev1a1.ClusterOffline:
-			offlineReason = condition.Reason
-		default:
-			continue
-		}
-	}
-	return readyReason, joinedReason, offlineReason
-}