Merge branch 'master' into jul-19_typos [netlify-ignore]

Author: markzegarelli

src/_data/catalog/overrides-list.yml

@@ -1,3 +1,5 @@
 items:
   - hubspot
   - iterable
+  - google-ads-gtag
+  - klaviyo

src/_data/catalog/overrides.yml

@@ -37,3 +37,26 @@ items:
       accepts cloud-mode data from all Segment source types. It does not offer device-mode connections.
     cmode_type: mixed
     case: '5'
+- slug: google-ads-gtag
+  previous_names:
+  - Google AdWords New
+- slug: klaviyo
+  display_name: Klaviyo
+  components:
+  - code: 'https://github.com/segment-integrations/analytics.js-integration-klaviyo'
+    type: browser
+  - code: 'https://github.com/segmentio/integrations/tree/master/integrations/klaviyo'
+    type: server
+  connection_modes:
+    device:
+      web: true
+      mobile: false
+      server: false
+    cloud:
+      web: false
+      mobile: true
+      server: true
+    summary: >-
+      accepts data in cloud-mode from web and mobile sources, and can accept data in device-mode from Analytics.js sources.
+    cmode_type: mixed
+    case: '10'

src/_includes/content/destination-footer.md

@@ -5,6 +5,8 @@
 
 {% if currentIntegration.platforms.server == true %}
 {% unless page.hide-personas-partial == true %}
+{% assign overridesList = site.data.catalog.overrides-list.items %}
+
 
 ## Personas
 
