fixes example for importing grafana dashboards with the api

helm · Mar 29, 2018 · 96abf94 · 96abf94
1 parent 790ced1
commit 96abf94
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/stable/grafana/Chart.yaml b/stable/grafana/Chart.yaml
@@ -1,5 +1,5 @@
 name: grafana
-version: 0.8.4
+version: 0.8.5
 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

diff --git a/stable/grafana/README.md b/stable/grafana/README.md
@@ -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                                             |

diff --git a/stable/grafana/templates/dashboards-import-job-configmap.yaml b/stable/grafana/templates/dashboards-import-job-configmap.yaml
@@ -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 \

diff --git a/stable/grafana/templates/job.yaml b/stable/grafana/templates/job.yaml
@@ -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"

diff --git a/stable/grafana/values.yaml b/stable/grafana/values.yaml
@@ -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