From 5bb9765d496044b0e65581e8aa7489835b5e07ca Mon Sep 17 00:00:00 2001 From: Shane Starcher Date: Fri, 30 Mar 2018 12:05:03 -0400 Subject: [PATCH] fixes example for importing grafana dashboards with the api (#4437) * fixes example for importing grafana dashboards with the api * adding app version --- stable/grafana/Chart.yaml | 3 ++- stable/grafana/README.md | 2 +- .../templates/dashboards-import-job-configmap.yaml | 2 +- stable/grafana/templates/job.yaml | 2 +- stable/grafana/values.yaml | 9 ++++----- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/stable/grafana/Chart.yaml b/stable/grafana/Chart.yaml index cf79fb4995..ed24ec544c 100755 --- a/stable/grafana/Chart.yaml +++ b/stable/grafana/Chart.yaml @@ -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 diff --git a/stable/grafana/README.md b/stable/grafana/README.md index 2168895495..e44afa4157 100644 --- 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 index 754d51d875..c524affd54 100755 --- 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 index 35f292a926..3c40932727 100644 --- 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 index 84b83bd156..ead1527aa2 100644 --- 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