Skip to content

Commit

Permalink
Update Grafana to the release 6.7.3
Browse files Browse the repository at this point in the history
Make target and website.
  • Loading branch information
aLekSer committed Apr 24, 2020
1 parent 7fd5c85 commit 3d501f4
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 2 deletions.
2 changes: 1 addition & 1 deletion build/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ setup-grafana: PASSWORD ?= admin
setup-grafana:
$(DOCKER_RUN) kubectl apply -f $(mount_path)/build/grafana/
$(DOCKER_RUN) \
helm upgrade --install --wait grafana stable/grafana --version=5.0.11 --namespace metrics \
helm upgrade --install --wait grafana stable/grafana --version=5.0.13 --namespace metrics \
--set persistence.enabled=$(PVC),server.persistentVolume.size=$(PV_SIZE) \
--set adminPassword=$(PASSWORD) -f $(mount_path)/build/grafana.yaml

Expand Down
14 changes: 14 additions & 0 deletions build/grafana.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# Copyright 2020 Google LLC All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

service:
port: 3000
tolerations:
Expand Down
2 changes: 1 addition & 1 deletion site/content/en/docs/Guides/metrics.md
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ kubectl apply -f ./build/grafana/
Now we can install [grafana chart](https://github.com/helm/charts/tree/master/stable/grafana) from stable repository. (Replace `<your-admin-password>` with the admin password of your choice)

```bash
helm install --wait --name grafana stable/grafana --version=5.0.11 --namespace metrics \
helm install --wait --name grafana stable/grafana --version=5.0.13 --namespace metrics \
--set adminPassword=<your-admin-password> -f ./build/grafana.yaml
```

Expand Down

0 comments on commit 3d501f4

Please sign in to comment.