make grafana work again

SCT-Engineering · Mar 11, 2025 · b4a73f8 · b4a73f8
1 parent 926307c
commit b4a73f8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/lab/_envcommon/default-versions.hcl b/lab/_envcommon/default-versions.hcl
@@ -60,10 +60,11 @@ locals {
   ################
   # Grafana
   ################
-  download_dashboards_image_tag = "stable"
-  grafana_chart_version         = "8.10.1"
-  grafana_hostname              = "grafana"
-  grafana_tag                   = "11.5.2"
+  grafana_hostname               = "grafana"
+  grafana_operator_chart_version = "4.9.7"
+  grafana_operator_tag           = "5.16.0"
+  grafana_tag                    = "11.5.2"
+  os_shell_image_tag             = "12"
 
   ################
   # Istio
@@ -81,8 +82,8 @@ locals {
   ################
   # Karpenter
   ################
-  karpenter_helm_chart = "1.2.2"
-  karpenter_tag        = "1.2.2"
+  karpenter_helm_chart = "1.3.1"
+  karpenter_tag        = "1.3.1"
 
   ################
   # Keycloak

diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-grafana/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-grafana/terragrunt.hcl
@@ -54,9 +54,10 @@ inputs = {
   rwo_storage_class = dependency.eks_loki.outputs.rwo_storage_class
 
   # Grafana Configuration
-  grafana_chart_version         = include.root.inputs.grafana_chart_version
-  grafana_tag                   = include.root.inputs.grafana_tag
-  download_dashboards_image_tag = include.root.inputs.download_dashboards_image_tag
-  namespace                     = include.root.inputs.namespaces["grafana"]
-  service_name                  = "grafana"
+  grafana_operator_chart_version = include.root.inputs.grafana_operator_chart_version
+  grafana_operator_tag           = include.root.inputs.grafana_operator_tag
+  grafana_tag                    = include.root.inputs.grafana_tag
+  namespace                      = include.root.inputs.namespaces["grafana"]
+  os_shell_image_tag             = include.root.inputs.os_shell_image_tag
+  service_name                   = "grafana"
 }