From 12bef89c9172ea01a61346c548b0612c5fe9dd59 Mon Sep 17 00:00:00 2001 From: Rodrigue Koffi Date: Thu, 17 Aug 2023 17:50:26 +0200 Subject: [PATCH] Drop dead variables for kustomization post build --- modules/eks-monitoring/dashboards.tf | 8 +------- modules/eks-monitoring/main.tf | 1 - modules/eks-monitoring/patterns/istio/main.tf | 3 --- modules/eks-monitoring/patterns/java/main.tf | 3 --- modules/eks-monitoring/patterns/nginx/main.tf | 4 ---- 5 files changed, 1 insertion(+), 18 deletions(-) diff --git a/modules/eks-monitoring/dashboards.tf b/modules/eks-monitoring/dashboards.tf index a427bdcb..0e5785e8 100644 --- a/modules/eks-monitoring/dashboards.tf +++ b/modules/eks-monitoring/dashboards.tf @@ -64,9 +64,6 @@ spec: name: ${local.apiserver_monitoring_config.flux_gitrepository_name} postBuild: substitute: - AMG_AWS_REGION: ${var.managed_prometheus_workspace_region} - AMP_ENDPOINT_URL: ${var.managed_prometheus_workspace_endpoint} - AMG_ENDPOINT_URL: ${var.grafana_url} GRAFANA_APISERVER_BASIC_DASH_URL: ${local.apiserver_monitoring_config.dashboards.basic} GRAFANA_APISERVER_ADVANCED_DASH_URL: ${local.apiserver_monitoring_config.dashboards.advanced} GRAFANA_APISERVER_TROUBLESHOOTING_DASH_URL: ${local.apiserver_monitoring_config.dashboards.troubleshooting} @@ -92,10 +89,7 @@ spec: name: ${local.adothealth_monitoring_config.flux_gitrepository_name} postBuild: substitute: - AMG_AWS_REGION: ${var.managed_prometheus_workspace_region} - AMP_ENDPOINT_URL: ${var.managed_prometheus_workspace_endpoint} - AMG_ENDPOINT_URL: ${var.grafana_url} - GRAFANA_ADOTHEALTH_DASH_URL: ${local.adothealth_monitoring_config.dashboards.grafana_adothealth_dashboard_url} + GRAFANA_ADOTHEALTH_DASH_URL: ${local.adothealth_monitoring_config.dashboards.health} YAML count = var.enable_adotcollector_metrics ? 1 : 0 depends_on = [module.external_secrets] diff --git a/modules/eks-monitoring/main.tf b/modules/eks-monitoring/main.tf index a1fd63b5..9602c898 100644 --- a/modules/eks-monitoring/main.tf +++ b/modules/eks-monitoring/main.tf @@ -209,7 +209,6 @@ module "java_monitoring" { count = var.enable_java ? 1 : 0 pattern_config = coalesce(var.java_config, local.java_pattern_config) - } module "nginx_monitoring" { diff --git a/modules/eks-monitoring/patterns/istio/main.tf b/modules/eks-monitoring/patterns/istio/main.tf index 8e0f48ec..065b75aa 100644 --- a/modules/eks-monitoring/patterns/istio/main.tf +++ b/modules/eks-monitoring/patterns/istio/main.tf @@ -206,9 +206,6 @@ spec: name: ${var.pattern_config.flux_gitrepository_name} postBuild: substitute: - AMG_AWS_REGION: ${var.pattern_config.managed_prometheus_workspace_region} - AMP_ENDPOINT_URL: ${var.pattern_config.managed_prometheus_workspace_endpoint} - AMG_ENDPOINT_URL: ${var.pattern_config.grafana_url} GRAFANA_ISTIO_CP_DASH_URL: ${var.pattern_config.grafana_istio_cp_dashboard_url} GRAFANA_ISTIO_MESH_DASH_URL: ${var.pattern_config.grafana_istio_mesh_dashboard_url} GRAFANA_ISTIO_PERF_DASH_URL: ${var.pattern_config.grafana_istio_performance_dashboard_url} diff --git a/modules/eks-monitoring/patterns/java/main.tf b/modules/eks-monitoring/patterns/java/main.tf index ac286fb1..a28ff6c0 100644 --- a/modules/eks-monitoring/patterns/java/main.tf +++ b/modules/eks-monitoring/patterns/java/main.tf @@ -50,9 +50,6 @@ spec: name: ${var.pattern_config.flux_gitrepository_name} postBuild: substitute: - AMG_AWS_REGION: ${var.pattern_config.managed_prometheus_workspace_region} - AMP_ENDPOINT_URL: ${var.pattern_config.managed_prometheus_workspace_endpoint} - AMG_ENDPOINT_URL: ${var.pattern_config.grafana_url} GRAFANA_JAVA_JMX_DASH_URL: ${var.pattern_config.grafana_dashboard_url} YAML } diff --git a/modules/eks-monitoring/patterns/nginx/main.tf b/modules/eks-monitoring/patterns/nginx/main.tf index 876d4bab..3407e1b2 100644 --- a/modules/eks-monitoring/patterns/nginx/main.tf +++ b/modules/eks-monitoring/patterns/nginx/main.tf @@ -56,10 +56,6 @@ spec: name: ${var.pattern_config.flux_gitrepository_name} postBuild: substitute: - AMG_AWS_REGION: ${var.pattern_config.managed_prometheus_workspace_region} - AMP_ENDPOINT_URL: ${var.pattern_config.managed_prometheus_workspace_endpoint} - AMG_ENDPOINT_URL: ${var.pattern_config.grafana_url} GRAFANA_NGINX_DASH_URL: ${var.pattern_config.grafana_dashboard_url} YAML - }