diff --git a/examples/main.tf b/examples/main.tf new file mode 100644 index 0000000..110b566 --- /dev/null +++ b/examples/main.tf @@ -0,0 +1,16 @@ +provider "aws" { + region = local.region +} + + +locals { + name = basename(path.cwd) + region = var.aws_region + + vpc_cidr = "10.0.0.0/16" + //azs = slice(data.aws_availability_zones.available.names, 0, 3) + + tags = { + GithubRepo = "github.com/aws-ia/terraform-aws-observability-accelerator" + } +} diff --git a/examples/outputs.tf b/examples/outputs.tf new file mode 100644 index 0000000..ab5a1d7 --- /dev/null +++ b/examples/outputs.tf @@ -0,0 +1,9 @@ +output "eks_cluster_id" { + description = "EKS Cluster Id" + value = module.eks_observability_accelerator.eks_cluster_id +} + +output "aws_region" { + description = "AWS Region" + value = module.eks_observability_accelerator.aws_region +} diff --git a/examples/variables.tf b/examples/variables.tf new file mode 100644 index 0000000..712e724 --- /dev/null +++ b/examples/variables.tf @@ -0,0 +1,16 @@ +variable "java" { + default = { + a = "" + b = "" + } +} + +variable "eks_cluster_id" { + description = "EKS Cluster Id" + type = string +} + +variable "aws_region" { + description = "AWS Region" + type = string +} diff --git a/examples/workloads.tf b/examples/workloads.tf index ca3309e..7132dff 100644 --- a/examples/workloads.tf +++ b/examples/workloads.tf @@ -1,67 +1,73 @@ module "eks_observability_accelerator" { - source = "aws-ia/aws-observability-accelerator/terraform/eks" + #source = "aws-ia/aws-observability-accelerator/terraform/eks" + source = "../" + + aws_region = var.aws_region - # -- or use an existing cluster eks_cluster_id = var.eks_cluster_id - # enable managed add-on for ADOT. Do we enforce this or let users - # have their own configs for OTEL operator - enable_amazon_eks_adot = true - # -- or enable opentelemetry operator - enable_open_telemetry_operator = true - open_telemetry_operator_config = map() // custom config + # # -- or use an existing cluster + # eks_cluster_id = var.eks_cluster_id - # deploy selected workloads by count indexing + # # enable managed add-on for ADOT. Do we enforce this or let users + # # have their own configs for OTEL operator + # enable_amazon_eks_adot = true - # this creates a new AMP workspace - create_managed_prometheus_workspace = true + # # -- or enable opentelemetry operator + # enable_open_telemetry_operator = true + # open_telemetry_operator_config = map() // custom config - enable_haproxy = true - haproxy_config = { - amp_endpoint = module / amp.endpoint - grafana_endpoint = module.grafana.endpoint - } + # # deploy selected workloads by count indexing - enable_java = true - java_config = { - amp_endpoint = "" - grafana_endpoint = "" - } + # # this creates a new AMP workspace + # create_managed_prometheus_workspace = true + + # enable_haproxy = true + # haproxy_config = { + # amp_endpoint = module / amp.endpoint + # grafana_endpoint = module.grafana.endpoint + # } + + # enable_java = true + # java_config = { + # amp_endpoint = "" + # 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 + # # -- 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 + # # enable rules and alerts + # enable_alert_manager = true - # -- or provide custom alerts definition - prometheus_custom_alert_rule = var.prometheus_custom_alert_rule + # # -- or provide custom alerts definition + # prometheus_custom_alert_rule = var.prometheus_custom_alert_rule - # create grafana workspace, and customer to deal with authentication later - create_managed_grafana_workspace = true - grafana_auth_provider = var.grafana_auth_provider //SAML or AWS_SSO - grafana_account_access_type = var.grafana_account_access_type // CURRENT_ACCOUNT or ORGANIZATION - grafana_permission_type = var.grafana_permission_type // SERVICE_MANAGED or CUSTOMER_MANAGED - grafana_permission_role_arn = var.grafana_permission_role_arn // if CUSTOMER_MANAGED + # # create grafana workspace, and customer to deal with authentication later + # create_managed_grafana_workspace = true + # grafana_auth_provider = var.grafana_auth_provider //SAML or AWS_SSO + # grafana_account_access_type = var.grafana_account_access_type // CURRENT_ACCOUNT or ORGANIZATION + # grafana_permission_type = var.grafana_permission_type // SERVICE_MANAGED or CUSTOMER_MANAGED + # 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 + # # -- or using existing amg workspace. so we can use API for keys + # managed_grafana_workspace_id = var.managed_grafana_workspace_id } -module "amp" { +# module "amp" { -} +# } -module "grafana" { +# module "grafana" { -} \ No newline at end of file +# } diff --git a/main.tf b/main.tf index e54e78b..b1ce5b0 100644 --- a/main.tf +++ b/main.tf @@ -6,12 +6,5 @@ # module "java" { - source = "" - + source = "./modules/java" } - - -module "haproxy" { - source = "" - -} \ No newline at end of file diff --git a/modules/adot-amp-grafana-for-haproxy/main.tf b/modules/haproxy/main.tf similarity index 100% rename from modules/adot-amp-grafana-for-haproxy/main.tf rename to modules/haproxy/main.tf diff --git a/modules/java/main.tf b/modules/java/main.tf new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/modules/java/main.tf @@ -0,0 +1 @@ + diff --git a/outputs.tf b/outputs.tf index e69de29..9c86e64 100644 --- a/outputs.tf +++ b/outputs.tf @@ -0,0 +1,9 @@ +output "eks_cluster_id" { + description = "EKS Cluster Id" + value = var.eks_cluster_id +} + +output "aws_region" { + description = "EKS Cluster Id" + value = var.aws_region +} diff --git a/variables.tf b/variables.tf index 295dc80..712e724 100644 --- a/variables.tf +++ b/variables.tf @@ -3,4 +3,14 @@ variable "java" { a = "" b = "" } -} \ No newline at end of file +} + +variable "eks_cluster_id" { + description = "EKS Cluster Id" + type = string +} + +variable "aws_region" { + description = "AWS Region" + type = string +}