Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into shgwpol

Author: dlepow

articles/aks/use-node-public-ips.md

@@ -260,7 +260,7 @@ az provider register --namespace Microsoft.ContainerService
 
 Triggering host port auto assignment is done by deploying a workload without any host ports and applying the `kubernetes.azure.com/assign-hostports-for-containerports` annotation with the list of ports that need host port assignments. The value of the annotation should be specified as a comma-separated list of entries like `port/protocol`, where the port is an individual port number that is defined in the Pod spec and the protocol is `tcp` or `udp`.
 
-Ports will be assigned from the range `40000-59999` and will be unique across the cluster. The assigned ports will also be added to environment variables inside the pod so that the application can determine what ports were assigned.
+Ports will be assigned from the range `40000-59999` and will be unique across the cluster. The assigned ports will also be added to environment variables inside the pod so that the application can determine what ports were assigned. The environment variable name will be in the following format (example below): `<deployment name>_PORT_<port number>_<protocol>_HOSTPORT`, so an example would be `mydeployment_PORT_8080_TCP_HOSTPORT: 41932`.
 
 Here is an example `echoserver` deployment, showing the mapping of host ports for ports 8080 and 8443:
 

articles/azure-monitor/containers/container-insights-enable-provisioned-clusters.md

@@ -0,0 +1,123 @@
+---
+title: Monitor AKS hybrid clusters
+ms.date: 01/10/2023
+ms.topic: article
+author: austonli
+ms.author: aul
+description: Collect metrics and logs of AKS hybrid clusters using Azure Monitor.
+ms.reviewer: aul
+---
+
+# Azure Monitor container insights for Azure Kubernetes Service (AKS) hybrid clusters (preview)
+
+>[!NOTE]
+>Support for monitoring AKS hybrid clusters is currently in preview. We recommend only using preview features in safe testing environments.
+
+[Azure Monitor container insights](./container-insights-overview.md) provides a rich monitoring experience for [AKS hybrid clusters (preview)](/azure/aks/hybrid/aks-hybrid-options-overview). This article describes how to set up Container insights to monitor an AKS hybrid cluster.
+
+## Supported configurations
+
+- Azure Monitor container insights supports monitoring only Linux containers.
+
+## Prerequisites
+
+- Pre-requisites listed under the [generic cluster extensions documentation](../../azure-arc/kubernetes/extensions.md#prerequisites).
+- Log Analytics workspace. Azure Monitor Container Insights supports a Log Analytics workspace in the regions listed under Azure [products by region page](https://azure.microsoft.com/global-infrastructure/services/?regions=all&products=monitor). You can create your own workspace using [Azure Resource Manager](../logs/resource-manager-workspace.md), [PowerShell](../logs/powershell-workspace-configuration.md), or [Azure portal](../logs/quick-create-workspace.md).
+- [Contributor](../../role-based-access-control/built-in-roles.md#contributor) role assignment on the Azure subscription containing the Azure Arc-enabled Kubernetes resource. If the Log Analytics workspace is in a different subscription, then [Log Analytics Contributor](../logs/manage-access.md#azure-rbac) role assignment is needed on the Log Analytics workspace.
+- To view the monitoring data, you need to have [Log Analytics Reader](../logs/manage-access.md#azure-rbac) role assignment on the Log Analytics workspace.
+- The following endpoints need to be enabled for outbound access in addition to the ones mentioned under [connecting a Kubernetes cluster to Azure Arc](../../azure-arc/kubernetes/quickstart-connect-cluster.md#meet-network-requirements).
+- Azure CLI version 2.43.0 or higher
+- Azure k8s-extension version 1.3.7 or higher
+- Azure Resource-graph version 2.1.0
+
+## Onboarding
+
+## [CLI](#tab/create-cli)
+
+```acli
+az login
+
+az account set --subscription <cluster-subscription-name>
+
+az k8s-extension create --name azuremonitor-containers --cluster-name <cluster-name> --resource-group <resource-group> --cluster-type provisionedclusters --cluster-resource-provider "microsoft.hybridcontainerservice" --extension-type Microsoft.AzureMonitor.Containers --configuration-settings amalogs.useAADAuth=true
+```
+## [Azure portal](#tab/create-portal)
+
+### Onboarding from the AKS hybrid resource pane
+
+1. In the Azure portal, select the AKS hybrid cluster that you wish to monitor.
+
+2. From the resource pane on the left, select the 'Insights' item under the 'Monitoring' section.
+
+3. On the onboarding page, select the 'Configure Azure Monitor' button
+
+4. You can now choose the [Log Analytics workspace](../logs/quick-create-workspace.md) to send your metrics and logs data to.
+
+5. Select the 'Configure' button to deploy the Azure Monitor Container Insights cluster extension.
+
+### Onboarding from Azure Monitor pane
+
+1. In the Azure portal, navigate to the 'Monitor' pane, and select the 'Containers' option under the 'Insights' menu.
+
+2. Select the 'Unmonitored clusters' tab to view the AKS hybrid clusters that you can enable monitoring for.
+
+3. Click on the 'Enable' link next to the cluster that you want to enable monitoring for.
+
+4. Choose the Log Analytics workspace. 
+
+5. Select the 'Configure' button to continue.
+
+
+## [Resource Manager](#tab/create-arm)
+
+1. Download the Azure Resource Manager Template and Parameter files
+
+```bash
+curl -L https://aka.ms/existingClusterOnboarding.json -o existingClusterOnboarding.json
+```
+
+```bash
+curl -L https://aka.ms/existingClusterParam.json -o existingClusterParam.json
+```
+
+2. Edit the values in the parameter file.
+
+  - For clusterResourceId and clusterRegion, use the values on the Overview page for the LCM cluster
+  - For workspaceResourceId, use the resource ID of your Log Analytics workspace
+  - For workspaceRegion, use the Location of your Log Analytics workspace
+  - For workspaceDomain, use the workspace domain value as “opinsights.azure.com” for public cloud and for Azure China cloud as “opinsights.azure.cn”
+  - For resourceTagValues, leave as empty if not specific
+
+3. Deploy the ARM template
+
+```azurecli
+az login
+
+az account set --subscription <cluster-subscription-name>
+
+az deployment group create --resource-group <resource-group> --template-file ./existingClusterOnboarding.json --parameters existingClusterParam.json
+```
+---
+
+## Validation
+
+### Extension details
+
+Showing the extension details:
+
+```azcli
+az k8s-extension list --cluster-name <cluster-name> --resource-group <resource-group> --cluster-type provisionedclusters --cluster-resource-provider "microsoft.hybridcontainerservice"
+```
+
+
+## Delete extension
+
+The command for deleting the extension:
+
+```azcli
+az k8s-extension delete --cluster-name <cluster-name> --resource-group <resource-group> --cluster-type provisionedclusters --cluster-resource-provider "microsoft.hybridcontainerservice" --name azuremonitor-containers --yes
+```
+
+## Known Issues/Limitations
+
+- Windows containers are not supported currently

articles/azure-monitor/toc.yml

@@ -966,6 +966,8 @@ items:
         href: containers/container-insights-enable-aks.md
       - name: Azure Arc-enabled cluster
         href: containers/container-insights-enable-arc-enabled-clusters.md
+      - name: AKS hybrid cluster
+        href: containers/container-insights-enable-provisioned-clusters.md
       - name: Hybrid cluster
         href: containers/container-insights-hybrid-setup.md
       - name: Enable with Azure Policy

articles/azure-netapp-files/azacsnap-cmd-ref-delete.md

@@ -12,7 +12,7 @@ ms.service: azure-netapp-files
 ms.workload: storage
 ms.tgt_pltfrm: na
 ms.topic: reference
-ms.date: 04/21/2021
+ms.date: 01/18/2023
 ms.author: phjensen
 ---
 
@@ -37,7 +37,7 @@ The `-c delete` command has the following options:
 
 - `--delete sync` when used with options `--dbsid <SID>` and `--hanabackupid <HANA backup id>` gets the storage snapshot name from the backup catalog for the `<HANA backup id>`, and then deletes the entry in the backup catalog _and_ the snapshot from any of the volumes containing the named snapshot.
 
-- `--delete sync` when used with `--snapshot <snapshot name>` will check for any entries in the backup catalog for the `<snapshot name>`, gets the SAP HANA backup ID and deletes both the entry in the backup catalog _and_ the snapshot from any of the volumes containing the named snapshot.
+- `--delete sync` when used with options `--dbsid <SID>` and `--snapshot <snapshot name>` will check for any entries in the backup catalog for the `<snapshot name>`, gets the SAP HANA backup ID and deletes both the entry in the backup catalog _and_ the snapshot from any of the volumes containing the named snapshot.
 
 - `[--force]` (optional) *Use with caution*.  This operation will force deletion without prompting for confirmation.
 

articles/cognitive-services/QnAMaker/How-To/multi-turn.md

@@ -362,4 +362,4 @@ QnA Maker supports version control by including multi-turn conversation steps in
 
 ## Next steps
 
-* Learn more about contextual conversations from this [dialog sample](https://github.com/microsoft/BotBuilder-Samples/tree/main/samples/csharp_dotnetcore/11.qnamaker) or learn more about [conceptual bot design for multi-turn conversations](/azure/bot-service/bot-builder-conversations).
+* Learn more about contextual conversations from this [dialog sample](https://github.com/microsoft/BotBuilder-Samples/tree/main/archive/samples/csharp_dotnetcore/11.qnamaker) or learn more about [conceptual bot design for multi-turn conversations](/azure/bot-service/bot-builder-conversations).

articles/cognitive-services/Speech-Service/custom-speech-overview.md

@@ -21,6 +21,9 @@ Out of the box, speech to text utilizes a Universal Language Model as a base mod
 
 A custom model can be used to augment the base model to improve recognition of domain-specific vocabulary specific to the application by providing text data to train the model. It can also be used to improve recognition based for the specific audio conditions of the application by providing audio data with reference transcriptions.  
 
+> [!NOTE]
+> You pay to use Custom Speech models, but you are not charged for training a model. Usage includes hosting of your deployed custom endpoint in addition to using the endpoint for speech-to-text. For more information, see [Speech service pricing](https://azure.microsoft.com/pricing/details/cognitive-services/speech-services/).
+
 ## How does it work?
 
 With Custom Speech, you can upload your own data, test and train a custom model, compare accuracy between models, and deploy a model to a custom endpoint.

articles/cognitive-services/Speech-Service/how-to-custom-speech-deploy-model.md

@@ -17,6 +17,9 @@ zone_pivot_groups: speech-studio-cli-rest
 
 In this article, you'll learn how to deploy an endpoint for a Custom Speech model. With the exception of [batch transcription](batch-transcription.md), you must deploy a custom endpoint to use a Custom Speech model.  
 
+> [!NOTE]
+> You pay to use Custom Speech models, but you are not charged for training a model. Usage includes hosting of your deployed custom endpoint in addition to using the endpoint for speech-to-text. For more information, see [Speech service pricing](https://azure.microsoft.com/pricing/details/cognitive-services/speech-services/).
+
 You can deploy an endpoint for a base or custom model, and then [update](#change-model-and-redeploy-endpoint) the endpoint later to use a better trained model.
 
 > [!NOTE]

articles/cognitive-services/Speech-Service/how-to-custom-speech-train-model.md

@@ -19,7 +19,7 @@ zone_pivot_groups: speech-studio-cli-rest
 In this article, you'll learn how to train a custom model to improve recognition accuracy from the Microsoft base model. The speech recognition accuracy and quality of a Custom Speech model will remain consistent, even when a new base model is released.
 
 > [!NOTE]
-> You pay to use Custom Speech models, but you are not charged for training a model.
+> You pay to use Custom Speech models, but you are not charged for training a model. Usage includes hosting of your deployed custom endpoint in addition to using the endpoint for speech-to-text. For more information, see [Speech service pricing](https://azure.microsoft.com/pricing/details/cognitive-services/speech-services/).
 
 Training a model is typically an iterative process. You will first select a base model that is the starting point for a new model. You train a model with [datasets](./how-to-custom-speech-test-and-train.md) that can include text and audio, and then you test. If the recognition quality or accuracy doesn't meet your requirements, you can create a new model with additional or modified training data, and then test again.
 

articles/external-attack-surface-management/index.md

@@ -53,7 +53,8 @@ For security purposes, Microsoft collects users' IP addresses when they log in.
 
 In the case of a region down scenario, customers should see no downtime as Defender EASM uses technologies that replicate data to a backup region. Defender EASM processes customer data. By default, customer data is replicated to the paired region.
 
-The Microsoft compliance framework requires that all customer data be deleted within 180 days in accordance with [Azure subscription states](https://learn.microsoft.com/azure/cost-management-billing/manage/subscription-states) handling.  This also includes storage of customer data in offline locations, such as database backups. 
+The Microsoft compliance framework requires that all customer data be deleted within 180 days of that organization no longer being a customer of Microsoft.  This also includes storage of customer data in offline locations, such as database backups. Once a resource is deleted, it cannot be restored by our teams.  The customer data will be retained in our data stores for 75 days, however the actual resource cannot be restored.  After the 75 day period, customer data will be permanently deleted.  
+
 
 ## Next Steps
 

articles/lab-services/class-type-jupyter-notebook.md

@@ -1,7 +1,6 @@
 ---
 title: Set up a lab to teach data science with Python and Jupyter Notebooks | Microsoft Docs
 description: Learn how to set up a lab to teach data science using Python and Jupyter Notebooks. 
-author: emaher
 ms.topic: how-to
 ms.date: 01/04/2022
 ms.service: lab-services