This repository has been archived by the owner on Feb 22, 2022. It is now read-only.
[stable/grafana] Utilize 5.x datasource and dashboard import tooling and general refactor #4713
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| name: grafana | ||
| version: 0.9.0 | ||
| appVersion: 5.0.4 | ||
| description: The leading tool for querying and visualizing time series and metrics. | ||
| home: https://grafana.net | ||
|
|
@@ -9,4 +9,6 @@ sources: | |
| maintainers: | ||
| - name: Ming Hsieh | ||
| email: [email protected] | ||
| - name: Ryan Luckie | ||
|
|
||
| email: [email protected] | ||
| engine: gotpl | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,36 +1,35 @@ | ||
| 1. Get your '{{ .Values.adminUser }}' user password by running: | ||
|
|
||
| kubectl get secret --namespace {{ .Release.Namespace }} {{ template "grafana.fullname" . }} -o jsonpath="{.data.admin-password}" | base64 --decode ; echo | ||
|
|
||
| 2. The Grafana server can be accessed via port {{ .Values.service.httpPort }} on the following DNS name from within your cluster: | ||
|
|
||
| {{ template "grafana.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local | ||
| {{ if .Values.ingress.enabled }} | ||
| From outside the cluster, the server URL(s) are: | ||
| {{- range .Values.ingress.hosts }} | ||
| http://{{ . }} | ||
| {{- end }} | ||
| {{ else }} | ||
| Get the Grafana URL to visit by running these commands in the same shell: | ||
| {{ if contains "NodePort" .Values.service.type -}} | ||
| export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "grafana.fullname" . }}) | ||
| export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") | ||
| echo http://$NODE_IP:$NODE_PORT | ||
| {{ else if contains "LoadBalancer" .Values.service.type -}} | ||
| NOTE: It may take a few minutes for the LoadBalancer IP to be available. | ||
| You can watch the status of by running 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "grafana.fullname" . }}' | ||
| export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "grafana.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') | ||
| echo http://$SERVICE_IP:{{ .Values.httpPort -}} | ||
|
There was a problem hiding this comment. Is the "echo" in this line needed? There was a problem hiding this comment. @timstoop good catch! fixed. |
||
| {{ else if contains "ClusterIP" .Values.service.type }} | ||
| export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "grafana.fullname" . }},component={{ .Values.name }}" -o jsonpath="{.items[0].metadata.name}") | ||
| kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 3000 | ||
| {{- end }} | ||
| {{- end }} | ||
|
|
||
| 3. Login with the password from step 1 and the username: {{ .Values.adminUser }} | ||
|
|
||
| {{- if not .Values.persistence.enabled }} | ||
| ################################################################################# | ||
| ###### WARNING: Persistence is disabled!!! You will lose your data when ##### | ||
| ###### the Grafana pod is terminated. ##### | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,52 @@ | ||
| apiVersion: v1 | ||
| kind: ConfigMap | ||
| metadata: | ||
| name: {{ template "grafana.fullname" . }} | ||
| labels: | ||
| app: {{ template "grafana.name" . }} | ||
| chart: {{ template "grafana.chart" . }} | ||
| release: {{ .Release.Name }} | ||
| heritage: {{ .Release.Service }} | ||
| data: | ||
| {{- if .Values.plugins }} | ||
| plugins: {{ default "" .Values.plugins | quote }} | ||
|
There was a problem hiding this comment. Don't use the |
||
| {{- end }} | ||
| grafana.ini: | | ||
| {{- range $key, $value := index .Values "grafana.ini" }} | ||
| [{{ $key }}] | ||
| {{- range $elem, $elemVal := $value }} | ||
| {{ $elem }} = {{ $elemVal }} | ||
| {{- end }} | ||
| {{- end }} | ||
|
|
||
| {{- if .Values.datasources }} | ||
| {{- range $key, $value := .Values.datasources }} | ||
| {{ $key }}: | | ||
| {{ toYaml $value | indent 4 }} | ||
| {{- end -}} | ||
| {{- end -}} | ||
|
There was a problem hiding this comment. The datasources configuration can contain passwords and other sensitive information. Seems like it should go into a Secret instead of a ConfigMap. There was a problem hiding this comment. Good call. grafana.ini should probably also be a secret. Will fix in follow-up PR. |
||
|
|
||
| {{- if .Values.dashboardProviders }} | ||
| {{- range $key, $value := .Values.dashboardProviders }} | ||
| {{ $key }}: | | ||
| {{ toYaml $value | indent 4 }} | ||
| {{- end -}} | ||
| {{- end -}} | ||
|
|
||
| {{- if .Values.dashboards }} | ||
| download_dashboards.sh: | | ||
| #!/usr/bin/env sh | ||
| set -euf | ||
| mkdir -p /var/lib/grafana/dashboards | ||
| {{- range .Values.dashboards }} | ||
| {{ if .gnetId }} | ||
| curl -sk \ | ||
| --connect-timeout 60 \ | ||
| --max-time 60 \ | ||
| -H "Accept: application/json" \ | ||
| -H "Content-Type: application/json;charset=UTF-8" \ | ||
| https://grafana.com/api/dashboards/{{ .gnetId }}/revisions/{{ default 1 .revision }}/download {{ if .datasource }}| sed 's|\"datasource\":[^,]*|\"datasource\": \"{{ .datasource }}\"|g'{{ end }} \ | ||
| > /var/lib/grafana/dashboards/{{ .name }}.json | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- end }} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| apiVersion: v1 | ||
| kind: ConfigMap | ||
| metadata: | ||
| name: {{ template "grafana.fullname" . }}-dashboards-json | ||
| labels: | ||
| app: {{ template "grafana.name" . }} | ||
| chart: {{ template "grafana.chart" . }} | ||
| release: {{ .Release.Name }} | ||
| heritage: {{ .Release.Service }} | ||
| data: | ||
| {{- if .Values.dashboards }} | ||
| {{- range .Values.dashboards }} | ||
| {{ if .json }} | ||
| {{ .name }}.json: | | ||
| {{ .json }} | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- end -}} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nitpicky: I would argue 1.0.0 is more appropriate here, since this is a backwards incompatible change
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed.