add otel

SCT-Engineering · Apr 18, 2025 · 6fd3843 · 6fd3843
1 parent 1726a12
commit 6fd3843
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 17 deletions.
diff --git a/lab/_envcommon/common-variables.hcl b/lab/_envcommon/common-variables.hcl
@@ -6,8 +6,8 @@
 # that are common across all environments/accounts.
 # ---------------------------------------------------------------------------------------------------------------------
 locals {
-  state_bucket_prefix   = "inf-tfstate"
-  state_table_name      = "tf_remote_state"
+  state_bucket_prefix = "inf-tfstate"
+  state_table_name    = "tf_remote_state"
   route53_endpoints = {
     route53_main = {
       "account_id"    = "269244441389"
@@ -17,8 +17,8 @@ locals {
     }
   }
   eecr_account_id = local.enterprise_ecr_account.lab["account_id"]
-  eecr_alias = local.enterprise_ecr_account.lab["alias"]
-  eecr_profile = format("%v-%v", local.eecr_account_id, local.eecr_alias)
+  eecr_alias      = local.enterprise_ecr_account.lab["alias"]
+  eecr_profile    = format("%v-%v", local.eecr_account_id, local.eecr_alias)
   enterprise_ecr_account = {
     lab = {
       "account_id" = "269222635945"

diff --git a/lab/_envcommon/default-versions.hcl b/lab/_envcommon/default-versions.hcl
@@ -14,18 +14,18 @@ locals {
   #####################
   # Module Enablement
   #####################
-  
+
   # Core modules that should always be enabled (cannot be disabled)
   core_modules = [
     "eks",
     "eks-karpenter",
     "eks-config",
-    "eks-metrics-server", 
+    "eks-metrics-server",
     "eks-cert-manager",
     "eks-istio",
     "eks-dns",
   ]
-  
+
   # Optional modules with their default enablement state
   enabled_modules = {
     "eks-arcgis"        = false
@@ -139,7 +139,7 @@ locals {
   keycloak_username      = "keycloak"
   keycloak_password      = "this is my very secure and totally random password horse battery staple now"
   postgresql_tag         = "17.4.0-debian-12-r2"
-  utilities_tag              = "1.0.3"
+  utilities_tag          = "1.0.3"
 
   ################
   # Kiali
@@ -164,6 +164,15 @@ locals {
   metrics_server_helm_chart = "3.12.2"
   metrics_server_tag        = "v0.7.2"
 
+  ################
+  # Open Telemetry
+  ################
+  auto_instrumentation_java_version = "2.9.0"
+  collector_version                 = "0.111.0-amd64"
+  collector_contrib_version         = "0.113.0-amd64"
+  otel_version                      = "0.110.0"
+  rbac_proxy_version                = "v0.18.1"
+
   ################
   # PostgreSQL
   ################

diff --git a/lab/root.hcl b/lab/root.hcl
@@ -24,10 +24,10 @@ locals {
   # Automatically load vpc-level variables
   vpc_vars = read_terragrunt_config(find_in_parent_folders("vpc.hcl"))
 
- root_locals_for_inputs = {
-    is_module_enabled     = local.is_module_enabled
-    module_name           = local.module_name
-    eecr_profile          = local.eecr_profile
+  root_locals_for_inputs = {
+    is_module_enabled = local.is_module_enabled
+    module_name       = local.module_name
+    eecr_profile      = local.eecr_profile
     # Add any other locals you want to expose
     # only expose things not already included via local.xxx_vars.locals.*
   }
@@ -50,11 +50,11 @@ locals {
     local.versions.locals.enabled_modules,
     local.module_overrides
   )
-  module_name           = basename(get_original_terragrunt_dir())
-  module_overrides      = local.cluster_vars.locals.module_enablement_overrides
-  organization          = local.cluster_vars.locals.organization
-  state_bucket_prefix   = local.common_vars.locals.state_bucket_prefix
-  state_table_name      = local.common_vars.locals.state_table_name
+  module_name         = basename(get_original_terragrunt_dir())
+  module_overrides    = local.cluster_vars.locals.module_enablement_overrides
+  organization        = local.cluster_vars.locals.organization
+  state_bucket_prefix = local.common_vars.locals.state_bucket_prefix
+  state_table_name    = local.common_vars.locals.state_table_name
 }
 
 # Only generate providers for non-EKS modules