🏗️ Add Prometheus persistent storage configuration

openfun · Jun 4, 2024 · cfa36ef · cfa36ef
1 parent 950822f
commit cfa36ef
Show file tree

Hide file tree

Showing 9 changed files with 66 additions and 30 deletions.
diff --git a/common/prom-grafana-values.yml b/common/prom-grafana-values.yml
@@ -66,5 +66,14 @@ grafana:
       default_home_dashboard_path: /var/lib/grafana/dashboards/k8s/k8s-views-global.json
 prometheus:
   prometheusSpec:
+  %{ if prometheus_persistence_enabled }
+    storageSpec:
+      volumeClaimTemplate:
+        spec:
+          accessModes: ["ReadWriteOnce"]
+          resources:
+            requests:
+              storage: ${prometheus_persistence_size}
+    %{ endif }
     podMonitorSelectorNilUsesHelmValues: false
     serviceMonitorSelectorNilUsesHelmValues: false
diff --git a/common/prometheus-grafana.tf b/common/prometheus-grafana.tf
@@ -12,5 +12,7 @@ resource "helm_release" "kube-prometheus" {
     grafana_admin_password = var.grafana_admin_password
     grafana_persistence_enabled = var.grafana_persistence_enabled
     grafana_persistence_size = var.grafana_persistence_size
+    prometheus_persistence_enabled = var.prometheus_persistence_enabled
+    prometheus_persistence_size = var.prometheus_persistence_size
   })]
 }
diff --git a/common/variables.tf b/common/variables.tf
@@ -87,6 +87,18 @@ variable "grafana_persistence_size" {
   default     = "10Gi"
 }
 
+variable "prometheus_persistence_enabled" {
+  type        = bool
+  description = "Enable Prometheus persistence"
+  default     = false
+}
+
+variable "prometheus_persistence_size" {
+  type        = string
+  description = "Prometheus persistence size"
+  default     = "20Gi"
+}
+
 variable "vault_server_hostname" {
   type        = string
   description = "The hostname to use for the Vault server ingress"

diff --git a/ovh/terraform.tfvars.example b/ovh/terraform.tfvars.example
@@ -39,6 +39,8 @@ grafana_hostname            = "grafana.kubic.example"
 grafana_admin_password      = "change_me"
 grafana_persistence_enabled = true
 grafana_persistence_size    = "10Gi"
+prometheus_persistence_enabled = true
+prometheus_persistence_size    = "20Gi"
 vault_server_hostname       = "vault.kubic.example"
 install_hashicorp_vault     = true
 vault_ui                    = true

diff --git a/ovh/terraform.tfvars.template b/ovh/terraform.tfvars.template
@@ -33,6 +33,8 @@ grafana_hostname=""
 grafana_admin_password=""
 grafana_persistence_enabled =
 grafana_persistence_size    = ""
+prometheus_persistence_enabled =
+prometheus_persistence_size    = ""
 vault_server_hostname=""
 install_hashicorp_vault=true
 vault_ui=true

diff --git a/scaleway/terraform.tfvars.example b/scaleway/terraform.tfvars.example
@@ -36,6 +36,8 @@ grafana_hostname            = "grafana.kubic.example"
 grafana_admin_password      = "change_me"
 grafana_persistence_enabled = true
 grafana_persistence_size    = "10Gi"
+prometheus_persistence_enabled = true
+prometheus_persistence_size    = "20Gi"
 vault_server_hostname       = "vault.kubic.example"
 install_hashicorp_vault     = true
 vault_ui                    = true

diff --git a/scaleway/terraform.tfvars.template b/scaleway/terraform.tfvars.template
@@ -30,6 +30,8 @@ grafana_hostname            = ""
 grafana_admin_password      = ""
 grafana_persistence_enabled =
 grafana_persistence_size    = ""
+prometheus_persistence_enabled =
+prometheus_persistence_size    = ""
 vault_server_hostname       = ""
 install_hashicorp_vault     =
 vault_ui                    =

diff --git a/standalone/terraform.tfvars.example b/standalone/terraform.tfvars.example
@@ -27,6 +27,8 @@ grafana_hostname            = "grafana.kubic.example"
 grafana_admin_password      = "change_me"
 grafana_persistence_enabled = true
 grafana_persistence_size    = "10Gi"
+prometheus_persistence_enabled = true
+prometheus_persistence_size    = "20Gi"
 vault_server_hostname       = "vault.kubic.example"
 install_hashicorp_vault     = true
 vault_ui                    = true

diff --git a/state_bucket/.terraform.lock.hcl b/state_bucket/.terraform.lock.hcl