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

fixes example for importing grafana dashboards with the api (#4437)

Browse Source 
* fixes example for importing grafana dashboards with the api

* adding app version
This commit is contained in:
Shane Starcher
2018-03-30 09:05:03 -07:00
committed by k8s-ci-robot
parent 2155790cf3
commit 5bb9765d49
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stable/grafana/Chart.yaml
+2 -1
View File
@@ -1,5 +1,6 @@
name: grafana
version: 0.8.4
version: 0.8.5
appVersion: 5.0.4
description: The leading tool for querying and visualizing time series and metrics.
home: https://grafana.net
icon: https://raw.githubusercontent.com/grafana/grafana/master/public/img/logo_transparent_400x.png
stable/grafana/README.md
+1 -1
View File
@@ -31,7 +31,7 @@ The command removes all the Kubernetes components associated with the chart and
| Parameter | Description | Default |
|-------------------------------------------|-------------------------------------|---------------------------------------------------|
| `server.image` | Container image to run | grafana/grafana:4.6.3 |
| `server.image` | Container image to run | grafana/grafana:5.0.4 |
| `server.adminUser` | Admin user username | admin |
| `server.adminPassword` | Admin user password | Randomly generated |
| `server.antiAffinity.enabled` | Enable anti affinity | false |
stable/grafana/templates/dashboards-import-job-configmap.yaml
+1 -1
View File
@@ -18,7 +18,7 @@ data:
{{- end }}
for dashboard in $(ls); do
wget \
"http://{{ template "grafana.fullname" . }}:{{ .Values.server.service.httpPort }}/api/dashboards/db" \
"http://{{ template "grafana.server.fullname" . }}:{{ .Values.server.service.httpPort }}/api/dashboards/db" \
--user=${ADMIN_USER} \
--password=${ADMIN_PASSWORD} \
--auth-no-challenge \
stable/grafana/templates/job.yaml
+1 -1
View File
@@ -37,7 +37,7 @@ spec:
name: {{ template "grafana.server.fullname" . }}
key: grafana-admin-password
args:
- "http://$(ADMIN_USER):$(ADMIN_PASSWORD)@{{ template "grafana.fullname" . }}:{{ .Values.server.service.httpPort }}/api/datasources"
- "http://$(ADMIN_USER):$(ADMIN_PASSWORD)@{{ template "grafana.server.fullname" . }}:{{ .Values.server.service.httpPort }}/api/datasources"
- "--max-time"
- "10"
- "-H"
stable/grafana/values.yaml
+4 -5
View File
@@ -6,7 +6,7 @@ server:
## Grafana Docker image
##
image: "grafana/grafana:4.6.3"
image: "grafana/grafana:5.0.4"
extraEnv: []
@@ -453,11 +453,10 @@ dashboardImports:
## Grafana dashboard URL to import (this should be a JSON file, not the HTML page)
# Example:
# dashboards: {
# Prometheus_Stats.json: https://grafana.com/api/dashboards/2/revisions/2/download,
# Docker_Dashboard.json: https://grafana.com/api/dashboards/179/revisions/5/download,
# dashboards:
# Prometheus_Stats.json: https://grafana.com/api/dashboards/2/revisions/2/download
# Docker_Dashboard.json: https://grafana.com/api/dashboards/179/revisions/5/download
# MyPrivateDashboard.json: http://example.com/dashboard.json
# }
# dashboards: {}
## Specify the Job policy