From 76b738e28429502eb64f138fab65a1737bab1169 Mon Sep 17 00:00:00 2001
From: Alex Bance <abance@bancey.xyz>
Date: Wed, 9 Oct 2024 20:30:11 +0100
Subject: [PATCH] fix: correct issues with Grafana cloud monitoring

---
 kubernetes/apps/base/grafana-cloud-monitoring/release.yaml | 3 +++
 terraform/modules/proxmox-vm/inputs-optional.tf            | 6 ++++++
 terraform/modules/proxmox-vm/vm.tf                         | 1 +
 3 files changed, 10 insertions(+)

diff --git a/kubernetes/apps/base/grafana-cloud-monitoring/release.yaml b/kubernetes/apps/base/grafana-cloud-monitoring/release.yaml
index b4f543b6..1aa8c977 100644
--- a/kubernetes/apps/base/grafana-cloud-monitoring/release.yaml
+++ b/kubernetes/apps/base/grafana-cloud-monitoring/release.yaml
@@ -83,6 +83,9 @@ spec:
         exporter:
           defaultClusterId: my-cluster
         prometheus:
+          existingSecretName: grafana-cloud-monitoring
+          username_key: prometheus-username
+          password_key: prometheus-password
           external:
             url: prometheus-api-url
     kube-state-metrics:
diff --git a/terraform/modules/proxmox-vm/inputs-optional.tf b/terraform/modules/proxmox-vm/inputs-optional.tf
index 7ba2fd89..9b438c2a 100644
--- a/terraform/modules/proxmox-vm/inputs-optional.tf
+++ b/terraform/modules/proxmox-vm/inputs-optional.tf
@@ -40,6 +40,12 @@ variable "cpu_architecture" {
   default     = "x86_64"
 }
 
+variable "cpu_type" {
+  type        = string
+  description = "The type to use for the CPU. Defaults to host."
+  default     = "host"
+}
+
 variable "gateway_ip_address" {
   type        = string
   description = "The IP address of the gateway."
diff --git a/terraform/modules/proxmox-vm/vm.tf b/terraform/modules/proxmox-vm/vm.tf
index 996fc158..89d349a6 100644
--- a/terraform/modules/proxmox-vm/vm.tf
+++ b/terraform/modules/proxmox-vm/vm.tf
@@ -30,6 +30,7 @@ resource "proxmox_virtual_environment_vm" "vm" {
     cores        = var.cpu_cores
     sockets      = var.cpu_sockets
     architecture = var.cpu_architecture
+    type         = var.cpu_type
   }
 
   memory {