From 783654c76d14f7f66e4336c9156ae89e272ace50 Mon Sep 17 00:00:00 2001
From: mcgin314 <luther.coleman.mcginty@census.gov>
Date: Thu, 27 Feb 2025 11:39:35 -0500
Subject: [PATCH 1/2] Move to kube-system namespace

---
 main.tf           | 12 ++++++++----
 tempo_values.yaml |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/main.tf b/main.tf
index b0cb5dd..1df9024 100644
--- a/main.tf
+++ b/main.tf
@@ -46,12 +46,12 @@ resource "helm_release" "tempo" {
   timeout          = 300
 
   set {
-    name  = "tempo.storage.trace.s3.insecure"
-    value = "false"
+    name  = "replicas"
+    value = "3"
   }
   set {
-    name  = "tempo.replicas"
-    value = "2"
+    name  = "tempo.storage.trace.s3.insecure"
+    value = "false"
   }
   set {
     name = "tempo.repository"
@@ -72,6 +72,10 @@ resource "helm_release" "tempo" {
     name  = "tempo.storage.trace.s3.endpoint"
     value = "s3.${var.region}.amazonaws.com"
   }
+  set {
+    name  = "tempo.metricsGenerator.enabled"
+    value = true
+  }
   set {
     name  = "tempo.metricsGenerator.remoteWriteUrl"
     value = "http://${var.prometheus_svc}.${var.prometheus_namespace}:${var.prometheus_port}/api/v1/write"
diff --git a/tempo_values.yaml b/tempo_values.yaml
index 8be8c8b..24b0ce7 100644
--- a/tempo_values.yaml
+++ b/tempo_values.yaml
@@ -1,4 +1,3 @@
----
 tempo:
   storage:
     trace:
@@ -10,6 +9,7 @@ tempo:
       value: "9411"
   metricsGenerator:
     enabled: true
+    remoteWriteUrl: http://prometheus-server.prometheus:80/api/v1/write
   reportingEnabled: false
 
 serviceAccount:

From d17fd8ddfebad55ae14a995eab2ec8eaf14e526b Mon Sep 17 00:00:00 2001
From: mcgin314 <luther.coleman.mcginty@census.gov>
Date: Thu, 6 Mar 2025 13:51:16 -0500
Subject: [PATCH 2/2] Fix port number and add service to outputs

---
 main.tf    | 4 ++++
 outputs.tf | 9 +++++++++
 2 files changed, 13 insertions(+)

diff --git a/main.tf b/main.tf
index 1df9024..d5375e6 100644
--- a/main.tf
+++ b/main.tf
@@ -2,6 +2,10 @@ locals {
   oidc_arn   = var.oidc_provider_arn
   tags       = var.tags
   account_id = var.account_id
+
+  tempo_internal_hostname    = format("tempo.%v.svc.cluster.local", var.namespace)
+  tempo_internal_port_number = 3100
+  tempo_internal_url         = format("http://%v:%v/", local.tempo_internal_hostname, local.tempo_internal_port_number)
 }
 
 ################################################################################
diff --git a/outputs.tf b/outputs.tf
index b999ac9..cab42f5 100644
--- a/outputs.tf
+++ b/outputs.tf
@@ -2,6 +2,15 @@
 # Module information
 ################################################################################
 
+output "tempo_internal_endpoint" {
+  description = "internal endpoint for prometheus"
+  value = {
+    hostname    = local.tempo_internal_hostname
+    port_number = local.tempo_internal_port_number
+    url         = local.tempo_internal_url
+  }
+} 
+
 output "module_name" {
   description = "The name of this module."
   value       = local.module_name