@@ -69,10 +71,14 @@ Segment lets you change these destination settings from the Segment app without
 ## Adding {{ currentIntegration.display_name }} to the integrations object
 
 To add {{ currentIntegration.display_name }} to the `integrations` JSON object (for example, [to filter data from a specific source](/docs/guides/filtering-data/#filtering-with-the-integrations-object)), use one of the following valid names for this integration:
+{% if page.name-override %}
+{% assign currentIntegration = site.data.catalog.overrides.items | where: "slug", currentSlug | first %}
+{% endif %}
 
 {% for valid_name in currentIntegration.previous_names %}
 - {{ valid_name }}
 {% endfor %}
+
 {% endunless %}
 {% endif %}
 

src/_sass/components/_markdown.scss

@@ -293,7 +293,7 @@
 
 }
 
-a[target="_blank"]:after:not(.reference-button){
+a[target="_blank"]:not(.reference-button):after{
   content: url("/docs/images/external-link-alt-solid.svg");
   margin-left: 4px;
 }

src/connections/destinations/add-destination.md

@@ -187,7 +187,6 @@ For the following destinations, a single source can connect to up to 10 instance
 - [ActiveCampaign](/docs/connections/destinations/catalog/activecampaign/)
 - [Akita](/docs/connections/destinations/catalog/akita/)
 - [All Aboard](/docs/connections/destinations/catalog/all-aboard/)
-- [Amazon EventBridge](/docs/connections/destinations/catalog/amazon-eventbridge/)
 - [Amazon Kinesis](/docs/connections/destinations/catalog/amazon-kinesis/)
 - [Amazon Kinesis Firehose](/docs/connections/destinations/catalog/amazon-kinesis-firehose/)
 - [Amazon Lambda](/docs/connections/destinations/catalog/amazon-lambda/)

src/connections/destinations/catalog/amazon-kinesis-firehose/index.md

@@ -178,27 +178,33 @@ Replace that snippet with the following, and replace the contents of the array w
 
 #### Use a single secret ID
 
-If you have so many sources using Kinesis that it is impractical to attach all of their IDs to your IAM role, you can set a single ID to use instead. **This approach requires that you securely store a secret value, so we recommend that you use the method above if at all possible. **
+If you have many sources using Kinesis that it's impractical to attach all of their IDs to your IAM role, you can set a single ID to use instead. *This approach requires that you securely store a secret value, so we recommend that you use the method above if at all possible.*
 
-To set this value, go to the Kinesis Firehose destination settings from each of your Segment sources and set the **Secret ID'** to a value of your choosing. This value is a secret and should be treated as sensitively as a password. Once all of your sources have been updated to use this value, find the IAM role you created for this destination in the AWS Console in Services > IAM > Roles. Click on the role, and navigate to the **Trust Relationships** tab. Click **Edit trust relationship**. You should see a snippet that looks something that looks like this:
+To set this value for a single Secret ID:
+1. Go to the Kinesis Firehose destination settings from each of your Segment sources.
+2. Click **Secret ID** and enter your Workspace ID.
+    * **NOTE:** For security purposes, Segment recommends you to use your Segment Workspace ID as your Secret ID. If you’re using a Secret ID different from your Workspace ID, you're susceptible to attacks. You can find your Workspace ID by going to:  **Settings > Workspace Settings > ID** from the Segment dashboard.
+3. Once all of your sources are updated to use this value, find the IAM role you created for this destination in the AWS Console in **Services > IAM > Roles**.
+4. Select the role and navigate to the **Trust Relationships** tab.
+5. Click **Edit trust relationship**. You should see a snippet that looks something that looks like this:
 
-```json
-{
-  "Version": "2012-10-17",
-  "Statement": [
+    ```json
     {
-      "Effect": "Allow",
-      "Principal": {
-        "AWS": "arn:aws:iam::595280932656:root"
-      },
-      "Action": "sts:AssumeRole",
-      "Condition": {
-        "StringEquals": {
-          "sts:ExternalId": "YOUR_SEGMENT_SOURCE_ID"
+      "Version": "2012-10-17",
+      "Statement": [
+        {
+          "Effect": "Allow",
+          "Principal": {
+            "AWS": "arn:aws:iam::595280932656:root"
+          },
+          "Action": "sts:AssumeRole",
+          "Condition": {
+            "StringEquals": {
+              "sts:ExternalId": "YOUR_SEGMENT_SOURCE_ID"
+            }
+          }
         }
-      }
+      ]
     }
-  ]
-}
-```
-Replace your source ID (found at "YOUR_SEGMENT_SOURCE_ID") with your secret ID.
+    ```
+6. Replace the value of `sts:ExternalId` ( "YOUR_SEGMENT_SOURCE_ID") with the Secret ID / Workspace ID value from the previous step.

src/connections/destinations/catalog/amazon-kinesis/index.md

@@ -182,7 +182,7 @@ Replace that snippet with the following, and replace the contents of the array w
 
 ### Update IAM to Support PutRecords
 
-The Kinesis destination defaults to use PutRecords. A previous version of the IAM policy document only granted `PutRecord` access, which can slow down Kinesis write times and degrade data deliverability. Substitute the updated policy document above to grant Kinesis `PutRecords` (plural) and allow batching, like this: 
+The Kinesis destination defaults to use PutRecords. A previous version of the IAM policy document only granted `PutRecord` access, which can slow down Kinesis write times and degrade data deliverability. Substitute the updated policy document above to grant Kinesis `PutRecords` (plural) and allow batching, like this:
    ```json
    {
       "Version": "2012-10-17",
@@ -205,25 +205,31 @@ The Kinesis destination defaults to use PutRecords. A previous version of the IA
 After you update the IAM policy, Segment systems default to use PutRecords for more efficient data transmission. This is a zero-downtime change and does not impact your data other than increasing the deliverability success rate.
 
 ### Use a single secret ID
-If you have so many sources using Kinesis that it is impractical to attach all of their IDs to your IAM role, you can instead opt to set a single ID to use instead. This approach should be avoided in favor of the above approach if possible since it will result in you having to keep track of a secret value. To set this value, go to the Kinesis destination settings from each of your Segment sources and set the 'Secret ID' to a value of your choosing. This value is a secret and should be treated as sensitively as a password. Once all of your sources have been updated to use this value, find the IAM role you created for this destination in the AWS Console in Services > IAM > Roles. Click on the role, and navigate to the **Trust Relationships** tab. Click **Edit trust relationship**. You should see a snippet that looks something that looks like this:
-
-```json
-{
-  "Version": "2012-10-17",
-  "Statement": [
+If you have many sources using Kinesis that it's impractical to attach all of their IDs to your IAM role, you can instead opt to set a single ID to use. To set this value:
+1. Go to **Connections > Destinations > Amazon Kinesis** for each of your Segment sources.
+2. Click **Secret ID** and enter your Workspace ID.
+    * **NOTE:** For security purposes, Segment recommends you to use your Workspace ID as your Secret ID. If you’re currently using a Secret ID different from your Workspace ID, you’ll be susceptible to attacks. You can find your Workspace ID by going to:  **Settings > Workspace Settings > ID**.
+3. Once all of your sources have been updated to use this value, find the IAM role you created for this destination in the AWS Console in **Services > IAM > Roles**.
+4. Click on the role and navigate to the **Trust Relationships** tab.
+5. Click **Edit trust relationship**. You should see a snippet that looks something that looks like this:
+
+    ```json
     {
-      "Effect": "Allow",
-      "Principal": {
-        "AWS": "arn:aws:iam::595280932656:root"
-      },
-      "Action": "sts:AssumeRole",
-      "Condition": {
-        "StringEquals": {
-          "sts:ExternalId": "YOUR_SEGMENT_SOURCE_ID"
+      "Version": "2012-10-17",
+      "Statement": [
+        {
+          "Effect": "Allow",
+          "Principal": {
+            "AWS": "arn:aws:iam::595280932656:root"
+          },
+          "Action": "sts:AssumeRole",
+          "Condition": {
+            "StringEquals": {
+              "sts:ExternalId": "YOUR_SEGMENT_SOURCE_ID"
+            }
+          }
         }
-      }
+      ]
     }
-  ]
-}
-```
-Replace your source ID (found at "YOUR_SEGMENT_SOURCE_ID") with your secret ID.
+    ```
+6. Replace the value of `sts:ExternalId` (`"YOUR_SEGMENT_SOURCE_ID"`) with your Secret ID.

src/connections/destinations/catalog/amazon-lambda/index.md

@@ -57,43 +57,47 @@ There are two options for setting up the IAM policy and role:
 
 ### Use CloudFormation
 
-Using CloudFormation minimizes the set up steps needed, and is Segment's recommended way to create your Lambda's policy and role.
+Using CloudFormation minimizes the setup steps needed, and is Segment's recommended way to create your Lambda's policy and role. To use CloudFormation:
+1. Create the CloudFormation Template.
+   1. Copy or download the [SegmentLambdaDestinationCFTemplate](https://github.com/segmentio/segment-lambda-recipes/blob/ead6c0f77deb38cea7ed486a7b98b47207796b5c/SegmentLambdaDestinationCFTemplate#L1){:target="_blank"} from the [segment-lambda-recipes](https://github.com/segmentio/segment-lambda-recipes){:target="_blank"} GitHub repo. 
+   2. Save the file with a name you like, but make sure it doesn't have a file extension.
+2. Create the CloudFormation stack.
+   1. Within the AWS Console, navigate to **CloudFormation > Stacks**.
 
-**Create the CloudFormation Template**
+      ![](images/CloudFormationStackNav.png)
 
-Copy or download the [SegmentLambdaDestinationCFTemplate](https://github.com/segmentio/segment-lambda-recipes/blob/ead6c0f77deb38cea7ed486a7b98b47207796b5c/SegmentLambdaDestinationCFTemplate#L1) from our [segment-lambda-recipes](https://github.com/segmentio/segment-lambda-recipes) GitHub repo. Save the file with whatever name you like, but make sure it doesn't have a file extension.
+   2. Click **Create Stack**.
 
-**Create the CloudFormation stack**
+      ![](images/CloudFormationCreateStack.png)
 
-Within the AWS Console, navigate to CloudFormation. Navigate to the Stacks page.
+   3. On the **Select Template** page, select **Upload a template to Amazon S3**. Using **Choose File**, select the SegmentLambdaDestinationCFTemplate you downloaded in the previous step.
 
-![](images/CloudFormationStackNav.png)
+   4. Click **Next**.
 
-Click the "Create Stack" button.
+      ![](images/CloudFormationUploadTemplate.png)
 
-![](images/CloudFormationCreateStack.png)
+   5. Give your stack a name.
+   6. For the **ExternalId** parameter, enter the "External ID" setting in your Segment Lambda destination settings. This should be your **Workspace ID**.
+      * **NOTE:** For security purposes, Segment recommends you to use your Workspace ID as your External ID. If you’re currently using an External ID different from your Workspace ID, you’ll be susceptible to attacks. You can find your Workspace ID by going to:  **Settings > Workspace Settings > ID**.
+   7. The **LambdaARN** parameter corresponds to the **Lambda** setting in your Segment Lambda destination settings.
 
-On the "Select Template" page, select "Upload a template to Amazon S3", then using "Chose File", select the SegmentLambdaDestinationCFTemplate you created/downloaded in the previous step.
+      ![](images/CloudFormationStackDetails.png)
 
-Click "Next".
+   8. You can leave the next page as is, no changes needed.
+   9. On the last page, review your template details and click **Create**.
+   10. You will now see your new Stack listed in the Stacks page.
 
-![](images/CloudFormationUploadTemplate.png)
+        ![](images/CloudFormationCreateInProgress.png)
 
-Give your stack a meaningful name. The "ExternalId" parameter corresponds to the "External ID" setting in your Segment Lambda destination settings. The "LambdaARN" parameter corresponds to the "Lambda" setting in your Segment Lambda destination settings.
+   11. Once the status is **CREATE_COMPLETE**, click on the name of your Stack.
+   12. On the Stack Detail page under the **Resources** section, you will see a policy and role listed.
 
-![](images/CloudFormationStackDetails.png)
+        ![](images/CloudFormationLambdaRole.png)
 
-You can leave the next page as is, no changes needed. On the last page, review your template details and click "Create".
+   13. Click the **Physical ID** of the role. You will be redirected to the summary page for the role within the IAM console.
+   14. Copy the **Role ARN** and copy it into the **Role Address** setting in your Segment Lambda destination settings.
 
-You should now see your new Stack listed in the Stacks page.
-
-![](images/CloudFormationCreateInProgress.png)
-
-Once the status is "CREATE_COMPLETE", click on the name of your Stack. On the Stack Detail page, under the "Resources" section, you should see a policy and role listed.
-
-![](images/CloudFormationLambdaRole.png)
-
-Click on the "Physical ID" of the role. You will be redirected to the summary page for the role within the IAM console. Copy the "Role ARN" and copy it into the "Role Address" setting in your Segment Lambda destination settings. Using the examples provided, your Segment Lambda destination settings would now look something like this:
+Using the examples provided, your Segment Lambda destination settings will look something like this:
 
 ![](images/SegmentLambdaSettingsPostCF.png)