From 59f83124b6efbb3cd3dfa732e67eca8d082543ad Mon Sep 17 00:00:00 2001 From: pawel siwek Date: Fri, 8 Mar 2024 14:38:36 +0000 Subject: [PATCH 1/3] Track type of node group created/deleted in auto-provisioned group metrics. --- cluster-autoscaler/metrics/metrics.go | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/cluster-autoscaler/metrics/metrics.go b/cluster-autoscaler/metrics/metrics.go index bf7cb42a877e..5cb751e3f2a4 100644 --- a/cluster-autoscaler/metrics/metrics.go +++ b/cluster-autoscaler/metrics/metrics.go @@ -390,20 +390,22 @@ var ( }, ) - nodeGroupCreationCount = k8smetrics.NewCounter( + nodeGroupCreationCount = k8smetrics.NewCounterVec( &k8smetrics.CounterOpts{ Namespace: caNamespace, Name: "created_node_groups_total", Help: "Number of node groups created by Node Autoprovisioning.", }, + []string{"group_type"}, ) - nodeGroupDeletionCount = k8smetrics.NewCounter( + nodeGroupDeletionCount = k8smetrics.NewCounterVec( &k8smetrics.CounterOpts{ Namespace: caNamespace, Name: "deleted_node_groups_total", Help: "Number of node groups deleted by Node Autoprovisioning.", }, + []string{"group_type"}, ) nodeTaintsCount = k8smetrics.NewGaugeVec( @@ -643,12 +645,22 @@ func UpdateNapEnabled(enabled bool) { // RegisterNodeGroupCreation registers node group creation func RegisterNodeGroupCreation() { - nodeGroupCreationCount.Add(1.0) + RegisterNodeGroupCreationWithLabelValues("") +} + +// RegisterQueuedProvisioningNodeGroupCreation registers node group creation with the provided labels +func RegisterNodeGroupCreationWithLabelValues(groupType string) { + nodeGroupCreationCount.WithLabelValues(groupType).Add(1.0) } // RegisterNodeGroupDeletion registers node group deletion func RegisterNodeGroupDeletion() { - nodeGroupDeletionCount.Add(1.0) + RegisterNodeGroupDeletionWithLabelValues("") +} + +// RegisterNodeGroupDeletion registers node group deletion with the provided labels +func RegisterNodeGroupDeletionWithLabelValues(groupType string) { + nodeGroupDeletionCount.WithLabelValues(groupType).Add(1.0) } // UpdateScaleDownInCooldown registers if the cluster autoscaler From 8605c34a6be576112b434c1a3e1be2edbbf15541 Mon Sep 17 00:00:00 2001 From: pawel siwek Date: Thu, 14 Mar 2024 12:03:38 +0000 Subject: [PATCH 2/3] trigger tests From 61fa2a067f7b40694d2eb15907739a358a507378 Mon Sep 17 00:00:00 2001 From: pawel siwek Date: Thu, 14 Mar 2024 12:08:44 +0000 Subject: [PATCH 3/3] fix comment --- cluster-autoscaler/metrics/metrics.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cluster-autoscaler/metrics/metrics.go b/cluster-autoscaler/metrics/metrics.go index 5cb751e3f2a4..1809a7edffab 100644 --- a/cluster-autoscaler/metrics/metrics.go +++ b/cluster-autoscaler/metrics/metrics.go @@ -648,7 +648,7 @@ func RegisterNodeGroupCreation() { RegisterNodeGroupCreationWithLabelValues("") } -// RegisterQueuedProvisioningNodeGroupCreation registers node group creation with the provided labels +// RegisterNodeGroupCreationWithLabelValues registers node group creation with the provided labels func RegisterNodeGroupCreationWithLabelValues(groupType string) { nodeGroupCreationCount.WithLabelValues(groupType).Add(1.0) } @@ -658,7 +658,7 @@ func RegisterNodeGroupDeletion() { RegisterNodeGroupDeletionWithLabelValues("") } -// RegisterNodeGroupDeletion registers node group deletion with the provided labels +// RegisterNodeGroupDeletionWithLabelValues registers node group deletion with the provided labels func RegisterNodeGroupDeletionWithLabelValues(groupType string) { nodeGroupDeletionCount.WithLabelValues(groupType).Add(1.0) }