fix: metric and add SA permissions

JasperHG90 · Mar 18, 2024 · a42f66d · a42f66d
1 parent 3666764
commit a42f66d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/infra/README.md b/infra/README.md
@@ -23,6 +23,8 @@ Below is the automatically generated Terraform documentation.
 | [google_project_iam_member.artifact_reader](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/project_iam_member) | resource |
 | [google_project_iam_member.artifact_writer](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/project_iam_member) | resource |
 | [google_project_iam_member.kubernetes_engine_developer](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/project_iam_member) | resource |
+| [google_project_iam_member.monitoring-metric-writer](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/project_iam_member) | resource |
+| [google_project_iam_member.monitoring-viewer](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/project_iam_member) | resource |
 | [google_project_iam_member.sql_editor](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/project_iam_member) | resource |
 | [google_secret_manager_secret.credentials](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/secret_manager_secret) | resource |
 | [google_secret_manager_secret_version.credentials](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/secret_manager_secret_version) | resource |

diff --git a/infra/iam.tf b/infra/iam.tf
@@ -68,6 +68,18 @@ resource "google_storage_bucket_iam_member" "logs_user_locations_sa" {
   member = "serviceAccount:${module.dagster_user_locations_workload_identity.gcp_service_account_email}"
 }
 
+resource "google_project_iam_member" "monitoring-metric-writer" {
+  role    = "roles/monitoring.metricWriter"
+  member  = "serviceAccount:${module.dagster_user_locations_workload_identity.gcp_service_account_email}"
+  project = var.gcp_project
+}
+
+resource "google_project_iam_member" "monitoring-viewer" {
+  role    = "roles/monitoring.viewer"
+  member  = "serviceAccount:${module.dagster_user_locations_workload_identity.gcp_service_account_email}"
+  project = var.gcp_project
+}
+
 resource "google_storage_hmac_key" "key" {
   service_account_email = google_service_account.datareadwriter.email
 }
diff --git a/infra/metrics.tf b/infra/metrics.tf
@@ -3,14 +3,10 @@ resource "google_monitoring_metric_descriptor" "dagster_jobs" {
   display_name = "dagster-jobs"
   type         = "custom.googleapis.com/dagster/job_success"
   metric_kind  = "GAUGE"
-  value_type   = "DOUBLE"
+  value_type   = "BOOL"
   labels {
     key         = "job_name"
     value_type  = "STRING"
     description = "The name of the job."
   }
-  metadata {
-    sample_period = "60s"
-    ingest_delay  = "30s"
-  }
 }