Create a new AMG workspace

examples/variables.tf

@@ -14,7 +14,7 @@ variable "aws_region" {
   description = "AWS Region"
   type        = string
 }
-variable "managed_prometheus_id" {
+variable "managed_prometheus_workspace_id" {
   type    = string
   default = ""
 }
@@ -26,3 +26,10 @@ variable "managed_prometheus_region" {
   type    = string
   default = ""
 }
+
+
+variable "managed_grafana_workspace_id" {
+  type    = string
+  default = ""
+}
+

examples/workloads.tf

@@ -7,6 +7,8 @@ module "eks_observability_accelerator" {
   aws_region     = var.aws_region
   eks_cluster_id = var.eks_cluster_id
 
+  # TODO: create also a cluster, VPC -- check if enough VPCs
+
   # deploys AWS Distro for OpenTelemetry operator into the cluster
   enable_amazon_eks_adot = false
 
@@ -15,20 +17,27 @@ module "eks_observability_accelerator" {
 
   # # -- or enable opentelemetry operator
   enable_opentelemetry_operator = false #-- true doesn't work for me, needs fix
-  # open_telemetry_operator_config = map() // custom config
+  #open_telemetry_operator_config = map() // custom config
 
   # creates a new AMP workspace, defaults to true
-  create_managed_prometheus_workspace = false
+  enable_managed_prometheus = false
 
   # reusing existing AMP -- needs data source for alerting rules
-  managed_prometheus_id     = var.managed_prometheus_id
-  managed_prometheus_region = null # defaults to the current region, useful for cross region scenarios
+  managed_prometheus_id     = var.managed_prometheus_workspace_id
+  managed_prometheus_region = null # defaults to the current region, useful for cross region scenarios (same account)
 
   # sets up the AMP alert manager at the workspace level
   enable_alertmanager = true
 
+  # create a new Grafana workspace
+  enable_managed_grafana = true
+  #managed_grafana_workspace_id = "g-9790a4306b"
+
+
+
   enable_java                 = true
-  enable_java_recording_rules = true # defaults to true
+  enable_java_recording_rules = true
+
 
   # enable_haproxy = true
   # haproxy_config = {
@@ -42,17 +51,6 @@ module "eks_observability_accelerator" {
   #   grafana_endpoint = ""
   # }
 
-
-
-
-  # # -- or use an existing one
-  # # seems like https://github.com/terraform-aws-modules/terraform-aws-managed-service-prometheus
-  # # supports importing
-  # amp_workspace_alias = var.amp_alias
-
-  # # enable rules and alerts
-  # enable_alert_manager = true
-
   # # -- or provide custom alerts definition
   # prometheus_custom_alert_rule = var.prometheus_custom_alert_rule
 
@@ -65,12 +63,12 @@ module "eks_observability_accelerator" {
   # grafana_permission_role_arn      = var.grafana_permission_role_arn // if CUSTOMER_MANAGED
 
   # # -- or using existing amg workspace. so we can use API for keys
-  # managed_grafana_workspace_id = var.managed_grafana_workspace_id
+
 
   tags = local.tags
 
-}
 
+}
 # module "amp" {
 
 # }