Make scale grafana dashboard optional to install (#1044)

* Optionally enable grafana dashboard for scale chart

* Make scale grafana dashboard optional to install

Makefile

@@ -363,6 +363,7 @@ install-scale-chart: install-chart-prerequisite build/toolchain/bin/helm$(EXE_EX
 	$(HELM) template $(OPEN_MATCH_HELM_NAME)-scale  install/helm/open-match $(HELM_TEMPLATE_FLAGS) $(HELM_IMAGE_FLAGS) -f install/helm/open-match/values-production.yaml \
 		--set open-match-core.enabled=false \
 		--set global.telemetry.prometheus.enabled=true \
+		--set global.telemetry.grafana.enabled=true \
 		--set open-match-scale.enabled=true | $(KUBECTL) apply -f -
 
 # install-ci-chart will install open-match-core with pool based mmf for end-to-end in-cluster test.

install/helm/open-match/subcharts/open-match-scale/templates/scale-grafana-dashboard.yaml

@@ -0,0 +1,25 @@
+# Copyright 2019 Google LLC
+#
+# 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.
+
+{{- if .Values.global.telemetry.grafana.enabled }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: open-match-scale-dashboard
+  namespace: {{ .Release.Namespace }}
+  labels:
+     grafana_dashboard: "1"
+data:
+  {{- (.Files.Glob "dashboards/*.json").AsConfig | nindent 2 }}
+{{- end }}

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

@@ -16,7 +16,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: open-match-rpc-dashboard
+  name: open-match-dashboards
   labels:
      grafana_dashboard: "1"
 data: