diff --git a/build/Makefile b/build/Makefile index 522da501a6..098b205145 100644 --- a/build/Makefile +++ b/build/Makefile @@ -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 diff --git a/build/grafana.yaml b/build/grafana.yaml index e9a3a11b37..1fa64704e4 100644 --- a/build/grafana.yaml +++ b/build/grafana.yaml @@ -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: diff --git a/site/content/en/docs/Guides/metrics.md b/site/content/en/docs/Guides/metrics.md index 133118eb29..0cedb9bc19 100644 --- a/site/content/en/docs/Guides/metrics.md +++ b/site/content/en/docs/Guides/metrics.md @@ -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 `` 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= -f ./build/grafana.yaml ```