Skip to content
This repository has been archived by the owner on Feb 22, 2022. It is now read-only.

fixes example for importing grafana dashboards with the api #4437

Merged
merged 2 commits into from
Mar 30, 2018
Merged

fixes example for importing grafana dashboards with the api #4437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96abf94
fixes example for importing grafana dashboards with the api
sstarcher Mar 29, 2018
d8d8cd0
adding app version
sstarcher Mar 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion stable/grafana/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion stable/grafana/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
2 changes: 1 addition & 1 deletion stable/grafana/templates/dashboards-import-job-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion stable/grafana/templates/job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
9 changes: 4 additions & 5 deletions stable/grafana/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ server:

## Grafana Docker image
##
image: "grafana/grafana:4.6.3"
image: "grafana/grafana:5.0.4"

extraEnv: []

Expand Down Expand Up @@ -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
Expand Down