Skip to content

Commit

Permalink
feat: Create Unhealthy Disrupted Nodeclaim Metric (#1952)
Browse files Browse the repository at this point in the history
  • Loading branch information
engedaam authored Feb 4, 2025
1 parent 6cf451f commit a2697c2
Show file tree
Hide file tree
Showing 4 changed files with 59 additions and 2 deletions.
8 changes: 7 additions & 1 deletion pkg/controllers/node/health/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,16 @@ func (c *Controller) deleteNodeClaim(ctx context.Context, nodeClaim *v1.NodeClai
// The deletion timestamp has successfully been set for the Node, update relevant metrics.
log.FromContext(ctx).V(1).Info("deleting unhealthy node")
metrics.NodeClaimsDisruptedTotal.Inc(map[string]string{
metrics.ReasonLabel: pretty.ToSnakeCase(string(unhealthyNodeCondition.Type)),
metrics.ReasonLabel: metrics.UnhealthyReason,
metrics.NodePoolLabel: node.Labels[v1.NodePoolLabelKey],
metrics.CapacityTypeLabel: node.Labels[v1.CapacityTypeLabelKey],
})
NodeClaimsUnhealthyDisruptedTotal.Inc(map[string]string{
Condition: pretty.ToSnakeCase(string(unhealthyNodeCondition.Type)),
metrics.NodePoolLabel: node.Labels[v1.NodePoolLabelKey],
metrics.CapacityTypeLabel: node.Labels[v1.CapacityTypeLabelKey],
ImageID: nodeClaim.Status.ImageID,
})
return reconcile.Result{}, nil
}

Expand Down
46 changes: 46 additions & 0 deletions pkg/controllers/node/health/metrics.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
/*
Copyright The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package health

import (
opmetrics "github.com/awslabs/operatorpkg/metrics"
"github.com/prometheus/client_golang/prometheus"
crmetrics "sigs.k8s.io/controller-runtime/pkg/metrics"

"sigs.k8s.io/karpenter/pkg/metrics"
)

const (
ImageID = "image_id"
Condition = "condition"
)

var NodeClaimsUnhealthyDisruptedTotal = opmetrics.NewPrometheusCounter(
crmetrics.Registry,
prometheus.CounterOpts{
Namespace: metrics.Namespace,
Subsystem: metrics.NodeClaimSubsystem,
Name: "unhealthy_disrupted_total",
Help: "Number of unhealthy nodeclaims disrupted in total by Karpenter. Labeled by condition on the node was disrupted, the owning nodepool, and the image ID.",
},
[]string{
Condition,
metrics.NodePoolLabel,
metrics.CapacityTypeLabel,
ImageID,
},
)
6 changes: 5 additions & 1 deletion pkg/controllers/node/health/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,11 @@ var _ = Describe("Node Health", func() {
Expect(nodeClaim.DeletionTimestamp).ToNot(BeNil())

ExpectMetricCounterValue(metrics.NodeClaimsDisruptedTotal, 1, map[string]string{
metrics.ReasonLabel: pretty.ToSnakeCase(string(cloudProvider.RepairPolicies()[0].ConditionType)),
metrics.ReasonLabel: metrics.UnhealthyReason,
metrics.NodePoolLabel: nodePool.Name,
})
ExpectMetricCounterValue(health.NodeClaimsUnhealthyDisruptedTotal, 1, map[string]string{
health.Condition: pretty.ToSnakeCase(string(cloudProvider.RepairPolicies()[0].ConditionType)),
metrics.NodePoolLabel: nodePool.Name,
})
})
Expand Down
1 change: 1 addition & 0 deletions pkg/metrics/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ const (
// Reasons for CREATE/DELETE shared metrics
ProvisionedReason = "provisioned"
ExpiredReason = "expired"
UnhealthyReason = "unhealthy"
)

// DurationBuckets returns a []float64 of default threshold values for duration histograms.
Expand Down

0 comments on commit a2697c2

Please sign in to comment.