From d740403d7bc45f8a1c7afad9c9c2c6c573650fe0 Mon Sep 17 00:00:00 2001 From: Rodrigue Koffi Date: Wed, 7 Sep 2022 12:41:45 +0200 Subject: [PATCH] Pre commit fixes --- .../README.md | 16 +++++++--------- .../existing-cluster-with-base-and-infra/main.tf | 14 ++++---------- .../outputs.tf | 14 ++++++++------ .../variables.tf | 16 +++------------- 4 files changed, 22 insertions(+), 38 deletions(-) diff --git a/examples/existing-cluster-with-base-and-infra/README.md b/examples/existing-cluster-with-base-and-infra/README.md index adc4b8b..cf5e4b1 100644 --- a/examples/existing-cluster-with-base-and-infra/README.md +++ b/examples/existing-cluster-with-base-and-infra/README.md @@ -131,7 +131,7 @@ add this `managed_prometheus_region=xxx` and `managed_prometheus_workspace_id=ws | Name | Version | |------|---------| -| [grafana](#requirement\_grafana) | 1.25.0 | +| [grafana](#requirement\_grafana) | >= 1.25.0 | ## Providers @@ -160,11 +160,9 @@ add this `managed_prometheus_region=xxx` and `managed_prometheus_workspace_id=ws | [aws\_region](#input\_aws\_region) | AWS Region | `string` | n/a | yes | | [eks\_cluster\_id](#input\_eks\_cluster\_id) | EKS Cluster Id | `string` | n/a | yes | | [grafana\_api\_key](#input\_grafana\_api\_key) | API key for authorizing the Grafana provider to make changes to Amazon Managed Grafana | `string` | `""` | no | -| [grafana\_endpoint](#input\_grafana\_endpoint) | AMG endpoint | `string` | `null` | no | -| [managed\_grafana\_workspace\_id](#input\_managed\_grafana\_workspace\_id) | Amazon Managed Grafana (AMG) workspace ID | `string` | `""` | no | -| [managed\_prometheus\_endpoint](#input\_managed\_prometheus\_endpoint) | AMP workspace ID | `string` | `""` | no | -| [managed\_prometheus\_region](#input\_managed\_prometheus\_region) | Region where AMP is deployed | `string` | `""` | no | -| [managed\_prometheus\_workspace\_id](#input\_managed\_prometheus\_workspace\_id) | Amazon Managed Service for Prometheus (AMP) workspace ID | `string` | `""` | no | +| [managed\_grafana\_workspace\_id](#input\_managed\_grafana\_workspace\_id) | Amazon Managed Grafana Workspace ID | `string` | `""` | no | +| [managed\_prometheus\_endpoint](#input\_managed\_prometheus\_endpoint) | Amazon Managed Service for Prometheus Workspace ID | `string` | `""` | no | +| [managed\_prometheus\_workspace\_id](#input\_managed\_prometheus\_workspace\_id) | Amazon Managed Service for Prometheus Workspace ID | `string` | `""` | no | ## Outputs @@ -172,7 +170,7 @@ add this `managed_prometheus_region=xxx` and `managed_prometheus_workspace_id=ws |------|-------------| | [aws\_region](#output\_aws\_region) | AWS Region | | [eks\_cluster\_id](#output\_eks\_cluster\_id) | EKS Cluster Id | -| [eks\_cluster\_version](#output\_eks\_cluster\_version) | n/a | -| [prometheus\_endpoint](#output\_prometheus\_endpoint) | n/a | -| [prometheus\_id](#output\_prometheus\_id) | n/a | +| [eks\_cluster\_version](#output\_eks\_cluster\_version) | EKS Cluster version | +| [managed\_prometheus\_workspace\_endpoint](#output\_managed\_prometheus\_workspace\_endpoint) | Amazon Managed Prometheus workspace endpoint | +| [managed\_prometheus\_workspace\_id](#output\_managed\_prometheus\_workspace\_id) | Amazon Managed Prometheus workspace ID | diff --git a/examples/existing-cluster-with-base-and-infra/main.tf b/examples/existing-cluster-with-base-and-infra/main.tf index 81232a1..677c54a 100644 --- a/examples/existing-cluster-with-base-and-infra/main.tf +++ b/examples/existing-cluster-with-base-and-infra/main.tf @@ -34,15 +34,9 @@ terraform { } locals { - name = basename(path.cwd) - region = var.aws_region - - eks_oidc_issuer_url = replace(data.aws_eks_cluster.this.identity[0].oidc[0].issuer, "https://", "") + region = var.aws_region eks_cluster_endpoint = data.aws_eks_cluster.this.endpoint - eks_cluster_version = data.aws_eks_cluster.this.version - create_new_workspace = var.managed_prometheus_workspace_id == "" ? true : false - tags = { Source = "github.com/aws-observability/terraform-aws-observability-accelerator" } @@ -62,14 +56,14 @@ module "eks_observability_accelerator" { # reusing existing certificate manager? defaults to true enable_cert_manager = true - # creates a new AMP workspace, defaults to true + # creates a new Amazon Managed Prometheus workspace, defaults to true enable_managed_prometheus = local.create_new_workspace - # reusing existing AMP if specified + # reusing existing Amazon Managed Prometheus if specified managed_prometheus_workspace_id = var.managed_prometheus_workspace_id managed_prometheus_workspace_region = null # defaults to the current region, useful for cross region scenarios (same account) - # sets up the AMP alert manager at the workspace level + # sets up the Amazon Managed Prometheus alert manager at the workspace level enable_alertmanager = true # reusing existing Amazon Managed Grafana workspace diff --git a/examples/existing-cluster-with-base-and-infra/outputs.tf b/examples/existing-cluster-with-base-and-infra/outputs.tf index 8638710..5df79f3 100644 --- a/examples/existing-cluster-with-base-and-infra/outputs.tf +++ b/examples/existing-cluster-with-base-and-infra/outputs.tf @@ -9,14 +9,16 @@ output "aws_region" { } output "eks_cluster_version" { - value = module.eks_observability_accelerator.eks_cluster_version + description = "EKS Cluster version" + value = module.eks_observability_accelerator.eks_cluster_version } - -output "prometheus_endpoint" { - value = module.eks_observability_accelerator.managed_prometheus_workspace_endpoint +output "managed_prometheus_workspace_endpoint" { + description = "Amazon Managed Prometheus workspace endpoint" + value = module.eks_observability_accelerator.managed_prometheus_workspace_endpoint } -output "prometheus_id" { - value = module.eks_observability_accelerator.managed_prometheus_workspace_id +output "managed_prometheus_workspace_id" { + description = "Amazon Managed Prometheus workspace ID" + value = module.eks_observability_accelerator.managed_prometheus_workspace_id } diff --git a/examples/existing-cluster-with-base-and-infra/variables.tf b/examples/existing-cluster-with-base-and-infra/variables.tf index d89a6ef..3256da4 100644 --- a/examples/existing-cluster-with-base-and-infra/variables.tf +++ b/examples/existing-cluster-with-base-and-infra/variables.tf @@ -7,30 +7,20 @@ variable "aws_region" { type = string } variable "managed_prometheus_workspace_id" { - description = "Amazon Managed Service for Prometheus (AMP) workspace ID" + description = "Amazon Managed Service for Prometheus Workspace ID" type = string default = "" } variable "managed_prometheus_endpoint" { - description = "AMP workspace ID" - type = string - default = "" -} -variable "managed_prometheus_region" { - description = "Region where AMP is deployed" + description = "Amazon Managed Service for Prometheus Workspace ID" type = string default = "" } variable "managed_grafana_workspace_id" { - description = "Amazon Managed Grafana (AMG) workspace ID" + description = "Amazon Managed Grafana Workspace ID" type = string default = "" } -variable "grafana_endpoint" { - description = "AMG endpoint" - type = string - default = null -} variable "grafana_api_key" { description = "API key for authorizing the Grafana provider to make changes to Amazon Managed Grafana" type = string