github/deprecated-helm-charts
1
0
Fork 0
mirror of https://github.com/helm/charts.git synced 2026-08-23 22:37:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[stable/grafana] Allow sidecar dashboard default folder override (#12927)

Browse Source 
* - fix sidecar issue with dashboard providers
- bump patch

Signed-off-by: Richmond Wang <richmond.wang@quoine.com>

* change variable name to camelCase

Signed-off-by: Richmond Wang <richmond.wang@quoine.com>

* update version bump against master

Signed-off-by: Richmond Wang <richmond.wang@quoine.com>

* fix README wording

Signed-off-by: Richmond Wang <richmond.wang@quoine.com>
This commit is contained in:
Richmond
2019-04-24 01:54:06 -07:00
committed by Kubernetes Prow Robot
parent 31b8951a68
commit c65dc4d0a2
5 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stable/grafana/Chart.yaml
+1 -1
View File
@@ -1,6 +1,6 @@
apiVersion: v1
name: grafana
version: 3.3.1
version: 3.3.2
appVersion: 6.1.4
kubeVersion: "^1.8.0-0"
description: The leading tool for querying and visualizing time series and metrics.
stable/grafana/README.md
+2
View File
@@ -92,6 +92,8 @@ The command removes all the Kubernetes components associated with the chart and
| `sidecar.dashboards.enabled` | Enabled the cluster wide search for dashboards and adds/updates/deletes them in grafana | `false` |
| `sidecar.skipTlsVerify` | Set to true to skip tls verification for kube api calls | `nil` |
| `sidecar.dashboards.label` | Label that config maps with dashboards should have to be added | `grafana_dashboard` |
| `sidecar.dashboards.folder` | Folder in the pod that should hold the collected dashboards (unless `sidecar.dashboards.defaultFolderName` is set). This path will be mounted. | `/tmp/dashboards` |
| `sidecar.dashboards.defaultFolderName` | The default folder name, it will create a subfolder under the `sidecar.dashboards.folder` and put dashboards in there instead | `nil` |
| `sidecar.dashboards.searchNamespace` | If specified, the sidecar will search for dashboard config-maps inside this namespace. Otherwise the namespace in which the sidecar is running will be used. It's also possible to specify ALL to search in all namespaces | `nil` |
| `sidecar.datasources.enabled` | Enabled the cluster wide search for datasources and adds/updates/deletes them in grafana |`false` |
| `sidecar.datasources.label` | Label that config maps with datasources should have to be added | `grafana_datasource` |
stable/grafana/templates/configmap-dashboard-provider.yaml
+1 -1
View File
@@ -22,5 +22,5 @@ data:
type: file
disableDeletion: false
options:
path: {{ .Values.sidecar.dashboards.folder }}
path: {{ .Values.sidecar.dashboards.folder }}{{- with .Values.sidecar.dashboards.defaultFolderName }}/{{ . }}{{- end }}
{{- end}}
stable/grafana/templates/deployment.yaml
+1 -1
View File
@@ -125,7 +125,7 @@ spec:
- name: LABEL
value: "{{ .Values.sidecar.dashboards.label }}"
- name: FOLDER
value: "{{ .Values.sidecar.dashboards.folder }}"
value: "{{ .Values.sidecar.dashboards.folder }}{{- with .Values.sidecar.dashboards.defaultFolderName }}/{{ . }}{{- end }}"
{{- if .Values.sidecar.dashboards.searchNamespace }}
- name: NAMESPACE
value: "{{ .Values.sidecar.dashboards.searchNamespace }}"
stable/grafana/values.yaml
+3 -1
View File
@@ -384,8 +384,10 @@ sidecar:
enabled: false
# label that the configmaps with dashboards are marked with
label: grafana_dashboard
# folder in the pod that should hold the collected dashboards
# folder in the pod that should hold the collected dashboards (unless `defaultFolderName` is set)
folder: /tmp/dashboards
# The default folder name, it will create a subfolder under the `folder` and put dashboards in there instead
defaultFolderName: null
# If specified, the sidecar will search for dashboard config-maps inside this namespace.
# Otherwise the namespace in which the sidecar is running will be used.
# It's also possible to specify ALL to search in all namespaces