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

Author: yelevin

articles/app-service/manage-backup.md

@@ -3,7 +3,7 @@ title: Back up an app
 description: Learn how to restore backups of your apps in Azure App Service or configure custom backups. Customize backups by including the linked database.
 ms.assetid: 6223b6bd-84ec-48df-943f-461d84605694
 ms.topic: article
-ms.date: 09/09/2022 
+ms.date: 09/19/2022 
 ms.custom: seodec18
 
 ---
@@ -27,7 +27,7 @@ There are two types of backups in App Service. Automatic backups made for your a
 
 ||Automatic backups | Custom backups |
 |-|-|-|
-| Pricing tiers | **Standard**, **Premium**. | **Standard**, **Premium**, **Isolated**. |
+| Pricing tiers | **Basic**, **Standard**, **Premium**. | **Basic**, **Standard**, **Premium**, **Isolated**. |
 | Configuration required | No. | Yes. |
 | Backup size | 30 GB. | 10 GB, 4 GB of which can be the linked database. |
 | Linked database | Not backed up. | The following linked databases can be backed up: [SQL Database](/azure/azure-sql/database/), [Azure Database for MySQL](../mysql/index.yml), [Azure Database for PostgreSQL](../postgresql/index.yml), [MySQL in-app](https://azure.microsoft.com/blog/mysql-in-app-preview-app-service/). |

articles/application-gateway/tutorial-ingress-controller-add-on-existing.md

@@ -100,6 +100,11 @@ appGWVnetId=$(az network vnet show -n myVnet -g myResourceGroup -o tsv --query "
 az network vnet peering create -n AKStoAppGWVnetPeering -g $nodeResourceGroup --vnet-name $aksVnetName --remote-vnet $appGWVnetId --allow-vnet-access
 ```
 
+> [!NOTE]
+> In the "Deploy a new AKS cluster" step above we created AKS with Azure CNI, in case you have an existing AKS cluster using [Kubenet mode](../aks/configure-kubenet.md) you need to update the route table to help the packets destined for a POD IP reach the node which is hosting the pod.
+> A simple way to achieve this is by associating the same route table created by AKS to the Application Gateway's subnet. 
+
+
 ## Deploy a sample application using AGIC 
 
 You'll now deploy a sample application to the AKS cluster you created that will use the AGIC add-on for Ingress and connect the application gateway to the AKS cluster. First, you'll get credentials to the AKS cluster you deployed by running the `az aks get-credentials` command. 

articles/azure-monitor/app/java-standalone-config.md

@@ -418,6 +418,23 @@ These are the valid `level` values that you can specify in the `applicationinsig
 > | project timestamp, message, itemType
 > ```
 
+
+### Code properties for Logback (preview) 
+
+You can enable code properties (_FileName_, _ClassName_, _MethodName_, _LineNumber_) for Logback: 
+
+```json
+{
+  "preview": {
+    "captureLogbackCodeAttributes": true
+  }
+}
+```
+
+> [!WARNING]
+>
+> This feature could add a performance overhead.
+
 ### LoggingLevel
 
 Starting from version 3.3.0, `LoggingLevel` is not captured by default as part of Traces' custom dimension since that data is already captured in the `SeverityLevel` field.

articles/azure-netapp-files/TOC.yml

@@ -348,7 +348,7 @@
   - name: Pricing
     href: https://azure.microsoft.com/pricing/details/netapp/
   - name: Regional availability
-    href: https://azure.microsoft.com/global-infrastructure/services/?products=netapp
+    href: https://azure.microsoft.com/explore/global-infrastructure/products-by-region/?products=netapp&rar=true&regions=all
   - name: SLA
     href: https://azure.microsoft.com/support/legal/sla/netapp/
   - name: Videos

articles/azure-netapp-files/azure-netapp-files-create-volumes.md

@@ -40,7 +40,7 @@ This article shows you how to create an NFS volume. For SMB volumes, see [Create
 
 ## Best practice
 
-* Ensure that you’re using the proper mount instructions for the volume.  See [Mount a volume for Windows or Linux VMs](azure-netapp-files-mount-unmount-volumes-for-virtual-machines.md).
+* Ensure that you’re using the proper mount instructions for the volume. See [Mount a volume for Windows or Linux VMs](azure-netapp-files-mount-unmount-volumes-for-virtual-machines.md).
 
 * The NFS client should be in the same VNet or peered VNet as the Azure NetApp Files volume. Connecting from outside the VNet is supported; however, it will introduce additional latency and decrease overall performance.
 
@@ -112,7 +112,7 @@ This article shows you how to create an NFS volume. For SMB volumes, see [Create
 
         Additional configurations are required if you use Kerberos with NFSv4.1. Follow the instructions in [Configure NFSv4.1 Kerberos encryption](configure-kerberos-encryption.md).
 
-    * If you want to enable Active Directory LDAP users and extended groups (up to 1024 groups) to access the volume, select the **LDAP** option. Follow instructions in [Configure ADDS LDAP with extended groups for NFS volume access](configure-ldap-extended-groups.md) to complete the required configurations. 
+    * If you want to enable Active Directory LDAP users and extended groups (up to 1024 groups) to access the volume, select the **LDAP** option. Follow instructions in [Configure AD DS LDAP with extended groups for NFS volume access](configure-ldap-extended-groups.md) to complete the required configurations. 
 
     *  Customize **Unix Permissions** as needed to specify change permissions for the mount path. The setting does not apply to the files under the mount path. The default setting is `0770`. This default setting grants read, write, and execute permissions to the owner and the group, but no permissions are granted to other users.     
         Registration requirement and considerations apply for setting **Unix Permissions**. Follow instructions in [Configure Unix permissions and change ownership mode](configure-unix-permissions-change-ownership-mode.md).   
@@ -121,7 +121,7 @@ This article shows you how to create an NFS volume. For SMB volumes, see [Create
 
     ![Specify NFS protocol](../media/azure-netapp-files/azure-netapp-files-protocol-nfs.png)
 
-4. Click **Review + Create** to review the volume details.  Then click **Create** to create the volume.
+4. Click **Review + Create** to review the volume details. Then click **Create** to create the volume.
 
     The volume you created appears in the Volumes page. 
 
@@ -131,8 +131,8 @@ This article shows you how to create an NFS volume. For SMB volumes, see [Create
 
 * [Configure NFSv4.1 default domain for Azure NetApp Files](azure-netapp-files-configure-nfsv41-domain.md)
 * [Configure NFSv4.1 Kerberos encryption](configure-kerberos-encryption.md)
-* [Enable Active Directory Domain Services (ADDS) LDAP authentication for NFS volumes](configure-ldap-over-tls.md)
-* [Configure ADDS LDAP with extended groups for NFS volume access](configure-ldap-extended-groups.md)
+* [Enable Active Directory Domain Services (AD DS) LDAP authentication for NFS volumes](configure-ldap-over-tls.md)
+* [Configure AD DS LDAP with extended groups for NFS volume access](configure-ldap-extended-groups.md)
 * [Mount a volume for Windows or Linux VMs](azure-netapp-files-mount-unmount-volumes-for-virtual-machines.md)
 * [Configure export policy for an NFS volume](azure-netapp-files-configure-export-policy.md)
 * [Configure Unix permissions and change ownership mode](configure-unix-permissions-change-ownership-mode.md). 

articles/azure-video-indexer/language-support.md

@@ -13,7 +13,11 @@ ms.date: 09/14/2022
 This article provides a comprehensive list of language support by service features in Azure Video Indexer. For the list and definitions of all the features, see [Overview](video-indexer-overview.md).
 
 > [!NOTE]
-> To make sure a language is supported by the Azure Video Indexer frontend (the website and widget), check [the frontend language support](#language-support-in-frontend-experiences) table below.
+> The list below contains the source languages for transcription that are supported by the Video Indexer API. Some languages are supported only through the 
+> API and not through the Video Indexer website or widgets.
+>
+> To make sure a language is supported for search, transcription, or translation by the Azure Video Indexer website and widgets, see the [frontend language 
+> support table](#language-support-in-frontend-experiences) further below.
 
 ## General language support
 

articles/azure-video-indexer/logic-apps-connector-arm-accounts.md

@@ -12,17 +12,19 @@ Azure Video Indexer (AVI) [REST API](https://api-portal.videoindexer.ai/api-deta
 
 You can use the connectors to set up custom workflows to effectively index and extract insights from a large amount of video and audio files, without writing a single line of code. Furthermore, using the connectors for the integration gives you better visibility on the health of your workflow and an easy way to debug it.
 
+> [!TIP]
+> If you are using a classic AVI account, see [Logic Apps connector with classic-based AVI accounts](logic-apps-connector-tutorial.md).
+
+## Get started with the Azure Video Indexer connectors
+
 To help you get started quickly with the Azure Video Indexer connectors, the example in this article creates Logic App flows. The Logic App and Power Automate capabilities and their editors are almost identical, thus the diagrams and explanations are applicable to both. The example in this article is based on the ARM AVI account. If you're working with a classic account, see [Logic App connectors with classic-based AVI accounts](logic-apps-connector-tutorial.md).
 
 The "upload and index your video automatically" scenario covered in this article is composed of two different flows that work together. The "two flow" approach is used to support async upload and indexing of larger files effectively. 
 
 * The first flow is triggered when a blob is added or modified in an Azure Storage account. It uploads the new file to Azure Video Indexer with a callback URL to send a notification once the indexing operation completes.
 * The second flow is triggered based on the callback URL and saves the extracted insights back to a JSON file in Azure Storage. 
 
-> [!NOTE]
-> For details about the Azure Video Indexer REST ARM API and the request/response examples, see [API](https://aka.ms/avam-arm-api). For example, [Generate an Azure Video Indexer access token](/rest/api/videoindexer/generate/access-token?tabs=HTTP). Press **Try it** to get the correct values for your account.
->
-> If you are using a classic AVI account, see [Logic Apps connector with classic-based AVI accounts]( logic-apps-connector-tutorial.md).
+The logic apps that you create in this article, contain one flow per app. The second section ("**Create a second flow - JSON extraction**") explains how to connect the two. The second flow stands alone and is triggered by the first one (the section with the callback URL). 
 
 ## Prerequisites
 
@@ -160,13 +162,15 @@ The following image shows the first flow:
         |----|----|
         |Location| Location of the associated the Azure Video Indexer account.|	
         | Account ID| Account ID of the associated Azure Video Indexer account. You can find the **Account ID** in the **Overview** page of your account, in the Azure portal. Or, the **Account settings** tab, left of the [Azure Video Indexer website](https://www.videoindexer.ai/).|
-        |Access Token| Select **accessToken** from the **dynamic content** of the **Parse JSON** action.|
+        |Access Token| Use the `body('HTTP')['accessToken']` expression to extract the access token in the right format from the previous HTTP call.|
         | Video Name| Select **List of Files Name** from the dynamic content of **When a blob is added or modified** action. |
         |Video URL|Select **Web Url** from the dynamic content of **Create SAS URI by path** action.|
         | Body| Can be left as default.|
         
         ![Screenshot of the upload and index action.](./media/logic-apps-connector-arm-accounts/upload-and-index.png)
 
+        Select **Save**.
+
 The completion of the uploading and indexing from the first flow will send an HTTP request with the correct callback URL to trigger the second flow. Then, it will retrieve the insights generated by Azure Video Indexer. In this example, it will store the output of your indexing job in your Azure Storage. However, it's up to you what you do with the output.
 
 ## Create a second flow - JSON extraction

articles/azure-web-pubsub/reference-rest-api-data-plane.md

@@ -53,6 +53,8 @@ Like using `AccessKey`, a [JSON Web Token (JWT)](https://en.wikipedia.org/wiki/J
 
 [Learn how to generate Azure AD Tokens](../active-directory/develop/reference-v2-libraries.md)
 
+The credential scope used should be `https://webpubsub.azure.com/.default`.
+
 You could also use **Role Based Access Control (RBAC)** to authorize the request from your server to Azure Web PubSub Service.
 
 [Learn how to configure Role Based Access Control roles for your resource](./howto-authorize-from-application.md#add-role-assignments-on-azure-portal)
@@ -62,4 +64,4 @@ You could also use **Role Based Access Control (RBAC)** to authorize the request
 | Operation Group | Description |
 |-----------------|-------------|
 |[Service Status](/rest/api/webpubsub/dataplane/health-api)| Provides operations to check the service status |
-|[Hub Operations](/rest/api/webpubsub/dataplane/web-pub-sub)| Provides operations to manage the connections and send messages to them. |
+|[Hub Operations](/rest/api/webpubsub/dataplane/web-pub-sub)| Provides operations to manage the connections and send messages to them. |

articles/defender-for-cloud/episode-two.md

@@ -5,31 +5,31 @@ ms.topic: reference
 ms.date: 05/29/2022
 ---
 
-# Integrate Azure Purview with Microsoft Defender for Cloud 
+# Integrate Microsoft Purview with Microsoft Defender for Cloud 
 
-**Episode description**: In this episode of Defender for Cloud in the field, David Trigano joins Yuri Diogenes to share the new integration of Microsoft Defender for Cloud with Azure Purview, which was released at Ignite 2021.  
+**Episode description**: In this episode of Defender for Cloud in the field, David Trigano joins Yuri Diogenes to share the new integration of Microsoft Defender for Cloud with Microsoft Purview, which was released at Ignite 2021.  
 
-David explains the use case scenarios for this integration and how the data classification is done by Azure Purview can help prioritize recommendations and alerts in Defender for Cloud. David also demonstrates the overall experience of data enrichment based on the information that flows from Azure Purview to Defender for Cloud. 
+David explains the use case scenarios for this integration and how the data classification is done by Microsoft Purview can help prioritize recommendations and alerts in Defender for Cloud. David also demonstrates the overall experience of data enrichment based on the information that flows from Microsoft Purview to Defender for Cloud. 
 
 <br>
 <br>
 <iframe src="https://aka.ms/docs/player?id=9b911e9c-e933-4b7b-908a-5fd614f822c7" width="1080" height="530" allowFullScreen="true" frameBorder="0"></iframe>
 
-- [1:36](/shows/mdc-in-the-field/integrate-with-purview) - Overview of Azure Purview
+- [1:36](/shows/mdc-in-the-field/integrate-with-purview) - Overview of Microsoft Purview
 
 - [2:40](/shows/mdc-in-the-field/integrate-with-purview) - Integration with Microsoft Defender for Cloud
 
-- [3:48](/shows/mdc-in-the-field/integrate-with-purview) - How the integration with Azure Purview helps to prioritize Recommendations in Microsoft Defender for Cloud
+- [3:48](/shows/mdc-in-the-field/integrate-with-purview) - How the integration with Microsoft Purview helps to prioritize Recommendations in Microsoft Defender for Cloud
 
-- [5:26](/shows/mdc-in-the-field/integrate-with-purview) - How the integration with Azure Purview helps to prioritize Alerts in Microsoft Defender for Cloud
+- [5:26](/shows/mdc-in-the-field/integrate-with-purview) - How the integration with Microsoft Purview helps to prioritize Alerts in Microsoft Defender for Cloud
 
 - [8:54](/shows/mdc-in-the-field/integrate-with-purview) - Demonstration
 
 - [16:50](/shows/mdc-in-the-field/integrate-with-purview) - Final considerations
 
 ## Recommended resources
 
-Learn more about the [integration with Azure Purview](information-protection.md).
+Learn more about the [integration with Microsoft Purview](information-protection.md).
 
 -  Subscribe to [Microsoft Security on YouTube](https://www.youtube.com/redirect?event=video_description&redir_token=QUFFLUhqa0ZoTml2Qm9kZ2pjRzNMUXFqVUwyNl80YVNtd3xBQ3Jtc0trVm9QM2Z0NlpOeC1KSUE2UEd1cVJ5aHQ0MTN6WjJEYmNlOG9rWC1KZ1ZqaTNmcHdOOHMtWXRLSGhUTVBhQlhhYzlUc2xmTHZtaUpkd1c4LUQzLWt1YmRTbkVQVE5EcTJIM0Foc042SGdQZU5acVRJbw&q=https%3A%2F%2Faka.ms%2FSubscribeMicrosoftSecurity)
 

articles/hdinsight/hdinsight-administer-use-powershell.md

@@ -4,7 +4,7 @@ description: Learn how to perform administrative tasks for the Apache Hadoop clu
 ms.service: hdinsight
 ms.topic: conceptual
 ms.custom: hdinsightactive, devx-track-azurepowershell
-ms.date: 02/13/2020
+ms.date: 09/19/2022
 ---
 
 # Manage Apache Hadoop clusters in HDInsight by using Azure PowerShell