Skip to content

Commit 4517913

Browse files
bonclay7bonclay7
authored
🧹 Cleanup flux manifests (#220)
* Drop dead variables for kustomization post build * Cleanup istio config variables * Cleanup java and nginx variables * Bump dependencies * Fix tf bug * Pre-commit checks
1 parent 6ca939d commit 4517913

File tree

18 files changed

+51
-84
lines changed

18 files changed

+51
-84
lines changed

‎modules/eks-monitoring/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ See examples using this Terraform modules in the **Amazon EKS** section of [this
3939
|------|--------|---------|
4040
| <a name="module_external_secrets"></a> [external\_secrets](#module\_external\_secrets) | ./add-ons/external-secrets | n/a |
4141
| <a name="module_fluentbit_logs"></a> [fluentbit\_logs](#module\_fluentbit\_logs) | ./add-ons/aws-for-fluentbit | n/a |
42-
| <a name="module_helm_addon"></a> [helm\_addon](#module\_helm\_addon) | github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon | v4.32.0 |
42+
| <a name="module_helm_addon"></a> [helm\_addon](#module\_helm\_addon) | github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon | v4.32.1 |
4343
| <a name="module_istio_monitoring"></a> [istio\_monitoring](#module\_istio\_monitoring) | ./patterns/istio | n/a |
4444
| <a name="module_java_monitoring"></a> [java\_monitoring](#module\_java\_monitoring) | ./patterns/java | n/a |
4545
| <a name="module_nginx_monitoring"></a> [nginx\_monitoring](#module\_nginx\_monitoring) | ./patterns/nginx | n/a |
@@ -109,7 +109,7 @@ See examples using this Terraform modules in the **Amazon EKS** section of [this
109109
| <a name="input_helm_config"></a> [helm\_config](#input\_helm\_config) | Helm Config for Prometheus | `any` | `{}` | no |
110110
| <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 |
111111
| <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 |
112-
| <a name="input_istio_config"></a> [istio\_config](#input\_istio\_config) | Configuration object for ISTIO monitoring | <pre>object({<br> enable_alerting_rules = bool<br> enable_recording_rules = bool<br> enable_dashboards = bool<br> scrape_sample_limit = number<br><br> flux_gitrepository_name = string<br> flux_gitrepository_url = string<br> flux_gitrepository_branch = string<br> flux_kustomization_name = string<br> flux_kustomization_path = string<br><br> grafana_url = string<br> grafana_istio_cp_dashboard_url = string<br> grafana_istio_mesh_dashboard_url = string<br> grafana_istio_performance_dashboard_url = string<br> grafana_istio_service_dashboard_url = string<br><br> prometheus_metrics_endpoint = string<br> })</pre> | `null` | no |
112+
| <a name="input_istio_config"></a> [istio\_config](#input\_istio\_config) | Configuration object for ISTIO monitoring | <pre>object({<br> enable_alerting_rules = bool<br> enable_recording_rules = bool<br> enable_dashboards = bool<br> scrape_sample_limit = number<br><br> flux_gitrepository_name = string<br> flux_gitrepository_url = string<br> flux_gitrepository_branch = string<br> flux_kustomization_name = string<br> flux_kustomization_path = string<br><br> managed_prometheus_workspace_id = string<br> prometheus_metrics_endpoint = string<br><br> dashboards = object({<br> cp = string<br> mesh = string<br> performance = string<br> service = string<br> })<br> })</pre> | `null` | no |
113113
| <a name="input_java_config"></a> [java\_config](#input\_java\_config) | Configuration object for Java/JMX monitoring | <pre>object({<br> enable_alerting_rules = bool<br> enable_recording_rules = bool<br> enable_dashboards = bool<br> scrape_sample_limit = number<br><br><br> flux_gitrepository_name = string<br> flux_gitrepository_url = string<br> flux_gitrepository_branch = string<br> flux_kustomization_name = string<br> flux_kustomization_path = string<br><br> grafana_dashboard_url = string<br><br> prometheus_metrics_endpoint = string<br> })</pre> | `null` | no |
114114
| <a name="input_ksm_config"></a> [ksm\_config](#input\_ksm\_config) | Kube State metrics configuration | <pre>object({<br> create_namespace = bool<br> k8s_namespace = string<br> helm_chart_name = string<br> helm_chart_version = string<br> helm_release_name = string<br> helm_repo_url = string<br> helm_settings = map(string)<br> helm_values = map(any)<br><br> scrape_interval = string<br> scrape_timeout = string<br> })</pre> | <pre>{<br> "create_namespace": true,<br> "helm_chart_name": "kube-state-metrics",<br> "helm_chart_version": "4.24.0",<br> "helm_release_name": "kube-state-metrics",<br> "helm_repo_url": "https://prometheus-community.github.io/helm-charts",<br> "helm_settings": {},<br> "helm_values": {},<br> "k8s_namespace": "kube-system",<br> "scrape_interval": "60s",<br> "scrape_timeout": "15s"<br>}</pre> | no |
115115
| <a name="input_logs_config"></a> [logs\_config](#input\_logs\_config) | Configuration object for logs collection | <pre>object({<br> cw_log_retention_days = number<br> })</pre> | <pre>{<br> "cw_log_retention_days": 90<br>}</pre> | no |

‎modules/eks-monitoring/add-ons/aws-for-fluentbit/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ See this [Helm Chart](https://github.com/aws/eks-charts/tree/master/stable/aws-f
2424

2525
| Name | Source | Version |
2626
|------|--------|---------|
27-
| <a name="module_helm_addon"></a> [helm\_addon](#module\_helm\_addon) | github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon | v4.32.0 |
27+
| <a name="module_helm_addon"></a> [helm\_addon](#module\_helm\_addon) | github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon | v4.32.1 |
2828

2929
## Resources
3030

‎modules/eks-monitoring/add-ons/aws-for-fluentbit/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module "helm_addon" {
2-
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.32.0"
2+
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.32.1"
33
manage_via_gitops = var.manage_via_gitops
44
set_values = local.set_values
55
helm_config = local.helm_config

‎modules/eks-monitoring/add-ons/external-secrets/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ This deploys an EKS Cluster with the External Secrets Operator. The cluster is p
2323

2424
| Name | Source | Version |
2525
|------|--------|---------|
26-
| <a name="module_cluster_secretstore_role"></a> [cluster\_secretstore\_role](#module\_cluster\_secretstore\_role) | github.com/aws-ia/terraform-aws-eks-blueprints//modules/irsa | v4.32.0 |
27-
| <a name="module_external_secrets"></a> [external\_secrets](#module\_external\_secrets) | github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/external-secrets | v4.32.0 |
26+
| <a name="module_cluster_secretstore_role"></a> [cluster\_secretstore\_role](#module\_cluster\_secretstore\_role) | github.com/aws-ia/terraform-aws-eks-blueprints//modules/irsa | v4.32.1 |
27+
| <a name="module_external_secrets"></a> [external\_secrets](#module\_external\_secrets) | github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/external-secrets | v4.32.1 |
2828

2929
## Resources
3030

‎modules/eks-monitoring/add-ons/external-secrets/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module "external_secrets" {
2-
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/external-secrets?ref=v4.32.0"
2+
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/external-secrets?ref=v4.32.1"
33
count = var.enable_external_secrets ? 1 : 0
44

55
helm_config = var.helm_config
@@ -17,7 +17,7 @@ resource "aws_kms_key" "secrets" {
1717
}
1818

1919
module "cluster_secretstore_role" {
20-
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/irsa?ref=v4.32.0"
20+
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/irsa?ref=v4.32.1"
2121
kubernetes_namespace = local.namespace
2222
create_kubernetes_namespace = false
2323
kubernetes_service_account = local.cluster_secretstore_sa

‎modules/eks-monitoring/dashboards.tf

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,6 @@ spec:
6464
name: ${local.apiserver_monitoring_config.flux_gitrepository_name}
6565
postBuild:
6666
substitute:
67-
AMG_AWS_REGION: ${var.managed_prometheus_workspace_region}
68-
AMP_ENDPOINT_URL: ${var.managed_prometheus_workspace_endpoint}
69-
AMG_ENDPOINT_URL: ${var.grafana_url}
7067
GRAFANA_APISERVER_BASIC_DASH_URL: ${local.apiserver_monitoring_config.dashboards.basic}
7168
GRAFANA_APISERVER_ADVANCED_DASH_URL: ${local.apiserver_monitoring_config.dashboards.advanced}
7269
GRAFANA_APISERVER_TROUBLESHOOTING_DASH_URL: ${local.apiserver_monitoring_config.dashboards.troubleshooting}
@@ -92,10 +89,7 @@ spec:
9289
name: ${local.adothealth_monitoring_config.flux_gitrepository_name}
9390
postBuild:
9491
substitute:
95-
AMG_AWS_REGION: ${var.managed_prometheus_workspace_region}
96-
AMP_ENDPOINT_URL: ${var.managed_prometheus_workspace_endpoint}
97-
AMG_ENDPOINT_URL: ${var.grafana_url}
98-
GRAFANA_ADOTHEALTH_DASH_URL: ${local.adothealth_monitoring_config.dashboards.grafana_adothealth_dashboard_url}
92+
GRAFANA_ADOTHEALTH_DASH_URL: ${local.adothealth_monitoring_config.dashboards.health}
9993
YAML
10094
count = var.enable_adotcollector_metrics ? 1 : 0
10195
depends_on = [module.external_secrets]

‎modules/eks-monitoring/locals.tf

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,9 @@ locals {
4545
flux_kustomization_name = "grafana-dashboards-java"
4646
flux_kustomization_path = "./artifacts/grafana-operator-manifests/eks/java"
4747

48-
managed_prometheus_workspace_id = var.managed_prometheus_workspace_id
49-
managed_prometheus_workspace_region = var.managed_prometheus_workspace_region
50-
managed_prometheus_workspace_endpoint = var.managed_prometheus_workspace_endpoint
51-
prometheus_metrics_endpoint = "/metrics"
48+
managed_prometheus_workspace_id = var.managed_prometheus_workspace_id
49+
prometheus_metrics_endpoint = "/metrics"
5250

53-
grafana_url = var.grafana_url
5451
grafana_dashboard_url = "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/java/default.json"
5552
}
5653

@@ -69,12 +66,9 @@ locals {
6966
flux_kustomization_name = "grafana-dashboards-nginx"
7067
flux_kustomization_path = "./artifacts/grafana-operator-manifests/eks/nginx"
7168

72-
managed_prometheus_workspace_id = var.managed_prometheus_workspace_id
73-
managed_prometheus_workspace_region = var.managed_prometheus_workspace_region
74-
managed_prometheus_workspace_endpoint = var.managed_prometheus_workspace_endpoint
75-
prometheus_metrics_endpoint = "/metrics"
69+
managed_prometheus_workspace_id = var.managed_prometheus_workspace_id
70+
prometheus_metrics_endpoint = "/metrics"
7671

77-
grafana_url = var.grafana_url
7872
grafana_dashboard_url = "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/nginx/nginx.json"
7973
}
8074

@@ -93,16 +87,15 @@ locals {
9387
flux_kustomization_name = "grafana-dashboards-istio"
9488
flux_kustomization_path = "./artifacts/grafana-operator-manifests/eks/istio"
9589

96-
managed_prometheus_workspace_id = var.managed_prometheus_workspace_id
97-
managed_prometheus_workspace_region = var.managed_prometheus_workspace_region
98-
managed_prometheus_workspace_endpoint = var.managed_prometheus_workspace_endpoint
99-
prometheus_metrics_endpoint = "/metrics"
90+
managed_prometheus_workspace_id = var.managed_prometheus_workspace_id
91+
prometheus_metrics_endpoint = "/metrics"
10092

101-
grafana_url = var.grafana_url
102-
grafana_istio_cp_dashboard_url = "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/istio/istio-control-plane-dashboard.json"
103-
grafana_istio_mesh_dashboard_url = "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/istio/istio-mesh-dashboard.json"
104-
grafana_istio_performance_dashboard_url = "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/istio/istio-performance-dashboard.json"
105-
grafana_istio_service_dashboard_url = "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/istio/istio-service-dashboard.json"
93+
dashboards = {
94+
cp = "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/istio/istio-control-plane-dashboard.json"
95+
mesh = "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/istio/istio-mesh-dashboard.json"
96+
performance = "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/istio/istio-performance-dashboard.json"
97+
service = "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/eks/istio/istio-service-dashboard.json"
98+
}
10699
}
107100

108101
apiserver_monitoring_config = {
@@ -129,7 +122,7 @@ locals {
129122
flux_kustomization_path = "./artifacts/grafana-operator-manifests/eks/adot"
130123

131124
dashboards = {
132-
grafana_adothealth_dashboard_url = "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/adot/adothealth.json"
125+
health = "https://raw.githubusercontent.com/aws-observability/aws-observability-accelerator/main/artifacts/grafana-dashboards/adot/adothealth.json"
133126
}
134127
}
135128
}

‎modules/eks-monitoring/main.tf

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ resource "helm_release" "grafana_operator" {
7272
}
7373

7474
module "helm_addon" {
75-
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.32.0"
75+
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.32.1"
7676

7777
helm_config = merge(
7878
{
@@ -209,7 +209,6 @@ module "java_monitoring" {
209209
count = var.enable_java ? 1 : 0
210210

211211
pattern_config = coalesce(var.java_config, local.java_pattern_config)
212-
213212
}
214213

215214
module "nginx_monitoring" {

‎modules/eks-monitoring/patterns/istio/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ No modules.
3939

4040
| Name | Description | Type | Default | Required |
4141
|------|-------------|------|---------|:--------:|
42-
| <a name="input_pattern_config"></a> [pattern\_config](#input\_pattern\_config) | Configuration object for ISTIO monitoring | <pre>object({<br> enable_alerting_rules = bool<br> enable_recording_rules = bool<br> scrape_sample_limit = number<br><br> enable_recording_rules = bool<br><br> enable_dashboards = bool<br><br> flux_gitrepository_name = string<br> flux_gitrepository_url = string<br> flux_gitrepository_branch = string<br> flux_kustomization_name = string<br> flux_kustomization_path = string<br><br> managed_prometheus_workspace_id = string<br> managed_prometheus_workspace_region = string<br> managed_prometheus_workspace_endpoint = string<br><br> grafana_url = string<br> grafana_istio_cp_dashboard_url = string<br> grafana_istio_mesh_dashboard_url = string<br> grafana_istio_performance_dashboard_url = string<br> grafana_istio_service_dashboard_url = string<br> })</pre> | n/a | yes |
42+
| <a name="input_pattern_config"></a> [pattern\_config](#input\_pattern\_config) | Configuration object for ISTIO monitoring | <pre>object({<br> enable_alerting_rules = bool<br> enable_recording_rules = bool<br> enable_dashboards = bool<br> scrape_sample_limit = number<br><br> flux_gitrepository_name = string<br> flux_gitrepository_url = string<br> flux_gitrepository_branch = string<br> flux_kustomization_name = string<br> flux_kustomization_path = string<br><br> managed_prometheus_workspace_id = string<br> prometheus_metrics_endpoint = string<br><br> dashboards = object({<br> cp = string<br> mesh = string<br> performance = string<br> service = string<br> })<br> })</pre> | n/a | yes |
4343

4444
## Outputs
4545

‎modules/eks-monitoring/patterns/istio/main.tf

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -206,12 +206,9 @@ spec:
206206
name: ${var.pattern_config.flux_gitrepository_name}
207207
postBuild:
208208
substitute:
209-
AMG_AWS_REGION: ${var.pattern_config.managed_prometheus_workspace_region}
210-
AMP_ENDPOINT_URL: ${var.pattern_config.managed_prometheus_workspace_endpoint}
211-
AMG_ENDPOINT_URL: ${var.pattern_config.grafana_url}
212-
GRAFANA_ISTIO_CP_DASH_URL: ${var.pattern_config.grafana_istio_cp_dashboard_url}
213-
GRAFANA_ISTIO_MESH_DASH_URL: ${var.pattern_config.grafana_istio_mesh_dashboard_url}
214-
GRAFANA_ISTIO_PERF_DASH_URL: ${var.pattern_config.grafana_istio_performance_dashboard_url}
215-
GRAFANA_ISTIO_SERVICE_DASH_URL: ${var.pattern_config.grafana_istio_service_dashboard_url}
209+
GRAFANA_ISTIO_CP_DASH_URL: ${var.pattern_config.dashboards.cp}
210+
GRAFANA_ISTIO_MESH_DASH_URL: ${var.pattern_config.dashboards.mesh}
211+
GRAFANA_ISTIO_PERF_DASH_URL: ${var.pattern_config.dashboards.performance}
212+
GRAFANA_ISTIO_SERVICE_DASH_URL: ${var.pattern_config.dashboards.service}
216213
YAML
217214
}

0 commit comments

Comments
 (0)