From 4df9c8c4681d13fcf00af43cc34e23300024d8b9 Mon Sep 17 00:00:00 2001 From: mcgin314 Date: Wed, 26 Feb 2025 16:43:59 -0500 Subject: [PATCH 1/2] Move to telemetry namespace --- main.tf | 19 +++++-------------- outputs.tf | 2 +- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/main.tf b/main.tf index 12cdc83..c1334d1 100644 --- a/main.tf +++ b/main.tf @@ -1,37 +1,28 @@ locals { - alertmanager_internal_hostname = format("prometheus-alertmanager.%v.svc.cluster.local", kubernetes_namespace.ns.metadata[0].name) + alertmanager_internal_hostname = format("prometheus-alertmanager.%v.svc.cluster.local", var.namespace) alertmanager_internal_port_number = 9093 alertmanager_internal_url = format("http://%v:%v/", local.alertmanager_internal_hostname, local.alertmanager_internal_port_number) - headless_alertmanager_internal_hostname = format("prometheus-alertmanager-headless.%v.svc.cluster.local", kubernetes_namespace.ns.metadata[0].name) + headless_alertmanager_internal_hostname = format("prometheus-alertmanager-headless.%v.svc.cluster.local", var.namespace) headless_alertmanager_internal_port_number = 9093 headless_alertmanager_internal_url = format("http://%v:%v/", local.alertmanager_internal_hostname, local.alertmanager_internal_port_number) - pushgateway_internal_hostname = format("prometheus-prometheus-pushgateway.%v.svc.cluster.local", kubernetes_namespace.ns.metadata[0].name) + pushgateway_internal_hostname = format("prometheus-prometheus-pushgateway.%v.svc.cluster.local", var.namespace) pushgateway_internal_port_number = 9091 pushgateway_internal_url = format("http://%v:%v/", local.pushgateway_internal_hostname, local.pushgateway_internal_port_number) - server_internal_hostname = format("prometheus-server.%v.svc.cluster.local", kubernetes_namespace.ns.metadata[0].name) + server_internal_hostname = format("prometheus-server.%v.svc.cluster.local", var.namespace) server_internal_port_number = 9090 server_internal_url = format("http://%v:%v/", local.server_internal_hostname, local.server_internal_port_number) } -resource "kubernetes_namespace" "ns" { - metadata { - name = var.namespace - labels = { - istio-injection = "enabled" - } - } -} - resource "helm_release" "prometheus" { depends_on = [ module.images, ] chart = "prometheus" name = "prometheus" - namespace = kubernetes_namespace.ns.metadata[0].name + namespace = var.namespace version = var.prometheus_chart_version repository = "https://prometheus-community.github.io/helm-charts" diff --git a/outputs.tf b/outputs.tf index ac3c50c..ad7d38c 100644 --- a/outputs.tf +++ b/outputs.tf @@ -36,7 +36,7 @@ output "prometheus_server_internal_endpoint" { output "prometheus_namespace" { description = "namespace for prometheus" - value = kubernetes_namespace.ns.metadata[0].name + value = var.namespace } ################################################################################ From e656ce4722612f3c9f1a029521c6d270026748ed Mon Sep 17 00:00:00 2001 From: mcgin314 Date: Thu, 6 Mar 2025 13:44:11 -0500 Subject: [PATCH 2/2] Fix port number on server output --- main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.tf b/main.tf index c1334d1..c1c7b09 100644 --- a/main.tf +++ b/main.tf @@ -12,7 +12,7 @@ locals { pushgateway_internal_url = format("http://%v:%v/", local.pushgateway_internal_hostname, local.pushgateway_internal_port_number) server_internal_hostname = format("prometheus-server.%v.svc.cluster.local", var.namespace) - server_internal_port_number = 9090 + server_internal_port_number = 80 server_internal_url = format("http://%v:%v/", local.server_internal_hostname, local.server_internal_port_number) }