add validation rules to monitoring variables

.github/scripts/check.sh

@@ -48,7 +48,7 @@ update_component_status() {
 
 # Function to create an incident
 create_incident() {
-    local incident_name="Testing Instatus"
+    local incident_name="Degraded Service"
     local message="The following modules are experiencing issues:\n"
     for i in "${!failures[@]}"; do
         message+="$((i + 1)). ${failures[$i]}\n"
@@ -59,7 +59,7 @@ create_incident() {
         component_status="MAJOROUTAGE"
     fi
     # see https://instatus.com/help/api/incidents
-    response=$(curl -s -X POST "https://api.instatus.com/v1/$INSTATUS_PAGE_ID/incidents" \
+    incident_id=$(curl -s -X POST "https://api.instatus.com/v1/$INSTATUS_PAGE_ID/incidents" \
         -H "Authorization: Bearer $INSTATUS_API_KEY" \
         -H "Content-Type: application/json" \
         -d "{
@@ -74,10 +74,25 @@ create_incident() {
                     \"status\": \"PARTIALOUTAGE\"
                 }
             ]
-        }")
+        }" | jq -r '.id')
 
-    incident_id=$(echo "$response" | jq -r '.id')
-    echo "$incident_id"
+    echo "Created incident with ID: $incident_id"
+}
+
+# Function to check for existing unresolved incidents
+check_existing_incident() {
+    # Fetch the latest incidents with status not equal to "RESOLVED"
+    local unresolved_incidents=$(curl -s -X GET "https://api.instatus.com/v1/$INSTATUS_PAGE_ID/incidents" \
+        -H "Authorization: Bearer $INSTATUS_API_KEY" \
+        -H "Content-Type: application/json" | jq -r '.incidents[] | select(.status != "RESOLVED") | .id')
+
+    if [[ -n "$unresolved_incidents" ]]; then
+        echo "Unresolved incidents found: $unresolved_incidents"
+        return 0  # Indicate that there are unresolved incidents
+    else
+        echo "No unresolved incidents found."
+        return 1  # Indicate that no unresolved incidents exist
+    fi
 }
 
 force_redeploy_registry () {
@@ -174,9 +189,10 @@ else
         update_component_status "PARTIALOUTAGE"
     fi
 
-    # Create a new incident
-    incident_id=$(create_incident)
-    echo "Created incident with ID: $incident_id"
+    # Check if there is an existing incident before creating a new one
+    if ! check_existing_incident; then
+        create_incident
+    fi
 
     # If a module is down, force a reployment to try getting things back online
     # ASAP

jetbrains-gateway/README.md

@@ -14,7 +14,7 @@ This module adds a JetBrains Gateway Button to open any workspace with a single
 ```tf
 module "jetbrains_gateway" {
   source         = "registry.coder.com/modules/jetbrains-gateway/coder"
-  version        = "1.0.23"
+  version        = "1.0.25"
   agent_id       = coder_agent.example.id
   agent_name     = "example"
   folder         = "/home/coder/example"
@@ -32,7 +32,7 @@ module "jetbrains_gateway" {
 ```tf
 module "jetbrains_gateway" {
   source         = "registry.coder.com/modules/jetbrains-gateway/coder"
-  version        = "1.0.23"
+  version        = "1.0.25"
   agent_id       = coder_agent.example.id
   agent_name     = "example"
   folder         = "/home/coder/example"
@@ -41,27 +41,52 @@ module "jetbrains_gateway" {
 }
 ```
 
-### Use the latest release version
+### Use the latest version of each IDE
 
 ```tf
 module "jetbrains_gateway" {
   source         = "registry.coder.com/modules/jetbrains-gateway/coder"
-  version        = "1.0.23"
+  version        = "1.0.25"
   agent_id       = coder_agent.example.id
   agent_name     = "example"
   folder         = "/home/coder/example"
-  jetbrains_ides = ["GO", "WS"]
-  default        = "GO"
+  jetbrains_ides = ["IU", "PY"]
+  default        = "IU"
   latest         = true
 }
 ```
 
+### Use fixed versions set by `jetbrains_ide_versions`
+
+```tf
+module "jetbrains_gateway" {
+  source         = "registry.coder.com/modules/jetbrains-gateway/coder"
+  version        = "1.0.25"
+  agent_id       = coder_agent.example.id
+  agent_name     = "example"
+  folder         = "/home/coder/example"
+  jetbrains_ides = ["IU", "PY"]
+  default        = "IU"
+  latest         = false
+  jetbrains_ide_versions = {
+    "IU" = {
+      build_number = "243.21565.193"
+      version      = "2024.3"
+    }
+    "PY" = {
+      build_number = "243.21565.199"
+      version      = "2024.3"
+    }
+  }
+}
+```
+
 ### Use the latest EAP version
 
 ```tf
 module "jetbrains_gateway" {
   source         = "registry.coder.com/modules/jetbrains-gateway/coder"
-  version        = "1.0.23"
+  version        = "1.0.25"
   agent_id       = coder_agent.example.id
   agent_name     = "example"
   folder         = "/home/coder/example"
@@ -79,7 +104,7 @@ Due to the highest priority of the `ide_download_link` parameter in the `(jetbra
 ```tf
 module "jetbrains_gateway" {
   source             = "registry.coder.com/modules/jetbrains-gateway/coder"
-  version            = "1.0.23"
+  version            = "1.0.25"
   agent_id           = coder_agent.example.id
   agent_name         = "example"
   folder             = "/home/coder/example"

jetbrains-gateway/main.test.ts

@@ -22,7 +22,7 @@ describe("jetbrains-gateway", async () => {
       folder: "/home/coder",
     });
     expect(state.outputs.url.value).toBe(
-      "jetbrains-gateway://connect#type=coder&workspace=default&owner=default&agent=foo&folder=/home/coder&url=https://mydeployment.coder.com&token=$SESSION_TOKEN&ide_product_code=IU&ide_build_number=241.14494.240&ide_download_link=https://download.jetbrains.com/idea/ideaIU-2024.1.tar.gz",
+      "jetbrains-gateway://connect#type=coder&workspace=default&owner=default&agent=foo&folder=/home/coder&url=https://mydeployment.coder.com&token=$SESSION_TOKEN&ide_product_code=IU&ide_build_number=243.21565.193&ide_download_link=https://download.jetbrains.com/idea/ideaIU-2024.3.tar.gz",
     );
 
     const coder_app = state.resources.find(

jetbrains-gateway/main.tf

@@ -80,36 +80,36 @@ variable "jetbrains_ide_versions" {
   description = "The set of versions for each jetbrains IDE"
   default = {
     "IU" = {
-      build_number = "241.14494.240"
-      version      = "2024.1"
+      build_number = "243.21565.193"
+      version      = "2024.3"
     }
     "PS" = {
-      build_number = "241.14494.237"
-      version      = "2024.1"
+      build_number = "243.21565.202"
+      version      = "2024.3"
     }
     "WS" = {
-      build_number = "241.14494.235"
-      version      = "2024.1"
+      build_number = "243.21565.180"
+      version      = "2024.3"
     }
     "PY" = {
-      build_number = "241.14494.241"
-      version      = "2024.1"
+      build_number = "243.21565.199"
+      version      = "2024.3"
     }
     "CL" = {
-      build_number = "241.14494.288"
+      build_number = "243.21565.238"
       version      = "2024.1"
     }
     "GO" = {
-      build_number = "241.14494.238"
-      version      = "2024.1"
+      build_number = "243.21565.208"
+      version      = "2024.3"
     }
     "RM" = {
-      build_number = "241.14494.234"
-      version      = "2024.1"
+      build_number = "243.21565.197"
+      version      = "2024.3"
     }
     "RD" = {
-      build_number = "241.14494.307"
-      version      = "2024.1"
+      build_number = "243.21565.191"
+      version      = "2024.3"
     }
   }
   validation {

monitoring/README.md

@@ -0,0 +1,72 @@
+---
+display_name: Monitoring
+description: Monitoring of workspace resources
+maintainer_github: coder
+verified: true
+tags: [monitoring]
+---
+
+# Monitoring
+
+This module adds monitoring of workspace resources.
+
+```tf
+module "monitoring" {
+  source  = "registry.coder.com/modules/monitoring/coder"
+  version = "1.0.0"
+  agent_id = coder_agent.dev.id
+}
+```
+
+## Examples
+
+```tf
+module "monitoring" {
+  source  = "registry.coder.com/modules/monitoring/coder"
+  version = "1.0.0"
+  agent_id = coder_agent.dev.id
+}
+```
+
+### Enable/Disable
+
+You can customize the monitoring by setting the `enabled`, `memory_enabled`, and `disk_enabled` variables.
+
+```tf
+module "monitoring" {
+  source  = "registry.coder.com/modules/monitoring/coder"
+  version = "1.0.0"
+  agent_id = coder_agent.dev.id
+  enabled = false
+  memory_enabled = true
+  disk_enabled = false
+}
+```
+
+### Customize Thresholds
+
+You can customize the thresholds by setting the `threshold`, `memory_threshold`, and `disk_threshold` variables.
+
+```tf
+module "monitoring" {
+  source  = "registry.coder.com/modules/monitoring/coder"
+  version = "1.0.0"
+  agent_id = coder_agent.dev.id
+  threshold = 90
+  memory_threshold = 95
+  disk_threshold = 90
+}
+```
+
+### Customize Disks
+
+You can customize the disks by setting the `disks` variable.
+
+```tf
+module "monitoring" {
+  source  = "registry.coder.com/modules/monitoring/coder"
+  version = "1.0.0"
+  agent_id = coder_agent.dev.id
+  disks = ["/"]
+}
+```

monitoring/main.tf

@@ -0,0 +1,92 @@
+terraform {
+  required_version = ">= 1.0.25"
+
+  required_providers {
+    coder = {
+      source  = "coder/coder"
+      version = ">= 2.0.2"
+    }
+  }
+}
+
+variable "threshold" {
+  type        = number
+  description = "The threshold for the monitoring, used for all resources unless overridden by *_threshold - expressed as a percentage."
+  default     = 90
+  validation {
+    condition     = var.threshold >= 0 && var.threshold <= 100
+    error_message = "The threshold must be between 0 and 100."
+  }
+}
+
+variable "memory_threshold" {
+  type        = number
+  description = "The threshold for the memory monitoring - expressed as a percentage."
+  default     = 90
+  validation {
+    condition     = var.memory_threshold >= 0 && var.memory_threshold <= 100
+    error_message = "The memory_threshold must be between 0 and 100."
+  }
+}
+
+variable "disk_threshold" {
+  type        = number
+  description = "The threshold for the disk monitoring - expressed as a percentage."
+  default     = 90
+  validation {
+    condition     = var.disk_threshold >= 0 && var.disk_threshold <= 100
+    error_message = "The disk_threshold must be between 0 and 100."
+  }
+}
+
+variable "disks" {
+  type        = list(string)
+  description = "The disks to monitor. e.g. ['/', '/home']"
+  default     = ["/"]
+}
+
+variable "enabled" {
+  type        = bool
+  description = "Whether the monitoring is enabled."
+  default     = true
+  validation {
+    condition     = var.enabled == true || var.enabled == false
+    error_message = "The enabled must be true or false."
+  }
+}
+
+variable "memory_enabled" {
+  type        = bool
+  description = "Whether the memory monitoring is enabled."
+  default     = true
+  validation {
+    condition     = var.memory_enabled == true || var.memory_enabled == false
+    error_message = "The memory_enabled must be true or false."
+  }
+}
+
+variable "disk_enabled" {
+  type        = bool
+  description = "Whether the disk monitoring is enabled."
+  default     = true
+  validation {
+    condition     = var.disk_enabled == true || var.disk_enabled == false
+    error_message = "The disk_enabled must be true or false."
+  }
+}
+
+variable "agent_id" {
+  type        = string
+  description = "The ID of the agent to monitor."
+}
+
+data "coder_monitoring" "monitoring" {
+  threshold    = var.threshold
+  memory_threshold = var.memory_threshold
+  disk_threshold = var.disk_threshold
+  disks = var.disks
+  enabled = var.enabled
+  memory_enabled = var.memory_enabled
+  disk_enabled = var.disk_enabled
+  agent_id = var.agent_id
+}

update-version.sh

@@ -21,14 +21,39 @@ for dir in "${changed_dirs[@]}"; do
   if [[ -f "$dir/README.md" ]]; then
     file="$dir/README.md"
     tmpfile=$(mktemp /tmp/tempfile.XXXXXX)
-    awk -v tag="$LATEST_TAG" '{
-      if ($1 == "version" && $2 == "=") {
-        sub(/"[^"]*"/, "\"" tag "\"")
-        print
-      } else {
+    awk -v tag="$LATEST_TAG" '
+      BEGIN { in_code_block = 0; in_nested_block = 0 }
+      {
+        # Detect the start and end of Markdown code blocks.
+        if ($0 ~ /^```/) {
+          in_code_block = !in_code_block
+          # Reset nested block tracking when exiting a code block.
+          if (!in_code_block) {
+            in_nested_block = 0
+          }
+        }
+
+        # Handle nested blocks within a code block.
+        if (in_code_block) {
+          # Detect the start of a nested block (skipping "module" blocks).
+          if ($0 ~ /{/ && !($1 == "module" || $1 ~ /^[a-zA-Z0-9_]+$/)) {
+            in_nested_block++
+          }
+
+          # Detect the end of a nested block.
+          if ($0 ~ /}/ && in_nested_block > 0) {
+            in_nested_block--
+          }
+
+          # Update "version" only if not in a nested block.
+          if (!in_nested_block && $1 == "version" && $2 == "=") {
+            sub(/"[^"]*"/, "\"" tag "\"")
+          }
+        }
+
         print
       }
-    }' "$file" > "$tmpfile" && mv "$tmpfile" "$file"
+    ' "$file" > "$tmpfile" && mv "$tmpfile" "$file"
 
     # Check if the README.md file has changed
     if ! git diff --quiet -- "$dir/README.md"; then