hashicorp · jastr945 · Jul 26, 2023 · Jun 13, 2023 · Jun 16, 2023 · Jun 28, 2023
diff --git a/website/data/cloud-docs-nav-data.json b/website/data/cloud-docs-nav-data.json
@@ -462,28 +462,75 @@
     "title": "Integrations",
     "routes": [
       {
-        "title": "ServiceNow Integration",
+        "title": "ServiceNow Integrations",
         "routes": [
-          { "title": "Overview", "path": "integrations/service-now" },
           {
-            "title": "Service Catalog",
-            "path": "integrations/service-now/service-catalog"
-          },
-          {
-            "title": "Admin Guide",
-            "path": "integrations/service-now/admin-guide"
-          },
-          {
-            "title": "Developer Reference",
-            "path": "integrations/service-now/developer-reference"
-          },
-          {
-            "title": "Example Customizations",
-            "path": "integrations/service-now/example-customizations"
+            "title": "Service Catalog for Terraform",
+            "routes": [
+              { "title": "Overview", "path": "integrations/service-now/service-catalog-terraform" },
+              {
+                "title": "Service Catalog",
+                "path": "integrations/service-now/service-catalog-terraform/service-catalog-config"
+              },
+              {
+                "title": "Admin Guide",
+                "path": "integrations/service-now/service-catalog-terraform/admin-guide"
+              },
+              {
+                "title": "Developer Reference",
+                "path": "integrations/service-now/service-catalog-terraform/developer-reference"
+              },
+              {
+                "title": "Example Customizations",
+                "path": "integrations/service-now/service-catalog-terraform/example-customizations"
+              },
+              {
+                "title": "V1 Setup Instructions",
+                "path": "integrations/service-now/service-catalog-terraform/service-now-v1"
+              }
+            ]
           },
           {
-            "title": "V1 Setup Instructions",
-            "path": "integrations/service-now/service-now-v1"
+            "title": "Service Graph Connector for Terraform",
+            "routes": [
+              {
+                "title": "Overview", 
+                "path": "integrations/service-now/service-graph"
+              },
+              {
+                "title": "Setup",
+                "path": "integrations/service-now/service-graph/service-graph-setup"
+              },
+              {
+                "title": "Resource Coverage",
+                "routes": [
+                  {
+                    "title": "Overview",
+                    "path": "integrations/service-now/service-graph/resource-coverage"
+                  },
+                  {
+                    "title": "AWS",
+                    "path": "integrations/service-now/service-graph/resource-coverage/aws"
+                  },
+                  {
+                    "title": "Azure",
+                    "path": "integrations/service-now/service-graph/resource-coverage/azure"
+                  },
+                  {
+                    "title": "GCP",
+                    "path": "integrations/service-now/service-graph/resource-coverage/gcp"
+                  },
+                  {
+                    "title": "vSphere",
+                    "path": "integrations/service-now/service-graph/resource-coverage/vsphere"
+                  }
+                ]
+              },
+              {
+                "title": "Customizations",
+                "path": "integrations/service-now/service-graph/customizations"
+              }
+            ]
           }
         ]
       },

diff --git a/.../integrations/service-now/admin-guide.mdx → ...service-catalog-terraform/admin-guide.mdx b/.../integrations/service-now/admin-guide.mdx → ...service-catalog-terraform/admin-guide.mdx
@@ -9,11 +9,11 @@ ServiceNow administrators have several options with configuring the Terraform
 integration.
 
 If you haven't yet installed the integration, see the [installation
-documentation](/terraform/cloud-docs/integrations/service-now).
+documentation](/terraform/cloud-docs/integrations/service-now/service-catalog-terraform).
 
 Once the integration has been installed, you can add and customize a service
 catalog and VCS repositories using the [service catalog
-documentation](/terraform/cloud-docs/integrations/service-now/service-catalog).
+documentation](/terraform/cloud-docs/integrations/service-now/service-catalog-terraform/service-catalog-config).
 
 You can also configure how frequently ServiceNow will poll Terraform Cloud using
 the documentation below.

