remove labels from deleted reports and rules

kyverno · Feb 23, 2021 · 04c220d · 04c220d
1 parent a9f9fcd
commit 04c220d
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 56 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.16 as builder
+FROM golang:1.16-buster as builder
 
 WORKDIR /app
 COPY . .

diff --git a/charts/policy-reporter/Chart.yaml b/charts/policy-reporter/Chart.yaml
@@ -3,5 +3,5 @@ name: policy-reporter
 description: K8s PolicyReporter watches for wgpolicyk8s.io/v1alpha1.PolicyReport resources. It creates Prometheus Metrics and can send rule validation events to Loki
 
 type: application
-version: 0.6.0
-appVersion: 0.5.0
+version: 0.6.1
+appVersion: 0.5.1
diff --git a/charts/policy-reporter/values.yaml b/charts/policy-reporter/values.yaml
@@ -15,7 +15,7 @@ metrics:
 image:
   repository: fjogeleit/policy-reporter
   pullPolicy: IfNotPresent
-  tag: 0.5.0
+  tag: 0.5.1
 
 imagePullSecrets: []
 

diff --git a/pkg/metrics/cluster_policy_report.go b/pkg/metrics/cluster_policy_report.go
@@ -64,16 +64,14 @@ func (m ClusterPolicyReportMetrics) GenerateMetrics() error {
 
 				for _, rule := range m.getCachedReport(report.GetIdentifier()).Results {
 					res := rule.Resources[0]
-					ruleGauge.
-						WithLabelValues(
-							rule.Rule,
-							rule.Policy,
-							report.Name,
-							res.Kind,
-							res.Name,
-							rule.Status,
-						).
-						Set(0)
+					ruleGauge.DeleteLabelValues(
+						rule.Rule,
+						rule.Policy,
+						report.Name,
+						res.Kind,
+						res.Name,
+						rule.Status,
+					)
 				}
 
 				for _, rule := range report.Results {
@@ -92,24 +90,22 @@ func (m ClusterPolicyReportMetrics) GenerateMetrics() error {
 
 				m.cachedReport(report)
 			case watch.Deleted:
-				policyGauge.WithLabelValues(report.Name, "Pass").Set(0)
-				policyGauge.WithLabelValues(report.Name, "Fail").Set(0)
-				policyGauge.WithLabelValues(report.Name, "Warn").Set(0)
-				policyGauge.WithLabelValues(report.Name, "Error").Set(0)
-				policyGauge.WithLabelValues(report.Name, "Skip").Set(0)
+				policyGauge.DeleteLabelValues(report.Name, "Pass")
+				policyGauge.DeleteLabelValues(report.Name, "Fail")
+				policyGauge.DeleteLabelValues(report.Name, "Warn")
+				policyGauge.DeleteLabelValues(report.Name, "Error")
+				policyGauge.DeleteLabelValues(report.Name, "Skip")
 
 				for _, rule := range report.Results {
 					res := rule.Resources[0]
-					ruleGauge.
-						WithLabelValues(
-							rule.Rule,
-							rule.Policy,
-							report.Name,
-							res.Kind,
-							res.Name,
-							rule.Status,
-						).
-						Set(0)
+					ruleGauge.DeleteLabelValues(
+						rule.Rule,
+						rule.Policy,
+						report.Name,
+						res.Kind,
+						res.Name,
+						rule.Status,
+					)
 				}
 
 				m.removeCachedReport(report.GetIdentifier())

diff --git a/pkg/metrics/policy_report.go b/pkg/metrics/policy_report.go
@@ -74,17 +74,15 @@ func (m PolicyReportMetrics) GenerateMetrics() error {
 
 				for _, rule := range m.getCachedReport(report.GetIdentifier()).Results {
 					res := rule.Resources[0]
-					ruleGauge.
-						WithLabelValues(
-							report.Namespace,
-							rule.Rule,
-							rule.Policy,
-							report.Name,
-							res.Kind,
-							res.Name,
-							rule.Status,
-						).
-						Set(0)
+					ruleGauge.DeleteLabelValues(
+						report.Namespace,
+						rule.Rule,
+						rule.Policy,
+						report.Name,
+						res.Kind,
+						res.Name,
+						rule.Status,
+					)
 				}
 
 				for _, rule := range report.Results {
@@ -104,25 +102,24 @@ func (m PolicyReportMetrics) GenerateMetrics() error {
 
 				m.cachedReport(report)
 			case watch.Deleted:
-				policyGauge.WithLabelValues(report.Namespace, report.Name, "Pass").Set(0)
-				policyGauge.WithLabelValues(report.Namespace, report.Name, "Fail").Set(0)
-				policyGauge.WithLabelValues(report.Namespace, report.Name, "Warn").Set(0)
-				policyGauge.WithLabelValues(report.Namespace, report.Name, "Error").Set(0)
-				policyGauge.WithLabelValues(report.Namespace, report.Name, "Skip").Set(0)
+				policyGauge.DeleteLabelValues(report.Namespace, report.Name, "Pass")
+				policyGauge.DeleteLabelValues(report.Namespace, report.Name, "Fail")
+				policyGauge.DeleteLabelValues(report.Namespace, report.Name, "Warn")
+				policyGauge.DeleteLabelValues(report.Namespace, report.Name, "Error")
+				policyGauge.DeleteLabelValues(report.Namespace, report.Name, "Skip")
 
 				for _, rule := range report.Results {
 					res := rule.Resources[0]
-					ruleGauge.
-						WithLabelValues(
-							report.Namespace,
-							rule.Rule,
-							rule.Policy,
-							report.Name,
-							res.Kind,
-							res.Name,
-							rule.Status,
-						).
-						Set(0)
+
+					ruleGauge.DeleteLabelValues(
+						report.Namespace,
+						rule.Rule,
+						rule.Policy,
+						report.Name,
+						res.Kind,
+						res.Name,
+						rule.Status,
+					)
 				}
 
 				m.removeCachedReport(report.GetIdentifier())