diff --git a/docs/observability/aws/deploy-use-aws-observability/deploy-with-aws-cloudformation/index.md b/docs/observability/aws/deploy-use-aws-observability/deploy-with-aws-cloudformation/index.md index d52228dc4c..9ffcf2bb71 100644 --- a/docs/observability/aws/deploy-use-aws-observability/deploy-with-aws-cloudformation/index.md +++ b/docs/observability/aws/deploy-use-aws-observability/deploy-with-aws-cloudformation/index.md @@ -45,7 +45,8 @@ AWS Observability integrates with the [AWS Observability view](/docs/dashboards/ Download this or other versions of this template from [Changelog](../changelog.md).  ::: :::note - To change the Collector Name and Source Categories of Sumo Logic sources, you must download CloudFormation template version 2.1.0 or greater and follow the instructions in the (#modify-the-collector-name-and-source-categories) section. + - To change the Collector Name and Source Categories of Sumo Logic sources, you must download CloudFormation template version 2.1.0 or greater and follow the instructions in the [Modify the source categories](#modify-the-source-categories) section. + - The Global Intelligence for AWS CloudTrail DevOps app is planned for deprecation in the near future and has therefore been removed from the AWS Observability Solution. With this removal, the app will no longer be backed up or maintained during future solution upgrades. ::: 1. Select the AWS Region where you want to deploy the AWS CloudFormation template. :::danger diff --git a/docs/observability/aws/deploy-use-aws-observability/deploy-with-terraform.md b/docs/observability/aws/deploy-use-aws-observability/deploy-with-terraform.md index 617d041953..ab1bd54f1f 100644 --- a/docs/observability/aws/deploy-use-aws-observability/deploy-with-terraform.md +++ b/docs/observability/aws/deploy-use-aws-observability/deploy-with-terraform.md @@ -31,6 +31,11 @@ If you've previously set up our AWS Observability Solution with CloudFormation a ::: +:::note +The Global Intelligence for AWS CloudTrail DevOps app is planned for deprecation in the near future and has therefore been removed from the AWS Observability Solution. With this removal, the app will no longer be backed up or maintained during future solution upgrades. +::: + + For this setup, complete the following: 1. Set up the [AWS CLI](https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-install.html). @@ -406,6 +411,7 @@ Configure providers for collection using the Terraform source-module. # access_id = var.sumologic_access_id # access_key = var.sumologic_access_key # environment = var.sumologic_environment + # aws_resource_tags = var.aws_resource_tags #} ``` @@ -440,6 +446,7 @@ Configure providers for collection using the Terraform source-module. access_id = var.sumologic_access_id access_key = var.sumologic_access_key environment = var.sumologic_environment + aws_resource_tags = var.aws_resource_tags } ``` @@ -462,6 +469,7 @@ module "production-us-east-1" { access_id = var.sumologic_access_id access_key = var.sumologic_access_key environment = var.sumologic_environment + aws_resource_tags = var.aws_resource_tags } module "production-us-east-2" { @@ -472,7 +480,8 @@ module "production-us-east-2" { sumologic_organization_id = var.sumologic_organization_id access_id = var.sumologic_access_id access_key = var.sumologic_access_key - environment = var.sumologic_environment + environment = var.sumologic_environment + aws_resource_tags = var.aws_resource_tags # Use the same collector created for the first region of the production account. sumologic_existing_collector_details = { @@ -502,6 +511,7 @@ module "production-us-east-1" { access_id = var.sumologic_access_id access_key = var.sumologic_access_key environment = var.sumologic_environment + aws_resource_tags = var.aws_resource_tags } module "production-us-east-2" { @@ -513,6 +523,7 @@ module "production-us-east-2" { access_id = var.sumologic_access_id access_key = var.sumologic_access_key environment = var.sumologic_environment + aws_resource_tags = var.aws_resource_tags # Use the same collector created for the first region of the production account. sumologic_existing_collector_details = { @@ -530,6 +541,7 @@ module "development-us-west-1" { access_id = var.sumologic_access_id access_key = var.sumologic_access_key environment = var.sumologic_environment + aws_resource_tags = var.aws_resource_tags } ``` @@ -592,6 +604,7 @@ module "collection-module" { access_id = var.sumologic_access_id access_key = var.sumologic_access_key environment = var.sumologic_environment + aws_resource_tags = var.aws_resource_tags } ``` @@ -623,8 +636,15 @@ module "collection-module" { } fields = {} } + aws_resource_tags = { + env = "prod" + author = "sumologic" + } } ``` +:::note +`aws_resource_tags` is a map of tags that will be applied to all AWS resources provisioned through the AWS Observability Solution, except for SAM nested sources, which are not tagged. +::: **Override Example 2: Override the auto_enable_access_logs parameter** @@ -639,6 +659,7 @@ module "collection-module" { access_key = var.sumologic_access_key environment = var.sumologic_environment auto_enable_access_logs = None + aws_resource_tags = var.aws_resource_tags } ```