From e5bcab28297b522a5a726f5b1cfa5877d8f1b788 Mon Sep 17 00:00:00 2001 From: defelmnq Date: Tue, 18 Feb 2025 10:29:12 +0000 Subject: [PATCH 1/7] work on dogfood resources monitoring --- dogfood/contents/main.tf | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dogfood/contents/main.tf b/dogfood/contents/main.tf index ecd0925c490e4..80edef1c543a5 100644 --- a/dogfood/contents/main.tf +++ b/dogfood/contents/main.tf @@ -290,6 +290,13 @@ resource "coder_agent" "dev" { timeout = 5 } + resources_monitoring { + memory { + enabled = true + threshold = 80 + } + } + startup_script = <<-EOT #!/usr/bin/env bash set -eux -o pipefail From 68a020066062f032747728f4de81cd6511156f46 Mon Sep 17 00:00:00 2001 From: defelmnq Date: Tue, 18 Feb 2025 10:37:28 +0000 Subject: [PATCH 2/7] work on dogfood resources monitoring --- dogfood/contents/main.tf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dogfood/contents/main.tf b/dogfood/contents/main.tf index 80edef1c543a5..ab8e448ba64b9 100644 --- a/dogfood/contents/main.tf +++ b/dogfood/contents/main.tf @@ -295,6 +295,11 @@ resource "coder_agent" "dev" { enabled = true threshold = 80 } + volume { + enabled = true + threshold = 80 + path = "/" + } } startup_script = <<-EOT From ff57d51ad1c28a4ebe63cfc8e7c1dba2978764d7 Mon Sep 17 00:00:00 2001 From: defelmnq Date: Wed, 19 Feb 2025 05:56:45 +0000 Subject: [PATCH 3/7] add resources monitoring parameters --- dogfood/contents/main.tf | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/dogfood/contents/main.tf b/dogfood/contents/main.tf index ab8e448ba64b9..38e4087e7c8f4 100644 --- a/dogfood/contents/main.tf +++ b/dogfood/contents/main.tf @@ -2,6 +2,7 @@ terraform { required_providers { coder = { source = "coder/coder" + version = "~> 2.2.0" } docker = { source = "kreuzwerker/docker" @@ -84,6 +85,30 @@ data "coder_parameter" "region" { } } +data "coder_parameter" "res_mon_memory_threshold" { + type = "number" + name = "Memory usage threshold" + default = 80 + description = "The memory usage threshold used in resources monitoring to trigger notifications." + mutable = true +} + +data "coder_parameter" "res_mon_volume_threshold" { + type = "number" + name = "Volume usage threshold" + default = 80 + description = "The volume usage threshold used in resources monitoring to trigger notifications." + mutable = true +} + +data "coder_parameter" "res_mon_volume_path" { + type = "string" + name = "Volume path" + default = "/home/coder" + description = "The path monitored in resources monitoring to trigger notifications." + mutable = true +} + provider "docker" { host = lookup(local.docker_host, data.coder_parameter.region.value) } @@ -292,13 +317,13 @@ resource "coder_agent" "dev" { resources_monitoring { memory { - enabled = true - threshold = 80 + enabled = true + threshold = data.coder_parameter.res_mon_memory_threshold.value } volume { - enabled = true - threshold = 80 - path = "/" + enabled = true + threshold = data.coder_parameter.res_mon_volume_threshold.value + path = data.coder_parameter.res_mon_volume_path.value } } From 2644d2e5b71e9c6cbceb7a0173c9b23d91725e0e Mon Sep 17 00:00:00 2001 From: defelmnq Date: Wed, 19 Feb 2025 06:00:23 +0000 Subject: [PATCH 4/7] add resources monitoring parameters --- dogfood/contents/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dogfood/contents/main.tf b/dogfood/contents/main.tf index 38e4087e7c8f4..8c7a791a654a6 100644 --- a/dogfood/contents/main.tf +++ b/dogfood/contents/main.tf @@ -1,7 +1,7 @@ terraform { required_providers { coder = { - source = "coder/coder" + source = "coder/coder" version = "~> 2.2.0" } docker = { From 7f1e19b213217196870f52fb45154504a014af1c Mon Sep 17 00:00:00 2001 From: defelmnq Date: Wed, 19 Feb 2025 06:16:04 +0000 Subject: [PATCH 5/7] remove constraint on version --- dogfood/contents/main.tf | 1 - 1 file changed, 1 deletion(-) diff --git a/dogfood/contents/main.tf b/dogfood/contents/main.tf index 8c7a791a654a6..1566eb15262b2 100644 --- a/dogfood/contents/main.tf +++ b/dogfood/contents/main.tf @@ -2,7 +2,6 @@ terraform { required_providers { coder = { source = "coder/coder" - version = "~> 2.2.0" } docker = { source = "kreuzwerker/docker" From e0764e7b581f41bebd004ca587816dfa9d5dd56c Mon Sep 17 00:00:00 2001 From: defelmnq Date: Wed, 19 Feb 2025 06:22:15 +0000 Subject: [PATCH 6/7] make fmt --- dogfood/contents/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dogfood/contents/main.tf b/dogfood/contents/main.tf index 1566eb15262b2..59375d29474f2 100644 --- a/dogfood/contents/main.tf +++ b/dogfood/contents/main.tf @@ -1,7 +1,7 @@ terraform { required_providers { coder = { - source = "coder/coder" + source = "coder/coder" } docker = { source = "kreuzwerker/docker" From 4f671b30004c92d09ec0d30bc6250826a3a5e7fa Mon Sep 17 00:00:00 2001 From: defelmnq Date: Wed, 19 Feb 2025 06:44:01 +0000 Subject: [PATCH 7/7] fix version for provider --- dogfood/contents/main.tf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dogfood/contents/main.tf b/dogfood/contents/main.tf index 59375d29474f2..6e60c58cf1293 100644 --- a/dogfood/contents/main.tf +++ b/dogfood/contents/main.tf @@ -1,7 +1,8 @@ terraform { required_providers { coder = { - source = "coder/coder" + source = "coder/coder" + version = "2.2.0-pre0" } docker = { source = "kreuzwerker/docker"