diff --git a/...tions/service-now/developer-reference.mdx → ...catalog-terraform/developer-reference.mdx b/...tions/service-now/developer-reference.mdx → ...catalog-terraform/developer-reference.mdx
@@ -93,4 +93,4 @@ For users who only need to order from the Terraform Catalog, we recommend
 creating another role with read-only permissions for
 `x_terraform_vcs_repositories` to view the available repositories for ordering
 infrastructure. Install the Terraform ServiceNow Service Catalog integration by
-following [the installation guide](/terraform/cloud-docs/integrations/service-now).
+following [the installation guide](/terraform/cloud-docs/integrations/service-now/service-catalog-terraform).
diff --git a/...ns/service-now/example-customizations.mdx → ...alog-terraform/example-customizations.mdx b/...ns/service-now/example-customizations.mdx → ...alog-terraform/example-customizations.mdx
diff --git a/...d-docs/integrations/service-now/index.mdx → ...e-now/service-catalog-terraform/index.mdx b/...d-docs/integrations/service-now/index.mdx → ...e-now/service-catalog-terraform/index.mdx
@@ -7,7 +7,7 @@ description: >-
 
 # Terraform ServiceNow Service Catalog Integration Setup Instructions
 
--> **Integration version:**  v2.2.0
+-> **Integration version:**  v2.2.1
 
 The Terraform ServiceNow Service Catalog integration enables your end-users to
 provision self-serve infrastructure via ServiceNow. By connecting ServiceNow to
@@ -16,7 +16,7 @@ Items, create workspaces, and perform Terraform runs using prepared Terraform
 configurations hosted in VCS repositories.
 
 -> **Note:** The v1.x integration is deprecated, but documentation for existing
-installations can be found [here](/terraform/cloud-docs/integrations/service-now/service-now-v1)
+installations can be found [here](/terraform/cloud-docs/integrations/service-now/service-catalog-terraform/service-now-v1)
 
 <!-- BEGIN: TFC:only name:pnp-callout -->
 -> **Note:** The ServiceNow Catalog integration is available in Terraform Cloud **Plus** Edition. Refer to [Terraform Cloud pricing](https://www.hashicorp.com/products/terraform/pricing) for details.
@@ -216,21 +216,21 @@ Now that you have connected ServiceNow to Terraform Cloud, you are ready to
 create a Service Catalog using the VCS repositories provided by the Terraform
 Admin.
 
-Navigate to the [Service Catalog documentation](/terraform/cloud-docs/integrations/service-now/service-catalog) to
+Navigate to the [Service Catalog documentation](/terraform/cloud-docs/integrations/service-now/service-catalog-terraform/service-catalog-config) to
 begin. You can also refer to this documentation whenever you need to add or
 update request items.
 
 ### ServiceNow Developer Reference
 
 ServiceNow developers who wish to customize the Terraform integration can refer
-to the [developer documentation](/terraform/cloud-docs/integrations/service-now/developer-reference).
+to the [developer documentation](/terraform/cloud-docs/integrations/service-now/service-catalog-terraform/developer-reference).
 
 ### ServiceNow Administrator's Guide.
 
-Refer to the [ServiceNow Administrator documentation](/terraform/cloud-docs/integrations/service-now/admin-guide) for
+Refer to the [ServiceNow Administrator documentation](/terraform/cloud-docs/integrations/service-now/service-catalog-terraform/admin-guide) for
 information about configuring the integration.
 
 ### Example Customizations
 
 Once the ServiceNow integration is installed, you can consult the [example
-customizations documentation](/terraform/cloud-docs/integrations/service-now/example-customizations).
+customizations documentation](/terraform/cloud-docs/integrations/service-now/service-catalog-terraform/example-customizations).
diff --git a/...egrations/service-now/service-catalog.mdx → ...alog-terraform/service-catalog-config.mdx b/...egrations/service-now/service-catalog.mdx → ...alog-terraform/service-catalog-config.mdx
@@ -19,7 +19,7 @@ reporting the results back to ServiceNow.
 
 Before configuring a service catalog, you must install and configure the
 Terraform Cloud integration software on your ServiceNow instance. These steps
-are covered in the [installation documentation](/terraform/cloud-docs/integrations/service-now).
+are covered in the [installation documentation](/terraform/cloud-docs/integrations/service-now/service-catalog-terraform).
 
 Additionally, you must have have the following information:
 

