Merge pull request #1438 from splunk/repo-sync

Pulling refs/heads/main into main

Author: aurbiztondo-splunk

gdi/get-data-in/connect/aws/aws-cloudformation.rst

@@ -7,66 +7,50 @@ Available CloudFormation and Terraform templates
 .. meta::
   :description: CloudFormation templates for AWS in Splunk Observability Cloud.
 
-
 To create Splunk-managed Metric Streams resources you can either use :ref:`CloudFormation <aws-cloudformation-use>` or a :ref:`Terraform template <aws-terraform-use>`.
 
 .. _aws-cloudformation-use:
 
 Use CloudFormation to connect to Splunk Observability Cloud
 ========================================================================================
 
-You need to install the AWS integration first before you use any Cloudformation template. Learn more at :ref:`get-started-aws`.
+To use CloudFormation to connect to Splunk Observability Cloud follow these steps:
+
+1. Install the AWS integration. Learn more at :ref:`get-started-aws`.
+
+2. Decide which :ref:`CloudFormation template <aws-cloudformation-templates>` to use depending on your deployment method (for example, per AWS region or per AWS account) and integration type. Note that templates are only available for Metric Sreams.
 
-Decide which CloudFormation template to use depending on your deployment method (for example, per AWS region or per AWS account) and integration type. Even if you don't intend to use all options, you can safely deploy a CloudFormation template, since unused infrastructure doesn't generate costs.
+  * Even if you don't intend to use all options you can safely deploy any CloudFormation template since unused infrastructure doesn't generate costs.
+
+3. Select the QuickLink for your chosen template. The QuickLink automatically opens the AWS Management Console in the last region you used, but you can select any other region in the AWS Management Console.
 
 .. caution:: Splunk Log Observer is no longer available for new users. You can continue to use Log Observer if you already have an entitlement. To collect logs, see :ref:`aws-logs`.
 
+.. _aws-cloudformation-templates:
+
 Prepopulated CloudFormation templates
 -------------------------------------------
 
-Select the QuickLink for a template which supports Metric Streams to open the AWS Management Console in the last region that you used.
+These are the available prepopulated CloudFormation templates to create AWS Metric Streams resources:
 
 .. list-table::
   :header-rows: 1
-  :widths: 20, 20, 35, 35
+  :widths: 20, 40, 40
   :width: 100
 
-  * - Supports Metric Streams
-    - Deployment type
+  * - Deployment type
     - QuickLink
     - Hosted template 
 
-  * - Yes
-    - Once per account (using StackSets)
-    - Deploy this :new-page:`QuickLink <https://console.aws.amazon.com/cloudformation/home#/stacks/create/review?templateURL=https://o11y-public.s3.amazonaws.com/aws-cloudformation-templates/release/template_all_features.yaml>`
-    - :new-page:`Hosted template <https://o11y-public.s3.amazonaws.com/aws-cloudformation-templates/release/template_all_features.yaml>`
-
-  * - Yes
-    - In each region
-    - Deploy :new-page:`this QuickLink <https://console.aws.amazon.com/cloudformation/home#/stacks/create/review?templateURL=https://o11y-public.s3.amazonaws.com/aws-cloudformation-templates/release/template_all_features_regional.yaml>` in every region 
-    - :new-page:`Hosted template <https://o11y-public.s3.amazonaws.com/aws-cloudformation-templates/release/template_all_features_regional.yaml>`
-
-  * - No
-    - Once per account (using StackSets)
-    - Deploy this :new-page:`QuickLink <https://console.aws.amazon.com/cloudformation/home#/stacks/create/review?templateURL=https://o11y-public.s3.amazonaws.com/aws-cloudformation-templates/release/template_logs.yaml>`
-    - :new-page:`Hosted template <https://o11y-public.s3.amazonaws.com/aws-cloudformation-templates/release/template_logs.yaml>`
-
-  * - No
-    - In each region
-    - Deploy :new-page:`this QuickLink <https://console.aws.amazon.com/cloudformation/home#/stacks/create/review?templateURL=https://o11y-public.s3.amazonaws.com/aws-cloudformation-templates/release/template_logs_regional.yaml>` in every region
-    - :new-page:`Hosted template <https://o11y-public.s3.amazonaws.com/aws-cloudformation-templates/release/template_logs_regional.yaml>`
-
-  * - Yes
-    - Once per account (using StackSets)
+  * - Once per account (using StackSets)
     - Deploy this :new-page:`QuickLink <https://console.aws.amazon.com/cloudformation/home#/stacks/create/review?templateURL=https://o11y-public.s3.amazonaws.com/aws-cloudformation-templates/release/template_metric_streams.yaml>`
     - :new-page:`Hosted template <https://o11y-public.s3.amazonaws.com/aws-cloudformation-templates/release/template_metric_streams.yaml>`
 
