Support implicit new AMP creation

bonclay7 · bonclay7 · commit 9437a97285d2 · 2022-09-01T15:34:27.000+02:00
diff --git a/examples/existing-cluster-with-base-and-infra/main.tf b/examples/existing-cluster-with-base-and-infra/main.tf
@@ -28,7 +28,7 @@ terraform {
   required_providers {
     grafana = {
       source  = "grafana/grafana"
-      version = "1.25.0"
+      version = ">= 1.25.0"
     }
   }
 }
@@ -41,6 +41,8 @@ locals {
   eks_cluster_endpoint = data.aws_eks_cluster.this.endpoint
   eks_cluster_version  = data.aws_eks_cluster.this.version
 
+  create_new_workspace = var.managed_prometheus_workspace_id == "" ? true : false
+
   tags = {
     Source = "github.com/aws-observability/terraform-aws-observability-accelerator"
   }
@@ -61,9 +63,9 @@ module "eks_observability_accelerator" {
   enable_cert_manager = true
 
   # creates a new AMP workspace, defaults to true
-  enable_managed_prometheus = false
+  enable_managed_prometheus = local.create_new_workspace
 
-  # reusing existing AMP -- needs data source for alerting rules
+  # reusing existing AMP if specified
   managed_prometheus_workspace_id     = var.managed_prometheus_workspace_id
   managed_prometheus_workspace_region = null # defaults to the current region, useful for cross region scenarios (same account)
 

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ terraform {`
`28`	`28`	`required_providers {`
`29`	`29`	`grafana = {`
`30`	`30`	`source = "grafana/grafana"`
`31`		`- version = "1.25.0"`
	`31`	`+ version = ">= 1.25.0"`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`	`}`
`@@ -41,6 +41,8 @@ locals {`
`41`	`41`	`eks_cluster_endpoint = data.aws_eks_cluster.this.endpoint`
`42`	`42`	`eks_cluster_version = data.aws_eks_cluster.this.version`
`43`	`43`
	`44`	`+ create_new_workspace = var.managed_prometheus_workspace_id == "" ? true : false`
	`45`	`+`
`44`	`46`	`tags = {`
`45`	`47`	`Source = "github.com/aws-observability/terraform-aws-observability-accelerator"`
`46`	`48`	`}`
`@@ -61,9 +63,9 @@ module "eks_observability_accelerator" {`
`61`	`63`	`enable_cert_manager = true`
`62`	`64`
`63`	`65`	`# creates a new AMP workspace, defaults to true`
`64`		`- enable_managed_prometheus = false`
	`66`	`+ enable_managed_prometheus = local.create_new_workspace`
`65`	`67`
`66`		`- # reusing existing AMP -- needs data source for alerting rules`
	`68`	`+ # reusing existing AMP if specified`
`67`	`69`	`managed_prometheus_workspace_id = var.managed_prometheus_workspace_id`
`68`	`70`	`managed_prometheus_workspace_region = null # defaults to the current region, useful for cross region scenarios (same account)`
`69`	`71`