Added Grafana iDRAC dashboard

This patchset also refactor the handling of dashboards yaml
files so that multiple configmaps, grouped by functionality
will be created.

Change-Id: I9849e2a2744e1d2ae895d3e18647b9b3a1c38b12

grafana/Chart.yaml

@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v7.4.5
 description: OpenStack-Helm Grafana
 name: grafana
-version: 0.1.11
+version: 0.1.12
 home: https://grafana.com/
 sources:
   - https://github.com/grafana/grafana

grafana/templates/configmap-dashboards-alertmanager.yaml

@@ -1,25 +0,0 @@
-{{/*
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/}}
-
-{{- if .Values.manifests.configmap_dashboards_alertmanager }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: grafana-dashboards-alertmanager
-data:
-{{ range $key, $value := .Values.conf.dashboards_alertmanager }}
-  {{$key}}.json: {{ $value | toJson }}
-{{ end }}
-{{- end }}

grafana/templates/configmap-dashboards.yaml

@@ -13,13 +13,15 @@ limitations under the License.
 */}}
 
 {{- if .Values.manifests.configmap_dashboards }}
+{{ range $group, $dashboards := .Values.conf.dashboards }}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: grafana-dashboards
+  name: grafana-dashboards-{{$group}}
 data:
-{{ range $key, $value := .Values.conf.dashboards }}
+{{ range $key, $value := $dashboards }}
   {{$key}}.json: {{ $value | toJson }}
 {{ end }}
+{{ end }}
 {{- end }}

grafana/templates/deployment.yaml

@@ -120,18 +120,14 @@ spec:
               subPath: ldap.toml
             - name: data
               mountPath: /var/lib/grafana/data
-            {{- range $key, $value := .Values.conf.dashboards }}
-            - name: grafana-dashboards
+            {{- range $group, $dashboards := .Values.conf.dashboards }}
+            {{- range $key, $value := $dashboards }}
+            - name: grafana-dashboards-{{$group}}
               mountPath: /etc/grafana/dashboards/{{$key}}.json
               subPath: {{$key}}.json
             {{- end }}
-{{- if .Values.manifests.configmap_dashboards_alertmanager }}
-            {{- range $key, $value := .Values.conf.dashboards_alertmanager }}
-            - name: grafana-dashboards-alertmanager
-              mountPath: /etc/grafana/dashboards/{{$key}}.json
-              subPath: {{$key}}.json
             {{- end }}
-{{- end }}
+
 {{- dict "enabled" $envAll.Values.manifests.certificates "name" $envAll.Values.endpoints.oslo_db.auth.admin.secret.tls.internal "path" "/etc/mysql/certs" | include "helm-toolkit.snippets.tls_volume_mount" | indent 12 }}
 {{ if $mounts_grafana.volumeMounts }}{{ toYaml $mounts_grafana.volumeMounts | indent 12 }}{{ end }}
       volumes:
@@ -153,16 +149,12 @@ spec:
           secret:
             secretName: grafana-etc
             defaultMode: 0444
-        - name: grafana-dashboards
+        {{- range $group, $dashboards := .Values.conf.dashboards }}
+        - name: grafana-dashboards-{{$group}}
           configMap:
-            name: grafana-dashboards
+            name: grafana-dashboards-{{$group}}
             defaultMode: 0555
-{{- if .Values.manifests.configmap_dashboards_alertmanager }}
-        - name: grafana-dashboards-alertmanager
-          configMap:
-            name: grafana-dashboards-alertmanager
-            defaultMode: 0555
-{{- end }}
+        {{- end }}
         - name: data
           emptyDir: {}
 {{- dict "enabled" $envAll.Values.manifests.certificates "name" $envAll.Values.endpoints.oslo_db.auth.admin.secret.tls.internal | include "helm-toolkit.snippets.tls_volume" | indent 8 }}

grafana/values.yaml

@@ -367,7 +367,6 @@ manifests:
   configmap_bin: true
   configmap_etc: true
   configmap_dashboards: true
-  configmap_dashboards_alertmanager: false
   deployment: true
   ingress: true
   helm_tests: true
@@ -486,5 +485,4 @@ conf:
     grafana_net:
       url: https://grafana.net
   dashboards: {}
-  dashboards_alertmanager: {}
 ...

grafana/values_overrides/calico.yaml

@@ -3,6 +3,7 @@
 ---
 conf:
   dashboards:
+    network:
       calico: |-
         {
           "__inputs": [

grafana/values_overrides/ceph.yaml

@@ -4,6 +4,7 @@
 ---
 conf:
   dashboards:
+    ceph:
       ceph_cluster: |-
         {
           "__inputs": [

grafana/values_overrides/containers.yaml

@@ -3,6 +3,7 @@
 ---
 conf:
   dashboards:
+    kubernetes:
       containers: |-
         {
           "__inputs": [

grafana/values_overrides/coredns.yaml

@@ -3,6 +3,7 @@
 ---
 conf:
   dashboards:
+    kubernetes:
       coredns: |-
         {
           "__inputs": [

grafana/values_overrides/elasticsearch.yaml

@@ -3,6 +3,7 @@
 ---
 conf:
   dashboards:
+    lma:
       elasticsearch: |-
         {
           "__inputs": [

grafana/values_overrides/home_dashboard.yaml

@@ -3,6 +3,7 @@
 ---
 conf:
   dashboards:
+    home:
       home_dashboard: |-
         {
           "annotations": {

grafana/values_overrides/kubernetes.yaml

@@ -3,6 +3,7 @@
 ---
 conf:
   dashboards:
+    kubernetes:
       kubernetes_capacity_planning: |-
         {
           "__inputs": [

grafana/values_overrides/nginx.yaml

@@ -3,6 +3,7 @@
 ---
 conf:
   dashboards:
+    kubernetes:
       nginx_stats: |-
         {
           "__inputs": [

grafana/values_overrides/nodes.yaml

@@ -3,6 +3,7 @@
 ---
 conf:
   dashboards:
+    lma:
       nodes: |-
         {
           "__inputs": [

grafana/values_overrides/openstack.yaml

@@ -4,6 +4,7 @@
 ---
 conf:
   dashboards:
+    openstack:
       rabbitmq: |-
         {
           "__inputs": [

grafana/values_overrides/persistentvolume.yaml

@@ -3,6 +3,7 @@
 ---
 conf:
   dashboards:
+    openstack:
       persistent_volume: |-
         {
           "__inputs": [

grafana/values_overrides/prometheus.yaml

@@ -3,6 +3,7 @@
 ---
 conf:
   dashboards:
+    lma:
       prometheus: |-
         {
           "__inputs": [

releasenotes/notes/grafana.yaml

@@ -12,4 +12,5 @@ grafana:
   - 0.1.9 Add Alertmanager dashboard to Grafana
   - 0.1.10 Helm 3 - Fix Job labels
   - 0.1.11 Update htk requirements
+  - 0.1.12 Add iDRAC dashboard to Grafana
 ...