✨ Add: Manage grafana content/assets via terraform

.pre-commit-config.yaml

@@ -79,6 +79,10 @@ repos:
     hooks:
       - id: shellcheck
         name: Shell scripts conform to shellcheck
+  - repo: https://github.com/antonbabenko/pre-commit-terraform
+    rev: v1.89.1 # Get the latest from: https://github.com/antonbabenko/pre-commit-terraform/releases
+    hooks:
+    -   id: terraform_fmt
   - repo: local
     hooks:
       - id: run-pylint

services/monitoring/Makefile

@@ -84,20 +84,13 @@ update.grafana.pwd: .env ## Change grafana pwd
 	grafanacontainerid=$$(docker ps | grep grafana | awk '{print $$1;}');\
 	docker exec -ti $$grafanacontainerid grafana-cli admin reset-admin-password $$TRAEFIK_PASSWORD
 
-
-.PHONY: grafana-export
-grafana-export: .venv## Export the remote grafana dashboards and datasources TO YOUR LOCAL MACHINE
-	@cd grafana/scripts;\
-	source ${REPO_BASE_DIR}/.venv/bin/activate;\
-	pip install -r requirements.txt > /dev/null 2>&1;\
-	python3 export.py;
-
 .PHONY: grafana-import
-grafana-import: grafana/assets .venv ## Imports AND OVERWRITES the remote grafana dashboards and datasources FROM YOUR LOCAL MACHINE
-	@cd grafana/scripts;\
-	source ${REPO_BASE_DIR}/.venv/bin/activate;\
-	pip install -r requirements.txt > /dev/null 2>&1;\
-	python3 import.py
+grafana-import: grafana/assets ## Imports the remote grafana dashboards and datasources FROM YOUR LOCAL MACHINE
+	@pushd ${REPO_BASE_DIR}/services/monitoring/grafana && \
+	$(MAKE) terraform-plan && \
+	$(MAKE) terraform-apply; \
+	popd > /dev/null
+
 
 .PHONY: config.grafana.dashboards
 config.grafana.dashboards: grafana/templates-provisioning/dashboards/simcore/Metrics-dashboard.json.j2 .venv #Configure dashboards for aws or dalco clusters

services/monitoring/grafana/Makefile

@@ -0,0 +1,65 @@
+.DEFAULT_GOAL := help
+REPO_BASE_DIR := $(shell git rev-parse --show-toplevel)
+include ${REPO_BASE_DIR}/scripts/common.Makefile
+
+
+
+# Internal VARIABLES ------------------------------------------------
+TF_STATE_FILE := terraform/.terraform/terraform.tfstate
+
+terraform/main.tf: terraform/main.tf.j2 .venv $(REPO_CONFIG_LOCATION)
+	# generate $@
+	@$(call jinja, $<, $(REPO_CONFIG_LOCATION), $@)
+	# validate and format $@
+
+terraform-init: $(TF_STATE_FILE)  ## init terraform
+
+$(TF_STATE_FILE): $(REPO_CONFIG_LOCATION) terraform/main.tf
+	# terraform init
+	@set -a; source $<; set +a; \
+	if [ "$${GRAFANA_TERRAFORM_STATE_BACKEND_TYPE}" = "local" ]; then \
+	  terraform -chdir=./terraform init; \
+	else \
+	  terraform -chdir=./terraform init -backend-config="access_key=$${TF_GRAFANA_STATE_BACKEND_AWS_ACCESS_KEY_ID}" -backend-config="secret_key=$${TF_GRAFANA_STATE_BACKEND_AWS_SECRET_ACCESS_KEY}"; \
+	fi
+
+terraform/plan.cache:
+	@echo "$@ file not found. Run 'make terraform-plan' to generate it."
+	@exit 1
+
+.PHONY: terraform-plan
+terraform-plan: $(REPO_CONFIG_LOCATION) $(TF_STATE_FILE) ensure-grafana-online ## terraform plan
+	# terraform plan
+	@set -a; source $<; set +a; \
+    terraform -chdir=./terraform plan -out=plan.cache
+
+.PHONY: terraform-apply
+terraform-apply: $(REPO_CONFIG_LOCATION) terraform/plan.cache $(TF_STATE_FILE) ensure-grafana-online ## terraform apply
+	# terraform apply
+	@set -a; source $<; set +a; \
+	terraform -chdir=./terraform apply plan.cache
+
+.PHONY: ensure-grafana-online
+ensure-grafana-online:
+	@set -o allexport; \
+	source $(REPO_CONFIG_LOCATION); \
+	set +o allexport; \
+	url=$${TF_VAR_GRAFANA_URL}; \
+	echo "Waiting for grafana at $$url to become reachable..."; \
+	attempts=0; \
+	max_attempts=10; \
+	while [ $$attempts -lt $$max_attempts ]; do \
+		status_code=$$(curl -k -o /dev/null -s -w "%{http_code}" $$url); \
+		if [ "$$status_code" -ge 200 ] && [ "$$status_code" -lt 400 ]; then \
+			echo "Grafana is online"; \
+			break; \
+		else \
+			echo "Grafana still unreachable, waiting 5s for grafana to become reachable... (Attempt $$((attempts+1)))"; \
+			sleep 5; \
+			attempts=$$((attempts + 1)); \
+		fi; \
+	done; \
+	if [ $$attempts -eq $$max_attempts ]; then \
+		echo "Max attempts reached, Grafana is still unreachable."; \
+		exit 1; \
+	fi;