Skip to content

Commit 19ea812

Browse files
authored
Improve base module docs (#108)
* Improve base module docs * Update readme and concepts - Encourage release tags - make grafana_api_key as required * Update wording
1 parent 2e3011d commit 19ea812

File tree

3 files changed

+42
-27
lines changed

3 files changed

+42
-27
lines changed

README.md

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,34 +33,41 @@ to enable monitoring to an existing EKS cluster.
3333
The base module allows you to configure the AWS Observability services for your cluster and
3434
the AWS Distro for OpenTelemetry (ADOT) Operator as the signals collection mechanism.
3535

36-
This is the minimum configuration to have a new Managed Grafana Workspace, Amazon Managed
37-
Service for Prometheus Workspace, ADOT Operator deployed for you and ready to receive your
38-
data.
36+
This is the minimum configuration to have a new Amazon Managed Service for Prometheus Workspace
37+
and ADOT Operator deployed for you and ready to receive your data.
38+
The base module serve as an anchor to the workload modules and cannot run on its own.
3939

4040
```hcl
4141
module "eks_observability_accelerator" {
42-
source = "aws-observability/terraform-aws-observability-accelerator"
43-
aws_region = "eu-west-1"
42+
# use release tags and check for the latest versions
43+
# https://github.com/aws-observability/terraform-aws-observability-accelerator/releases
44+
source = "github.com/aws-observability/terraform-aws-observability-accelerator?ref=v1.6.1
45+
46+
aws_region = "eu-west-1"
4447
eks_cluster_id = "my-eks-cluster"
48+
49+
# As Grafana shares a different lifecycle, it's best to use an existing workspace.
50+
managed_grafana_workspace_id = var.managed_grafana_workspace_id
51+
grafana_api_key = var.grafana_api_key
4552
}
4653
```
4754

48-
You can optionally reuse existing Workspaces:
55+
You can optionally reuse an existing Amazon Managed Servce for Prometheus Workspace:
4956

5057
```hcl
5158
module "eks_observability_accelerator" {
52-
source = "aws-observability/terraform-aws-observability-accelerator"
53-
aws_region = "eu-west-1"
59+
# use release tags and check for the latest versions
60+
# https://github.com/aws-observability/terraform-aws-observability-accelerator/releases
61+
source = "github.com/aws-observability/terraform-aws-observability-accelerator?ref=v1.6.1
62+
63+
aws_region = "eu-west-1"
5464
eks_cluster_id = "my-eks-cluster"
5565
5666
# prevents creation of a new Amazon Managed Prometheus workspace
5767
enable_managed_prometheus = false
5868
5969
# reusing existing Amazon Managed Prometheus Workspace
60-
managed_prometheus_workspace_id = "ws-abcd123..."
61-
62-
# prevents creation of a new Amazon Managed Grafana workspace
63-
enable_managed_grafana = false
70+
managed_prometheus_workspace_id = "ws-abcd123..."
6471
6572
managed_grafana_workspace_id = "g-abcdef123"
6673
grafana_api_key = var.grafana_api_key
@@ -163,8 +170,8 @@ If you are interested in contributing, see the [Contribution guide](https://gith
163170
| <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 |
164171
| <a name="input_enable_managed_grafana"></a> [enable\_managed\_grafana](#input\_enable\_managed\_grafana) | Creates a new Amazon Managed Grafana Workspace | `bool` | `true` | no |
165172
| <a name="input_enable_managed_prometheus"></a> [enable\_managed\_prometheus](#input\_enable\_managed\_prometheus) | Creates a new Amazon Managed Service for Prometheus Workspace | `bool` | `true` | no |
166-
| <a name="input_grafana_api_key"></a> [grafana\_api\_key](#input\_grafana\_api\_key) | Grafana API key for the Amazon Managed Grafana workspace | `string` | `null` | no |
167-
| <a name="input_irsa_iam_permissions_boundary"></a> [irsa\_iam\_permissions\_boundary](#input\_irsa\_iam\_permissions\_boundary) | IAM permissions boundary for IRSA roles | `string` | `null` | no |
173+
| <a name="input_grafana_api_key"></a> [grafana\_api\_key](#input\_grafana\_api\_key) | Grafana API key for the Amazon Managed Grafana workspace | `string` | n/a | yes |
174+
| <a name="input_irsa_iam_permissions_boundary"></a> [irsa\_iam\_permissions\_boundary](#input\_irsa\_iam\_permissions\_boundary) | IAM permissions boundary for IRSA roles | `string` | `""` | no |
168175
| <a name="input_irsa_iam_role_path"></a> [irsa\_iam\_role\_path](#input\_irsa\_iam\_role\_path) | IAM role path for IRSA roles | `string` | `"/"` | no |
169176
| <a name="input_managed_grafana_workspace_id"></a> [managed\_grafana\_workspace\_id](#input\_managed\_grafana\_workspace\_id) | Amazon Managed Grafana Workspace ID | `string` | `""` | no |
170177
| <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 |

docs/concepts.md

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,35 +31,44 @@ you need to track changes as part of a Git repository or CI/CD pipeline.
3131
3232
## Base module
3333

34-
The base module allows you to configure the AWS Observability services for your cluster and the AWS Distro for OpenTelemetry (ADOT) Operator as the signals collection mechanism.
34+
The base module allows you to configure the AWS Observability services for your cluster and
35+
the AWS Distro for OpenTelemetry (ADOT) Operator as the signals collection mechanism.
3536

36-
Here is the minimum configuration to have a new Managed Grafana Workspace, Amazon Managed Service for Prometheus Workspace, ADOT Operator deployed for you and ready to receive your data.
37+
This is the minimum configuration to have a new Amazon Managed Service for Prometheus Workspace
38+
and ADOT Operator deployed for you and ready to receive your data.
39+
The base module serve as an anchor to the workload modules and cannot run on its own.
3740

3841
```hcl
3942
module "eks_observability_accelerator" {
40-
source = "aws-observability/terraform-aws-observability-accelerator"
41-
aws_region = "eu-west-1"
43+
# use release tags and check for the latest versions
44+
# https://github.com/aws-observability/terraform-aws-observability-accelerator/releases
45+
source = "github.com/aws-observability/terraform-aws-observability-accelerator?ref=v1.6.1
46+
47+
aws_region = "eu-west-1"
4248
eks_cluster_id = "my-eks-cluster"
49+
50+
# As Grafana shares a different lifecycle, it's best to use an existing workspace.
51+
managed_grafana_workspace_id = var.managed_grafana_workspace_id
52+
grafana_api_key = var.grafana_api_key
4353
}
4454
```
4555

46-
You can optionally reuse existing Workspaces to dissociate their lifecycle from the
47-
Terraform state.
56+
You can optionally reuse an existing Amazon Managed Servce for Prometheus Workspace:
4857

4958
```hcl
5059
module "eks_observability_accelerator" {
51-
source = "aws-observability/terraform-aws-observability-accelerator"
52-
aws_region = "eu-west-1"
60+
# use release tags and check for the latest versions
61+
# https://github.com/aws-observability/terraform-aws-observability-accelerator/releases
62+
source = "github.com/aws-observability/terraform-aws-observability-accelerator?ref=v1.6.1
63+
64+
aws_region = "eu-west-1"
5365
eks_cluster_id = "my-eks-cluster"
5466
5567
# prevents creation of a new Amazon Managed Prometheus workspace
5668
enable_managed_prometheus = false
5769
5870
# reusing existing Amazon Managed Prometheus Workspace
59-
managed_prometheus_workspace_id = "ws-abcd123..."
60-
61-
# prevents creation of a new Amazon Managed Grafana workspace
62-
enable_managed_grafana = false
71+
managed_prometheus_workspace_id = "ws-abcd123..."
6372
6473
managed_grafana_workspace_id = "g-abcdef123"
6574
grafana_api_key = var.grafana_api_key

variables.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ variable "managed_grafana_workspace_id" {
7070
variable "grafana_api_key" {
7171
description = "Grafana API key for the Amazon Managed Grafana workspace"
7272
type = string
73-
default = null
7473
}
7574

7675
variable "tags" {

0 commit comments

Comments
 (0)