chore: update metrics and add tier to sql

JasperHG90 · Mar 24, 2024 · 8e0cf8d · 8e0cf8d
1 parent 6ef3c22
commit 8e0cf8d
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 10 deletions.
diff --git a/infra/README.md b/infra/README.md
@@ -19,7 +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_monitoring_metric_descriptor.dagster_asset_status](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 |

diff --git a/infra/app.tf b/infra/app.tf
@@ -40,10 +40,9 @@ resource "helm_release" "dagster" {
     value = "dagster"
   }
 
-  # NB: max number of concurrent runs is 5
   set {
     name  = "dagsterDaemon.runCoordinator.config.queuedRunCoordinator.maxConcurrentRuns"
-    value = 5
+    value = 10
   }
 
   set {
@@ -53,7 +52,7 @@ resource "helm_release" "dagster" {
 
   set {
     name  = "dagsterDaemon.runCoordinator.config.queuedRunCoordinator.tagConcurrencyLimits[0].limit"
-    value = 3
+    value = 10
   }
 
   set {

diff --git a/infra/main.tf b/infra/main.tf
@@ -84,6 +84,7 @@ module "sql" {
   postgres_version    = "POSTGRES_14"
   private_network     = module.gke.network_name
   create_read_replica = false
+  tier                = "db-g1-small"
 }
 
 resource "google_sql_database" "dagster" {

diff --git a/infra/metrics.tf b/infra/metrics.tf
@@ -1,8 +1,8 @@
 locals {
   metric_labels = [
     {
-      key         = "job_name"
-      description = "The name of the job."
+      key         = "asset_name"
+      description = "The name of the asset."
     },
     {
       key         = "location"
@@ -31,10 +31,10 @@ locals {
   ]
 }
 
-resource "google_monitoring_metric_descriptor" "dagster_jobs" {
-  description  = "Successful dagster jobs."
+resource "google_monitoring_metric_descriptor" "dagster_asset_status" {
+  description  = "Successful dagster asset runs."
   display_name = "dagster-jobs"
-  type         = "custom.googleapis.com/dagster/job_success"
+  type         = "custom.googleapis.com/dagster/asset_success"
   metric_kind  = "GAUGE"
   value_type   = "BOOL"
   dynamic "labels" {

diff --git a/infra/modules/sql/main.tf b/infra/modules/sql/main.tf
@@ -83,7 +83,7 @@ resource "google_sql_database_instance" "main" {
   deletion_protection = false
 
   settings {
-    tier              = "db-f1-micro"
+    tier              = var.tier
     availability_type = "ZONAL"
     disk_autoresize   = true
     disk_type         = "PD_SSD"

diff --git a/infra/modules/sql/variables.tf b/infra/modules/sql/variables.tf
@@ -14,6 +14,12 @@ variable "region" {
   default     = "europe-west4"
 }
 
+variable "tier" {
+  description = "The tier of the SQL server"
+  type        = string
+  default     = "db-f1-micro"
+}
+
 variable "postgres_version" {
   description = "Postgres version to deploy"
   type        = string