From b58002ab4fa0bb9029bf432d1a86328f4f5155d2 Mon Sep 17 00:00:00 2001
From: Ben Vincent <ben@unkin.net>
Date: Sun, 13 Jul 2025 18:33:50 +1000
Subject: [PATCH] feat: add vmagent instances

- add three vmagent instances
---
 config/instances/ausyd1nxvm2099/config.yaml   |  7 +++
 .../instances/ausyd1nxvm2099/terragrunt.hcl   | 52 +++++++++++++++++++
 config/instances/ausyd1nxvm2100/config.yaml   |  7 +++
 .../instances/ausyd1nxvm2100/terragrunt.hcl   | 52 +++++++++++++++++++
 config/instances/ausyd1nxvm2101/config.yaml   |  7 +++
 .../instances/ausyd1nxvm2101/terragrunt.hcl   | 52 +++++++++++++++++++
 templates/base/boilerplate.yml                |  3 +-
 7 files changed, 179 insertions(+), 1 deletion(-)
 create mode 100644 config/instances/ausyd1nxvm2099/config.yaml
 create mode 100644 config/instances/ausyd1nxvm2099/terragrunt.hcl
 create mode 100644 config/instances/ausyd1nxvm2100/config.yaml
 create mode 100644 config/instances/ausyd1nxvm2100/terragrunt.hcl
 create mode 100644 config/instances/ausyd1nxvm2101/config.yaml
 create mode 100644 config/instances/ausyd1nxvm2101/terragrunt.hcl

