update telemetry helm chart versions and gke version (#1462)

* update telemetry helm chart versions and gke version

* split configmaps for grafana dashboards

* splitting grafana dashboard configMaps by reading filenames

* renaming label grafana dashboard for converting into string

Co-authored-by: Jon Foust <38893532+syntxerror@users.noreply.github.com>

Makefile

@@ -636,7 +636,7 @@ delete-kind-cluster: build/toolchain/bin/kind$(EXE_EXTENSION) build/toolchain/bi
 create-cluster-role-binding:
 	$(KUBECTL) create clusterrolebinding myname-cluster-admin-binding --clusterrole=cluster-admin --user=$(GCLOUD_ACCOUNT_EMAIL)
 
-create-gke-cluster: GKE_VERSION = 1.20.8-gke.900 # gcloud beta container get-server-config --zone us-west1-a
+create-gke-cluster: GKE_VERSION = 1.21.11-gke.900 # gcloud beta container get-server-config --zone us-west1-a
 create-gke-cluster: GKE_CLUSTER_SHAPE_FLAGS = --machine-type n1-standard-8 --enable-autoscaling --min-nodes 1 --num-nodes 6 --max-nodes 10 --disk-size 50
 create-gke-cluster: GKE_FUTURE_COMPAT_FLAGS = --no-enable-basic-auth --no-issue-client-certificate --enable-ip-alias --metadata disable-legacy-endpoints=true --enable-autoupgrade
 create-gke-cluster: build/toolchain/bin/kubectl$(EXE_EXTENSION) gcloud

install/helm/open-match/subcharts/open-match-telemetry/Chart.yaml

@@ -19,15 +19,15 @@ name: open-match-telemetry
 version: 0.0.0-dev
 dependencies:
   - name: prometheus
-    version: 9.2.0
-    repository: https://charts.helm.sh/stable
+    version: 15.8.7
+    repository:  https://prometheus-community.github.io/helm-charts
     condition: global.telemetry.prometheus.enabled,prometheus.enabled
   - name: grafana
-    version: 4.0.1
-    repository: https://charts.helm.sh/stable
+    version: 6.29.3
+    repository: https://grafana.github.io/helm-charts
     condition: global.telemetry.grafana.enabled,grafana.enabled
   - name: jaeger
-    version: 0.13.3
-    repository: https://charts.helm.sh/stable
+    version: 0.56.5
+    repository: https://jaegertracing.github.io/helm-charts
     condition: global.telemetry.jaeger.enabled,jaeger.enabled
 

install/helm/open-match/subcharts/open-match-telemetry/templates/default-grafana-dashboards.yaml

@@ -13,12 +13,20 @@
 # limitations under the License.
 
 {{- if .Values.global.telemetry.grafana.enabled }}
+{{- $om := (include "openmatch.fullname" .) }}
+{{ $c := 1 | int }}
+{{- range $path, $bytes := .Files.Glob "dashboards/*.json" }}
+{{- $ext := ext $path }}
+{{- $file := base $path }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "openmatch.fullname" . }}-dashboards
+  name: {{ printf "%s-%s-dashboard" $om ((printf "%s" $file) | replace $ext "") }} 
   labels:
-     grafana_dashboard: "1"
+    grafana_dashboard: {{ printf "d-%d" $c }}
 data:
-  {{- (.Files.Glob "dashboards/*.json").AsConfig | nindent 2 }}
+  {{- ($.Files.Glob (printf "dashboards/%s" $file)).AsConfig | nindent 2 }}
+---
+{{ $c = add1 $c }}
+{{- end }}
 {{- end }}