diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c69d015..a7c9d5af 100644 --- 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 index 190145e5..706537f9 100644 --- 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 index 13f4c8b4..9e2dee1e 100644 --- a/helm/dashboards/dashboards/home.json +++ b/helm/dashboards/dashboards/home.json @@ -55,7 +55,7 @@ }, "id": 6, "options": { - "content": "
\n
\n\nGrafana Dashboards\n
\n

Open the Dashboards / Manage menu on the left to find all dashboards, or select one from below:

\n\n

Learn more about this Grafana instance capabilities by reading some of our documentations:

\n\n
", + "content": "
\n
\n\nGrafana Dashboards\n
\n

Open the Dashboards / Manage menu on the left to find all dashboards, or select one from below:

\n\n

Learn more about this Grafana instance capabilities by reading some of our documentations:

\n\n
", "mode": "html" }, "pluginVersion": "8.0.3", diff --git a/helm/dashboards/templates/configmap-dashboards.yaml b/helm/dashboards/templates/configmap-dashboards.yaml index b303edec..3d2b762f 100644 --- 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 index a4027e6b..94f3bb47 100644 --- 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 index f64260a9..e7d7ac75 100644 --- 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: ""