fix-missing provider specific dashboards (#555)

Signed-off-by: QuentinBisson <[email protected]>
giantswarm · May 29, 2024 · b9763bd · b9763bd
1 parent ea0cb8d
commit b9763bd
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 26 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Move SLO reporting dashboard to be public.
 
+### Fixed
+
+- Fix missing provider specific dashboards.
+
 ### Removed
 
 - Remove EFK dashboards.

diff --git a/helm/dashboards/charts/public_dashboards/templates/configmap-dashboards.yaml b/helm/dashboards/charts/public_dashboards/templates/configmap-dashboards.yaml
@@ -16,18 +16,3 @@ items:
   data:
     {{ $dashboardName }}.json: {{ $.Files.Get $path | toJson }}
 {{- end }}
-## Provider specific public dashboards
-{{- range $path, $fileContents := $.Files.Glob (printf "dashboards/%s/public/*.json" $.Values.global.provider.kind) }}
-{{- $dashboardName := regexReplaceAll "(^.*/)(.*)\\.json$" $path "${2}" }}
-- apiVersion: v1
-  kind: ConfigMap
-  metadata:
-    annotations:
-      k8s-sidecar-target-directory: "/var/lib/grafana/dashboards/public/{{ $.Values.global.provider.kind }}"
-    labels:
-      {{- include "labels.common" $ | nindent 6 }}
-    name: {{ printf "grafana-%s-%s-dashboard" $.Values.global.provider.kind $dashboardName | trunc 63 | trimSuffix "-" }}
-    namespace: {{ $.Values.global.namespace  }}
-  data:
-    {{ $dashboardName }}.json: {{ $.Files.Get $path | toJson }}
-{{- end }}
diff --git a/helm/dashboards/dashboards/home.json b/helm/dashboards/dashboards/home.json
@@ -55,7 +55,7 @@
       },
       "id": 6,
       "options": {
-        "content": "<div style=\"color: #fff; padding: 30px; height: 100%; background: no-repeat url(https://user-images.githubusercontent.com/273727/122764477-cc0d7880-d29f-11eb-9379-62a551323b32.png); background-size: cover; background-position: center top 50%\">\n<div style=\"line-height: 55px\">\n<img src=\"https://s.giantswarm.io/brand/1/logo-white.svg\" style=\"display: inline-block; width: 220px; height: 55px; margin-bottom: 13px; margin-left: -15px; padding-right: 20px;\"/>\n<span class=\"h1\" style=\"display: inline-block; padding-top: 15px; margin-bottom: 0; line-height: 20px\">Grafana Dashboards</span>\n</div>\n<p>Open the <b>Dashboards</b> / <b>Manage</b> menu on the left to find all dashboards, or select one from below:</p>\n<ul>\n{{- range $index, $link := $.Values.global.home.urls -}}{{- if or (eq $link.provider "shared") (eq $link.provider $.Values.global.provider.kind) }}<li><b><a href=\"{{ $link.link }}\">{{ $link.name }}</a></b>: {{ $link.description }}.</li>\n{{- end -}}{{- end -}}</ul>\n<p>Learn more about this Grafana instance capabilities by reading some of our documentations:</p>\n<ul>\n{{- range $index, $link := $.Values.global.home.documentation -}}<li><b><a href=\"{{ $link.link }}\">{{ $link.name }}</a></b>: {{ $link.description }}.</li>\n{{- end -}}</ul>\n</div>",
+        "content": "<div style=\"color: #fff; padding: 30px; height: 100%; background: no-repeat url(https://user-images.githubusercontent.com/273727/122764477-cc0d7880-d29f-11eb-9379-62a551323b32.png); background-size: cover; background-position: center top 50%\">\n<div style=\"line-height: 55px\">\n<img src=\"https://s.giantswarm.io/brand/1/logo-white.svg\" style=\"display: inline-block; width: 220px; height: 55px; margin-bottom: 13px; margin-left: -15px; padding-right: 20px;\"/>\n<span class=\"h1\" style=\"display: inline-block; padding-top: 15px; margin-bottom: 0; line-height: 20px\">Grafana Dashboards</span>\n</div>\n<p>Open the <b>Dashboards</b> / <b>Manage</b> menu on the left to find all dashboards, or select one from below:</p>\n<ul>\n{{- range $index, $link := $.Values.global.home.urls -}}{{- if or (eq $link.provider "shared") (eq $link.provider $.Values.provider.kind) }}<li><b><a href=\"{{ $link.link }}\">{{ $link.name }}</a></b>: {{ $link.description }}.</li>\n{{- end -}}{{- end -}}</ul>\n<p>Learn more about this Grafana instance capabilities by reading some of our documentations:</p>\n<ul>\n{{- range $index, $link := $.Values.global.home.documentation -}}<li><b><a href=\"{{ $link.link }}\">{{ $link.name }}</a></b>: {{ $link.description }}.</li>\n{{- end -}}</ul>\n</div>",
         "mode": "html"
       },
       "pluginVersion": "8.0.3",

diff --git a/helm/dashboards/templates/configmap-dashboards.yaml b/helm/dashboards/templates/configmap-dashboards.yaml
@@ -28,3 +28,33 @@ items:
   data:
     {{ $dashboardName }}.json: {{ $.Files.Get $path | toJson }}
 {{- end }}
+## Provider specific public dashboards
+{{- range $path, $fileContents := $.Files.Glob (printf "dashboards/%s/public/*.json" $.Values.provider.kind) }}
+{{- $dashboardName := regexReplaceAll "(^.*/)(.*)\\.json$" $path "${2}" }}
+- apiVersion: v1
+  kind: ConfigMap
+  metadata:
+    annotations:
+      k8s-sidecar-target-directory: "/var/lib/grafana/dashboards/public/{{ $.Values.provider.kind }}"
+    labels:
+      {{- include "labels.common" $ | nindent 6 }}
+    name: {{ printf "grafana-%s-%s-dashboard" $.Values.provider.kind $dashboardName | trunc 63 | trimSuffix "-" }}
+    namespace: {{ $.Values.global.namespace  }}
+  data:
+    {{ $dashboardName }}.json: {{ $.Files.Get $path | toJson }}
+{{- end }}
+## Provider specific private dashboards
+{{- range $path, $fileContents := $.Files.Glob (printf "dashboards/%s/private/*.json" $.Values.provider.kind) }}
+{{- $dashboardName := regexReplaceAll "(^.*/)(.*)\\.json$" $path "${2}" }}
+- apiVersion: v1
+  kind: ConfigMap
+  metadata:
+    annotations:
+      k8s-sidecar-target-directory: "/var/lib/grafana/dashboards/private/{{ $.Values.provider.kind }}"
+    labels:
+      {{- include "labels.common" $ | nindent 6 }}
+    name: {{ printf "grafana-%s-%s-dashboard" $.Values.provider.kind $dashboardName | trunc 63 | trimSuffix "-" }}
+    namespace: {{ $.Values.global.namespace  }}
+  data:
+    {{ $dashboardName }}.json: {{ $.Files.Get $path | toJson }}
+{{- end }}
diff --git a/helm/dashboards/values.schema.json b/helm/dashboards/values.schema.json
@@ -53,18 +53,18 @@
                 "namespace": {
                     "type": "string"
                 },
-                "provider": {
-                    "type": "object",
-                    "properties": {
-                        "kind": {
-                            "type": "string"
-                        }
-                    }
-                },
                 "serviceType": {
                     "type": "string"
                 }
             }
+        },
+        "provider": {
+            "type": "object",
+            "properties": {
+                "kind": {
+                    "type": "string"
+                }
+            }
         }
     }
 }
diff --git a/helm/dashboards/values.yaml b/helm/dashboards/values.yaml
@@ -22,5 +22,5 @@ global:
       link: "https://docs.giantswarm.io/getting-started/observability/grafana/custom-dashboards/"
       description: "Add your own custom dashboards to this Grafana"
 
-  provider:
-    kind: ""
+provider:
+  kind: ""