Skip to content

Commit

Permalink
Upgrade Grafana to v5.4.2
Browse files Browse the repository at this point in the history
  • Loading branch information
stefanprodan committed Dec 18, 2018
1 parent eeb3b1b commit ee1e2e6
Show file tree
Hide file tree
Showing 6 changed files with 64 additions and 32 deletions.
11 changes: 8 additions & 3 deletions charts/grafana/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
apiVersion: v1
name: grafana
version: 0.1.0
appVersion: 5.3.1
description: A Grafana Helm chart for monitoring progressive deployments powered by Istio and Flagger
home: https://github.com/stefanprodan/flagger
appVersion: 5.4.2
description: Grafana Helm chart for monitoring progressive deployments powered by Istio and Flagger
home: https://flagger.app
sources:
- https://github.com/stefanprodan/flagger
maintainers:
- name: stefanprodan
url: https://github.com/stefanprodan
44 changes: 28 additions & 16 deletions charts/grafana/README.md
Original file line number Diff line number Diff line change
@@ -1,27 +1,40 @@
# Weave Cloud Grafana

Grafana v5 with Kubernetes dashboards and Prometheus and Weave Cloud data sources.
Grafana Helm chart for monitoring progressive deployments powered by Istio, Prometheus and Flagger.

## Prerequisites

* Kubernetes >= 1.9
* Istio >= 1.0
* Prometheus >= 2.6

## Installing the Chart

To install the chart with the release name `my-release`:
Add Flagger Helm repository:

```console
helm repo add flagger https://flagger.app
```

To install the chart with the release name `flagger-grafana`:

```console
$ helm install stable/grafana --name my-release \
--set service.type=NodePort \
--set token=WEAVE-TOKEN \
--set password=admin
helm upgrade -i flagger-grafana flagger/grafana \
--namespace=istio-system \
--set url=http://prometheus:9090 \
--set user=admin \
--set password=admin
```

The command deploys Grafana on the Kubernetes cluster in the default namespace.
The [configuration](#configuration) section lists the parameters that can be configured during installation.

## Uninstalling the Chart

To uninstall/delete the `my-release` deployment:
To uninstall/delete the `flagger-grafana` deployment:

```console
$ helm delete --purge my-release
helm delete --purge flagger-grafana
```

The command removes all the Kubernetes components associated with the chart and deletes the release.
Expand All @@ -34,30 +47,29 @@ Parameter | Description | Default
--- | --- | ---
`image.repository` | Image repository | `grafana/grafana`
`image.pullPolicy` | Image pull policy | `IfNotPresent`
`image.tag` | Image tag | `5.0.1`
`image.tag` | Image tag | `<VERSION>`
`replicaCount` | desired number of pods | `1`
`resources` | pod resources | `none`
`tolerations` | List of node taints to tolerate | `[]`
`affinity` | node/pod affinities | `node`
`nodeSelector` | node labels for pod assignment | `{}`
`service.type` | type of service | `LoadBalancer`
`url` | Prometheus URL, used when Weave token is empty | `http://prometheus:9090`
`service.type` | type of service | `ClusterIP`
`url` | Prometheus URL, used when Weave Cloud token is empty | `http://prometheus:9090`
`token` | Weave Cloud token | `none`
`user` | Grafana admin username | `admin`
`password` | Grafana admin password | `none`
`password` | Grafana admin password | `admin`

Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,

```console
$ helm install stable/grafana --name my-release \
--set=token=WEAVE-TOKEN \
--set password=admin
helm install flagger/grafana --name flagger-grafana \
--set token=WEAVE-CLOUD-TOKEN
```

Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example,

```console
$ helm install stable/grafana --name my-release -f values.yaml
helm install flagger/grafana --name flagger-grafana -f values.yaml
```

> **Tip**: You can use the default [values.yaml](values.yaml)
Expand Down
2 changes: 1 addition & 1 deletion charts/grafana/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ replicaCount: 1

image:
repository: grafana/grafana
tag: 5.3.1
tag: 5.4.2
pullPolicy: IfNotPresent

service:
Expand Down
Binary file modified docs/flagger-0.1.2.tgz
Binary file not shown.
Binary file modified docs/grafana-0.1.0.tgz
Binary file not shown.
39 changes: 27 additions & 12 deletions docs/index.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,30 @@ apiVersion: v1
entries:
flagger:
- apiVersion: v1
appVersion: 0.1.2
created: 2018-12-06T13:57:50.322474+07:00
created: 2018-12-18T12:57:39.345+02:00
description: Flagger is a Kubernetes operator that automates the promotion of
canary deployments using Istio routing for traffic shifting and Prometheus metrics
for canary analysis.
digest: a52bf1bf797d60d3d92f46f84805edbd1ffb7d87504727266f08543532ff5e08
home: https://github.com/stefanprodan/flagger
digest: c7d65f694bad298a8ae71ed498cd1c69e579f01a1f4b5e77966bedc5fcca5c76
engine: gotpl
home: https://flagger.app
icon: https://github.com/raw/stefanprodan/flagger/master/docs/logo/flagger-icon.png
keywords:
- canary
- istio
kubeVersion: '>=1.9.0-0'
maintainers:
- name: stefanprodan
url: https://github.com/stefanprodan
name: flagger
sources:
- https://github.com/stefanprodan/flagger
urls:
- https://stefanprodan.github.io/flagger/flagger-0.1.2.tgz
version: 0.1.2
- apiVersion: v1
appVersion: 0.1.1
created: 2018-12-06T13:57:50.322115+07:00
created: 2018-12-18T12:57:39.344584+02:00
description: Flagger is a Kubernetes operator that automates the promotion of
canary deployments using Istio routing for traffic shifting and Prometheus metrics
for canary analysis.
Expand All @@ -27,7 +37,7 @@ entries:
version: 0.1.1
- apiVersion: v1
appVersion: 0.1.0
created: 2018-12-06T13:57:50.321509+07:00
created: 2018-12-18T12:57:39.344274+02:00
description: Flagger is a Kubernetes operator that automates the promotion of
canary deployments using Istio routing for traffic shifting and Prometheus metrics
for canary analysis.
Expand All @@ -39,14 +49,19 @@ entries:
version: 0.1.0
grafana:
- apiVersion: v1
appVersion: 5.3.1
created: 2018-12-06T13:57:50.323051+07:00
description: A Grafana Helm chart for monitoring progressive deployments powered
appVersion: 5.4.2
created: 2018-12-18T12:57:39.345442+02:00
description: Grafana Helm chart for monitoring progressive deployments powered
by Istio and Flagger
digest: 692b7c545214b652374249cc814d37decd8df4f915530e82dff4d9dfa25e8762
home: https://github.com/stefanprodan/flagger
digest: ae2707d4a419558fd04aa1572982fad58038a5fb8500249cc3f5bceae4a80ba6
home: https://flagger.app
maintainers:
- name: stefanprodan
url: https://github.com/stefanprodan
name: grafana
sources:
- https://github.com/stefanprodan/flagger
urls:
- https://stefanprodan.github.io/flagger/grafana-0.1.0.tgz
version: 0.1.0
generated: 2018-12-06T13:57:50.320726+07:00
generated: 2018-12-18T12:57:39.343721+02:00

0 comments on commit ee1e2e6

Please sign in to comment.