Integrate dashboards submodule (temporalio#1965)

alexshtin · web-flow · commit 220795cf3c23 · 2021-09-22T16:42:00.000-07:00
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "proto/api"]
 	path = proto/api
 	url = https://github.com/temporalio/api
+[submodule "develop/docker-compose/grafana/provisioning/temporalio-dashboards"]
+	path = develop/docker-compose/grafana/provisioning/temporalio-dashboards
+	url = https://github.com/temporalio/dashboards
diff --git a/Makefile b/Makefile
@@ -491,6 +491,11 @@ docker-admin-tools:
 	@printf $(COLOR) "Build docker image temporalio/admin-tools:$(DOCKER_IMAGE_TAG)..."
 	docker build . -t temporalio/admin-tools:$(DOCKER_IMAGE_TAG) --build-arg TARGET=admin-tools
 
+##### Grafana #####
+update-dashboards:
+	@printf $(COLOR) "Update dashboards submodule from remote..."
+	git submodule update --force --init --remote develop/docker-compose/grafana/provisioning/temporalio-dashboards
+
 ##### Auxiliary #####
 gomodtidy:
 	@printf $(COLOR) "go mod tidy..."
diff --git a/develop/docker-compose/docker-compose.yml b/develop/docker-compose/docker-compose.yml
@@ -59,7 +59,7 @@ services:
       - temporal-dev-network
   prometheus:
     # Use http://localhost:9090/ to access Prometheus.
-    image: prom/prometheus
+    image: prom/prometheus:v2.30.0
     container_name: temporal-dev-prometheus
     command:
       - "--log.level=error"
@@ -69,7 +69,7 @@ services:
       - "--web.console.templates=/usr/share/prometheus/consoles"
   grafana:
     # Use http://localhost:3000/ to access Grafana (admin/admin).
-    image: grafana/grafana
+    image: grafana/grafana:8.1.5
     container_name: temporal-dev-grafana
     depends_on:
       - prometheus
diff --git a/develop/docker-compose/grafana/provisioning/dashboards/.gitignore b/develop/docker-compose/grafana/provisioning/dashboards/.gitignore
diff --git a/develop/docker-compose/grafana/provisioning/dashboards/dashboard.yml b/develop/docker-compose/grafana/provisioning/dashboards/dashboard.yml
@@ -8,4 +8,4 @@ providers:
   disableDeletion: false
   editable: true
   options:
-    path: /etc/grafana/provisioning/dashboards
+    path: /etc/grafana/provisioning/temporalio-dashboards/dashboards
diff --git a/develop/docker-compose/grafana/provisioning/temporalio-dashboards b/develop/docker-compose/grafana/provisioning/temporalio-dashboards
@@ -0,0 +1 @@
+Subproject commit f2e17e37a40ebb9dea8bc4217816efee8a4f0ffc
