Merge pull request #195091 from MicrosoftDocs/main

Merge main to live, 4 AM

Author: v-ccolin

articles/active-directory-b2c/find-help-open-support-ticket.md

@@ -75,10 +75,13 @@ If you're unable to find answers by using self-help resources, you can open an o
 
     1. Select a **[Severity](https://azure.microsoft.com/support/plans/response)**, and your preferred contact method.
 
+    > [!NOTE]
+    > Under **Advanced diagnostic information**, it's highly recommended that you allow the collection of advanced information by selecting **Yes**. It enables Microsoft support team to investigate the issue faster.
 
     :::image type="content" source="media/find-help-and-submit-support-ticket/find-help-and-submit-support-ticket-1.png" alt-text="Screenshot of how to find help and submit support ticket part 1.":::
 
     :::image type="content" source="media/find-help-and-submit-support-ticket/find-help-and-submit-support-ticket-2.png" alt-text="Screenshot of how to find help and submit support ticket part 2.":::
+
 
 1. Select **Next**. Under **4. Review + create**, you'll see a summary of your support ticket. 
 

articles/active-directory/app-provisioning/define-conditional-rules-for-provisioning-user-accounts.md

@@ -84,7 +84,7 @@ Scoping filters are configured as part of the attribute mappings for each Azure
 
    g. **REGEX MATCH**. Clause returns "true" if the evaluated attribute matches a regular expression pattern. For example: ([1-9][0-9]) matches any number between 10 and 99 (case sensitive).
 
-   h. **NOT REGEX MATCH**. Clause returns "true" if the evaluated attribute doesn't match a regular expression pattern.
+   h. **NOT REGEX MATCH**. Clause returns "true" if the evaluated attribute doesn't match a regular expression pattern. It will return "false" if the attribute is null / empty.
 
    i. **Greater_Than.** Clause returns "true" if the evaluated attribute is greater than the value. The value specified on the scoping filter must be an integer and the attribute on the user must be an integer [0,1,2,...]. 
 
@@ -97,6 +97,7 @@ Scoping filters are configured as part of the attribute mappings for each Azure
 > - The IsMemberOf filter is not supported currently.
 > - The members attribute on a group is not supported currently.
 > - EQUALS and NOT EQUALS are not supported for multi-valued attributes
+> - Scoping filters will return "false" if the value is null / empty
 
 9. Optionally, repeat steps 7-8 to add more scoping clauses.
 

articles/active-directory/app-provisioning/functions-for-customizing-application-data.md

@@ -7,7 +7,7 @@ ms.service: active-directory
 ms.subservice: app-provisioning
 ms.workload: identity
 ms.topic: reference
-ms.date: 02/16/2022
+ms.date: 04/13/2022
 ms.author: kenwith
 ms.reviewer: arvinh
 ---
@@ -1237,6 +1237,18 @@ Generate a user alias by taking first three letters of user's first name and fir
 * **INPUT** (surname): "Doe"
 * **OUTPUT**:  "JohDoe"
 
+### Add a comma between last name and first name. 
+Add a comma between last name and first name. 
+
+**Expression:** 
+`Join(", ", "", [surname], [givenName])`
+
+**Sample input/output:** 
+
+* **INPUT** (givenName): "John"
+* **INPUT** (surname): "Doe"
+* **OUTPUT**:  "Doe, John"
+
 
 ## Related Articles
 * [Automate User Provisioning/Deprovisioning to SaaS Apps](../app-provisioning/user-provisioning.md)

articles/active-directory/app-provisioning/on-premises-application-provisioning-architecture.md

@@ -13,7 +13,7 @@ ms.author: billmath
 ms.collection: M365-identity-device-management
 ---
 
-# Azure AD on-premises application provisioning architecture (preview)
+# Azure AD on-premises application identity provisioning architecture (preview)
 
 ## Overview
 
@@ -97,10 +97,6 @@ You can define one or more matching attribute(s) and prioritize them based on th
 ## Provisioning agent questions
 Some common questions are answered here.
 
-### What is the GA version of the provisioning agent?
-
-For the latest GA version of the provisioning agent, see [Azure AD connect provisioning agent: Version release history](provisioning-agent-release-version-history.md).
-
 ### How do I know the version of my provisioning agent?
 
  1. Sign in to the Windows server where the provisioning agent is installed.
@@ -138,19 +134,19 @@ You can also check whether all the required ports are open.
      - Microsoft Azure AD Connect Agent Updater
      - Microsoft Azure AD Connect Provisioning Agent Package
 
-### Provisioning agent history
+## Provisioning agent history
 This article lists the versions and features of Azure Active Directory Connect Provisioning Agent that have been released. The Azure AD team regularly updates the Provisioning Agent with new features and functionality. Please ensure that you do not use the same agent for on-prem provisioning and Cloud Sync / HR-driven provisioning.
 
 Microsoft provides direct support for the latest agent version and one version before.
 
-## Download link
+### Download link
 You can download the latest version of the agent using [this link](https://aka.ms/onpremprovisioningagent).
 
-## 1.1.846.0
+### 1.1.846.0
 
 April 11th, 2022 - released for download
 
-### Fixed issues
+#### Fixed issues
 
 - We added support for ObjectGUID as an anchor for the generic LDAP connector when provisioning users into AD LDS. 
 

articles/app-service/networking/nat-gateway-integration.md

@@ -8,7 +8,7 @@ ms.assetid: 0a84734e-b5c1-4264-8d1f-77e781b28426
 ms.service: app-service
 ms.workload: web
 ms.topic: article
-ms.date: 08/04/2021
+ms.date: 04/08/2022
 ms.author: madsd
 ms.custom: seodec18, devx-track-azurecli 
 ms.devlang: azurecli
@@ -26,7 +26,7 @@ For more information and pricing. Go to the [NAT gateway overview](../../virtual
 :::image type="content" source="./media/nat-gateway-integration/nat-gateway-overview.png" alt-text="Diagram shows Internet traffic flowing to a NAT gateway in an Azure Virtual Network.":::
 
 > [!Note] 
-> * Using NAT gateway with App Service is dependent on virtual network integration, and therefore **Standard**, **Premium**, **PremiumV2** or **PremiumV3** App Service plan is required.
+> * Using NAT gateway with App Service is dependent on virtual network integration, and therefore a supported App Service plan pricing tier is required.
 > * When using NAT gateway together with App Service, all traffic to Azure Storage must be using private endpoint or service endpoint.
 > * NAT gateway cannot be used together with App Service Environment v1 or v2.
 

articles/app-service/overview-vnet-integration.md

@@ -3,7 +3,7 @@ title: Integrate your app with an Azure virtual network
 description: Integrate your app in Azure App Service with Azure virtual networks.
 author: madsd
 ms.topic: conceptual
-ms.date: 03/04/2022
+ms.date: 04/08/2022
 ms.author: madsd
 
 ---
@@ -158,7 +158,7 @@ After your app integrates with your virtual network, it uses the same DNS server
 
 There are some limitations with using regional virtual network integration:
 
-* The feature is available from all App Service deployments in Premium v2 and Premium v3. It's also available in Standard but only from newer App Service deployments. If you're on an older deployment, you can only use the feature from a Premium v2 App Service plan. If you want to make sure you can use the feature in a Standard App Service plan, create your app in a Premium v3 App Service plan. Those plans are only supported on our newest deployments. You can scale down if you want after the plan is created.
+* The feature is available from all App Service deployments in Premium v2 and Premium v3. It's also available in Basic and Standard tier but only from newer App Service deployments. If you're on an older deployment, you can only use the feature from a Premium v2 App Service plan. If you want to make sure you can use the feature in a Standard App Service plan, create your app in a Premium v3 App Service plan. Those plans are only supported on our newest deployments. You can scale down if you want after the plan is created.
 * The feature can't be used by Isolated plan apps that are in an App Service Environment.
 * You can't reach resources across peering connections with classic virtual networks.
 * The feature requires an unused subnet that's an IPv4 `/28` block or larger in an Azure Resource Manager virtual network.
@@ -257,7 +257,7 @@ The regional virtual network integration feature has no extra charge for use bey
 
 Three charges are related to the use of the gateway-required virtual network integration feature:
 
-* **App Service plan pricing tier charges**: Your apps need to be in a Standard, Premium, Premium v2, or Premium v3 App Service plan. For more information on those costs, see [App Service pricing](https://azure.microsoft.com/pricing/details/app-service/).
+* **App Service plan pricing tier charges**: Your apps need to be in a Basic, Standard, Premium, Premium v2, or Premium v3 App Service plan. For more information on those costs, see [App Service pricing](https://azure.microsoft.com/pricing/details/app-service/).
 * **Data transfer costs**: There's a charge for data egress, even if the virtual network is in the same datacenter. Those charges are described in [Data transfer pricing details](https://azure.microsoft.com/pricing/details/data-transfers/).
 * **VPN gateway costs**: There's a cost to the virtual network gateway that's required for the point-to-site VPN. For more information, see [VPN gateway pricing](https://azure.microsoft.com/pricing/details/vpn-gateway/).
 

articles/azure-monitor/alerts/alerts-unified-log.md

@@ -180,7 +180,7 @@ Location affects which region the alert rule is evaluated in. Queries are execut
 
 Each Log Alert rule is billed based the interval at which the log query is evaluated (more frequent query evaluation results in a higher cost).  Additionally, for Log Alerts configured for [at scale monitoring](#split-by-alert-dimensions), the cost will also depend on the number of time series created by the dimensions resulting from your query.
 
-Prices for Log Alert rules are availalble on the [Azure Monitor pricing page](https://azure.microsoft.com/pricing/details/monitor/). 
+Prices for Log Alert rules are available on the [Azure Monitor pricing page](https://azure.microsoft.com/pricing/details/monitor/). 
 
 ## View log alerts usage on your Azure bill
 

articles/azure-monitor/app/java-in-process-agent.md

@@ -29,7 +29,7 @@ This section shows you how to download the auto-instrumentation jar file.
 
 #### Download the jar file
 
-Download the [applicationinsights-agent-3.2.10.jar](https://github.com/microsoft/ApplicationInsights-Java/releases/download/3.2.10/applicationinsights-agent-3.2.10.jar) file.
+Download the [applicationinsights-agent-3.2.11.jar](https://github.com/microsoft/ApplicationInsights-Java/releases/download/3.2.11/applicationinsights-agent-3.2.11.jar) file.
 
 > [!WARNING]
 > 
@@ -51,7 +51,7 @@ Download the [applicationinsights-agent-3.2.10.jar](https://github.com/microsoft
 
 #### Point the JVM to the jar file
 
-Add `-javaagent:path/to/applicationinsights-agent-3.2.10.jar` to your application's JVM args.
+Add `-javaagent:path/to/applicationinsights-agent-3.2.11.jar` to your application's JVM args.
 
 > [!TIP]
 > For help with configuring your application's JVM args, see [Tips for updating your JVM args](./java-standalone-arguments.md).
@@ -66,7 +66,7 @@ Add `-javaagent:path/to/applicationinsights-agent-3.2.10.jar` to your applicatio
         APPLICATIONINSIGHTS_CONNECTION_STRING = <Copy connection string from Application Insights Resource Overview>
         ```
 
-   - Or you can create a configuration file named `applicationinsights.json`. Place it in the same directory as `applicationinsights-agent-3.2.10.jar` with the following content:
+   - Or you can create a configuration file named `applicationinsights.json`. Place it in the same directory as `applicationinsights-agent-3.2.11.jar` with the following content:
 
         ```json
         {
@@ -367,7 +367,7 @@ If you want to attach custom dimensions to your logs, use [Log4j 1.2 MDC](https:
 
 ### Send custom telemetry by using the 2.x SDK
 
-1. Add `applicationinsights-core-2.6.4.jar` to your application. All 2.x versions are supported by Application Insights Java 3.x. If you have a choice. it's worth using the latest version:
+1. Add `applicationinsights-core-2.6.4.jar` to your application. All 2.x versions are supported by Application Insights Java 3.x. If you have a choice, it's worth using the latest version:
 
     ```xml
     <dependency>

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

@@ -15,24 +15,24 @@ Configure [App Services](../../app-service/configure-language-java.md#set-java-r
 
 ## Spring Boot
 
-Add the JVM arg `-javaagent:path/to/applicationinsights-agent-3.2.10.jar` somewhere before `-jar`, for example:
+Add the JVM arg `-javaagent:path/to/applicationinsights-agent-3.2.11.jar` somewhere before `-jar`, for example:
 
 ```
-java -javaagent:path/to/applicationinsights-agent-3.2.10.jar -jar <myapp.jar>
+java -javaagent:path/to/applicationinsights-agent-3.2.11.jar -jar <myapp.jar>
 ```
 
 ## Spring Boot via Docker entry point
 
-If you're using the *exec* form, add the parameter `"-javaagent:path/to/applicationinsights-agent-3.2.10.jar"` to the parameter list somewhere before the `"-jar"` parameter, for example:
+If you're using the *exec* form, add the parameter `"-javaagent:path/to/applicationinsights-agent-3.2.11.jar"` to the parameter list somewhere before the `"-jar"` parameter, for example:
 
 ```
-ENTRYPOINT ["java", "-javaagent:path/to/applicationinsights-agent-3.2.10.jar", "-jar", "<myapp.jar>"]
+ENTRYPOINT ["java", "-javaagent:path/to/applicationinsights-agent-3.2.11.jar", "-jar", "<myapp.jar>"]
 ```
 
-If you're using the *shell* form, add the JVM arg `-javaagent:path/to/applicationinsights-agent-3.2.10.jar` somewhere before `-jar`, for example:
+If you're using the *shell* form, add the JVM arg `-javaagent:path/to/applicationinsights-agent-3.2.11.jar` somewhere before `-jar`, for example:
 
 ```
-ENTRYPOINT java -javaagent:path/to/applicationinsights-agent-3.2.10.jar -jar <myapp.jar>
+ENTRYPOINT java -javaagent:path/to/applicationinsights-agent-3.2.11.jar -jar <myapp.jar>
 ```
 
 ## Tomcat 8 (Linux)
@@ -42,18 +42,18 @@ ENTRYPOINT java -javaagent:path/to/applicationinsights-agent-3.2.10.jar -jar <my
 If you installed Tomcat via `apt-get` or `yum`, then you should have a file `/etc/tomcat8/tomcat8.conf`.  Add this line to the end of that file:
 
 ```
-JAVA_OPTS="$JAVA_OPTS -javaagent:path/to/applicationinsights-agent-3.2.10.jar"
+JAVA_OPTS="$JAVA_OPTS -javaagent:path/to/applicationinsights-agent-3.2.11.jar"
 ```
 
 ### Tomcat installed via download and unzip
 
 If you installed Tomcat via download and unzip from [https://tomcat.apache.org](https://tomcat.apache.org), then you should have a file `<tomcat>/bin/catalina.sh`.  Create a new file in the same directory named `<tomcat>/bin/setenv.sh` with the following content:
 
 ```
-CATALINA_OPTS="$CATALINA_OPTS -javaagent:path/to/applicationinsights-agent-3.2.10.jar"
+CATALINA_OPTS="$CATALINA_OPTS -javaagent:path/to/applicationinsights-agent-3.2.11.jar"
 ```
 
-If the file `<tomcat>/bin/setenv.sh` already exists, then modify that file and add `-javaagent:path/to/applicationinsights-agent-3.2.10.jar` to `CATALINA_OPTS`.
+If the file `<tomcat>/bin/setenv.sh` already exists, then modify that file and add `-javaagent:path/to/applicationinsights-agent-3.2.11.jar` to `CATALINA_OPTS`.
 
 
 ## Tomcat 8 (Windows)
@@ -63,36 +63,36 @@ If the file `<tomcat>/bin/setenv.sh` already exists, then modify that file and a
 Locate the file `<tomcat>/bin/catalina.bat`.  Create a new file in the same directory named `<tomcat>/bin/setenv.bat` with the following content:
 
 ```
-set CATALINA_OPTS=%CATALINA_OPTS% -javaagent:path/to/applicationinsights-agent-3.2.10.jar
+set CATALINA_OPTS=%CATALINA_OPTS% -javaagent:path/to/applicationinsights-agent-3.2.11.jar
 ```
 
 Quotes aren't necessary, but if you want to include them, the proper placement is:
 
 ```
-set "CATALINA_OPTS=%CATALINA_OPTS% -javaagent:path/to/applicationinsights-agent-3.2.10.jar"
+set "CATALINA_OPTS=%CATALINA_OPTS% -javaagent:path/to/applicationinsights-agent-3.2.11.jar"
 ```
 
-If the file `<tomcat>/bin/setenv.bat` already exists, just modify that file and add `-javaagent:path/to/applicationinsights-agent-3.2.10.jar` to `CATALINA_OPTS`.
+If the file `<tomcat>/bin/setenv.bat` already exists, just modify that file and add `-javaagent:path/to/applicationinsights-agent-3.2.11.jar` to `CATALINA_OPTS`.
 
 ### Running Tomcat as a Windows service
 
-Locate the file `<tomcat>/bin/tomcat8w.exe`.  Run that executable and add `-javaagent:path/to/applicationinsights-agent-3.2.10.jar` to the `Java Options` under the `Java` tab.
+Locate the file `<tomcat>/bin/tomcat8w.exe`.  Run that executable and add `-javaagent:path/to/applicationinsights-agent-3.2.11.jar` to the `Java Options` under the `Java` tab.
 
 
 ## JBoss EAP 7
 
 ### Standalone server
 
-Add `-javaagent:path/to/applicationinsights-agent-3.2.10.jar` to the existing `JAVA_OPTS` environment variable in the file `JBOSS_HOME/bin/standalone.conf` (Linux) or `JBOSS_HOME/bin/standalone.conf.bat` (Windows):
+Add `-javaagent:path/to/applicationinsights-agent-3.2.11.jar` to the existing `JAVA_OPTS` environment variable in the file `JBOSS_HOME/bin/standalone.conf` (Linux) or `JBOSS_HOME/bin/standalone.conf.bat` (Windows):
 
 ```java    ...
-    JAVA_OPTS="-javaagent:path/to/applicationinsights-agent-3.2.10.jar -Xms1303m -Xmx1303m ..."
+    JAVA_OPTS="-javaagent:path/to/applicationinsights-agent-3.2.11.jar -Xms1303m -Xmx1303m ..."
     ...
 ```
 
 ### Domain server
 
-Add `-javaagent:path/to/applicationinsights-agent-3.2.10.jar` to the existing `jvm-options` in `JBOSS_HOME/domain/configuration/host.xml`:
+Add `-javaagent:path/to/applicationinsights-agent-3.2.11.jar` to the existing `jvm-options` in `JBOSS_HOME/domain/configuration/host.xml`:
 
 ```xml
 ...
@@ -102,7 +102,7 @@ Add `-javaagent:path/to/applicationinsights-agent-3.2.10.jar` to the existing `j
         <jvm-options>
             <option value="-server"/>
             <!--Add Java agent jar file here-->
-            <option value="-javaagent:path/to/applicationinsights-agent-3.2.10.jar"/>
+            <option value="-javaagent:path/to/applicationinsights-agent-3.2.11.jar"/>
             <option value="-XX:MetaspaceSize=96m"/>
             <option value="-XX:MaxMetaspaceSize=256m"/>
         </jvm-options>
@@ -142,20 +142,20 @@ Add these lines to `start.ini`
 
 ```
 --exec
--javaagent:path/to/applicationinsights-agent-3.2.10.jar
+-javaagent:path/to/applicationinsights-agent-3.2.11.jar
 ```
 
 
 ## Payara 5
 
-Add `-javaagent:path/to/applicationinsights-agent-3.2.10.jar` to the existing `jvm-options` in `glassfish/domains/domain1/config/domain.xml`:
+Add `-javaagent:path/to/applicationinsights-agent-3.2.11.jar` to the existing `jvm-options` in `glassfish/domains/domain1/config/domain.xml`:
 
 ```xml
 ...
 <java-config ...>
     <!--Edit the JVM options here-->
     <jvm-options>
-        -javaagent:path/to/applicationinsights-agent-3.2.10.jar>
+        -javaagent:path/to/applicationinsights-agent-3.2.11.jar>
     </jvm-options>
         ...
 </java-config>
@@ -165,14 +165,14 @@ Add `-javaagent:path/to/applicationinsights-agent-3.2.10.jar` to the existing `j
 ## WebSphere 8
 
 Open Management Console
-go to **servers > WebSphere application servers > Application servers**, choose the appropriate application servers and select: 
+Go to **servers > WebSphere application servers > Application servers**, choose the appropriate application servers and select: 
 
 ```
 Java and Process Management > Process definition >  Java Virtual Machine
 ```
 In "Generic JVM arguments" add the following:
 ```
--javaagent:path/to/applicationinsights-agent-3.2.10.jar
+-javaagent:path/to/applicationinsights-agent-3.2.11.jar
 ```
 After that, save and restart the application server.
 
@@ -181,7 +181,7 @@ After that, save and restart the application server.
 
 Create a new file `jvm.options` in the server directory (for example `<openliberty>/usr/servers/defaultServer`), and add this line:
 ```
--javaagent:path/to/applicationinsights-agent-3.2.10.jar
+-javaagent:path/to/applicationinsights-agent-3.2.11.jar
 ```
 
 ## Others