fix: switch to central Grafana instance (#139)

WalletConnect · Sep 18, 2023 · c458b45 · c458b45
1 parent a5a9bb6
commit c458b45
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 41 deletions.
diff --git a/.github/workflows/sub-infra-apply.yml b/.github/workflows/sub-infra-apply.yml
@@ -49,7 +49,7 @@ jobs:
         id: grafana-get-details
         uses: WalletConnect/actions/aws/grafana/get-details-by-name/@2.1.4
         with:
-          workspace-name: 'Main'
+          workspace-name: ${{ vars.GRAFANA_WORKSPACE_NAME }}
 
       - name: Get Grafana key
         id: grafana-get-key

diff --git a/.github/workflows/sub-infra-plan.yml b/.github/workflows/sub-infra-plan.yml
@@ -54,7 +54,7 @@ jobs:
         id: grafana-get-details
         uses: WalletConnect/actions/aws/grafana/get-details-by-name/@2.1.4
         with:
-          workspace-name: 'Main'
+          workspace-name: ${{ vars.GRAFANA_WORKSPACE_NAME }}
 
       - name: Get Grafana key
         id: grafana-get-key

diff --git a/terraform/.terraform.lock.hcl b/terraform/.terraform.lock.hcl
diff --git a/terraform/monitoring/dashboard.tf b/terraform/monitoring/dashboard.tf
@@ -2,7 +2,7 @@ data "jsonnet_file" "dashboard" {
   source = "${path.module}/dashboard.jsonnet"
 
   ext_str = {
-    dashboard_title = "Keys-Server - ${module.this.stage}"
+    dashboard_title = "Keys-Server - ${title(module.this.stage)}"
     dashboard_uid   = "keyserver-${module.this.stage}"
 
     prometheus_uid = grafana_data_source.prometheus.uid

diff --git a/terraform/monitoring/data_sources.tf b/terraform/monitoring/data_sources.tf
@@ -17,6 +17,8 @@ resource "grafana_data_source" "prometheus" {
     sigV4Region        = module.this.region
     sigV4AssumeRoleArn = module.monitoring-role.iam_role_arn
   })
+
+  depends_on = [module.monitoring-role]
 }
 
 resource "grafana_data_source" "cloudwatch" {
@@ -27,4 +29,6 @@ resource "grafana_data_source" "cloudwatch" {
     defaultRegion = module.this.region
     assumeRoleArn = module.monitoring-role.iam_role_arn
   })
+
+  depends_on = [module.monitoring-role]
 }
diff --git a/terraform/monitoring/outputs.tf b/terraform/monitoring/outputs.tf
@@ -1,4 +0,0 @@
-output "dashboard_definition" {
-  description = "The JSON definition of the dashboard."
-  value       = data.jsonnet_file.dashboard.rendered
-}

diff --git a/terraform/providers.tf b/terraform/providers.tf
@@ -7,6 +7,6 @@ provider "aws" {
 }
 
 provider "grafana" {
-  url  = "https://${data.terraform_remote_state.monitoring.outputs.grafana_workspaces.main.grafana_endpoint}"
+  url  = "https://${data.terraform_remote_state.monitoring.outputs.grafana_workspaces.central.grafana_endpoint}"
   auth = var.grafana_auth
 }
diff --git a/terraform/res_monitoring.tf b/terraform/res_monitoring.tf
@@ -8,6 +8,6 @@ module "monitoring" {
   ecs_target_group_arn  = module.ecs.target_group_arn
   load_balancer_arn     = module.ecs.load_balancer_arn_suffix
   keystore_cluster_id   = module.keystore.cluster_id
-  monitoring_role_arn   = data.terraform_remote_state.monitoring.outputs.grafana_workspaces.main.iam_role_arn
+  monitoring_role_arn   = data.terraform_remote_state.monitoring.outputs.grafana_workspaces.central.iam_role_arn
   ecs_task_family       = module.ecs.ecs_task_family
 }