From 27e9cc84eaafdf1fd43d230cca3351dab3a9a8f6 Mon Sep 17 00:00:00 2001 From: Rodrigue Koffi Date: Thu, 29 Sep 2022 10:40:28 +0200 Subject: [PATCH] Add dashboards output (#46) --- examples/existing-cluster-nginx/README.md | 1 + examples/existing-cluster-nginx/outputs.tf | 5 +++++ .../existing-cluster-with-base-and-infra/README.md | 1 + .../existing-cluster-with-base-and-infra/outputs.tf | 5 +++++ modules/workloads/infra/README.md | 4 +++- modules/workloads/infra/outputs.tf | 10 ++++++++++ modules/workloads/nginx/README.md | 4 +++- modules/workloads/nginx/outputs.tf | 4 ++++ 8 files changed, 32 insertions(+), 2 deletions(-) diff --git a/examples/existing-cluster-nginx/README.md b/examples/existing-cluster-nginx/README.md index e9c3821..2fd3913 100644 --- a/examples/existing-cluster-nginx/README.md +++ b/examples/existing-cluster-nginx/README.md @@ -235,6 +235,7 @@ add this `managed_prometheus_region=xxx` and `managed_prometheus_workspace_id=ws | [aws\_region](#output\_aws\_region) | AWS Region | | [eks\_cluster\_id](#output\_eks\_cluster\_id) | EKS Cluster Id | | [eks\_cluster\_version](#output\_eks\_cluster\_version) | EKS Cluster version | +| [grafana\_dashboard\_urls](#output\_grafana\_dashboard\_urls) | URLs for dashboards created | | [managed\_prometheus\_workspace\_endpoint](#output\_managed\_prometheus\_workspace\_endpoint) | Amazon Managed Prometheus workspace endpoint | | [managed\_prometheus\_workspace\_id](#output\_managed\_prometheus\_workspace\_id) | Amazon Managed Prometheus workspace ID | diff --git a/examples/existing-cluster-nginx/outputs.tf b/examples/existing-cluster-nginx/outputs.tf index 5df79f3..ec4cd48 100644 --- a/examples/existing-cluster-nginx/outputs.tf +++ b/examples/existing-cluster-nginx/outputs.tf @@ -22,3 +22,8 @@ output "managed_prometheus_workspace_id" { description = "Amazon Managed Prometheus workspace ID" value = module.eks_observability_accelerator.managed_prometheus_workspace_id } + +output "grafana_dashboard_urls" { + description = "URLs for dashboards created" + value = module.workloads_nginx.grafana_dashboard_urls +} diff --git a/examples/existing-cluster-with-base-and-infra/README.md b/examples/existing-cluster-with-base-and-infra/README.md index 00b8211..a2591b8 100644 --- a/examples/existing-cluster-with-base-and-infra/README.md +++ b/examples/existing-cluster-with-base-and-infra/README.md @@ -180,6 +180,7 @@ terraform destroy -var-file=terraform.tfvars | [aws\_region](#output\_aws\_region) | AWS Region | | [eks\_cluster\_id](#output\_eks\_cluster\_id) | EKS Cluster Id | | [eks\_cluster\_version](#output\_eks\_cluster\_version) | EKS Cluster version | +| [grafana\_dashboard\_urls](#output\_grafana\_dashboard\_urls) | URLs for dashboards created | | [managed\_prometheus\_workspace\_endpoint](#output\_managed\_prometheus\_workspace\_endpoint) | Amazon Managed Prometheus workspace endpoint | | [managed\_prometheus\_workspace\_id](#output\_managed\_prometheus\_workspace\_id) | Amazon Managed Prometheus workspace ID | diff --git a/examples/existing-cluster-with-base-and-infra/outputs.tf b/examples/existing-cluster-with-base-and-infra/outputs.tf index 5df79f3..3554a75 100644 --- a/examples/existing-cluster-with-base-and-infra/outputs.tf +++ b/examples/existing-cluster-with-base-and-infra/outputs.tf @@ -22,3 +22,8 @@ output "managed_prometheus_workspace_id" { description = "Amazon Managed Prometheus workspace ID" value = module.eks_observability_accelerator.managed_prometheus_workspace_id } + +output "grafana_dashboard_urls" { + description = "URLs for dashboards created" + value = module.workloads_infra.grafana_dashboard_urls +} diff --git a/modules/workloads/infra/README.md b/modules/workloads/infra/README.md index 2963936..b981291 100644 --- a/modules/workloads/infra/README.md +++ b/modules/workloads/infra/README.md @@ -75,5 +75,7 @@ This module is inspired from the open source [kube-prometheus-stack](https://git ## Outputs -No outputs. +| Name | Description | +|------|-------------| +| [grafana\_dashboard\_urls](#output\_grafana\_dashboard\_urls) | URLs for dashboards created | diff --git a/modules/workloads/infra/outputs.tf b/modules/workloads/infra/outputs.tf index e69de29..50c09c6 100644 --- a/modules/workloads/infra/outputs.tf +++ b/modules/workloads/infra/outputs.tf @@ -0,0 +1,10 @@ +output "grafana_dashboard_urls" { + value = [concat( + grafana_dashboard.workloads.*.url, + grafana_dashboard.nodes.*.url, + grafana_dashboard.nsworkload.*.url, + grafana_dashboard.kubelet.*.url, + grafana_dashboard.cluster.*.url, + )] + description = "URLs for dashboards created" +} diff --git a/modules/workloads/nginx/README.md b/modules/workloads/nginx/README.md index d665532..67a9ac6 100644 --- a/modules/workloads/nginx/README.md +++ b/modules/workloads/nginx/README.md @@ -60,5 +60,7 @@ It provides the following resources: ## Outputs -No outputs. +| Name | Description | +|------|-------------| +| [grafana\_dashboard\_urls](#output\_grafana\_dashboard\_urls) | URLs for dashboards created | diff --git a/modules/workloads/nginx/outputs.tf b/modules/workloads/nginx/outputs.tf index e69de29..a5bac35 100644 --- a/modules/workloads/nginx/outputs.tf +++ b/modules/workloads/nginx/outputs.tf @@ -0,0 +1,4 @@ +output "grafana_dashboard_urls" { + value = [concat(grafana_dashboard.workloads.*.url)] + description = "URLs for dashboards created" +}