Skip to content

Commit

Permalink
Merge pull request #89 from Disper/metrics
Browse files Browse the repository at this point in the history
[WiP] Metrics PoC
  • Loading branch information
kyma-bot authored Dec 4, 2023
2 parents 0d41803 + eec2f69 commit 89dfec3
Show file tree
Hide file tree
Showing 2 changed files with 55 additions and 7 deletions.
20 changes: 13 additions & 7 deletions internal/controller/gardener_cluster_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (

"github.com/go-logr/logr"
imv1 "github.com/kyma-project/infrastructure-manager/api/v1"
"github.com/kyma-project/infrastructure-manager/internal/controller/metrics"
"github.com/pkg/errors"
corev1 "k8s.io/api/core/v1"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
Expand Down Expand Up @@ -84,6 +85,8 @@ func (controller *GardenerClusterController) Reconcile(ctx context.Context, req

var cluster imv1.GardenerCluster

metrics.IncrementReconciliationLoopsStarted()

err := controller.Get(ctx, req.NamespacedName, &cluster)
if err != nil {
if k8serrors.IsNotFound(err) {
Expand All @@ -94,7 +97,7 @@ func (controller *GardenerClusterController) Reconcile(ctx context.Context, req
controller.log.Info("Secret has been deleted.", loggingContext(req)...)
}

return controller.resultWithoutRequeue(), err
return controller.resultWithoutRequeue(&cluster), err
}

lastSyncTime := time.Now()
Expand All @@ -106,23 +109,23 @@ func (controller *GardenerClusterController) Reconcile(ctx context.Context, req
if k8serrors.IsNotFound(err) {
err = nil
}
return controller.resultWithoutRequeue(), err
return controller.resultWithoutRequeue(&cluster), err
}

// there was a request to rotate the kubeconfig
if kubeconfigStatus == ksRotated {
err = controller.removeForceRotationAnnotation(ctx, &cluster)
if err != nil {
return controller.resultWithoutRequeue(), err
return controller.resultWithoutRequeue(&cluster), err
}
}

if kubeconfigStatus == ksCreated || kubeconfigStatus == ksModified {
_ = controller.persistStatusChange(ctx, &cluster)
return controller.resultWithRequeue(), nil
return controller.resultWithoutRequeue(&cluster), nil
}

return controller.resultWithRequeue(), nil
return controller.resultWithRequeue(&cluster), nil
}

func loggingContextFromCluster(cluster *imv1.GardenerCluster) []any {
Expand All @@ -133,14 +136,17 @@ func loggingContext(req ctrl.Request) []any {
return []any{"GardenerCluster", req.Name, "Namespace", req.Namespace}
}

func (controller *GardenerClusterController) resultWithRequeue() ctrl.Result {
func (controller *GardenerClusterController) resultWithRequeue(cluster *imv1.GardenerCluster) ctrl.Result {
metrics.SetGardenerClusterStates(*cluster)

return ctrl.Result{
Requeue: true,
RequeueAfter: controller.rotationPeriod,
}
}

func (controller *GardenerClusterController) resultWithoutRequeue() ctrl.Result {
func (controller *GardenerClusterController) resultWithoutRequeue(cluster *imv1.GardenerCluster) ctrl.Result { //nolint:unparam
metrics.SetGardenerClusterStates(*cluster)
return ctrl.Result{}
}

Expand Down
42 changes: 42 additions & 0 deletions internal/controller/metrics/metrics.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
package metrics

import (
v1 "github.com/kyma-project/infrastructure-manager/api/v1"
"github.com/prometheus/client_golang/prometheus"
ctrlMetrics "sigs.k8s.io/controller-runtime/pkg/metrics"
)

const (
shootName = "shootName"
state = "state"
)

var (

//nolint:godox //TODO: test custom metric, remove when done with https://github.com/kyma-project/infrastructure-manager/issues/11
playgroundTotalReconciliationLoopsStarted = prometheus.NewCounter( //nolint:gochecknoglobals
prometheus.CounterOpts{
Name: "im_playground_reconciliation_loops_started_total",
Help: "Number of times reconciliation loop was started",
},
)

metricGardenerClustersState = prometheus.NewGaugeVec( //nolint:gochecknoglobals
prometheus.GaugeOpts{ //nolint:gochecknoglobals
Subsystem: "infrastructure_manager",
Name: "im_gardener_clusters_state",
Help: "Indicates the Status.state for GardenerCluster CRs",
}, []string{shootName, state})
)

func init() {
ctrlMetrics.Registry.MustRegister(playgroundTotalReconciliationLoopsStarted, metricGardenerClustersState)
}

func IncrementReconciliationLoopsStarted() {
playgroundTotalReconciliationLoopsStarted.Inc()
}

func SetGardenerClusterStates(cluster v1.GardenerCluster) {
metricGardenerClustersState.WithLabelValues(cluster.Spec.Shoot.Name, string(cluster.Status.State)).Set(1)
}

0 comments on commit 89dfec3

Please sign in to comment.