Merge branch 'MicrosoftDocs:main' into release-stor-isv

Author: beber-msft

articles/machine-learning/how-to-create-component-pipeline-python.md

@@ -112,6 +112,11 @@ The code above define a component with display name `Prep Data` using `@command_
 * `display_name` is a friendly display name of the component in UI, which isn't unique.
 * `description` usually describes what task this component can complete.
 * `environment` specifies the run-time environment for this component. The environment of this component specifies a docker image and refers to the `conda.yaml` file.
+
+    The `conda.yaml` file contains all packages used for the component like following:
+
+    :::code language="python" source="~/azureml-examples-v2samplesreorg/sdk/python/jobs/pipelines/2e_image_classification_keras_minist_convnet/prep/conda.yaml":::
+
 * The `prepare_data_component` function defines one input for `input_data` and two outputs for `training_data` and `test_data`. 
 `input_data` is input data path. `training_data` and `test_data` are output data paths for training data and test data. 
 * This component converts the data from `input_data` into a training data csv to `training_data` and a test data csv to `test_data`.
@@ -123,19 +128,6 @@ Following is what a component looks like in the studio UI.
 
 :::image type="content" source="./media/how-to-create-component-pipeline-python/prep-data-component.png" alt-text="Screenshot of the Prep Data component in the UI and code." lightbox ="./media/how-to-create-component-pipeline-python/prep-data-component.png":::
 
-#### Specify component run-time environment
-
-You'll need to modify the runtime environment in which your component runs.
-
-:::code language="python" source="~/azureml-examples-main/sdk/python/jobs/pipelines/2e_image_classification_keras_minist_convnet/prep/prep_component.py" range="5-10":::
-
-The above code creates an object of `Environment` class, which represents the runtime environment in which the component runs.
-
-The `conda.yaml` file contains all packages used for the component like following:
-
-:::code language="python" source="~/azureml-examples-main/sdk/python/jobs/pipelines/2e_image_classification_keras_minist_convnet/prep/conda.yaml":::
-
-
 Now, you've prepared all source files for the `Prep Data` component.
 
 
@@ -165,8 +157,6 @@ The code above define a component with display name `Train Image Classification
 
 * The `keras_train_component` function defines one input `input_data` where training data comes from, one input `epochs` specifying epochs during training, and one output `output_model` where outputs the model file. The default value of `epochs` is 10. The execution logic of this component is from `train()` function in `train.py` above.
 
-#### Specify component run-time environment
-
 The train-model component has a slightly more complex configuration than the prep-data component. The `conda.yaml` is like following:
 
 :::code language="yaml" source="~/azureml-examples-main/sdk/python/jobs/pipelines/2e_image_classification_keras_minist_convnet/train/conda.yaml":::
@@ -206,11 +196,7 @@ In this section, you'll learn to create a component specification in the valid Y
 * This component has two inputs and one output. 
 * The source code path of it's defined in the `code` section and when the component is run in cloud, all files from that path will be uploaded as the snapshot of this component. 
 * The `command` section specifies the command to execute while running this component. 
