From be97c922639a0ba9ca2d196a751a6b8ccfd16b05 Mon Sep 17 00:00:00 2001
From: Stefan Prodan <stefan.prodan@gmail.com>
Date: Fri, 18 Aug 2023 19:35:14 +0300
Subject: [PATCH] Extend metrics with source revision labels

Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
---
 .../kube-prometheus-stack/release.yaml        | 36 ++++++-------------
 1 file changed, 10 insertions(+), 26 deletions(-)

diff --git a/monitoring/controllers/kube-prometheus-stack/release.yaml b/monitoring/controllers/kube-prometheus-stack/release.yaml
index 471fea2..ad66f35 100644
--- a/monitoring/controllers/kube-prometheus-stack/release.yaml
+++ b/monitoring/controllers/kube-prometheus-stack/release.yaml
@@ -82,16 +82,7 @@ spec:
                     labelsFromPath:
                       exported_namespace: [ metadata, namespace ]
                       ready: [ status, conditions, "[type=Ready]", status ]
-                  - name: "kustomization_revision_info"
-                    help: "The revision information of a Kustomization resource."
-                    each:
-                      type: Info
-                      info:
-                        labelsFromPath:
-                          revision: [ status, lastAppliedRevision ]
-                    labelsFromPath:
-                      name: [ metadata, name ]
-                      exported_namespace: [ metadata, namespace ]
+                      revision: [ status, lastAppliedRevision ]
                       source_name: [ spec, sourceRef, name ]
               - groupVersionKind:
                   group: helm.toolkit.fluxcd.io
@@ -109,18 +100,9 @@ spec:
                     labelsFromPath:
                       exported_namespace: [ metadata, namespace ]
                       ready: [ status, conditions, "[type=Ready]", status ]
-                  - name: "helmrelease_revision_info"
-                    help: "The revision information of a HelmRelease resource."
-                    each:
-                      type: Info
-                      info:
-                        labelsFromPath:
-                          revision: [ status, lastAppliedRevision ]
-                    labelsFromPath:
-                      name: [ metadata, name ]
-                      exported_namespace: [ metadata, namespace ]
+                      revision: [ status, lastAppliedRevision ]
                       chart_name: [ spec, chart, spec, chart ]
-              - &metric
+              - &sourcemetric
                 groupVersionKind:
                   group: source.toolkit.fluxcd.io
                   version: "v1"
@@ -137,27 +119,29 @@ spec:
                     labelsFromPath:
                       exported_namespace: [ metadata, namespace ]
                       ready: [ status, conditions, "[type=Ready]", status ]
-              - <<: *metric
+                      revision: [ status, artifact, revision ]
+                      url: [ spec, url ]
+              - <<: *sourcemetric
                 groupVersionKind:
                   group: source.toolkit.fluxcd.io
                   version: "v1beta2"
                   kind: Bucket
-              - <<: *metric
+              - <<: *sourcemetric
                 groupVersionKind:
                   group: source.toolkit.fluxcd.io
                   version: "v1beta2"
                   kind: HelmRepository
-              - <<: *metric
+              - <<: *sourcemetric
                 groupVersionKind:
                   group: source.toolkit.fluxcd.io
                   version: "v1beta2"
                   kind: HelmChart
-              - <<: *metric
+              - <<: *sourcemetric
                 groupVersionKind:
                   group: source.toolkit.fluxcd.io
                   version: "v1beta2"
                   kind: OCIRepository
-              - <<: *metric
+              - &metric
                 groupVersionKind:
                   group: image.toolkit.fluxcd.io
                   version: "v1beta2"