From 45179135498cc6f6eccd7ec0156d06642b8bc3aa Mon Sep 17 00:00:00 2001 From: Rodrigue Koffi Date: Fri, 18 Aug 2023 10:04:53 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=B9=20Cleanup=20flux=20manifests=20(#2?= =?UTF-8?q?20)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Drop dead variables for kustomization post build * Cleanup istio config variables * Cleanup java and nginx variables * Bump dependencies * Fix tf bug * Pre-commit checks --- modules/eks-monitoring/README.md | 4 +-- .../add-ons/aws-for-fluentbit/README.md | 2 +- .../add-ons/aws-for-fluentbit/main.tf | 2 +- .../add-ons/external-secrets/README.md | 4 +-- .../add-ons/external-secrets/main.tf | 4 +-- modules/eks-monitoring/dashboards.tf | 8 +---- modules/eks-monitoring/locals.tf | 33 ++++++++----------- modules/eks-monitoring/main.tf | 3 +- .../eks-monitoring/patterns/istio/README.md | 2 +- modules/eks-monitoring/patterns/istio/main.tf | 11 +++---- .../patterns/istio/variables.tf | 21 +++++------- .../eks-monitoring/patterns/java/README.md | 2 +- modules/eks-monitoring/patterns/java/main.tf | 3 -- .../eks-monitoring/patterns/java/variables.tf | 8 ++--- .../eks-monitoring/patterns/nginx/README.md | 2 +- modules/eks-monitoring/patterns/nginx/main.tf | 4 --- .../patterns/nginx/variables.tf | 8 ++--- modules/eks-monitoring/variables.tf | 14 ++++---- 18 files changed, 51 insertions(+), 84 deletions(-) diff --git a/modules/eks-monitoring/README.md b/modules/eks-monitoring/README.md index 9817be9..0033b23 100644 --- a/modules/eks-monitoring/README.md +++ b/modules/eks-monitoring/README.md @@ -39,7 +39,7 @@ See examples using this Terraform modules in the **Amazon EKS** section of [this |------|--------|---------| | [external\_secrets](#module\_external\_secrets) | ./add-ons/external-secrets | n/a | | [fluentbit\_logs](#module\_fluentbit\_logs) | ./add-ons/aws-for-fluentbit | n/a | -| [helm\_addon](#module\_helm\_addon) | github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon | v4.32.0 | +| [helm\_addon](#module\_helm\_addon) | github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon | v4.32.1 | | [istio\_monitoring](#module\_istio\_monitoring) | ./patterns/istio | n/a | | [java\_monitoring](#module\_java\_monitoring) | ./patterns/java | n/a | | [nginx\_monitoring](#module\_nginx\_monitoring) | ./patterns/nginx | n/a | @@ -109,7 +109,7 @@ See examples using this Terraform modules in the **Amazon EKS** section of [this | [helm\_config](#input\_helm\_config) | Helm Config for Prometheus | `any` | `{}` | no | | [irsa\_iam\_permissions\_boundary](#input\_irsa\_iam\_permissions\_boundary) | IAM permissions boundary for IRSA roles | `string` | `null` | no | | [irsa\_iam\_role\_path](#input\_irsa\_iam\_role\_path) | IAM role path for IRSA roles | `string` | `"/"` | no | -| [istio\_config](#input\_istio\_config) | Configuration object for ISTIO monitoring | 
object({
    enable_alerting_rules  = bool
    enable_recording_rules = bool
    enable_dashboards      = bool
    scrape_sample_limit    = number

    flux_gitrepository_name   = string
    flux_gitrepository_url    = string
    flux_gitrepository_branch = string
    flux_kustomization_name   = string
    flux_kustomization_path   = string

    grafana_url                             = string
    grafana_istio_cp_dashboard_url          = string
    grafana_istio_mesh_dashboard_url        = string
    grafana_istio_performance_dashboard_url = string
    grafana_istio_service_dashboard_url     = string

    prometheus_metrics_endpoint = string
  })
| `null` | no | +| [istio\_config](#input\_istio\_config) | Configuration object for ISTIO monitoring | 
object({
    enable_alerting_rules  = bool
    enable_recording_rules = bool
    enable_dashboards      = bool
    scrape_sample_limit    = number

    flux_gitrepository_name   = string
    flux_gitrepository_url    = string
    flux_gitrepository_branch = string
    flux_kustomization_name   = string
    flux_kustomization_path   = string

    managed_prometheus_workspace_id = string
    prometheus_metrics_endpoint     = string

    dashboards = object({
      cp          = string
      mesh        = string
      performance = string
      service     = string
    })
  })
| `null` | no | | [java\_config](#input\_java\_config) | Configuration object for Java/JMX monitoring | 
object({
    enable_alerting_rules  = bool
    enable_recording_rules = bool
    enable_dashboards      = bool
    scrape_sample_limit    = number


    flux_gitrepository_name   = string
    flux_gitrepository_url    = string
    flux_gitrepository_branch = string
    flux_kustomization_name   = string
    flux_kustomization_path   = string

    grafana_dashboard_url = string

    prometheus_metrics_endpoint = string
  })
| `null` | no | | [ksm\_config](#input\_ksm\_config) | Kube State metrics configuration | 
object({
    create_namespace   = bool
    k8s_namespace      = string
    helm_chart_name    = string
    helm_chart_version = string
    helm_release_name  = string
    helm_repo_url      = string
    helm_settings      = map(string)
    helm_values        = map(any)

    scrape_interval = string
    scrape_timeout  = string
  })
| 
{
  "create_namespace": true,
  "helm_chart_name": "kube-state-metrics",
  "helm_chart_version": "4.24.0",
  "helm_release_name": "kube-state-metrics",
  "helm_repo_url": "https://prometheus-community.github.io/helm-charts",
  "helm_settings": {},
  "helm_values": {},
  "k8s_namespace": "kube-system",
  "scrape_interval": "60s",
  "scrape_timeout": "15s"
}
| no | | [logs\_config](#input\_logs\_config) | Configuration object for logs collection | 
object({
    cw_log_retention_days = number
  })
| 
{
  "cw_log_retention_days": 90
}
| no | diff --git a/modules/eks-monitoring/add-ons/aws-for-fluentbit/README.md b/modules/eks-monitoring/add-ons/aws-for-fluentbit/README.md index 701d18b..8b37ec6 100644 --- a/modules/eks-monitoring/add-ons/aws-for-fluentbit/README.md +++ b/modules/eks-monitoring/add-ons/aws-for-fluentbit/README.md @@ -24,7 +24,7 @@ See this [Helm Chart](https://github.com/aws/eks-charts/tree/master/stable/aws-f | Name | Source | Version | |------|--------|---------| -| [helm\_addon](#module\_helm\_addon) | github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon | v4.32.0 | +| [helm\_addon](#module\_helm\_addon) | github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon | v4.32.1 | ## Resources diff --git a/modules/eks-monitoring/add-ons/aws-for-fluentbit/main.tf b/modules/eks-monitoring/add-ons/aws-for-fluentbit/main.tf index e0a0dea..126d04a 100644 --- a/modules/eks-monitoring/add-ons/aws-for-fluentbit/main.tf +++ b/modules/eks-monitoring/add-ons/aws-for-fluentbit/main.tf @@ -1,5 +1,5 @@ module "helm_addon" { - source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.32.0" + source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.32.1" manage_via_gitops = var.manage_via_gitops set_values = local.set_values helm_config = local.helm_config diff --git a/modules/eks-monitoring/add-ons/external-secrets/README.md b/modules/eks-monitoring/add-ons/external-secrets/README.md index d2309ee..c2a33c5 100644 --- a/modules/eks-monitoring/add-ons/external-secrets/README.md +++ b/modules/eks-monitoring/add-ons/external-secrets/README.md @@ -23,8 +23,8 @@ This deploys an EKS Cluster with the External Secrets Operator. The cluster is p | Name | Source | Version | |------|--------|---------| -| [cluster\_secretstore\_role](#module\_cluster\_secretstore\_role) | github.com/aws-ia/terraform-aws-eks-blueprints//modules/irsa | v4.32.0 | -| [external\_secrets](#module\_external\_secrets) | github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/external-secrets | v4.32.0 | +| [cluster\_secretstore\_role](#module\_cluster\_secretstore\_role) | github.com/aws-ia/terraform-aws-eks-blueprints//modules/irsa | v4.32.1 | +| [external\_secrets](#module\_external\_secrets) | github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/external-secrets | v4.32.1 | ## Resources diff --git a/modules/eks-monitoring/add-ons/external-secrets/main.tf b/modules/eks-monitoring/add-ons/external-secrets/main.tf index 9a18632..dfd3669 100644 --- a/modules/eks-monitoring/add-ons/external-secrets/main.tf +++ b/modules/eks-monitoring/add-ons/external-secrets/main.tf @@ -1,5 +1,5 @@ module "external_secrets" { - source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/external-secrets?ref=v4.32.0" + source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/external-secrets?ref=v4.32.1" count = var.enable_external_secrets ? 1 : 0 helm_config = var.helm_config @@ -17,7 +17,7 @@ resource "aws_kms_key" "secrets" { } module "cluster_secretstore_role" { - source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/irsa?ref=v4.32.0" + source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/irsa?ref=v4.32.1" kubernetes_namespace = local.namespace create_kubernetes_namespace = false kubernetes_service_account = local.cluster_secretstore_sa diff --git a/modules/eks-monitoring/dashboards.tf b/modules/eks-monitoring/dashboards.tf index a427bdc..0e5785e 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/locals.tf b/modules/eks-monitoring/locals.tf index 059dc41..5b47945 100644 --- a/modules/eks-monitoring/locals.tf +++ b/modules/eks-monitoring/locals.tf @@ -45,12 +45,9 @@ locals { flux_kustomization_name = "grafana-dashboards-java" flux_kustomization_path = "./artifacts/grafana-operator-manifests/eks/java" - managed_prometheus_workspace_id = var.managed_prometheus_workspace_id - managed_prometheus_workspace_region = var.managed_prometheus_workspace_region - managed_prometheus_workspace_endpoint = var.managed_prometheus_workspace_endpoint - prometheus_metrics_endpoint = "/metrics" + managed_prometheus_workspace_id = var.managed_prometheus_workspace_id + prometheus_metrics_endpoint = "/metrics" - grafana_url = var.grafana_url grafana_dashboard_url = "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/java/default.json" } @@ -69,12 +66,9 @@ locals { flux_kustomization_name = "grafana-dashboards-nginx" flux_kustomization_path = "./artifacts/grafana-operator-manifests/eks/nginx" - managed_prometheus_workspace_id = var.managed_prometheus_workspace_id - managed_prometheus_workspace_region = var.managed_prometheus_workspace_region - managed_prometheus_workspace_endpoint = var.managed_prometheus_workspace_endpoint - prometheus_metrics_endpoint = "/metrics" + managed_prometheus_workspace_id = var.managed_prometheus_workspace_id + prometheus_metrics_endpoint = "/metrics" - grafana_url = var.grafana_url grafana_dashboard_url = "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/nginx/nginx.json" } @@ -93,16 +87,15 @@ locals { flux_kustomization_name = "grafana-dashboards-istio" flux_kustomization_path = "./artifacts/grafana-operator-manifests/eks/istio" - managed_prometheus_workspace_id = var.managed_prometheus_workspace_id - managed_prometheus_workspace_region = var.managed_prometheus_workspace_region - managed_prometheus_workspace_endpoint = var.managed_prometheus_workspace_endpoint - prometheus_metrics_endpoint = "/metrics" + managed_prometheus_workspace_id = var.managed_prometheus_workspace_id + prometheus_metrics_endpoint = "/metrics" - grafana_url = var.grafana_url - grafana_istio_cp_dashboard_url = "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/istio/istio-control-plane-dashboard.json" - grafana_istio_mesh_dashboard_url = "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/istio/istio-mesh-dashboard.json" - grafana_istio_performance_dashboard_url = "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/istio/istio-performance-dashboard.json" - grafana_istio_service_dashboard_url = "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/istio/istio-service-dashboard.json" + dashboards = { + cp = "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/istio/istio-control-plane-dashboard.json" + mesh = "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/istio/istio-mesh-dashboard.json" + performance = "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/istio/istio-performance-dashboard.json" + service = "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/istio/istio-service-dashboard.json" + } } apiserver_monitoring_config = { @@ -129,7 +122,7 @@ locals { flux_kustomization_path = "./artifacts/grafana-operator-manifests/eks/adot" dashboards = { - grafana_adothealth_dashboard_url = "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/adot/adothealth.json" + health = "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/adot/adothealth.json" } } } diff --git a/modules/eks-monitoring/main.tf b/modules/eks-monitoring/main.tf index a1fd63b..48358b6 100644 --- a/modules/eks-monitoring/main.tf +++ b/modules/eks-monitoring/main.tf @@ -72,7 +72,7 @@ resource "helm_release" "grafana_operator" { } module "helm_addon" { - source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.32.0" + source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.32.1" helm_config = merge( { @@ -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/README.md b/modules/eks-monitoring/patterns/istio/README.md index fc9feda..cd53b5a 100644 --- a/modules/eks-monitoring/patterns/istio/README.md +++ b/modules/eks-monitoring/patterns/istio/README.md @@ -39,7 +39,7 @@ No modules. | Name | Description | Type | Default | Required | |------|-------------|------|---------|:--------:| -| [pattern\_config](#input\_pattern\_config) | Configuration object for ISTIO monitoring | 
object({
    enable_alerting_rules  = bool
    enable_recording_rules = bool
    scrape_sample_limit    = number

    enable_recording_rules = bool

    enable_dashboards = bool

    flux_gitrepository_name   = string
    flux_gitrepository_url    = string
    flux_gitrepository_branch = string
    flux_kustomization_name   = string
    flux_kustomization_path   = string

    managed_prometheus_workspace_id       = string
    managed_prometheus_workspace_region   = string
    managed_prometheus_workspace_endpoint = string

    grafana_url                             = string
    grafana_istio_cp_dashboard_url          = string
    grafana_istio_mesh_dashboard_url        = string
    grafana_istio_performance_dashboard_url = string
    grafana_istio_service_dashboard_url     = string
  })
| n/a | yes | +| [pattern\_config](#input\_pattern\_config) | Configuration object for ISTIO monitoring | 
object({
    enable_alerting_rules  = bool
    enable_recording_rules = bool
    enable_dashboards      = bool
    scrape_sample_limit    = number

    flux_gitrepository_name   = string
    flux_gitrepository_url    = string
    flux_gitrepository_branch = string
    flux_kustomization_name   = string
    flux_kustomization_path   = string

    managed_prometheus_workspace_id = string
    prometheus_metrics_endpoint     = string

    dashboards = object({
      cp          = string
      mesh        = string
      performance = string
      service     = string
    })
  })
| n/a | yes | ## Outputs diff --git a/modules/eks-monitoring/patterns/istio/main.tf b/modules/eks-monitoring/patterns/istio/main.tf index 8e0f48e..30f5304 100644 --- a/modules/eks-monitoring/patterns/istio/main.tf +++ b/modules/eks-monitoring/patterns/istio/main.tf @@ -206,12 +206,9 @@ 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} - GRAFANA_ISTIO_SERVICE_DASH_URL: ${var.pattern_config.grafana_istio_service_dashboard_url} + GRAFANA_ISTIO_CP_DASH_URL: ${var.pattern_config.dashboards.cp} + GRAFANA_ISTIO_MESH_DASH_URL: ${var.pattern_config.dashboards.mesh} + GRAFANA_ISTIO_PERF_DASH_URL: ${var.pattern_config.dashboards.performance} + GRAFANA_ISTIO_SERVICE_DASH_URL: ${var.pattern_config.dashboards.service} YAML } diff --git a/modules/eks-monitoring/patterns/istio/variables.tf b/modules/eks-monitoring/patterns/istio/variables.tf index 37b4445..65e04f4 100644 --- a/modules/eks-monitoring/patterns/istio/variables.tf +++ b/modules/eks-monitoring/patterns/istio/variables.tf @@ -3,27 +3,24 @@ variable "pattern_config" { type = object({ enable_alerting_rules = bool enable_recording_rules = bool + enable_dashboards = bool scrape_sample_limit = number - enable_recording_rules = bool - - enable_dashboards = bool - flux_gitrepository_name = string flux_gitrepository_url = string flux_gitrepository_branch = string flux_kustomization_name = string flux_kustomization_path = string - managed_prometheus_workspace_id = string - managed_prometheus_workspace_region = string - managed_prometheus_workspace_endpoint = string + managed_prometheus_workspace_id = string + prometheus_metrics_endpoint = string - grafana_url = string - grafana_istio_cp_dashboard_url = string - grafana_istio_mesh_dashboard_url = string - grafana_istio_performance_dashboard_url = string - grafana_istio_service_dashboard_url = string + dashboards = object({ + cp = string + mesh = string + performance = string + service = string + }) }) nullable = false } diff --git a/modules/eks-monitoring/patterns/java/README.md b/modules/eks-monitoring/patterns/java/README.md index a53cbc6..bf7acfe 100644 --- a/modules/eks-monitoring/patterns/java/README.md +++ b/modules/eks-monitoring/patterns/java/README.md @@ -39,7 +39,7 @@ No modules. | Name | Description | Type | Default | Required | |------|-------------|------|---------|:--------:| -| [pattern\_config](#input\_pattern\_config) | Configuration object for Java/JMX monitoring | 
object({
    enable_alerting_rules  = bool
    enable_recording_rules = bool
    scrape_sample_limit    = number

    enable_recording_rules = bool

    enable_dashboards = bool

    flux_gitrepository_name   = string
    flux_gitrepository_url    = string
    flux_gitrepository_branch = string
    flux_kustomization_name   = string
    flux_kustomization_path   = string

    managed_prometheus_workspace_id       = string
    managed_prometheus_workspace_region   = string
    managed_prometheus_workspace_endpoint = string

    grafana_url           = string
    grafana_dashboard_url = string
  })
| n/a | yes | +| [pattern\_config](#input\_pattern\_config) | Configuration object for Java/JMX monitoring | 
object({
    enable_alerting_rules  = bool
    enable_recording_rules = bool
    scrape_sample_limit    = number

    enable_dashboards = bool

    flux_gitrepository_name   = string
    flux_gitrepository_url    = string
    flux_gitrepository_branch = string
    flux_kustomization_name   = string
    flux_kustomization_path   = string

    managed_prometheus_workspace_id = string
    prometheus_metrics_endpoint     = string

    grafana_dashboard_url = string
  })
| n/a | yes | ## Outputs diff --git a/modules/eks-monitoring/patterns/java/main.tf b/modules/eks-monitoring/patterns/java/main.tf index ac286fb..a28ff6c 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/java/variables.tf b/modules/eks-monitoring/patterns/java/variables.tf index 1decc09..96e89bb 100644 --- a/modules/eks-monitoring/patterns/java/variables.tf +++ b/modules/eks-monitoring/patterns/java/variables.tf @@ -5,8 +5,6 @@ variable "pattern_config" { enable_recording_rules = bool scrape_sample_limit = number - enable_recording_rules = bool - enable_dashboards = bool flux_gitrepository_name = string @@ -15,11 +13,9 @@ variable "pattern_config" { flux_kustomization_name = string flux_kustomization_path = string - managed_prometheus_workspace_id = string - managed_prometheus_workspace_region = string - managed_prometheus_workspace_endpoint = string + managed_prometheus_workspace_id = string + prometheus_metrics_endpoint = string - grafana_url = string grafana_dashboard_url = string }) nullable = false diff --git a/modules/eks-monitoring/patterns/nginx/README.md b/modules/eks-monitoring/patterns/nginx/README.md index 06e6ea7..ee3ce93 100644 --- a/modules/eks-monitoring/patterns/nginx/README.md +++ b/modules/eks-monitoring/patterns/nginx/README.md @@ -39,7 +39,7 @@ No modules. | Name | Description | Type | Default | Required | |------|-------------|------|---------|:--------:| -| [pattern\_config](#input\_pattern\_config) | Configuration object for Java/JMX monitoring | 
object({
    enable_alerting_rules  = bool
    enable_recording_rules = bool
    scrape_sample_limit    = number

    enable_recording_rules = bool

    enable_dashboards = bool

    flux_gitrepository_name   = string
    flux_gitrepository_url    = string
    flux_gitrepository_branch = string
    flux_kustomization_name   = string
    flux_kustomization_path   = string

    managed_prometheus_workspace_id       = string
    managed_prometheus_workspace_region   = string
    managed_prometheus_workspace_endpoint = string

    grafana_url           = string
    grafana_dashboard_url = string
  })
| n/a | yes | +| [pattern\_config](#input\_pattern\_config) | Configuration object for Java/JMX monitoring | 
object({
    enable_alerting_rules  = bool
    enable_recording_rules = bool
    scrape_sample_limit    = number

    enable_dashboards = bool

    flux_gitrepository_name   = string
    flux_gitrepository_url    = string
    flux_gitrepository_branch = string
    flux_kustomization_name   = string
    flux_kustomization_path   = string

    managed_prometheus_workspace_id = string
    prometheus_metrics_endpoint     = string

    grafana_dashboard_url = string
  })
| n/a | yes | ## Outputs diff --git a/modules/eks-monitoring/patterns/nginx/main.tf b/modules/eks-monitoring/patterns/nginx/main.tf index 876d4ba..3407e1b 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 - } diff --git a/modules/eks-monitoring/patterns/nginx/variables.tf b/modules/eks-monitoring/patterns/nginx/variables.tf index 1decc09..96e89bb 100644 --- a/modules/eks-monitoring/patterns/nginx/variables.tf +++ b/modules/eks-monitoring/patterns/nginx/variables.tf @@ -5,8 +5,6 @@ variable "pattern_config" { enable_recording_rules = bool scrape_sample_limit = number - enable_recording_rules = bool - enable_dashboards = bool flux_gitrepository_name = string @@ -15,11 +13,9 @@ variable "pattern_config" { flux_kustomization_name = string flux_kustomization_path = string - managed_prometheus_workspace_id = string - managed_prometheus_workspace_region = string - managed_prometheus_workspace_endpoint = string + managed_prometheus_workspace_id = string + prometheus_metrics_endpoint = string - grafana_url = string grafana_dashboard_url = string }) nullable = false diff --git a/modules/eks-monitoring/variables.tf b/modules/eks-monitoring/variables.tf index 531ca18..744c1d4 100644 --- a/modules/eks-monitoring/variables.tf +++ b/modules/eks-monitoring/variables.tf @@ -351,13 +351,15 @@ variable "istio_config" { flux_kustomization_name = string flux_kustomization_path = string - grafana_url = string - grafana_istio_cp_dashboard_url = string - grafana_istio_mesh_dashboard_url = string - grafana_istio_performance_dashboard_url = string - grafana_istio_service_dashboard_url = string + managed_prometheus_workspace_id = string + prometheus_metrics_endpoint = string - prometheus_metrics_endpoint = string + dashboards = object({ + cp = string + mesh = string + performance = string + service = string + }) }) # defaults are pre-computed in locals.tf, provide a full definition to override