From 7fd5c850d62e59df6219544291d4fce6b9baebed Mon Sep 17 00:00:00 2001 From: Alexander Apalikov Date: Thu, 23 Apr 2020 14:09:37 +0300 Subject: [PATCH 1/2] Docs: add Grafana version explicitly Add new make target `helm-repo-update`. --- build/Makefile | 3 +++ build/README.md | 4 ++++ site/content/en/docs/Guides/metrics.md | 6 +++--- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/build/Makefile b/build/Makefile index 9ebaab9f95..522da501a6 100644 --- a/build/Makefile +++ b/build/Makefile @@ -457,6 +457,9 @@ setup-grafana: --set persistence.enabled=$(PVC),server.persistentVolume.size=$(PV_SIZE) \ --set adminPassword=$(PASSWORD) -f $(mount_path)/build/grafana.yaml +helm-repo-update: + $(DOCKER_RUN) helm repo update + setup-test-cluster: DOCKER_RUN_ARGS+=--network=host setup-test-cluster: $(ensure-build-image) $(DOCKER_RUN) kubectl apply -f $(mount_path)/build/helm.yaml diff --git a/build/README.md b/build/README.md index 30c5695c8e..5fd95bdbd2 100644 --- a/build/README.md +++ b/build/README.md @@ -502,6 +502,10 @@ You can use this to collect Agones [Metrics](../site/content/en/docs/Guides/metr See [`make minikube-setup-prometheus`](#make-minikube-setup-prometheus) and [`make kind-setup-prometheus`](#make-kind-setup-prometheus) to run the installation on Minikube or Kind. +#### make helm-repo-update + +Run helm repo update to get the mose recent charts. + #### `make setup-grafana` Install Gafrana server using [stable/grafana](https://github.com/helm/charts/tree/master/stable/grafana) chart into the current cluster and setup [Agones dashboards with Prometheus datasource](./grafana/). diff --git a/site/content/en/docs/Guides/metrics.md b/site/content/en/docs/Guides/metrics.md index 19749a9eda..133118eb29 100644 --- a/site/content/en/docs/Guides/metrics.md +++ b/site/content/en/docs/Guides/metrics.md @@ -179,7 +179,7 @@ Now let's install some Grafana dashboards. ### Grafana installation -Grafana is a open source time series analytics platform which supports Prometheus data source. We can also install easily import pre-built dashboards. +Grafana is a open source time series analytics platform which supports Prometheus data source. We can also easily import pre-built dashboards. First we will install [Agones dashboard](#grafana-dashboards) as [config maps](https://kubernetes.io/docs/tasks/configure-pod-container/configure-pod-configmap/) in our cluster. @@ -190,8 +190,8 @@ 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 --namespace metrics \ - --set adminPassword= -f ../build/grafana.yaml +helm install --wait --name grafana stable/grafana --version=5.0.11 --namespace metrics \ + --set adminPassword= -f ./build/grafana.yaml ``` This will install Grafana with our prepopulated dashboards and prometheus datasource [previously installed](#prometheus-installation) From 8fed988dec5f88f6129ff47e581634e7d456e292 Mon Sep 17 00:00:00 2001 From: Alexander Apalikov Date: Fri, 24 Apr 2020 15:44:15 +0300 Subject: [PATCH 2/2] Update Grafana chart to 5.0.13 Grafana version still 6.7.1 but Helm chart got changes. Make target and website, add license header. --- build/Makefile | 2 +- build/grafana.yaml | 14 ++++++++++++++ site/content/en/docs/Guides/metrics.md | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) 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 ```