From 1e232d2c84a9f169e7a6320076cad3fe6aee2604 Mon Sep 17 00:00:00 2001 From: Tamal Saha Date: Thu, 14 Dec 2023 10:19:18 -0800 Subject: [PATCH] Update values Signed-off-by: Tamal Saha --- charts/kubedb-grafana-dashboards/README.md | 31 ++++++++++++------- .../templates/configmap.yaml | 4 +++ charts/kubedb-grafana-dashboards/values.yaml | 16 +++++----- 3 files changed, 32 insertions(+), 19 deletions(-) diff --git a/charts/kubedb-grafana-dashboards/README.md b/charts/kubedb-grafana-dashboards/README.md index f0c519a06..244405b49 100644 --- a/charts/kubedb-grafana-dashboards/README.md +++ b/charts/kubedb-grafana-dashboards/README.md @@ -45,17 +45,26 @@ The command removes all the Kubernetes components associated with the chart and The following table lists the configurable parameters of the `kubedb-grafana-dashboards` chart and their default values. -| Parameter | Description | Default | -|---------------------------------|--------------------------------------------------------------------|------------------------------------------------------------------------------------------| -| nameOverride | Overrides name template | "" | -| fullnameOverride | Overrides fullname template | "" | -| resources | List of resources for which dashboards will be applied | ["elasticsearch","mariadb","mongodb","mysql","postgres","redis","proxysql"] | -| dashboard.folderID | ID of Grafana folder where these dashboards will be applied | 0 | -| dashboard.overwrite | If true, dashboard with matching uid will be overwritten | true | -| dashboard.templatize.title | If true, datasource will be prefixed to dashboard name | false | -| dashboard.templatize.datasource | If true, datasource will be hardcoded in the dashboard | false | -| grafana.name | Name of Grafana Appbinding where these dashboards are applied | "" | -| grafana.namespace | Namespace of Grafana Appbinding where these dashboards are applied | "" | +| Parameter | Description | Default | +|---------------------------------------------------|--------------------------------------------------------------------|------------------------------------------------------------------------------------------| +| nameOverride | Overrides name template | "" | +| fullnameOverride | Overrides fullname template | "" | +| resources | List of resources for which dashboards will be applied | ["elasticsearch","mariadb","mongodb","mysql","postgres","redis","proxysql"] | +| dashboard.folderID | ID of Grafana folder where these dashboards will be applied | 0 | +| dashboard.overwrite | If true, dashboard with matching uid will be overwritten | true | +| dashboard.templatize.title | If true, datasource will be prefixed to dashboard name | false | +| dashboard.templatize.datasource | If true, datasource will be hardcoded in the dashboard | false | +| dashboard.replacements.job=\"kube-state-metrics\" | | job=\"kubernetes-service-endpoints\" | +| dashboard.replacements.job=\"kubelet\" | | job=\"kubernetes-nodes-cadvisor\" | +| dashboard.replacements.job=\"repl-stats\" | | job=\"kubedb-databases\" | +| grafana.name | Name of Grafana Appbinding where these dashboards are applied | "" | +| grafana.namespace | Namespace of Grafana Appbinding where these dashboards are applied | "" | +| grafana.version | | 8.2.3 | +| grafana.jobName | | kubedb-databases | +| grafana.url | | "" | +| grafana.apikey | | "" | +| app.name | | "" | +| app.namespace | | "" | Specify each parameter using the `--set key=value[,key=value]` argument to `helm upgrade -i`. For example: diff --git a/charts/kubedb-grafana-dashboards/templates/configmap.yaml b/charts/kubedb-grafana-dashboards/templates/configmap.yaml index 249386009..312cda48d 100644 --- a/charts/kubedb-grafana-dashboards/templates/configmap.yaml +++ b/charts/kubedb-grafana-dashboards/templates/configmap.yaml @@ -1,6 +1,10 @@ {{ $shared := and (eq .Values.app.name "") (eq .Values.app.namespace "") }} {{ if not $shared }} +{{- if not (eq (len .Values.resources) 1) }} +{{- fail "Only one .Values.resources can be used when app name or namespace is set!" }} +{{- end }} + apiVersion: v1 kind: ConfigMap metadata: diff --git a/charts/kubedb-grafana-dashboards/values.yaml b/charts/kubedb-grafana-dashboards/values.yaml index 4b71875d0..72991b7c3 100644 --- a/charts/kubedb-grafana-dashboards/values.yaml +++ b/charts/kubedb-grafana-dashboards/values.yaml @@ -9,13 +9,13 @@ fullnameOverride: "" # List of resources for which dashboards will be applied resources: # +doc-gen:break - # - elasticsearch - # - mariadb - # - mongodb - # - mysql + - elasticsearch + - mariadb + - mongodb + - mysql - postgres - # - redis - # - proxysql + - redis + - proxysql dashboard: # ID of Grafana folder where these dashboards will be applied @@ -43,5 +43,5 @@ grafana: apikey: "" app: - name: "mymg" - namespace: "demo" + name: "" + namespace: ""