Merge pull request #463 from povilasv/add-namespace-to-error-metrics

add namespace to unseal error metric
bitnami-labs · Oct 26, 2020 · 6377107 · 6377107
2 parents afd6c04 + b85fda3
commit 6377107
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/cmd/controller/controller.go b/cmd/controller/controller.go
@@ -208,7 +208,7 @@ func (c *Controller) unseal(key string) (unsealErr error) {
 	obj, exists, err := c.informer.GetIndexer().GetByKey(key)
 	if err != nil {
 		log.Printf("Error fetching object with key %s from store: %v", key, err)
-		unsealErrorsTotal.WithLabelValues("fetch").Inc()
+		unsealErrorsTotal.WithLabelValues("fetch", "").Inc()
 		return err
 	}
 
@@ -242,7 +242,7 @@ func (c *Controller) unseal(key string) (unsealErr error) {
 		if err := c.updateSealedSecretStatus(ssecret, unsealErr); err != nil {
 			// Non-fatal.  Log and continue.
 			log.Printf("Error updating SealedSecret %s status: %v", key, err)
-			unsealErrorsTotal.WithLabelValues("status").Inc()
+			unsealErrorsTotal.WithLabelValues("status", ssecret.GetNamespace()).Inc()
 		} else {
 			ObserveCondition(ssecret)
 		}
@@ -251,7 +251,7 @@ func (c *Controller) unseal(key string) (unsealErr error) {
 	newSecret, err := c.attemptUnseal(ssecret)
 	if err != nil {
 		c.recorder.Eventf(ssecret, corev1.EventTypeWarning, ErrUnsealFailed, "Failed to unseal: %v", err)
-		unsealErrorsTotal.WithLabelValues("unseal").Inc()
+		unsealErrorsTotal.WithLabelValues("unseal", ssecret.GetNamespace()).Inc()
 		return err
 	}
 
@@ -261,14 +261,14 @@ func (c *Controller) unseal(key string) (unsealErr error) {
 	}
 	if err != nil {
 		c.recorder.Event(ssecret, corev1.EventTypeWarning, ErrUpdateFailed, err.Error())
-		unsealErrorsTotal.WithLabelValues("update").Inc()
+		unsealErrorsTotal.WithLabelValues("update", ssecret.GetNamespace()).Inc()
 		return err
 	}
 
 	if !metav1.IsControlledBy(secret, ssecret) && !isAnnotatedToBeManaged(secret) {
 		msg := fmt.Sprintf("Resource %q already exists and is not managed by SealedSecret", secret.Name)
 		c.recorder.Event(ssecret, corev1.EventTypeWarning, ErrUpdateFailed, msg)
-		unsealErrorsTotal.WithLabelValues("unmanaged").Inc()
+		unsealErrorsTotal.WithLabelValues("unmanaged", ssecret.GetNamespace()).Inc()
 		return fmt.Errorf("failed update: %s", msg)
 	}
 
@@ -285,7 +285,7 @@ func (c *Controller) unseal(key string) (unsealErr error) {
 		secret, err = c.sclient.Secrets(ssecret.GetObjectMeta().GetNamespace()).Update(secret)
 		if err != nil {
 			c.recorder.Event(ssecret, corev1.EventTypeWarning, ErrUpdateFailed, err.Error())
-			unsealErrorsTotal.WithLabelValues("update").Inc()
+			unsealErrorsTotal.WithLabelValues("update", ssecret.GetNamespace()).Inc()
 			return err
 		}
 	}

diff --git a/cmd/controller/metrics.go b/cmd/controller/metrics.go
@@ -47,7 +47,7 @@ var (
 			Name:      "unseal_errors_total",
 			Help:      "Total number of sealed secret unseal errors by reason",
 		},
-		[]string{"reason"},
+		[]string{"reason", "namespace"},
 	)
 
 	conditionInfo = prometheus.NewGaugeVec(prometheus.GaugeOpts{
@@ -64,11 +64,6 @@ func init() {
 	prometheus.MustRegister(unsealRequestsTotal)
 	prometheus.MustRegister(unsealErrorsTotal)
 	prometheus.MustRegister(conditionInfo)
-
-	// Initialise known label values
-	for _, val := range []string{"fetch", "status", "unmanaged", "unseal", "update"} {
-		unsealErrorsTotal.WithLabelValues(val)
-	}
 }
 
 // ObserveCondition sets a `condition_info` Gauge according to a SealedSecret status.