Merge pull request #229372 from MikeRayMSFT/20230302-create-data-controller

Remove individual experience

Author: Stacyrch140

articles/azure-arc/data/automated-integration-testing.md

@@ -413,7 +413,8 @@ At a high-level, the launcher performs the following sequence of steps:
 3. Perform CRD metadata scan to discover existing Arc and Arc Data Services Custom Resources
 4. Clean up any existing Custom Resources in Kubernetes, and subsequent resources in Azure. If any mismatch between the credentials in `.test.env` compared to resources existing in the cluster, quit.
 5. Generate a unique set of environment variables based on timestamp for Arc Cluster name, Data Controller and Custom Location/Namespace. Prints out the environment variables, obfuscating sensitive values (e.g. Service Principal Password etc.)
-6. a. For Direct Mode - Onboard the Cluster to Azure Arc, then deploys the Controller via the [unified experience](create-data-controller-direct-cli.md?tabs=linux#deploy---unified-experience)
+6. a. For Direct Mode - Onboard the Cluster to Azure Arc, then deploys the controller. 
+
    b. For Indirect Mode: deploy the Data Controller
 7. Once Data Controller is `Ready`, generate a set of Azure CLI ([`az arcdata dc debug`](/cli/azure/arcdata/dc/debug?view=azure-cli-latest&preserve-view=true)) logs and store locally, labeled as `setup-complete` - as a baseline.
 8. Use the `TESTS_DIRECT/INDIRECT` environment variable from `.test.env` to launch a set of parallelized Sonobuoy test runs based on a space-separated array (`TESTS_(IN)DIRECT`). These runs execute in a new `sonobuoy` namespace, using `arc-sb-plugin` pod that contains the Pytest validation tests.

articles/azure-arc/data/configure-transparent-data-encryption-manually.md

@@ -20,7 +20,7 @@ This article describes how to enable transparent data encryption on a database c
 
 Before you proceed with this article, you must have an Azure Arc-enabled SQL Managed Instance resource created and connect to it.
 
-- [An Azure Arc-enabled SQL Managed Instance created](./create-sql-managed-instance.md)
+- [Create an Azure Arc-enabled SQL Managed Instance](./create-sql-managed-instance.md)
 - [Connect to Azure Arc-enabled SQL Managed Instance](./connect-managed-instance.md)
 
 ## Turn on transparent data encryption on a database in the managed instance

articles/azure-arc/data/configure-transparent-data-encryption-sql-managed-instance.md

@@ -30,7 +30,7 @@ Turning on the TDE feature does the following:
 
 Before you proceed with this article, you must have an Azure Arc-enabled SQL Managed Instance resource created and connect to it.
 
-- [An Azure Arc-enabled SQL Managed Instance created](./create-sql-managed-instance.md)
+- [Create an Azure Arc-enabled SQL Managed Instance](./create-sql-managed-instance.md)
 - [Connect to Azure Arc-enabled SQL Managed Instance](./connect-managed-instance.md)
 
 ## Limitations

articles/azure-arc/data/create-data-controller-direct-azure-portal.md

@@ -62,6 +62,6 @@ The progress of Azure Arc data controller deployment can be monitored as follows
 
 ## Next steps
 
-[Create an Azure Arc-enabled SQL managed instance](create-sql-managed-instance.md)
+[Create an Azure Arc-enabled SQL Managed Instance](create-sql-managed-instance.md)
 
 [Create an Azure Arc-enabled PostgreSQL server](create-postgresql-server.md)

articles/azure-arc/data/create-data-controller-direct-cli.md

@@ -30,12 +30,7 @@ Creating an Azure Arc data controller in direct connectivity mode involves the f
 1. Create a custom location.
 1. Create the data controller.
 
-You can create them individually or in a unified experience. 
-
-## Deploy - unified experience
-
-In the unified experience, you can create the Arc data controller extension, custom location, and Arc data controller all in one command as follows: 
-
+Create the Arc data controller extension, custom location, and Arc data controller all in one command as follows: 
 
 ##### [Linux](#tab/linux)
 
@@ -112,205 +107,6 @@ az arcdata dc create --name arc-dc1 --resource-group $ENV:resourceGroup --custom
 
 ---
 
-## Deploy - individual experience
- 
-### Step 1: Create an Azure Arc-enabled data services extension
-
-Use the k8s-extension CLI to create a data services extension.
-
-#### Set environment variables
-
-Set the following environment variables, which will be then used in later steps.
-
-Following are two sets of environment variables. The first set of variables identifies your Azure subscription, resource group, cluster name, location, extension, and namespace. The second defines credentials to access the metrics and logs dashboards.
-
-The environment variables include passwords for log and metric services. The passwords must be at least eight characters long and contain characters from three of the following four categories: Latin uppercase letters, Latin lowercase letters, numbers, and non-alphanumeric characters.
-
-
-##### [Linux](#tab/linux)
-
-```console
-## variables for Azure subscription, resource group, cluster name, location, extension, and namespace.
-export subscription=<Your subscription ID>
-export resourceGroup=<Your resource group>
-export clusterName=<name of your connected Kubernetes cluster>
-export location=<Azure location>
-export adsExtensionName="<extension name>" 
-export namespace="<namespace>"
-## variables for logs and metrics dashboard credentials
-export AZDATA_LOGSUI_USERNAME=<username for Kibana dashboard>
-export AZDATA_LOGSUI_PASSWORD=<password for Kibana dashboard>
-export AZDATA_METRICSUI_USERNAME=<username for Grafana dashboard>
-export AZDATA_METRICSUI_PASSWORD=<password for Grafana dashboard>
-```
-
-##### [Windows (PowerShell)](#tab/windows)
-
-``` PowerShell
-## variables for Azure location, extension and namespace
-$ENV:subscription="<Your subscription ID>"
-$ENV:resourceGroup="<Your resource group>"
-$ENV:clusterName="<name of your connected Kubernetes cluster>"
-$ENV:location="<Azure location>"
-$ENV:adsExtensionName="<name of Data controller extension" 
-$ENV:namespace="<namespace where you will deploy the extension and data controller>"
-## variables for Metrics and Monitoring dashboard credentials
-$ENV:AZDATA_LOGSUI_USERNAME="<username for Kibana dashboard>"
-$ENV:AZDATA_LOGSUI_PASSWORD="<password for Kibana dashboard>"
-$ENV:AZDATA_METRICSUI_USERNAME="<username for Grafana dashboard>"
-$ENV:AZDATA_METRICSUI_PASSWORD="<password for Grafana dashboard>"
-```
-
---- 
-
-#### Create the Arc data services extension
-
-The following command creates the Arc data services extension.
-
-##### [Linux](#tab/linux)
-
-```azurecli
-az k8s-extension create --cluster-name ${clusterName} --resource-group ${resourceGroup} --name ${adsExtensionName} --cluster-type connectedClusters --extension-type microsoft.arcdataservices --auto-upgrade false --auto-upgrade-minor-version false --scope cluster --release-namespace ${namespace} --config Microsoft.CustomLocation.ServiceAccount=sa-arc-bootstrapper
-az k8s-extension show --resource-group ${resourceGroup} --cluster-name ${resourceName} --name ${adsExtensionName} --cluster-type connectedclusters
-```
-
-##### [Windows (PowerShell)](#tab/windows)
-
-```azurecli
-az k8s-extension create --cluster-name $ENV:clusterName --resource-group $ENV:resourceGroup --name $ENV:adsExtensionName --cluster-type connectedClusters --extension-type microsoft.arcdataservices --auto-upgrade false --auto-upgrade-minor-version false --scope cluster --release-namespace $ENV:namespace --config Microsoft.CustomLocation.ServiceAccount=sa-arc-bootstrapper
-az k8s-extension show --resource-group $ENV:resourceGroup --cluster-name $ENV:clusterName --name $ENV:adsExtensionName --cluster-type connectedclusters
-```
-
----
-
-##### Deploy Azure Arc data services extension using private container registry and credentials
-
-Use the below command if you are deploying from your private repository:
-
-```azurecli
-az k8s-extension create --cluster-name "<connected cluster name>" --resource-group "<resource group>" --name "<extension name>" --cluster-type connectedClusters -auto-upgrade false --auto-upgrade-minor-version false  --extension-type microsoft.arcdataservices --scope cluster --release-namespace "<namespace>" --config Microsoft.CustomLocation.ServiceAccount=sa-arc-bootstrapper --config imageCredentials.registry=<registry info> --config imageCredentials.username=<username> --config systemDefaultValues.image=<registry/repo/arc-bootstrapper:<imagetag>> --config-protected imageCredentials.password=$ENV:DOCKER_PASSWORD --debug
-```
-
-For example:
-
-```azurecli
-az k8s-extension create --cluster-name "my-connected-cluster" --resource-group "my-resource-group" --name "arc-data-services" --cluster-type connectedClusters -auto-upgrade false --auto-upgrade-minor-version false  --extension-type microsoft.arcdataservices --scope cluster --release-namespace "arc" --config Microsoft.CustomLocation.ServiceAccount=sa-bootstrapper --config imageCredentials.registry=mcr.microsoft.com --config imageCredentials.username=arcuser --config systemDefaultValues.image=mcr.microsoft.com/arcdata/arc-bootstrapper:latest --config-protected imageCredentials.password=$ENV:DOCKER_PASSWORD --debug
-```
-
-
-> [!NOTE]
-> The Arc data services extension install can take a few minutes to complete.
-
-#### Verify the Arc data services extension is created
-
-You can verify the status of the deployment of Azure Arc-enabled data services extension. Use the Azure portal or Cube
-
-##### Check status from Azure portal
-
-1. Log in to the Azure portal and browse to the resource group where the Kubernetes connected cluster resource is located.
-1. Select the Azure Arc-enabled Kubernetes cluster (Type = "Kubernetes - Azure Arc") where the extension was deployed.
-1. In the navigation on the left side, under **Settings**, select **Extensions**.
-1. The portal shows the extension that was created earlier in an installed state.
-
-##### Check status using kubectl CLI
-
-1. Connect to your Kubernetes cluster via a Terminal window.
-1. Run the below command and ensure:
-   -  The namespace mentioned above is created 
-
-    and 
-
-   - The `bootstrapper` pod state is **running** before proceeding to the next step.
-
-   ``` console
-   kubectl get pods --name <name of namespace used in the json template file above>
-   ```
-
-For example, the following example gets the pods from `arc` namespace.
-
-```console
-#Example:
-kubectl get pods --name arc
-```
-
-### Retrieve the managed identity and grant roles
-
-When the Arc data services extension is created, Azure creates a managed identity. You need to assign certain roles to this managed identity for usage and/or metrics to be uploaded. 
-
-#### Retrieve managed identity of the Arc data controller extension
-
-```azurecli
-$Env:MSI_OBJECT_ID = (az k8s-extension show --resource-group <resource group>  --cluster-name <connectedclustername> --cluster-type connectedClusters --name <name of extension> | convertFrom-json).identity.principalId
-#Example
-$Env:MSI_OBJECT_ID = (az k8s-extension show --resource-group myresourcegroup  --cluster-name myconnectedcluster --cluster-type connectedClusters --name ads-extension | convertFrom-json).identity.principalId
-```
-
-#### Assign role to the managed identity
-
-Run the below command to assign the **Contributor** and **Monitoring Metrics Publisher** roles:
-
-```azurecli
-az role assignment create --assignee $Env:MSI_OBJECT_ID --role "Contributor" --scope "/subscriptions/$ENV:subscription/resourceGroups/$ENV:resourceGroup"
-az role assignment create --assignee $Env:MSI_OBJECT_ID --role "Monitoring Metrics Publisher" --scope "/subscriptions/$ENV:subscription/resourceGroups/$ENV:resourceGroup"
-```
-
-### Step 2: Create a custom location using `customlocation` CLI extension
-
-A custom location is an Azure resource that is equivalent to a namespace in a Kubernetes cluster.  Custom locations are used as a target to deploy resources to or from Azure. Learn more about custom locations in the [Custom locations on top of Azure Arc-enabled Kubernetes documentation](../kubernetes/conceptual-custom-locations.md).
-
-#### Set environment variables
-
-##### [Linux](#tab/linux)
-
-```azurecli
-export clName=mycustomlocation
-export hostClusterId=$(az connectedk8s show --resource-group ${resourceGroup} --name ${clusterName} --query id -o tsv)
-export extensionId=$(az k8s-extension show --resource-group ${resourceGroup} --cluster-name ${clusterName} --cluster-type connectedClusters --name ${adsExtensionName} --query id -o tsv)
-az customlocation create --resource-group ${resourceGroup} --name ${clName} --namespace ${namespace} --host-resource-id ${hostClusterId} --cluster-extension-ids ${extensionId} --location ${location}
-```
-
-##### [Windows (PowerShell)](#tab/windows)
-
-```azurecli
-$ENV:clName="mycustomlocation"
-$ENV:hostClusterId=(az connectedk8s show --resource-group $ENV:resourceGroup --name $ENV:clusterName --query id -o tsv)
-$ENV:extensionId=(az k8s-extension show --resource-group $ENV:resourceGroup --cluster-name $ENV:clusterName --cluster-type connectedClusters --name $ENV:adsExtensionName --query id -o tsv)
-az customlocation create --resource-group $ENV:resourceGroup --name $ENV:clName --namespace $ENV:namespace --host-resource-id $ENV:hostClusterId --cluster-extension-ids $ENV:extensionId
-```
-
----
-
-### Validate  the custom location is created
-
-From the terminal, run the below command to list the custom locations, and validate that the **Provisioning State** shows Succeeded:
-
-```azurecli
-az customlocation list -o table
-```
-
-### Create certificates for logs and metrics UI dashboards
-
-Optionally, you can specify certificates for logs and metrics UI dashboards. See [Provide certificates for monitoring](monitor-certificates.md) for examples. The December, 2021 release introduces this option.
-
-### Step 3: Create the Azure Arc data controller
-
-After the extension and custom location are created, proceed to deploy the Azure Arc data controller as follows.
-
-```azurecli
-az arcdata dc create --name <name> --resource-group <resourcegroup> --location <location> --connectivity-mode direct --profile-name <profile name>  --auto-upload-metrics true --custom-location <name of custom location> --storage-class <storageclass>
-# Example
-az arcdata dc create --name arc-dc1 --resource-group my-resource-group --location eastasia --connectivity-mode direct --profile-name azure-arc-aks-premium-storage  --auto-upload-metrics true --custom-location mycustomlocation --storage-class mystorageclass
-```
-
-If you want to create the Azure Arc data controller using a custom configuration template, follow the steps described in [Create custom configuration profile](create-custom-configuration-template.md) and provide the path to the file as follows:
-
-
-```azurecli
-az arcdata dc create --name <name> --resource-group <resourcegroup> --location <location> --connectivity-mode direct --path ./azure-arc-custom --auto-upload-metrics true --custom-location <name of custom location>
-# Example
-az arcdata dc create --name arc-dc1 --resource-group my-resource-group --location eastasia --connectivity-mode direct --path ./azure-arc-custom --auto-upload-metrics true --custom-location mycustomlocation
-```
-
 ## Monitor the status of Azure Arc data controller deployment
 
 The deployment status of the Arc data controller on the cluster can be monitored as follows:
@@ -323,4 +119,5 @@ kubectl get datacontrollers --namespace arc
 
 [Create an Azure Arc-enabled PostgreSQL server](create-postgresql-server.md)
 
-[Create an Azure SQL managed instance on Azure Arc](create-sql-managed-instance.md)
+[Create an Azure Arc-enabled SQL Managed Instance](create-sql-managed-instance.md)
+

articles/azure-arc/data/create-sql-managed-instance.md

@@ -1,6 +1,6 @@
 ---
-title: Create an Azure SQL managed instance on Azure Arc
-description: Create an Azure SQL managed instance on Azure Arc
+title: Create an Azure Arc-enabled SQL Managed Instance
+description: Deploy Azure Arc-enabled SQL Managed Instance
 services: azure-arc
 ms.service: azure-arc
 ms.subservice: azure-arc-data-sqlmi
@@ -11,7 +11,7 @@ ms.date: 07/30/2021
 ms.topic: how-to
 ---
 
-# Create an Azure SQL managed instance on Azure Arc
+# Create an Azure Arc-enabled SQL Managed Instance
 
 [!INCLUDE [azure-arc-common-prerequisites](../../../includes/azure-arc-common-prerequisites.md)]
 

articles/azure-arc/data/migrate-to-managed-instance.md

@@ -189,4 +189,4 @@ GO
 
 [Start by creating a Data Controller](create-data-controller-indirect-cli.md)
 
-[Already created a Data Controller? Create an Azure Arc-enabled SQL Managed Instance](create-sql-managed-instance.md)
+[Create an Azure Arc-enabled SQL Managed Instance](create-sql-managed-instance.md)

articles/azure-arc/data/overview.md

@@ -65,6 +65,6 @@ To see the regions that currently support Azure Arc-enabled data services, go to
 
 [Plan your Azure Arc data services deployment](plan-azure-arc-data-services.md) (requires installing the client tools first)
 
-[Create an Azure SQL managed instance on Azure Arc](create-sql-managed-instance.md) (requires creation of an Azure Arc data controller first)
+[Create an Azure Arc-enabled SQL Managed Instance](create-sql-managed-instance.md) (requires creation of an Azure Arc data controller first)
 
 [Create an Azure Database for PostgreSQL server on Azure Arc](create-postgresql-server.md) (requires creation of an Azure Arc data controller first)

articles/azure-arc/data/plan-azure-arc-data-services.md

@@ -42,7 +42,7 @@ In order to experience Azure Arc-enabled data services, you'll need to complete
 
 1. Create data services.
 
-   For example, [Create an Azure SQL managed instance on Azure Arc](create-sql-managed-instance.md).
+   For example, [Create an Azure Arc-enabled SQL Managed Instance](create-sql-managed-instance.md).
 
 1. Connect with Azure Data Studio.
 

articles/azure-arc/data/point-in-time-restore.md

@@ -206,4 +206,4 @@ Point-in-time restore to Azure Arc-enabled SQL Managed Instance has the followin
 
 [Start by creating a Data Controller](create-data-controller-indirect-cli.md)
 
-[Already created a Data Controller? Create an Azure Arc-enabled SQL Managed Instance](create-sql-managed-instance.md)
+[Create an Azure Arc-enabled SQL Managed Instance](create-sql-managed-instance.md)