Skip to content

Commit 215933b

Browse files
authored
docs: improvements (#128)
Update docs
1 parent 5298fb0 commit 215933b

File tree

4 files changed

+44
-37
lines changed

4 files changed

+44
-37
lines changed

README.md

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,16 @@
44

55
Welcome to the AWS Observability Accelerator for Terraform!
66

7-
The AWS Observability accelerator for Terraform is a set of modules to help you
8-
configure Observability for your Amazon EKS clusters with AWS Observability services.
9-
This project proposes a core module to bootstrap your cluster with the AWS Distro for
10-
OpenTelemetry (ADOT) Operator for EKS, Amazon Managed Service for Prometheus,
11-
Amazon Managed Grafana. Additionally we have a set of workloads modules to
12-
leverage curated ADOT collector configurations, Grafana dashboards,
13-
Prometheus recording rules and alerts.
7+
The AWS Observability Accelerator for Terraform is a set of opinionated modules to
8+
help you set up observability for your AWS environments with
9+
AWS-managed observability services such as Amazon Managed Service for Prometheus,
10+
Amazon Managed Grafana and AWS Distro for OpenTelemetry (ADOT).
11+
12+
We provide curated metrics, traces collection, alerting rules and Grafana dashboards
13+
for your EKS infrastructure, Java/JMX, NGINX based workloads and custom applications.
14+
15+
You also can monitor your Amazon Managed Service for Prometheus workspaces ingestion,
16+
costs, active series with [this module](./modules/managed-prometheus-monitoring).
1417

1518
<img width="1501" alt="image" src="docs/images/dark-o11y-accelerator-amp-xray.png">
1619

docs/eks/index.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Amazon EKS cluster metrics
22

33
This example demonstrates how to monitor your Amazon Elastic Kubernetes Service
4-
(Amazon EKS) cluster with the Observability Accelerator's EKS
5-
[infrastructure module](https://github.com/aws-observability/terraform-aws-observability-accelerator/tree/main/modules/eks-monitoring).
4+
(Amazon EKS) cluster with the Observability Accelerator's
5+
[EKS monitoring module](https://github.com/aws-observability/terraform-aws-observability-accelerator/tree/main/modules/eks-monitoring).
66

77
Monitoring Amazon Elastic Kubernetes Service (Amazon EKS) for metrics has two categories:
88
the control plane and the Amazon EKS nodes (with Kubernetes objects).
@@ -17,7 +17,7 @@ It provides default dashboards to get a comprehensible visibility on your nodes,
1717
namespaces, pods, and kubelet operations health. Finally, you get curated Prometheus recording rules
1818
and alerts to operate your cluster.
1919

20-
Additionally, you can optionally collect additional custom Prometheus metrics from your applications running
20+
Additionally, you can optionally collect custom Prometheus metrics from your applications running
2121
on your EKS cluster.
2222

2323
## Prerequisites
@@ -27,23 +27,23 @@ on your EKS cluster.
2727

2828
## Setup
2929

30-
### 1. Download sources and initialize Terraform
30+
#### 1. Download sources and initialize Terraform
3131

3232
```
3333
git clone https://github.com/aws-observability/terraform-aws-observability-accelerator.git
3434
cd examples/existing-cluster-with-base-and-infra
3535
terraform init
3636
```
3737

38-
### 2. AWS Region
38+
#### 2. AWS Region
3939

4040
Specify the AWS Region where the resources will be deployed:
4141

4242
```bash
4343
export TF_VAR_aws_region=xxx
4444
```
4545

46-
### 3. Amazon EKS Cluster
46+
#### 3. Amazon EKS Cluster
4747

4848
To run this example, you need to provide your EKS cluster name. If you don't
4949
have a cluster ready, visit [this example](https://aws-observability.github.io/terraform-aws-observability-accelerator/helpers/new-eks-cluster/)
@@ -55,7 +55,7 @@ Specify your cluster name:
5555
export TF_VAR_eks_cluster_id=xxx
5656
```
5757

58-
### 4. Amazon Managed Service for Prometheus workspace (optional)
58+
#### 4. Amazon Managed Service for Prometheus workspace (optional)
5959

6060
By default, we create an Amazon Managed Service for Prometheus workspace for you.
6161
However, if you have an existing workspace you want to reuse, edit and run:
@@ -70,7 +70,7 @@ To create a workspace outside of Terraform's state, simply run:
7070
aws amp create-workspace --alias observability-accelerator --query '.workspaceId' --output text
7171
```
7272

73-
### 5. Amazon Managed Grafana workspace
73+
#### 5. Amazon Managed Grafana workspace
7474

7575
To run this example you need an Amazon Managed Grafana workspace. If you have an existing workspace, create an environment variable as described below.
7676
To create a new workspace, visit our Amazon Managed Grafana [documentation](https://docs.aws.amazon.com/grafana/latest/userguide/getting-started-with-AMG.html).
@@ -83,7 +83,7 @@ Make sure to provide the workspace with Amazon Managed Service for Prometheus re
8383
export TF_VAR_managed_grafana_workspace_id=g-xxx
8484
```
8585

86-
### 6. Grafana API Key
86+
#### 6. Grafana API Key
8787

8888
Amazon Managed Grafana provides a control plane API for generating Grafana API keys.
8989
As a security best practice, we will provide to Terraform a short lived API key to
@@ -105,7 +105,7 @@ terraform apply
105105

106106
## Visualization
107107

108-
### 1. Prometheus datasource on Grafana
108+
#### 1. Prometheus datasource on Grafana
109109

110110
Make sure to open the link in the output. After a successful deployment, this will open
111111
the Prometheus datasource configuration on Grafana.
@@ -115,7 +115,7 @@ Click `Save & test` and you should see a notification confirming that the Amazon
115115
terraform output grafana_prometheus_datasource_test
116116
```
117117

118-
### 2. Grafana dashboards
118+
#### 2. Grafana dashboards
119119

120120
Go to the Dashboards panel of your Grafana workspace. You should see a list of dashboards under the `Observability Accelerator Dashboards`
121121

@@ -125,7 +125,7 @@ Open a specific dashboard and you should be able to view its visualization
125125

126126
<img width="2056" alt="cluster headlines" src="https://user-images.githubusercontent.com/10175027/199110753-9bc7a9b7-1b45-4598-89d3-32980154080e.png">
127127

128-
### 3. Amazon Managed Service for Prometheus rules and alerts
128+
#### 3. Amazon Managed Service for Prometheus rules and alerts
129129

130130
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.
131131

docs/eks/java.md

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ configuration options for Java based workloads on EKS.
1111

1212
## Setup
1313

14-
### 1. Add Java metrics, dashboards and alerts
14+
#### 1. Add Java metrics, dashboards and alerts
1515

1616
From the [previous example's](https://aws-observability.github.io/terraform-aws-observability-accelerator/eks/) configuration,
1717
simply enable the Java pattern's flag.
@@ -26,7 +26,7 @@ module "eks_monitoring" {
2626

2727
You can further customize the Java pattern by providing `java_config` [options](https://github.com/aws-observability/terraform-aws-observability-accelerator/blob/main/modules/eks-monitoring/README.md#input_java_config).
2828

29-
### 2. Grafana API key
29+
#### 2. Grafana API key
3030

3131
Make sure to refresh your temporary Grafana API key
3232

@@ -48,7 +48,7 @@ terraform apply
4848

4949
## Visualization
5050

51-
1. Grafana dashboards
51+
#### 1. Grafana dashboards
5252

5353
Go to the Dashboards panel of your Grafana workspace. There will be a folder called `Observability Accelerator Dashboards`
5454

@@ -58,7 +58,7 @@ Open the "Java/JMX" dashboard to view its visualization
5858

5959
<img width="2560" alt="Grafana Java dashboard" src="https://user-images.githubusercontent.com/10175027/217821001-2119c81f-94bd-4811-8bbb-caaf1ae5a77a.png">
6060

61-
2. Amazon Managed Service for Prometheus rules and alerts
61+
#### 2. Amazon Managed Service for Prometheus rules and alerts
6262

6363
Open the Amazon Managed Service for Prometheus console and view the details of your workspace. Under the `Rules management` tab, you will find new rules deployed.
6464

@@ -72,32 +72,37 @@ Open the Amazon Managed Service for Prometheus console and view the details of y
7272

7373
In this section we will reuse an example from the AWS OpenTelemetry collector [repository](https://github.com/aws-observability/aws-otel-collector/blob/main/docs/developers/container-insights-eks-jmx.md). For convenience, the steps can be found below.
7474

75-
1. Clone [this repository](https://github.com/aws-observability/aws-otel-test-framework) and navigate to the `sample-apps/jmx/` directory.
75+
#### 1. Clone repository
7676

77-
2. Authenticate to Amazon ECR
77+
```sh
78+
git clone https://github.com/aws-observability/aws-otel-test-framework
79+
cd aws-otel-test-framework/sample-apps/jmx/
80+
```
81+
82+
#### 2. Authenticate to Amazon ECR
7883

7984
```sh
8085
export AWS_ACCOUNT_ID=`aws sts get-caller-identity --query Account --output text`
8186
export AWS_REGION={region}
8287
aws ecr get-login-password --region $AWS_REGION | docker login --username AWS --password-stdin $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com
8388
```
8489

85-
3. Create an Amazon ECR repository
90+
#### 3. Create an Amazon ECR repository
8691

8792
```sh
8893
aws ecr create-repository --repository-name prometheus-sample-tomcat-jmx \
8994
--image-scanning-configuration scanOnPush=true \
9095
--region $AWS_REGION
9196
```
9297

93-
4. Build Docker image and push to ECR.
98+
#### 4. Build Docker image and push to ECR.
9499

95100
```sh
96101
docker build -t $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/prometheus-sample-tomcat-jmx:latest .
97102
docker push $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/prometheus-sample-tomcat-jmx:latest
98103
```
99104

100-
5. Install sample application
105+
#### 5. Install sample application
101106

102107
```sh
103108
export SAMPLE_TRAFFIC_NAMESPACE=javajmx-sample

docs/index.md

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22

33
Welcome to the AWS Observability Accelerator for Terraform!
44

5-
The AWS Observability accelerator is a set of Terraform modules to help you
6-
configure Observability for your container workloads and environments with AWS
7-
Observability services. This project proposes a core module to bootstrap
8-
your Amazon EKS cluster with the AWS Distro for OpenTelemetry (ADOT) Operator for EKS,
9-
Amazon Managed Service for Prometheus, Amazon Managed Grafana.
5+
The AWS Observability Accelerator for Terraform is a set of opinionated modules to
6+
help you set up observability for your AWS environments with
7+
AWS-managed observability services such as Amazon Managed Service for Prometheus,
8+
Amazon Managed Grafana and AWS Distro for OpenTelemetry (ADOT).
109

11-
Additionally we have a set of workload modules to leverage curated ADOT
12-
collector configurations, Grafana dashboards, Prometheus recording rules and alerts.
10+
We provide curated metrics, traces collection, alerting rules and Grafana dashboards
11+
for your EKS infrastructure, Java/JMX, NGINX based workloads and custom applications.
1312

1413
<img width="1501" alt="image" src="images/dark-o11y-accelerator-amp-xray.png">
1514

@@ -30,7 +29,7 @@ to be deployed in our packaged
3029
!!! tip
3130
We have supporting examples for quick setup such as:
3231

33-
- Creating an empty Amazon EKS cluster and a VPC
32+
- Creating a new Amazon EKS cluster and a VPC
3433
- Creating and configure an Amazon Managed Grafana workspace with SSO (coming soon)
3534

3635
## Motivation
@@ -43,7 +42,7 @@ Grafana and Amazon OpenSearch.
4342
AWS customers have asked for best-practices and guidance to collect metrics, logs
4443
and traces from their containerized applications and microservices with ease of
4544
deployment. Customers can use the AWS Observability Accelerator to configure their
46-
metrics collection, leveraging [AWS Distro for OpenTelemetry](https://aws-otel.github.io/),
45+
metrics and traces collection, leveraging [AWS Distro for OpenTelemetry](https://aws-otel.github.io/),
4746
to have opinionated dashboards and alerts available in only minutes.
4847

4948

0 commit comments

Comments
 (0)