feat: add metric and make SA with workload identity

JasperHG90 · Mar 16, 2024 · 3666764 · 3666764
1 parent 0307057
commit 3666764
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 15 deletions.
diff --git a/infra/README.md b/infra/README.md
@@ -19,6 +19,7 @@ Below is the automatically generated Terraform documentation.
 |------|------|
 | [google-beta_google_artifact_registry_repository.docker_registry](https://registry.terraform.io/providers/hashicorp/google-beta/latest/docs/resources/google_artifact_registry_repository) | resource |
 | [google-beta_google_artifact_registry_repository.docker_utils_registry](https://registry.terraform.io/providers/hashicorp/google-beta/latest/docs/resources/google_artifact_registry_repository) | resource |
+| [google_monitoring_metric_descriptor.dagster_jobs](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/monitoring_metric_descriptor) | resource |
 | [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 |
@@ -40,7 +41,6 @@ Below is the automatically generated Terraform documentation.
 | [helm_release.dagster](https://registry.terraform.io/providers/hashicorp/helm/latest/docs/resources/release) | resource |
 | [kubernetes_namespace.dagster](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/namespace) | resource |
 | [kubernetes_secret.credentials](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/secret) | resource |
-| [kubernetes_service_account.user_locations](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/service_account) | resource |
 | [google_client_config.default](https://registry.terraform.io/providers/hashicorp/google/latest/docs/data-sources/client_config) | data source |
 | [google_secret_manager_secret_version.postgres_password](https://registry.terraform.io/providers/hashicorp/google/latest/docs/data-sources/secret_manager_secret_version) | data source |
 | [google_secret_manager_secret_version.secrets](https://registry.terraform.io/providers/hashicorp/google/latest/docs/data-sources/secret_manager_secret_version) | data source |

diff --git a/infra/app.tf b/infra/app.tf
@@ -4,13 +4,6 @@ resource "kubernetes_namespace" "dagster" {
   }
 }
 
-resource "kubernetes_service_account" "user_locations" {
-  metadata {
-    name      = "user-locations"
-    namespace = kubernetes_namespace.dagster.metadata[0].name
-  }
-}
-
 data "google_secret_manager_secret_version" "postgres_password" {
   secret     = "POSTGRESQL_PASSWORD_${local.environment_toupper}"
   depends_on = [module.sql]
@@ -142,13 +135,13 @@ module "dagster_prd_workload_identity" {
 }
 
 module "dagster_user_locations_workload_identity" {
-  source              = "terraform-google-modules/kubernetes-engine/google//modules/workload-identity"
-  use_existing_k8s_sa = true
-  cluster_name        = module.gke.cluster_name
-  location            = module.gke.location
-  name                = kubernetes_service_account.user_locations.metadata[0].name
-  namespace           = kubernetes_namespace.dagster.metadata[0].name
-  project_id          = var.gcp_project
+  source       = "terraform-google-modules/kubernetes-engine/google//modules/workload-identity"
+  cluster_name = module.gke.cluster_name
+  location     = module.gke.location
+  name         = "user-locations"
+  namespace    = kubernetes_namespace.dagster.metadata[0].name
+  project_id   = var.gcp_project
+  k8s_sa_name  = "user-locations"
 }
 
 # resource "local_file" "helm_manifest" {

diff --git a/infra/metrics.tf b/infra/metrics.tf
@@ -0,0 +1,16 @@
+resource "google_monitoring_metric_descriptor" "dagster_jobs" {
+  description  = "Successful dagster jobs."
+  display_name = "dagster-jobs"
+  type         = "custom.googleapis.com/dagster/job_success"
+  metric_kind  = "GAUGE"
+  value_type   = "DOUBLE"
+  labels {
+    key         = "job_name"
+    value_type  = "STRING"
+    description = "The name of the job."
+  }
+  metadata {
+    sample_period = "60s"
+    ingest_delay  = "30s"
+  }
+}