Skip to content

Commit 5298060

Browse files
AWSO 2.13.0 doc (#5771)
* Updated doc for tag support for awso related AWS resources using TF * Added note for aws_resource_tags * Addressed review comment * Added note for GIS CloudTrail DevOps app is deprecated * Rephrased GIS CloudTrail DevOps notes * Rephrased GIS CloudTrail DevOps notes * Update index.md --------- Co-authored-by: Amee Lepcha <[email protected]>
1 parent 4aa7dd2 commit 5298060

File tree

2 files changed

+24
-2
lines changed

2 files changed

+24
-2
lines changed

docs/observability/aws/deploy-use-aws-observability/deploy-with-aws-cloudformation/index.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ AWS Observability integrates with the [AWS Observability view](/docs/dashboards/
4545
Download this or other versions of this template from [Changelog](../changelog.md). 
4646
:::
4747
:::note
48-
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.
48+
- 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.
49+
- 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.
4950
:::
5051
1. Select the AWS Region where you want to deploy the AWS CloudFormation template.
5152
:::danger

docs/observability/aws/deploy-use-aws-observability/deploy-with-terraform.md

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@ If you've previously set up our AWS Observability Solution with CloudFormation a
3131

3232
:::
3333

34+
:::note
35+
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.
36+
:::
37+
38+
3439
For this setup, complete the following:
3540

3641
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.
406411
# access_id = var.sumologic_access_id
407412
# access_key = var.sumologic_access_key
408413
# environment = var.sumologic_environment
414+
# aws_resource_tags = var.aws_resource_tags
409415
#}
410416
```
411417

@@ -440,6 +446,7 @@ Configure providers for collection using the Terraform source-module.
440446
access_id = var.sumologic_access_id
441447
access_key = var.sumologic_access_key
442448
environment = var.sumologic_environment
449+
aws_resource_tags = var.aws_resource_tags
443450
444451
}
445452
```
@@ -462,6 +469,7 @@ module "production-us-east-1" {
462469
access_id = var.sumologic_access_id
463470
access_key = var.sumologic_access_key
464471
environment = var.sumologic_environment
472+
aws_resource_tags = var.aws_resource_tags
465473
}
466474
467475
module "production-us-east-2" {
@@ -472,7 +480,8 @@ module "production-us-east-2" {
472480
sumologic_organization_id = var.sumologic_organization_id
473481
access_id = var.sumologic_access_id
474482
access_key = var.sumologic_access_key
475-
environment = var.sumologic_environment
483+
environment = var.sumologic_environment
484+
aws_resource_tags = var.aws_resource_tags
476485
477486
# Use the same collector created for the first region of the production account.
478487
sumologic_existing_collector_details = {
@@ -502,6 +511,7 @@ module "production-us-east-1" {
502511
access_id = var.sumologic_access_id
503512
access_key = var.sumologic_access_key
504513
environment = var.sumologic_environment
514+
aws_resource_tags = var.aws_resource_tags
505515
}
506516
507517
module "production-us-east-2" {
@@ -513,6 +523,7 @@ module "production-us-east-2" {
513523
access_id = var.sumologic_access_id
514524
access_key = var.sumologic_access_key
515525
environment = var.sumologic_environment
526+
aws_resource_tags = var.aws_resource_tags
516527
517528
# Use the same collector created for the first region of the production account.
518529
sumologic_existing_collector_details = {
@@ -530,6 +541,7 @@ module "development-us-west-1" {
530541
access_id = var.sumologic_access_id
531542
access_key = var.sumologic_access_key
532543
environment = var.sumologic_environment
544+
aws_resource_tags = var.aws_resource_tags
533545
}
534546
```
535547
@@ -592,6 +604,7 @@ module "collection-module" {
592604
access_id = var.sumologic_access_id
593605
access_key = var.sumologic_access_key
594606
environment = var.sumologic_environment
607+
aws_resource_tags = var.aws_resource_tags
595608
}
596609
```
597610
@@ -623,8 +636,15 @@ module "collection-module" {
623636
}
624637
fields = {}
625638
}
639+
aws_resource_tags = {
640+
env = "prod"
641+
author = "sumologic"
642+
}
626643
}
627644
```
645+
:::note
646+
`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.
647+
:::
628648
629649
**Override Example 2: Override the auto_enable_access_logs parameter**
630650
@@ -639,6 +659,7 @@ module "collection-module" {
639659
access_key = var.sumologic_access_key
640660
environment = var.sumologic_environment
641661
auto_enable_access_logs = None
662+
aws_resource_tags = var.aws_resource_tags
642663
}
643664
```
644665

0 commit comments

Comments
 (0)