-  * - Yes
-    - In each region
+  * - In each region
     - Deploy :new-page:`this QuickLink <https://console.aws.amazon.com/cloudformation/home#/stacks/create/review?templateURL=https://o11y-public.s3.amazonaws.com/aws-cloudformation-templates/release/template_metric_streams_regional.yaml>` in every region
     - :new-page:`Hosted template <https://o11y-public.s3.amazonaws.com/aws-cloudformation-templates/release/template_metric_streams_regional.yaml>`
 
-From the :strong:`CloudFormation templates` table, select the QuickLink for a template with support for metric streams. The QuickLink automatically opens the AWS Management Console in the last region you used, but you can select any other region in the AWS Management Console.
+To see other CloudFormation templates offered by Splunk Observability Cloud refer to the :new-page:`AWS CloudFormation templates <https://github.com/signalfx/aws-cloudformation-templates/tree/main>` repo in GitHub.
 
 Custom CloudFormation templates
 -------------------------------------------
@@ -85,6 +69,8 @@ You can optionally use AWS CloudFormation StackSets to work simultaneously acros
 Use the Terraform template to connect to Splunk Observability Cloud
 ========================================================================================
 
-Alternatively, you can also deploy Kinesis Firehose with Terraform. See :new-page:`Terraform Setup for Creating Kinesis Firehose to Send CloudWatch Metric Stream <https://github.com/signalfx/aws-terraform-templates/tree/main>`.
+Alternatively, you can also deploy Kinesis Firehose with Terraform. See the :new-page:`Terraform Setup for Creating Kinesis Firehose to Send CloudWatch Metric Stream <https://github.com/signalfx/aws-terraform-templates/tree/main>` GitHub repo.
+
+The provided Terraform template supports Metric Streams only, and does not offer log support.
 
-The provided Terraform template supports Metric Streams only, and does not offer log support.
+For more information on how to use Terraform to connect to AWS, see :ref:`terraform-config`.

gdi/get-data-in/connect/aws/aws-terraformconfig.rst

@@ -99,7 +99,14 @@ To configure a connection through Terraform, perform the following steps:
 
 5. Add your cloud service as a data source, as described in: :guilabel:`Data Source: signalfx_aws_services`, :guilabel:`Data Source: signalfx_azure_services`, or :guilabel:`Data Source: signalfx_gcp_services`. Data sources allow Terraform to use information defined outside of Terraform, defined by another separate Terraform configuration, or modified by functions.  
 
-.. note:: For more Terraform syntax examples, see the blog entry :new-page:`Manage Your Splunk Infrastructure as Code Using Terraform <https://www.splunk.com/en_us/blog/partners/manage-your-splunk-infrastructure-as-code-using-terraform.html>`. For examples of how to configure through the Splunk Observability Cloud API, see :ref:`Connect to AWS using the Splunk Observability Cloud API <get-configapi>`.
+Additional resources
+-------------------------------------------
+
+See also:
+
+* For more Terraform syntax examples, see the blog entry :new-page:`Manage Your Splunk Infrastructure as Code Using Terraform <https://www.splunk.com/en_us/blog/partners/manage-your-splunk-infrastructure-as-code-using-terraform.html>`. 
+* For examples of how to configure through the Splunk Observability Cloud API, see :ref:`Connect to AWS using the Splunk Observability Cloud API <get-configapi>`.
+* For AWS Terraform templates, see :ref:`aws-terraform-use`.
 
 Next steps
 ===============

gdi/get-data-in/connect/aws/get-awstoc.rst

@@ -18,8 +18,8 @@ Connect AWS to Splunk Observability Cloud
   Connect with AWS-managed Metric Streams <aws-console-ms>  
   Connect to AWS using the Splunk API <aws-apiconfig>  
   Connect to AWS with Terraform <aws-terraformconfig>
+  CloudFormation and Terraform templates <aws-cloudformation>
   Send AWS logs to Splunk Platform <aws-logs>
-  CloudFormation templates <aws-cloudformation>
   Next steps <aws-post-install>
   Troubleshoot your AWS integration <aws-troubleshooting>
   Troubleshoot Metric Streams <aws-ts-metric-streams>