diff --git a/docs/guides/azure/import/active-directory/active-directory-tenant-details.png b/docs/guides/azure/import/active-directory/active-directory-tenant-details.png new file mode 100644 index 00000000..c3093a3e Binary files /dev/null and b/docs/guides/azure/import/active-directory/active-directory-tenant-details.png differ diff --git a/docs/guides/azure/import/active-directory/index.md b/docs/guides/azure/import/active-directory/index.md index f2cf8975..07d0f541 100644 --- a/docs/guides/azure/import/active-directory/index.md +++ b/docs/guides/azure/import/active-directory/index.md @@ -12,35 +12,33 @@ nav: import of a Microsoft Entra ID directory into Guardrails. Note that the [azure-activedirectory](https://hub.guardrails.turbot.com/mods/azure/mods/azure-activedirectory) mod is required to connect an Entra ID directory. -All child resources of the Microsoft Entra ID directory will be discovered and -subsequently entered into the Guardrails CMDB. +All child resources of the Microsoft Entra ID directory will be discovered and subsequently entered into the Guardrails CMDB. -While you can import an Entra ID directory at the Guardrails level, it is -recommended that you import accounts into Guardrails Folders, as it provides greater -flexibility and ease of management. Define a Folder hierarchy prior to import. +While you can import an Entra ID directory at the Guardrails level, it is recommended that you import accounts into Guardrails Folders, as it provides greater flexibility and ease of management. Define a Folder hierarchy prior to import. ## Importing Microsoft Entra ID Directory via Guardrails Console -1. On the main Guardrails landing page after logging in with `Turbot/Admin` permissions, - click the purple **IMPORT** card in the top right. -2. Select **Azure Active Directory** on the left. -3. Use the **Parent Resource** dropdown menu to select where the Azure Active - Directory will be imported to. -4. Enter the **Directory ID**, **Tenant (directory) ID**, **Client (application) - ID**, and **Client Key (secret)**, as well as the **Environment** type then - click **Import**. -5. Congratulations! The active directory is now added as a child resource of the - folder. - -CMDB and Discovery controls are enabled by default and Guardrails will begin -discovering the resources in the Active Directory. Resources will start -appearing right away, and resource discovery will continue to run in the -background. +Login to Guardrails workspace console in with `Turbot/Admin` permissions, select the **CONNECT** card in the top right corner. Select **Microsoft Entra ID (formerly Azure Active Directory)** from the panel. + +![Select Azure](/images/docs/guardrails/guides/azure/import/active-directory/select-ms-entra-id.png) + +Provide the details as below: + +- Select **Choose your folder** dropdown menu to select the [folder](/guardrails/docs/concepts/resources/hierarchy#folders) where you would like to import your Entra ID directory. +- Provide the `Directory ID`. +- Provide the **Tenant ID**. +- **Client ID** and **Client Key (secret)** in `Client details`. +- Provide **Environment** from the dropdown list. + +![Provide Details](/images/docs/guardrails/guides/azure/import/active-directory/active-directory-tenant-details.png) + +Select **Connect**. + +CMDB and Discovery controls are enabled by default and Guardrails will begin discovering the resources in the Azure Tenant. Resources will start appearing right away, and resource discovery will continue to run in the background. ## Import Active Directory via Terraform -Administrators can easily import Active Directory using Terraform. If your -Terraform environment has not been setup, head on over to the +Administrators can easily import Active Directory using Terraform. If your Terraform environment has not been setup, head on over to the [Terraform Setup Page](reference/terraform/setup). ```hcl diff --git a/docs/guides/azure/import/active-directory/select-ms-entra-id.png b/docs/guides/azure/import/active-directory/select-ms-entra-id.png new file mode 100644 index 00000000..ec132155 Binary files /dev/null and b/docs/guides/azure/import/active-directory/select-ms-entra-id.png differ diff --git a/docs/guides/azure/import/subscription/index.md b/docs/guides/azure/import/subscription/index.md index 2c36522c..37baeaa2 100644 --- a/docs/guides/azure/import/subscription/index.md +++ b/docs/guides/azure/import/subscription/index.md @@ -8,35 +8,32 @@ nav: # Import Azure Subscription into Guardrails -[Proper setup in the Azure tenant](integrations/azure/import) is required for -import of an Azure Subscription into a Guardrails workspace. +[Proper setup in the Azure tenant](integrations/azure/import) is required for import of an Azure Subscription into a Guardrails workspace. -While you can import an Azure Subscription at the Turbot level, it is -recommended that you import accounts into Guardrails Folders, as it provides greater -flexibility and ease of management. Define a Folder hierarchy prior to import. +While you can import an Azure Subscription at the Turbot level, it is recommended that you import accounts into Guardrails Folders, as it provides greater flexibility and ease of management. Define a Folder hierarchy prior to import. ## Import Azure Subscription via Guardrails Console -1. On the Guardrails landing page after logging in with `Turbot/Admin` permissions, - click the **IMPORT** card in the top right. -2. Select **Azure Subscription** on the left. -3. Use the **Parent Resource** dropdown menu to select where the Azure - Subscription will be imported to. -4. Enter the **Subscription ID**, **Tenant (directory) ID**, **Client - (application) ID**, and **Client Key (secret)**, as well as the - **Environment** type then click **Import**. -5. Congratulations! The subscription is now added as a child resource of the - folder. +Login to Guardrails workspace console in with `Turbot/Admin` permissions, select the **CONNECT** card in the top right corner. Select **Azure** from the panel. -CMDB and Discovery controls are enabled by default and Guardrails will begin -discovering the resources in the Azure Subscription. Resources will start -appearing right away, and resource discovery will continue to run in the -background. +![Select Azure](/images/docs/guardrails/guides/azure/import/tenant/select-azure.png) + +Provide the details as below: + +- Select **Azure Subscription** option. +- Select the Guardrails [folder](/guardrails/docs/concepts/resources/hierarchy#folders) where you would like to import your subscription from `Choose your folder`. +- Provide the **Subscription ID**. +- Provide the **Tenant ID**. +- Provide **Client ID** and **Client Key (secret)** in `Client details`. +- Provide **Environment** from the dropdown list. + +Select **Connect**. + +CMDB and Discovery controls are enabled by default and Guardrails will begin discovering the resources in the Azure Tenant. Resources will start appearing right away, and resource discovery will continue to run in the background. ## Import Subscription via Terraform -Administrators can easily import subscriptions using Terraform. If your -Terraform environment has not been set up, head on over to the +Administrators can easily import subscriptions using Terraform. If your Terraform environment has not been set up, head on over to the [Terraform Setup Page](reference/terraform/setup). ```hcl diff --git a/docs/guides/azure/import/tenant/index.md b/docs/guides/azure/import/tenant/index.md index 9c4abff8..19f4289a 100644 --- a/docs/guides/azure/import/tenant/index.md +++ b/docs/guides/azure/import/tenant/index.md @@ -8,30 +8,31 @@ nav: # Import Azure Tenant into Guardrails -[Proper setup in the Azure tenant](integrations/azure/import) is required for -import of an Azure Tenant into Guardrails. +[Proper setup in the Azure tenant](integrations/azure/import) is required for import of an Azure Tenant into Guardrails. -All child resources of the Azure Tenant will be discovered and subsequently -entered into the Guardrails CMDB. +All child resources of the Azure Tenant will be discovered and subsequently entered into the Guardrails CMDB. -While you can import an Azure Tenant at the Turbot level, it is recommended that -you import accounts into Guardrails Folders, as it provides greater flexibility and -ease of management. Define a Folder hierarchy prior to import. +While you can import an Azure Tenant at the Turbot level, it is recommended that you import accounts into Guardrails Folders, as it provides greater flexibility and ease of management. Define a Folder hierarchy prior to import. ## Import Azure Tenant via Guardrails Console -1. At the main Guardrails landing page after logging in with `Turbot/Admin` permissions, - click the purple **CONNECT** card in the top right corner. -2. Select **Azure** from the . -3. Use the **Parent Resource** dropdown menu to select the parent resource for the Azure Tenant. -4. Enter the **Tenant (directory) ID**, **Client (application) ID**, and - **Client Key (secret)**, as well as the **Environment** type then click - **Import**. -5. Congratulations! The tenant is now added as a child resource of the folder. - -CMDB and Discovery controls are enabled by default and Guardrails will begin -discovering the resources in the Azure Tenant. Resources will start appearing -right away, and resource discovery will continue to run in the background. +Login to Guardrails workspace console in with `Turbot/Admin` permissions, select the **CONNECT** card in the top right corner. Select **Azure** from the panel. + +![Select Azure](/images/docs/guardrails/guides/azure/import/tenant/select-azure.png) + +Provide the details as below: + +- Select **Choose your folder** dropdown menu to select the [folder](/guardrails/docs/concepts/resources/hierarchy#folders) where you would like to import your tenant. +- Enter the **Tenant ID**. +- **Client ID** and **Client Key (secret)** in `Client details`. +- Provide **Environment** from the dropdown list. +- Provide YAML list of subscription or management group IDs. + +![Provide Details](/images/docs/guardrails/guides/azure/import/tenant/tenant-details.png) + +Select **Connect**. + +CMDB and Discovery controls are enabled by default and Guardrails will begin discovering the resources in the Azure Tenant. Resources will start appearing right away, and resource discovery will continue to run in the background. ## Management Group Event Pollers diff --git a/docs/guides/azure/import/tenant/select-azure.png b/docs/guides/azure/import/tenant/select-azure.png new file mode 100644 index 00000000..75feee0c Binary files /dev/null and b/docs/guides/azure/import/tenant/select-azure.png differ diff --git a/docs/guides/azure/import/tenant/tenant-details.png b/docs/guides/azure/import/tenant/tenant-details.png new file mode 100644 index 00000000..2866fde6 Binary files /dev/null and b/docs/guides/azure/import/tenant/tenant-details.png differ