Drop dead variables for kustomization post build

aws-observability · Aug 17, 2023 · 12bef89 · 12bef89
1 parent 6ca939d
commit 12bef89
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 18 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
-
 }