Skip to content

Commit a16cf6c

Browse files
committed
Update wording
1 parent 703e3d5 commit a16cf6c

File tree

4 files changed

+8
-14
lines changed

4 files changed

+8
-14
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ If you are interested in contributing to EKS Blueprints, see the Contribution (h
150150
| Name | Description | Type | Default | Required |
151151
|------|-------------|------|---------|:--------:|
152152
| <a name="input_aws_region"></a> [aws\_region](#input\_aws\_region) | AWS Region | `string` | n/a | yes |
153-
| <a name="input_eks_cluster_id"></a> [eks\_cluster\_id](#input\_eks\_cluster\_id) | EKS Cluster Id | `string` | n/a | yes |
153+
| <a name="input_eks_cluster_id"></a> [eks\_cluster\_id](#input\_eks\_cluster\_id) | Name of the EKS cluster | `string` | n/a | yes |
154154
| <a name="input_enable_alertmanager"></a> [enable\_alertmanager](#input\_enable\_alertmanager) | Creates Amazon Managed Service for Prometheus AlertManager for all workloads | `bool` | `false` | no |
155155
| <a name="input_enable_amazon_eks_adot"></a> [enable\_amazon\_eks\_adot](#input\_enable\_amazon\_eks\_adot) | Enables the ADOT Operator on the EKS Cluster | `bool` | `true` | no |
156156
| <a name="input_enable_cert_manager"></a> [enable\_cert\_manager](#input\_enable\_cert\_manager) | Allow reusing an existing installation of cert-manager | `bool` | `true` | no |

examples/existing-cluster-with-base-and-infra/README.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ terraform init
4242

4343
3. AWS Region
4444

45-
Specify the AWS Region where the resources will be deployed. Edit the `terraform.tfvars` file and add `aws_region="..."`. You can also use environement variables `export TF_VAR_aws_region=xxx`.
45+
Specify the AWS Region where the resources will be deployed. Edit the `terraform.tfvars` file and modify `aws_region="..."`. You can also use environement variables `export TF_VAR_aws_region=xxx`.
4646

4747
4. EKS Cluster
4848

@@ -93,7 +93,7 @@ terraform apply
9393

9494
1. Prometheus datasource on Grafana
9595

96-
Open your Grafana workspace and under Configuration -> Data sources, you should see `aws-observability-accelerator`. Open and click `Save & test`. You should see a notification confirming that the AMP workspace is ready to be used on Grafana.
96+
Open your Grafana workspace and under Configuration -> Data sources, you should see `aws-observability-accelerator`. Open and click `Save & test`. You should see a notification confirming that the Amazon Managed Service for Prometheus workspace is ready to be used on Grafana.
9797

9898
2. Grafana dashboards
9999

@@ -105,9 +105,9 @@ Open a specific dashboard and you should be able to view its visualization
105105

106106
<img width="1721" alt="Screenshot 2022-08-30 at 20 01 32" src="https://user-images.githubusercontent.com/10175027/187515925-67864dd1-2b35-4be0-a15e-1e36805e8b29.png">
107107

108-
2. Amazon Managed Service for Prometheus (AMP) rules and alerts
108+
2. Amazon Managed Service for Prometheus rules and alerts
109109

110-
Open the AMP console and view the details of your workspace. Under the `Rules management` tab, you should find new rules deployed.
110+
Open the Amazon Managed Service for Prometheus console and view the details of your workspace. Under the `Rules management` tab, you should find new rules deployed.
111111

112112
<img width="1311" alt="Screenshot 2022-08-30 at 20 22 27" src="https://user-images.githubusercontent.com/10175027/187514450-0f70b5ce-b2ee-4712-850c-c2b32db1d8d6.png">
113113

@@ -158,10 +158,9 @@ add this `managed_prometheus_region=xxx` and `managed_prometheus_workspace_id=ws
158158
| Name | Description | Type | Default | Required |
159159
|------|-------------|------|---------|:--------:|
160160
| <a name="input_aws_region"></a> [aws\_region](#input\_aws\_region) | AWS Region | `string` | n/a | yes |
161-
| <a name="input_eks_cluster_id"></a> [eks\_cluster\_id](#input\_eks\_cluster\_id) | EKS Cluster Id | `string` | n/a | yes |
161+
| <a name="input_eks_cluster_id"></a> [eks\_cluster\_id](#input\_eks\_cluster\_id) | Name of the EKS cluster | `string` | n/a | yes |
162162
| <a name="input_grafana_api_key"></a> [grafana\_api\_key](#input\_grafana\_api\_key) | API key for authorizing the Grafana provider to make changes to Amazon Managed Grafana | `string` | `""` | no |
163163
| <a name="input_managed_grafana_workspace_id"></a> [managed\_grafana\_workspace\_id](#input\_managed\_grafana\_workspace\_id) | Amazon Managed Grafana Workspace ID | `string` | `""` | no |
164-
| <a name="input_managed_prometheus_endpoint"></a> [managed\_prometheus\_endpoint](#input\_managed\_prometheus\_endpoint) | Amazon Managed Service for Prometheus Workspace ID | `string` | `""` | no |
165164
| <a name="input_managed_prometheus_workspace_id"></a> [managed\_prometheus\_workspace\_id](#input\_managed\_prometheus\_workspace\_id) | Amazon Managed Service for Prometheus Workspace ID | `string` | `""` | no |
166165

167166
## Outputs

examples/existing-cluster-with-base-and-infra/variables.tf

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
variable "eks_cluster_id" {
2-
description = "EKS Cluster Id"
2+
description = "Name of the EKS cluster"
33
type = string
44
}
55
variable "aws_region" {
@@ -11,11 +11,6 @@ variable "managed_prometheus_workspace_id" {
1111
type = string
1212
default = ""
1313
}
14-
variable "managed_prometheus_endpoint" {
15-
description = "Amazon Managed Service for Prometheus Workspace ID"
16-
type = string
17-
default = ""
18-
}
1914
variable "managed_grafana_workspace_id" {
2015
description = "Amazon Managed Grafana Workspace ID"
2116
type = string

variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
variable "eks_cluster_id" {
2-
description = "EKS Cluster Id"
2+
description = "Name of the EKS cluster"
33
type = string
44
}
55

0 commit comments

Comments
 (0)