deployd: include team, kind and name in kubernetes_resources metric

nais · Sep 13, 2024 · 2a4569c · 2a4569c
1 parent 93d9563
commit 2a4569c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/pkg/deployd/deployd/deployd.go b/pkg/deployd/deployd/deployd.go
@@ -104,7 +104,7 @@ func Run(op *operation.Operation, client kubeclient.Interface) {
 
 		span.AddEvent("Resource saved to Kubernetes")
 
-		metrics.KubernetesResources.Inc()
+		metrics.KubernetesResources(op.Request.GetTeam(), identifier.Kind, identifier.Name).Inc()
 
 		op.StatusChan <- pb.NewInProgressStatus(op.Request, "Successfully applied %s", identifier.String())
 		wait.Add(1)

diff --git a/pkg/deployd/metrics/metrics.go b/pkg/deployd/metrics/metrics.go
@@ -25,14 +25,27 @@ var (
 	DeploySuccessful    = counter("deploy_successful", "number of successful deployments")
 	DeployFailed        = counter("deploy_failed", "number of failed deployments")
 	DeployIgnored       = counter("deploy_ignored", "number of ignored/discarded deployments")
-	KubernetesResources = counter("kubernetes_resources", "number of Kubernetes resources successfully committed to cluster")
+	kubernetesResources = prometheus.NewCounterVec(prometheus.CounterOpts{
+		Name:      "kubernetes_resources",
+		Help:      "number of Kubernetes resources successfully committed to cluster",
+		Namespace: namespace,
+		Subsystem: subsystem,
+	}, []string{
+		"team",
+		"kind",
+		"name",
+	})
 )
 
+func KubernetesResources(team, kind, name string) prometheus.Counter {
+	return kubernetesResources.WithLabelValues(team, kind, name)
+}
+
 func init() {
 	prometheus.MustRegister(DeploySuccessful)
 	prometheus.MustRegister(DeployFailed)
 	prometheus.MustRegister(DeployIgnored)
-	prometheus.MustRegister(KubernetesResources)
+	prometheus.MustRegister(kubernetesResources)
 }
 
 func Handler() http.Handler {