fix: use scope for catalog instead of groupby

flanksource · Oct 28, 2024 · bbee823 · bbee823
1 parent 2a5d862
commit bbee823
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/charts/kubernetes/templates/topology.yaml b/charts/kubernetes/templates/topology.yaml
@@ -42,6 +42,7 @@ spec:
           catalog:
             - selector:
               - types: ['Kubernetes::Node']
+                scope: {{.Release.Namespace}}/{{ tpl .Values.scraper.name . }}
               display:
                 expr: |
                   dyn(results).map(r, {
@@ -74,6 +75,7 @@ spec:
         catalog:
           - selector:
             - types: ['Kubernetes::Pod']
+              scope: {{.Release.Namespace}}/{{ tpl .Values.scraper.name . }}
             display:
               expr: |
                 dyn(results).filter(r, !(r.name.startsWith('junit-'))).map(r, {
@@ -112,6 +114,7 @@ spec:
           catalog:
             - selector:
               - types: ['Kubernetes::Namespace']
+                scope: {{.Release.Namespace}}/{{ tpl .Values.scraper.name . }}
               display:
                 expr: |
                   dyn(results).map(r, {
@@ -143,6 +146,7 @@ spec:
           catalog:
             - selector:
               - types: ['Kubernetes::Ingress']
+                scope: {{.Release.Namespace}}/{{ tpl .Values.scraper.name . }}
               display:
                 expr: |
                   dyn(results).map(r, {

diff --git a/charts/kubernetes/values.yaml b/charts/kubernetes/values.yaml
@@ -118,7 +118,7 @@ topology:
     # @schema
     # required: false
     # @schema
-    tag: "cluster"
+    tag: ""
     # @schema
     # required: false
     # $ref: https://raw.githubusercontent.com/flanksource/duty/main/schema/openapi/scrape_config.schema.json#/$defs/ResourceSelector