Use deployment name label for kyverno policy metric (#755)

* Update grafana-cloud.rules.yml * Update helm/prometheus-rules/templates/recording-rules/grafana-cloud.rules.yml
giantswarm · May 10, 2023 · c493fc9 · c493fc9
1 parent ca9ca7c
commit c493fc9
Showing 1 changed file with 17 additions and 15 deletions.
diff --git a/helm/prometheus-rules/templates/recording-rules/grafana-cloud.rules.yml b/helm/prometheus-rules/templates/recording-rules/grafana-cloud.rules.yml
@@ -238,23 +238,25 @@ spec:
       record: aggregation:kyverno_resource_counts
     # Kyverno policy status by team - Deployments
     - expr: |-
-        sum(
-          label_join(policy_report_result{
-            policy!="check-deprecated-apis-1-25",
-            cluster_type="management_cluster",
-            kind=~"Deployment"
-            }, "deployment", ",", "name")
-        ) by (deployment, category, policy, status) 
-        * on(deployment) group_left(team, app) 
-        sum(
+        label_join(
           sum(
-            label_join(kube_deployment_labels{}, "app", ",", "label_app_kubernetes_io_name")
-          ) by (deployment, app) 
-          * on(app) group_left(team) 
+            label_join(policy_report_result{
+              policy!="check-deprecated-apis-1-25",
+              cluster_type="management_cluster",
+              kind=~"Deployment"
+              }, "deployment", ",", "name")
+          ) by (deployment, category, policy, status) 
+          * on(deployment) group_left(team, app) 
           sum(
-            app_operator_app_info{team!="noteam"}
-          ) by (app, team)
-        ) by (team, deployment, app)
+            sum(
+              label_join(kube_deployment_labels{}, "app", ",", "label_app_kubernetes_io_name")
+            ) by (deployment, app) 
+            * on(app) group_left(team) 
+            sum(
+              app_operator_app_info{team!="noteam"}
+            ) by (app, team)
+          ) by (team, deployment, app),
+        "name", ",", "deployment")
       record: aggregation:kyverno_policy_deployment_status_team
     # Kyverno policy status by team - DaemonSets
     - expr: |-