Skip to content

Commit 6266c63

Browse files
bonclay7bonclay7
authored
Merge pull request #18 from aws-observability/docs-and-wording
Apply pre-commit
2 parents dd45719 + 9831f1b commit 6266c63

File tree

14 files changed

+143
-53
lines changed

14 files changed

+143
-53
lines changed

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,15 +113,15 @@ If you are interested in contributing to EKS Blueprints, see the [Contribution g
113113
| Name | Version |
114114
|------|---------|
115115
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.14.0 |
116-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.0.0, < 5.0.0 |
116+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.0.0 |
117117
| <a name="requirement_awscc"></a> [awscc](#requirement\_awscc) | >= 0.24.0 |
118118
| <a name="requirement_grafana"></a> [grafana](#requirement\_grafana) | 1.25.0 |
119119

120120
## Providers
121121

122122
| Name | Version |
123123
|------|---------|
124-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.0.0, < 5.0.0 |
124+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.0.0 |
125125
| <a name="provider_grafana"></a> [grafana](#provider\_grafana) | 1.25.0 |
126126

127127
## Modules

‎examples/eks-cluster-with-vpc/versions.tf

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
terraform {
2+
required_version = ">= 1.0.0"
3+
4+
required_providers {
5+
aws = {
6+
source = "hashicorp/aws"
7+
version = ">= 4.0.0"
8+
}
9+
kubernetes = {
10+
source = "hashicorp/kubernetes"
11+
version = ">= 2.10"
12+
}
13+
kubectl = {
14+
source = "gavinbunney/kubectl"
15+
version = ">= 1.14"
16+
}
17+
helm = {
18+
source = "hashicorp/helm"
19+
version = ">= 2.4.1"
20+
}
21+
grafana = {
22+
source = "grafana/grafana"
23+
version = ">= 1.25.0"
24+
}
25+
}
26+
}

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,13 +131,19 @@ add this `managed_prometheus_region=xxx` and `managed_prometheus_workspace_id=ws
131131

132132
| Name | Version |
133133
|------|---------|
134+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0 |
135+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.0.0 |
134136
| <a name="requirement_grafana"></a> [grafana](#requirement\_grafana) | >= 1.25.0 |
137+
| <a name="requirement_grafana"></a> [grafana](#requirement\_grafana) | >= 1.25.0 |
138+
| <a name="requirement_helm"></a> [helm](#requirement\_helm) | >= 2.4.1 |
139+
| <a name="requirement_kubectl"></a> [kubectl](#requirement\_kubectl) | >= 1.14 |
140+
| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | >= 2.10 |
135141

136142
## Providers
137143

138144
| Name | Version |
139145
|------|---------|
140-
| <a name="provider_aws"></a> [aws](#provider\_aws) | n/a |
146+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.0.0 |
141147

142148
## Modules
143149

‎examples/existing-cluster-with-base-and-infra/main.tf

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,6 @@ provider "helm" {
2424
}
2525
}
2626

27-
terraform {
28-
required_providers {
29-
grafana = {
30-
source = "grafana/grafana"
31-
version = ">= 1.25.0"
32-
}
33-
}
34-
}
35-
3627
locals {
3728
region = var.aws_region
3829
eks_cluster_endpoint = data.aws_eks_cluster.this.endpoint

‎examples/existing-cluster-with-base-and-infra/versions.tf

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
terraform {
2+
required_version = ">= 1.0.0"
3+
required_providers {
4+
aws = {
5+
source = "hashicorp/aws"
6+
version = ">= 4.0.0"
7+
}
8+
kubernetes = {
9+
source = "hashicorp/kubernetes"
10+
version = ">= 2.10"
11+
}
12+
kubectl = {
13+
source = "gavinbunney/kubectl"
14+
version = ">= 1.14"
15+
}
16+
helm = {
17+
source = "hashicorp/helm"
18+
version = ">= 2.4.1"
19+
}
20+
grafana = {
21+
source = "grafana/grafana"
22+
version = ">= 1.25.0"
23+
}
24+
}
25+
}

‎modules/workloads/infra/README.md

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,20 @@ This module provides EKS cluster monitoring with the following resources:
1111

1212
| Name | Version |
1313
|------|---------|
14-
| <a name="requirement_grafana"></a> [grafana](#requirement\_grafana) | 1.25.0 |
14+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0 |
15+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.0.0 |
16+
| <a name="requirement_grafana"></a> [grafana](#requirement\_grafana) | >= 1.25.0 |
17+
| <a name="requirement_helm"></a> [helm](#requirement\_helm) | >= 2.4.1 |
18+
| <a name="requirement_kubectl"></a> [kubectl](#requirement\_kubectl) | >= 1.14 |
19+
| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | >= 2.10 |
1520

1621
## Providers
1722

1823
| Name | Version |
1924
|------|---------|
20-
| <a name="provider_aws"></a> [aws](#provider\_aws) | n/a |
21-
| <a name="provider_grafana"></a> [grafana](#provider\_grafana) | 1.25.0 |
22-
| <a name="provider_helm"></a> [helm](#provider\_helm) | n/a |
25+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.0.0 |
26+
| <a name="provider_grafana"></a> [grafana](#provider\_grafana) | >= 1.25.0 |
27+
| <a name="provider_helm"></a> [helm](#provider\_helm) | >= 2.4.1 |
2328

2429
## Modules
2530

@@ -33,18 +38,18 @@ This module provides EKS cluster monitoring with the following resources:
3338
|------|------|
3439
| [aws_prometheus_rule_group_namespace.alerting_rules](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/prometheus_rule_group_namespace) | resource |
3540
| [aws_prometheus_rule_group_namespace.recording_rules](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/prometheus_rule_group_namespace) | resource |
36-
| [grafana_dashboard.cluster](https://registry.terraform.io/providers/grafana/grafana/1.25.0/docs/resources/dashboard) | resource |
37-
| [grafana_dashboard.clusternw](https://registry.terraform.io/providers/grafana/grafana/1.25.0/docs/resources/dashboard) | resource |
38-
| [grafana_dashboard.kubelet](https://registry.terraform.io/providers/grafana/grafana/1.25.0/docs/resources/dashboard) | resource |
39-
| [grafana_dashboard.nodes](https://registry.terraform.io/providers/grafana/grafana/1.25.0/docs/resources/dashboard) | resource |
40-
| [grafana_dashboard.nsnw](https://registry.terraform.io/providers/grafana/grafana/1.25.0/docs/resources/dashboard) | resource |
41-
| [grafana_dashboard.nsnwworkload](https://registry.terraform.io/providers/grafana/grafana/1.25.0/docs/resources/dashboard) | resource |
42-
| [grafana_dashboard.nspods](https://registry.terraform.io/providers/grafana/grafana/1.25.0/docs/resources/dashboard) | resource |
43-
| [grafana_dashboard.nsworkload](https://registry.terraform.io/providers/grafana/grafana/1.25.0/docs/resources/dashboard) | resource |
44-
| [grafana_dashboard.nwworload](https://registry.terraform.io/providers/grafana/grafana/1.25.0/docs/resources/dashboard) | resource |
45-
| [grafana_dashboard.podnetwork](https://registry.terraform.io/providers/grafana/grafana/1.25.0/docs/resources/dashboard) | resource |
46-
| [grafana_dashboard.pods](https://registry.terraform.io/providers/grafana/grafana/1.25.0/docs/resources/dashboard) | resource |
47-
| [grafana_dashboard.workloads](https://registry.terraform.io/providers/grafana/grafana/1.25.0/docs/resources/dashboard) | resource |
41+
| [grafana_dashboard.cluster](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/dashboard) | resource |
42+
| [grafana_dashboard.clusternw](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/dashboard) | resource |
43+
| [grafana_dashboard.kubelet](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/dashboard) | resource |
44+
| [grafana_dashboard.nodes](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/dashboard) | resource |
45+
| [grafana_dashboard.nsnw](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/dashboard) | resource |
46+
| [grafana_dashboard.nsnwworkload](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/dashboard) | resource |
47+
| [grafana_dashboard.nspods](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/dashboard) | resource |
48+
| [grafana_dashboard.nsworkload](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/dashboard) | resource |
49+
| [grafana_dashboard.nwworload](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/dashboard) | resource |
50+
| [grafana_dashboard.podnetwork](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/dashboard) | resource |
51+
| [grafana_dashboard.pods](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/dashboard) | resource |
52+
| [grafana_dashboard.workloads](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/dashboard) | resource |
4853
| [helm_release.kube_state_metrics](https://registry.terraform.io/providers/hashicorp/helm/latest/docs/resources/release) | resource |
4954
| [helm_release.prometheus_node_exporter](https://registry.terraform.io/providers/hashicorp/helm/latest/docs/resources/release) | resource |
5055
| [aws_caller_identity.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/caller_identity) | data source |

‎modules/workloads/infra/main.tf

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
terraform {
2-
required_providers {
3-
grafana = {
4-
source = "grafana/grafana"
5-
version = "1.25.0"
6-
}
7-
}
8-
}
9-
101
resource "helm_release" "kube_state_metrics" {
112
count = var.enable_kube_state_metrics ? 1 : 0
123
chart = var.ksm_config.helm_chart_name

‎modules/workloads/infra/versions.tf

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
terraform {
2+
required_version = ">= 1.0.0"
3+
required_providers {
4+
aws = {
5+
source = "hashicorp/aws"
6+
version = ">= 4.0.0"
7+
}
8+
kubernetes = {
9+
source = "hashicorp/kubernetes"
10+
version = ">= 2.10"
11+
}
12+
kubectl = {
13+
source = "gavinbunney/kubectl"
14+
version = ">= 1.14"
15+
}
16+
helm = {
17+
source = "hashicorp/helm"
18+
version = ">= 2.4.1"
19+
}
20+
grafana = {
21+
source = "grafana/grafana"
22+
version = ">= 1.25.0"
23+
}
24+
}
25+
}

‎modules/workloads/java/README.md

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,19 @@ This module provides monitoring for Java based workloads with the following reso
1111

1212
| Name | Version |
1313
|------|---------|
14-
| <a name="requirement_grafana"></a> [grafana](#requirement\_grafana) | ~> 1.25.0 |
14+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0 |
15+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.0.0 |
16+
| <a name="requirement_grafana"></a> [grafana](#requirement\_grafana) | >= 1.25.0 |
17+
| <a name="requirement_helm"></a> [helm](#requirement\_helm) | >= 2.4.1 |
18+
| <a name="requirement_kubectl"></a> [kubectl](#requirement\_kubectl) | >= 1.14 |
19+
| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | >= 2.10 |
1520

1621
## Providers
1722

1823
| Name | Version |
1924
|------|---------|
20-
| <a name="provider_aws"></a> [aws](#provider\_aws) | n/a |
21-
| <a name="provider_grafana"></a> [grafana](#provider\_grafana) | ~> 1.25.0 |
25+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.0.0 |
26+
| <a name="provider_grafana"></a> [grafana](#provider\_grafana) | >= 1.25.0 |
2227

2328
## Modules
2429

‎modules/workloads/java/main.tf

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,6 @@ locals {
33
namespace = try(var.helm_config.namespace, local.name)
44
}
55

6-
terraform {
7-
required_providers {
8-
grafana = {
9-
source = "grafana/grafana"
10-
version = "~> 1.25.0"
11-
}
12-
}
13-
}
14-
156
data "aws_partition" "current" {}
167

178
# deploys collector

0 commit comments

Comments
 (0)