diff --git a/config/instances/ausyd1nxvm2099/config.yaml b/config/instances/ausyd1nxvm2099/config.yaml
new file mode 100644
index 0000000..b77988f
--- /dev/null
+++ b/config/instances/ausyd1nxvm2099/config.yaml
@@ -0,0 +1,7 @@
+description: VicMet-vmagent
+cobbler_mgmt_classes:
+  - roles::infra::metrics::vmagent
+profiles:
+  - disk20
+  - net_com1_eth0
+  - 2core2048
diff --git a/config/instances/ausyd1nxvm2099/terragrunt.hcl b/config/instances/ausyd1nxvm2099/terragrunt.hcl
new file mode 100644
index 0000000..98fe447
--- /dev/null
+++ b/config/instances/ausyd1nxvm2099/terragrunt.hcl
@@ -0,0 +1,52 @@
+locals {
+  node_name     = "prodnxsr0011"
+  config_common     = yamldecode(file("${get_terragrunt_dir()}/../config_common.yaml"))
+  config_specific   = yamldecode(file("${get_terragrunt_dir()}/config.yaml"))
+  config            = merge(local.config_common, local.config_specific)
+  instance_name     = basename(get_terragrunt_dir())
+}
+
+inputs = merge(
+  {
+    name = local.instance_name
+  },
+  local.config
+)
+
+include "root" {
+  path   = find_in_parent_folders("root.hcl")
+}
+
+include "instances" {
+  path   = find_in_parent_folders("instances.hcl")
+  expose = true
+  merge_strategy = "deep"
+}
+
+dependencies {
+  paths = ["${get_repo_root()}/config/nodes/${local.node_name}"]
+}
+
+terraform {
+  source = "${get_repo_root()}/modules/instance"
+}
+
+generate "incus" {
+  path      = "incus.tf"
+  if_exists = "overwrite_terragrunt"
+  contents  = <<-EOF
+    provider "incus" {
+      generate_client_certificates = true
+      accept_remote_certificate    = true
+
+      remote {
+        name    = "${basename(get_terragrunt_dir())}"
+        scheme  = "https"
+        address = "${yamldecode(file("${get_repo_root()}/config/nodes/${local.node_name}/config.yaml")).node_addr}"
+        port    = "${yamldecode(file("${get_repo_root()}/config/nodes/${local.node_name}/config.yaml")).node_port}"
+        token   = "${get_env("INCUS_TOKEN_${upper(local.node_name)}")}"
+        default = true
+      }
+    }
+  EOF
+}
diff --git a/config/instances/ausyd1nxvm2100/config.yaml b/config/instances/ausyd1nxvm2100/config.yaml
new file mode 100644
index 0000000..b77988f
--- /dev/null
+++ b/config/instances/ausyd1nxvm2100/config.yaml
@@ -0,0 +1,7 @@
+description: VicMet-vmagent
+cobbler_mgmt_classes:
+  - roles::infra::metrics::vmagent
+profiles:
+  - disk20
+  - net_com1_eth0
+  - 2core2048
diff --git a/config/instances/ausyd1nxvm2100/terragrunt.hcl b/config/instances/ausyd1nxvm2100/terragrunt.hcl
new file mode 100644
index 0000000..b33a99b
--- /dev/null
+++ b/config/instances/ausyd1nxvm2100/terragrunt.hcl
@@ -0,0 +1,52 @@
+locals {
+  node_name     = "prodnxsr0012"
+  config_common     = yamldecode(file("${get_terragrunt_dir()}/../config_common.yaml"))
+  config_specific   = yamldecode(file("${get_terragrunt_dir()}/config.yaml"))
+  config            = merge(local.config_common, local.config_specific)
+  instance_name     = basename(get_terragrunt_dir())
+}
+
+inputs = merge(
+  {
+    name = local.instance_name
+  },
+  local.config
+)
+
+include "root" {
+  path   = find_in_parent_folders("root.hcl")
+}
+
+include "instances" {
+  path   = find_in_parent_folders("instances.hcl")
+  expose = true
+  merge_strategy = "deep"
+}
+
+dependencies {
+  paths = ["${get_repo_root()}/config/nodes/${local.node_name}"]
+}
+
+terraform {
+  source = "${get_repo_root()}/modules/instance"
+}
+
+generate "incus" {
+  path      = "incus.tf"
+  if_exists = "overwrite_terragrunt"
+  contents  = <<-EOF
+    provider "incus" {
+      generate_client_certificates = true
+      accept_remote_certificate    = true
+
+      remote {
+        name    = "${basename(get_terragrunt_dir())}"
+        scheme  = "https"
+        address = "${yamldecode(file("${get_repo_root()}/config/nodes/${local.node_name}/config.yaml")).node_addr}"
+        port    = "${yamldecode(file("${get_repo_root()}/config/nodes/${local.node_name}/config.yaml")).node_port}"
+        token   = "${get_env("INCUS_TOKEN_${upper(local.node_name)}")}"
+        default = true
+      }
+    }
+  EOF
+}
diff --git a/config/instances/ausyd1nxvm2101/config.yaml b/config/instances/ausyd1nxvm2101/config.yaml
new file mode 100644
index 0000000..b77988f
--- /dev/null
+++ b/config/instances/ausyd1nxvm2101/config.yaml
@@ -0,0 +1,7 @@
+description: VicMet-vmagent
+cobbler_mgmt_classes:
+  - roles::infra::metrics::vmagent
+profiles:
+  - disk20
+  - net_com1_eth0
+  - 2core2048
diff --git a/config/instances/ausyd1nxvm2101/terragrunt.hcl b/config/instances/ausyd1nxvm2101/terragrunt.hcl
new file mode 100644
index 0000000..5326e08
--- /dev/null
+++ b/config/instances/ausyd1nxvm2101/terragrunt.hcl
@@ -0,0 +1,52 @@
+locals {
+  node_name     = "prodnxsr0013"
+  config_common     = yamldecode(file("${get_terragrunt_dir()}/../config_common.yaml"))
+  config_specific   = yamldecode(file("${get_terragrunt_dir()}/config.yaml"))
+  config            = merge(local.config_common, local.config_specific)
+  instance_name     = basename(get_terragrunt_dir())
+}
+
+inputs = merge(
+  {
+    name = local.instance_name
+  },
+  local.config
+)
+
+include "root" {
+  path   = find_in_parent_folders("root.hcl")
+}
+
+include "instances" {
+  path   = find_in_parent_folders("instances.hcl")
+  expose = true
+  merge_strategy = "deep"
+}
+
+dependencies {
+  paths = ["${get_repo_root()}/config/nodes/${local.node_name}"]
+}
+
+terraform {
+  source = "${get_repo_root()}/modules/instance"
+}
+
+generate "incus" {
+  path      = "incus.tf"
+  if_exists = "overwrite_terragrunt"
+  contents  = <<-EOF
+    provider "incus" {
+      generate_client_certificates = true
+      accept_remote_certificate    = true
+
+      remote {
+        name    = "${basename(get_terragrunt_dir())}"
+        scheme  = "https"
+        address = "${yamldecode(file("${get_repo_root()}/config/nodes/${local.node_name}/config.yaml")).node_addr}"
+        port    = "${yamldecode(file("${get_repo_root()}/config/nodes/${local.node_name}/config.yaml")).node_port}"
+        token   = "${get_env("INCUS_TOKEN_${upper(local.node_name)}")}"
+        default = true
+      }
+    }
+  EOF
+}
diff --git a/templates/base/boilerplate.yml b/templates/base/boilerplate.yml
index bbfed08..6c52b22 100644
--- a/templates/base/boilerplate.yml
+++ b/templates/base/boilerplate.yml
@@ -62,9 +62,10 @@ variables:
       - roles::infra::k8s::worker
       - roles::infra::metrics::grafana
       - roles::infra::metrics::prometheus
-      - roles::infra::metrics::vmstorage
+      - roles::infra::metrics::vmagent
       - roles::infra::metrics::vminsert
       - roles::infra::metrics::vmselect
+      - roles::infra::metrics::vmstorage
       - roles::infra::nomad::agent
       - roles::infra::nomad::agentv2
       - roles::infra::nomad::server
-- 
2.47.3