Merge pull request #244 from vmercierfr/grafana-dashboard-cross-namespace

Support deployment in non Grafana namespace

Author: qfritz

configs/helm/templates/grafanadashboard.yaml

@@ -8,6 +8,7 @@ kind: GrafanaDashboard
 metadata:
   name: {{ $path | base | trimSuffix ".json" }}
 spec:
+  allowCrossNamespaceImport: {{ .Values.dashboards.allowCrossNamespaceImport }}
   resyncPeriod: {{ .Values.dashboards.resyncPeriod }}
   folder: {{ .Values.dashboards.folderName }}
   instanceSelector:

configs/helm/tests/grafanadashboard_test.yaml

@@ -28,6 +28,9 @@ tests:
         equal:
           path: metadata.name
           value: rds-instances
+      - equal:
+          path: spec.allowCrossNamespaceImport
+          value: true
       - equal:
           path: spec.resyncPeriod
           value: 24h
@@ -41,6 +44,9 @@ tests:
     values:
       - ./values/with_grafanadashboards_custom.yaml
     asserts:
+      - equal:
+          path: spec.allowCrossNamespaceImport
+          value: false
       - equal:
           path: spec.resyncPeriod
           value: 1m

configs/helm/tests/values/with_grafanadashboards_custom.yaml

@@ -1,6 +1,7 @@
 ---
 dashboards:
   enabled: true
+  allowCrossNamespaceImport: false  # Disable cross namespace dashboard import
   resyncPeriod: 1m
   instanceSelector: my-grafana
   folderName: dmf

configs/helm/values.yaml

@@ -92,6 +92,7 @@ affinity: {}
 
 dashboards:
   enabled: false  # enabled GrafanaDashboard CRD import
+  allowCrossNamespaceImport: true  # define if Grafana operator can loads dashboards when stored in a different namespace
   resyncPeriod: 24h  # how often the dashboard is refreshed
   instanceSelector: grafana  # selects Grafana for import
   folderName:  # folder assignment for dashboard