-* The `environment` section contains a docker image and a conda yaml file.
-
-#### Specify component run-time environment
-
-The score component uses the same image and conda.yaml file as the train component. The source file is in the [sample repository](https://github.com/Azure/azureml-examples/blob/main/sdk/python/jobs/pipelines/2e_image_classification_keras_minist_convnet/train/conda.yaml).
+* The `environment` section contains a docker image and a conda yaml file. The source file is in the [sample repository](https://github.com/Azure/azureml-examples/blob/v2samplesreorg/sdk/python/jobs/pipelines/2e_image_classification_keras_minist_convnet/score/conda.yaml).
 
 Now, you've got all source files for score-model component.
 

articles/machine-learning/media/tutorial-designer-automobile-price-deploy/real-time-inferencepipeline-limitation.png

@@ -179,7 +179,13 @@ You can update the online endpoint with new model trained in the designer. On th
 
 ## Limitations
 
-Due to datastore access limitation, if your inference pipeline contains **Import Data** or **Export Data** component, they'll be auto-removed when deploy to real-time endpoint.
+* Due to datastore access limitation, if your inference pipeline contains **Import Data** or **Export Data** component, they'll be auto-removed when deploy to real-time endpoint.
+
+* If you have datasets in the real-time inference pipeline and want to deploy it to real-time endpoint, currently this flow only supports datasets registered from **Blob** datastore. If you want to use datasets from other type datastores, you can use Select Column to connect with your initial dataset with settings of selecting all columns, register the outputs of Select Column as File dataset and then replace the initial dataset in the real-time inference pipeline with this newly registered dataset.
+
+* If your inference graph contains "Enter Data Manually" component which is not connected to the same port as “Web service Input” component, the "Enter Data Manually" component will not be executed during HTTP call processing. A workaround is to register the outputs of that "Enter Data Manually" component as dataset, then in the inference pipeline draft, replace the "Enter Data Manually" component with the registered dataset. 
+
+    :::image type="content" source="./media/tutorial-designer-automobile-price-deploy/real-time-inferencepipeline-limitation.png" alt-text="Screenshot showing how to modify inference pipeline containing enter data manually component.":::
 
 ## Clean up resources
 

articles/machine-learning/tutorial-designer-automobile-price-deploy.md

@@ -29,7 +29,7 @@ This article explains how to expose applications to the internet using Applicati
 
 ## Configure Application Gateway for Azure Spring Apps
 
-We recommend that the domain name, as seen by the browser, is the same as the host name which Application Gateway uses to direct traffic to the Azure Spring Apps back end. This recommendation provides the best experience when using Application Gateway to expose applications hosted in Azure Spring Apps and residing in a virtual network. If the domain exposed by Application Gateway is different from the domain accepted by Azure Spring Apps, cookies and generated redirect URLs (for example) can be broken.
+We recommend that the domain name, as seen by the browser, is the same as the host name which Application Gateway uses to direct traffic to the Azure Spring Apps back end. This recommendation provides the best experience when using Application Gateway to expose applications hosted in Azure Spring Apps and residing in a virtual network. If the domain exposed by Application Gateway is different from the domain accepted by Azure Spring Apps, cookies and generated redirect URLs (for example) can be broken. For more information, see [Host name preservation](/azure/architecture/best-practices/host-name-preservation.md).
 
 To configure Application Gateway in front of Azure Spring Apps, use the following steps.
 

articles/spring-apps/expose-apps-gateway-end-to-end-tls.md

@@ -28,7 +28,7 @@ When an Azure Spring Apps service instance is deployed in your virtual network (
 
 ## Configure Application Gateway for Azure Spring Apps
 
-We recommend that the domain name, as seen by the browser, is the same as the host name which Application Gateway uses to direct traffic to the Azure Spring Apps back end. This recommendation provides the best experience when using Application Gateway to expose applications hosted in Azure Spring Apps and residing in a virtual network. If the domain exposed by Application Gateway is different from the domain accepted by Azure Spring Apps, cookies and generated redirect URLs (for example) can be broken.
+We recommend that the domain name, as seen by the browser, is the same as the host name which Application Gateway uses to direct traffic to the Azure Spring Apps back end. This recommendation provides the best experience when using Application Gateway to expose applications hosted in Azure Spring Apps and residing in a virtual network. If the domain exposed by Application Gateway is different from the domain accepted by Azure Spring Apps, cookies and generated redirect URLs (for example) can be broken. For more information, see [Host name preservation](/azure/architecture/best-practices/host-name-preservation.md).
 
 To configure Application Gateway in front of Azure Spring Apps in a private VNET, use the following steps.
 

articles/spring-apps/expose-apps-gateway-tls-termination.md

@@ -20,14 +20,19 @@ ms.custom: devx-track-java, event-tier1-build-2022
 
 Azure Spring Apps supports Spring applications on Azure. Increasing business can require multiple data centers with management of multiple instances of Azure Spring Apps.
 
-Azure already provides different load-balance solutions. There are three options to integrate Azure Spring Apps with Azure load-balance solutions:
+Azure already provides [different load-balance solutions](/azure/architecture/guide/technology-choices/load-balancing-overview.md). There are three common options to integrate Azure Spring Apps with Azure load-balance solutions:
 
 1. Integrate Azure Spring Apps with Azure Traffic Manager
-2. Integrate Azure Spring Apps with Azure App Gateway
-3. Integrate Azure Spring Apps with Azure Front Door
+1. Integrate Azure Spring Apps with Azure App Gateway
+1. Integrate Azure Spring Apps with Azure Front Door
+
+In the examples below, we will load balance requests for a custom domain of `www.contoso.com` towards two deployments of Azure Spring Apps in two different regions: `eastus.azuremicroservices.io` and `westus.azuremicroservices.io`.
+
+We recommend that the domain name, as seen by the browser, is the same as the host name which the load balancer uses to direct traffic to the Azure Spring Apps back end. This recommendation provides the best experience when using a load balancer to expose applications hosted in Azure Spring Apps. If the domain exposed by the load balancer is different from the domain accepted by Azure Spring Apps, cookies and generated redirect URLs (for example) can be broken. For more information, see [Host name preservation](/azure/architecture/best-practices/host-name-preservation.md).
 
 ## Prerequisites
 
+* A custom domain to be used to access the application: [Tutorial: Map an existing custom domain to Azure Spring Apps](./tutorial-custom-domain.md)
 * Azure Spring Apps: [How to create an Azure Spring Apps service](./quickstart.md)
 * Azure Traffic Manager: [How to create a traffic manager](../traffic-manager/quickstart-create-traffic-manager-profile.md)
 * Azure App Gateway: [How to create an application gateway](../application-gateway/quick-create-portal.md)
@@ -53,10 +58,6 @@ Add endpoints in traffic manager:
 To finish the configuration:
 
 1. Sign in to the website of your domain provider, and create a CNAME record mapping from your custom domain to traffic manager’s Azure default domain name.
-1. Follow instructions [How to add custom domain to Azure Spring Apps](./tutorial-custom-domain.md).
-1. Add above custom domain binding to traffic manager to Azure Spring Apps corresponding app service and upload SSL certificate there.
-
-    ![Traffic Manager 3](media/spring-cloud-load-balancers/traffic-manager-3.png)
 
 ## Integrate Azure Spring Apps with Azure App Gateway
 
@@ -72,43 +73,30 @@ To integrate with Azure Spring Apps service, complete the following configuratio
 ### Add Custom Probe
 
 1. Select **Health Probes** then **Add** to open custom **Probe** dialog.
-1. The key point is to select *Yes* for **Pick host name from backend HTTP settings** option.
+1. The key point is to select *No* for **Pick host name from backend HTTP settings** option and explicitly specify the host name. For more information, see [Application Gateway configuration for host name preservation](/azure/architecture/best-practices/host-name-preservation.md#application-gateway).
 
     ![App Gateway 2](media/spring-cloud-load-balancers/app-gateway-2.png)
 
-### Configure Http Setting
+### Configure Backend Setting
 
-1. Select **Http Settings** then **Add** to add an HTTP setting.
-1. **Override with new host name:** select *Yes*.
-1. **Host name override**: select **Pick host name from backend target**.
+1. Select **Backend settings** then **Add** to add a backend setting.
+1. **Override with new host name:** select *No*.
 1. **Use custom probe**: select *Yes* and pick the custom probe created above.
 
     ![App Gateway 3](media/spring-cloud-load-balancers/app-gateway-3.png)
 
-### Configure Rewrite Set
-
-1. Select **Rewrites** then **Rewrite set** to add a rewrite set.
-1. Select the routing rules that route requests to Azure Spring Apps public endpoints.
-1. On **Rewrite rule configuration** tab, select **Add rewrite rule**.
-1. **Rewrite type**: select **Request Header**
-1. **Action type**: select **Delete**
-1. **Header name**: select **Common header**
-1. **Common Header**: select **X-Forwarded-Proto**
-
-    ![App Gateway 4](media/spring-cloud-load-balancers/app-gateway-4.png)
-
 ## Integrate Azure Spring Apps with Azure Front Door
 
-To integrate with Azure Spring Apps service and configure backend pool, use the following steps:
+To integrate with Azure Spring Apps service and configure an origin group, use the following steps:
 
-1. **Add backend pool**.
-1. Specify the backend endpoint by adding host.
+1. **Add origin group**.
+1. Specify the backend endpoints by adding origins for the different Azure Spring Apps instances.
 
     ![Front Door 1](media/spring-cloud-load-balancers/front-door-1.png)
 
-1. Specify **backend host type** as *custom host*.
-1. Input FQDN of your Azure Spring Apps public endpoints in **backend host name**.
-1. Accept the **backend host header** default, which is the same as **backend host name**.
+1. Specify **origin type** as *Azure Spring Apps*.
+1. Select your Azure Spring Apps instance for the **host name**.
+1. Keep the **origin host header** empty, so that the incoming host header will be used towards the backend. For more information, see [Azure Front Door configuration for host name preservation](/azure/architecture/best-practices/host-name-preservation.md#azure-front-door).
 
     ![Front Door 2](media/spring-cloud-load-balancers/front-door-2.png)