diff --git a/...ions/service-now/service-now-v1/index.mdx → ...atalog-terraform/service-now-v1/index.mdx b/...ions/service-now/service-now-v1/index.mdx → ...atalog-terraform/service-now-v1/index.mdx
@@ -7,7 +7,7 @@ description: >-
 
 # Terraform ServiceNow Service Catalog Integration Setup Instructions
 
--> **\[DEPRECATED] Integration version:** v1.1.0 (Find the latest version [here](/terraform/cloud-docs/integrations/service-now))
+-> **\[DEPRECATED] Integration version:** v1.1.0 (Find the latest version [here](/terraform/cloud-docs/integrations/service-now/service-catalog-terraform))
 
 !> **Note:** The ServiceNow Catalog integration is designed for use by Terraform Enterprise customers. We do not currently recommend using it with the SaaS version of Terraform Cloud.
 

diff --git a/website/docs/cloud-docs/integrations/service-now/service-graph/customizations.mdx b/website/docs/cloud-docs/integrations/service-now/service-graph/customizations.mdx
@@ -0,0 +1,95 @@
+---
+page_title: Overview - ServiceNow Service Graph Connector for Terraform Integration - instructions on customizations for admins
+description: >-
+  ServiceNow Service Graph Connector for Terraform allows you to edit ETL mapping and add more resources.
+---
+
+# ETL Mapping Customizations
+
+-> **ServiceNow roles:** `admin`
+
+-> **ServiceNow plugin requirement:** `IntegrationHub ETL`
+
+You can update and customize the default ETL mapping rules offered by the Service Graph Connector for Terraform. 
+
+To ensure that your custom rules remain intact during future updates, you can clone the existing ETL record and maintain it separately from the default one.
+
+This documentation guides you through the process of mapping a resource using an example of an AWS virtual private network (VPC). Although this resource is already covered by the application, the principles discussed apply to any new potential resource mapping.
+
+Any customizations should be done from the application's scope: **Service Graph Connector for Terraform**.
+
+## Clone the ETL map
+
+Navigate to the **IntegrationHub ETL** in the top menu. Check the **SG-Terraform** record and click **Duplicate**. Refer to the [ServiceNow documentation](https://docs.servicenow.com/en-US/bundle/utah-servicenow-platform/page/product/configuration-management/task/duplicate-cmdb-transform-map.html) to create a duplicate of an existing ETL transform map.
+
+## Build a resource in Terraform Cloud
+
+Create a new workspace in your Terraform Cloud organization and create a Terraform resource that you would like to map. It helps to have a Terraform state record of the resource to ensure accurate mapping. 
+
+[Configure a webhook](/terraform/cloud-docs/integrations/service-now/service-graph/service-graph-setup#configure-terraform-webhook) and initiate a Terraform run.
+
+## Download Terraform State
+
+Once the run is successfully completed, open your ServiceNow instance, click on **All** and navigate to **Scheduled Imports**. 
+
+Open the **SG-Terraform Scheduled Process State** record, search for the import set corresponding to the latest webhook request. Click the **Import Set** field to open the import set. Wait for the import set to be successfully processed. 
+
+Since there are no existing ETL rules configured for the new resource, it is ignored during the ETL process.
+
+Open the **Outbound Http Requests** tab to list the requests sent from your ServiceNow instance to Terraform Cloud and get the latest state of the workspace. 
+
+![ServiceNow Service Graph Connector Outbound Http Requests interface](/img/docs/service-now-service-graph-state-object-url.png)
+
+Open the record that starts with "http://archivist.terraform.io" by clicking on the timestamp. Copy the content of the URL field and open it you your browser to download the Terraform state file.
+
+Locate the resource in the state object. This JSON record will serve as a source for the future mapping.
+
+## Identify the CI target
+
+Pick a suitable Configuration Item (CI) target for your resource. For example, the AWS virtual private network (VPC) resource is mapped to Cloud Network (`cmdb_ci_network`) by the Service Graph Connector for Terraform. Refer to the [ServiceNow CMDB documentation](https://docs.servicenow.com/en-US/bundle/utah-servicenow-platform/page/product/configuration-management/reference/cmdb-tables-details.html) for more details on available CI tables.
+
+## Consult the CI Class Manager
+
+After selecting an appropriate CI target, it is important to consult the CI Class Manager for guidance on dependent relationships. Many CMDB resources rely on other CI tables. If a related class is not properly mapped, the ETL job will generate errors or warnings and fail to import your resource into the CMDB.
+
+In the top navigation, click on **All**, search for **CI Class Manager**, and click on **Open Hierarchy**. Search for your target CI Class and check **Dependent Relationships** tab to learn more about dependent mappings required by the resource.
+
+For example, according to the **CI Class Manager**, **Cloud Network** should be hosted on **Logical Datacenter** and **Cloud Service Account**.
+
+## Set the mapping rules
+
+Open the **IntegrationHub ETL** from the top navigation menu and select your cloned ETL map record prepared for customization. Refer to the [ServiceNow documentation](https://docs.servicenow.com/en-US/bundle/utah-servicenow-platform/page/product/configuration-management/concept/create-etl-transform-map.html) for instructions to create an ETL transform map.
+
+Click on the first **Specify Basic Details** section of the ETL Transform Map Assistant. Select the import set number containing your resource from the **Sample Import Set** dropdown and click **Mark as Complete**.
+
+Open the **Preview and Prepare Data** section and review the imported rows. Click **Mark as Complete**.
+
+The third section provides the interface for mapping resource attributes. Click on **Select CMDB Classes to Map Source Data**. Click on **Add Conditional Class** button at the top. Set the rules that will identify your resource in the import set. Use the `type` field value from the Terraform state object to identify your resource (on the ServiceNow side, field name are prefaced with `u_`). Set the target CMDB CI Class name and click **Save**.
+
+![ServiceNow Service Graph Connector: setting the Conditional Class rules in the ETL mapping](/img/docs/service-now-service-graph-conditional-class-mapping.png)
+
+To modify the mapping for your new Conditional Class record, select **Edit Mapping**. On the right side of the interface, drag the relevant data pills and drop them into the corresponding CMDB fields on the left side. Refer to the Terraform state record to verify the presence of attributes. For uniqueness, the **Source Native Key** value is typically mapped to the `arn` field when dealing with AWS resources. All resources mapped in the Service Graph Connector for Terraform will have the **Operational status** and **Name** fields populated.
+
+![ServiceNow Service Graph Connector: mapping resource attributes in the ETL](/img/docs/service-now-service-graph-etl-attribute-mapping.png)
+
+Once the mapping is completed, click on the left arrow at the top to return to the list of Conditional Classes. Map two more conditional classes in the same manner, according to the rules set in the CI Class Manager: **Logical Datacenter** (**AWS Datacenter** in case of AWS VPC) and **Cloud Service Account**. Since the AWS cloud provider is already covered by the application, these classes are already present. Click **Edit Class**  to include your newly mapped resource into the listed conditional rules. Add another **OR** condition to each of them and click **Save**. 
+
+![ServiceNow Service Graph Connector: updating conditions on existing parent records when a new resource is mapped](/img/docs/service-now-service-graph-etl-condition-update.png)
+
+Click **Mark as Complete** to finalize the **Select CMDB Classes to Map Source Data** section. 
+
+## Set the required relationships
+
+Click **Add Relationships** to continue to the next section. Click the **Add Conditional Relationship** button at the top of the page. The following configuration tells the ETL that when a record with `aws_vpc` type is found in the import set, it should be hosted on **AWS Datacenter 1**. Click **Save**.
+
+![ServiceNow Service Graph Connector: setting dependent relationships in the ETL mapping interface](/img/docs/service-now-service-graph-etl-setting-relationship.png)
+
+A similar dependent relationship needs to be established from **AWS Datacenter** to **Cloud Service Account**. Since the AWS cloud provider is already covered by the application, the relationship record is present in the application. Click **Edit Relationship** and add another **OR** condition containing your new resource to the list. Click **Save**.
+
+![ServiceNow Service Graph Connector: updating existing dependent relationships in the ETL mapping interface](/img/docs/service-now-service-graph-etl-editing-relationship.png)
+
+Click **Mark as Complete** to finalize the **Add Relationships** section. 
+
+## Run a test
+
+There are two ways to test the new resource mapping. You can utilize the **Test and Rollback Integration Results** interface of the ETL Transform Map Assistant. Alternatively, you can initiate a new run in your Terraform Cloud workspace that includes the deployment of the resource.