[vmware-exporter] Improve Grafana dashboards

charts/vmware-exporter/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 0.18.2
 description: A prometheus exporter for vSphere vCenter
 name: vmware-exporter
-version: 0.0.1
+version: 0.1.1
 kubeVersion: ">=1.16.0-0"
 keywords:
 - vmware-exporter

charts/vmware-exporter/README.md

@@ -1,6 +1,6 @@
 # vmware-exporter
 
-![Version: 0.0.1](https://img.shields.io/badge/Version-0.0.1-informational?style=flat-square) ![AppVersion: 0.18.2](https://img.shields.io/badge/AppVersion-0.18.2-informational?style=flat-square)
+![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![AppVersion: 0.18.2](https://img.shields.io/badge/AppVersion-0.18.2-informational?style=flat-square)
 
 A prometheus exporter for vSphere vCenter
 
@@ -81,6 +81,8 @@ N/A
 | image.repository | string | `"pryorda/vmware_exporter"` | image repository |
 | image.tag | string | `"v0.18.2"` | image tag |
 | ingress.main | object | See values.yaml | Enable and configure ingress settings for the chart under this key. |
+| metrics.dashboards | object | See values.yaml | Enable and configure Grafana dashboard ConfigMaps for the chart under this key. |
+| metrics.dashboards.namespace | string | `nil` | Namespace to create the dashboards ConfigMap under. |
 | metrics.enabled | bool | See values.yaml | Enable and configure a Prometheus serviceMonitor for the chart under this key. |
 | metrics.prometheusRule | object | See values.yaml | Enable and configure Prometheus Rules for the chart under this key. |
 | metrics.prometheusRule.rules | list | See prometheusrules.yaml | Configure additionial rules for the chart under this key. |
@@ -95,6 +97,36 @@ All notable changes to this application Helm chart will be documented in this fi
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+### [0.1.1]
+
+#### Added
+
+- N/A
+
+#### Changed
+
+- Improved dashboard naming and tagging, re-saved on Grafana 8.3.
+
+#### Removed
+
+- N/A
+
+### [0.1.0]
+
+#### Added
+
+- Create a Grafana dashboard ConfigMap when `metrics.dashboards.create` is `true`
+
+#### Changed
+
+- N/A
+
+#### Removed
+
+- N/A
+
+[0.0.1]: #100
+
 ### [0.0.1]
 
 #### Added
@@ -109,8 +141,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - N/A
 
-[0.0.1]: #100
-
 ## Support
 
 - Open an [issue](https://github.com/nikdoof/helm-charts/issues/new/choose)

charts/vmware-exporter/README_CHANGELOG.md.gotmpl

@@ -9,6 +9,36 @@ All notable changes to this application Helm chart will be documented in this fi
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+### [0.1.1]
+
+#### Added
+
+- N/A
+
+#### Changed
+
+- Improved dashboard naming and tagging, re-saved on Grafana 8.3.
+
+#### Removed
+
+- N/A
+
+### [0.1.0]
+
+#### Added
+
+- Create a Grafana dashboard ConfigMap when `metrics.dashboards.create` is `true`
+
+#### Changed
+
+- N/A
+
+#### Removed
+
+- N/A
+
+[0.0.1]: #100
+
 ### [0.0.1]
 
 #### Added
@@ -23,5 +53,4 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - N/A
 
-[0.0.1]: #100
 {{- end -}}

charts/vmware-exporter/ci/test-values.yaml

@@ -3,3 +3,7 @@ env:
   VSPHERE_USER: administrator@vsphere.my.domain.com
   VSPHERE_PASSWORD: Secure-Pass
   VSPHERE_HOST: test
+metrics:
+  enabled: true
+  dashboards:
+    create: true

charts/vmware-exporter/templates/dashboard-configmap.yaml

@@ -0,0 +1,19 @@
+{{- if and .Values.metrics.enabled .Values.metrics.dashboards.create }}
+{{- $namespace := .Values.metrics.dashboards.namespace | default $.Release.Namespace }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "common.names.fullname" . }}
+  namespace: {{ $namespace }}
+  labels:
+    {{- include "common.labels" . | nindent 4 }}
+    {{- with .Values.metrics.dashboards.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+data:
+{{- range $path, $_ :=  .Files.Glob  "dashboards/*.json" }}
+{{- $filename := trimSuffix (ext $path) (base $path) }}
+  {{ base $path }}: |-
+{{ $.Files.Get $path | indent 4 }}
+{{- end }}
+{{- end }}

charts/vmware-exporter/values.yaml

@@ -64,3 +64,12 @@ metrics:
       #   for: 5m
       #   labels:
       #     severity: critical
+  # -- Enable and configure Grafana dashboard ConfigMaps for the chart under this key.
+  # @default -- See values.yaml
+  dashboards:
+    create: false
+    # -- Namespace to create the dashboards ConfigMap under.
+    # @default -- The release's namespace
+    namespace:
+    labels:
+      grafana_dashboard: "true"