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

Author: BCS2022

articles/active-directory-b2c/whats-new-docs.md

@@ -15,6 +15,27 @@ manager: CelesteDG
 
 Welcome to what's new in Azure Active Directory B2C documentation. This article lists new docs that have been added and those that have had significant updates in the last three months. To learn what's new with the B2C service, see [What's new in Azure Active Directory](../active-directory/fundamentals/whats-new.md) and [Azure AD B2C developer release notes](custom-policy-developer-notes.md)
 
+## June 2022
+
+### New articles
+
+- [Configure authentication in an Azure Static Web App by using Azure AD B2C](configure-authentication-in-azure-static-app.md)
+- [Configure authentication in an Azure Web App configuration file by using Azure AD B2C](configure-authentication-in-azure-web-app-file-based.md)
+- [Configure authentication in an Azure Web App by using Azure AD B2C](configure-authentication-in-azure-web-app.md)
+- [Enable authentication options in an Azure Static Web App by using Azure AD B2C](enable-authentication-azure-static-app-options.md)
+- [Enable authentication in your own Python web application using Azure Active Directory B2C](enable-authentication-python-web-app.md)
+- [Set up OAuth 2.0 client credentials flow in Azure Active Directory B2C](client-credentials-grant-flow.md)
+- [Configure WhoIAM Rampart with Azure Active Directory B2C](partner-whoiam-rampart.md)
+
+### Updated articles
+
+- [Configure authentication in a sample Python web app by using Azure AD B2C](configure-authentication-sample-python-web-app.md)
+- [Single-page application sign-in using the OAuth 2.0 implicit flow in Azure Active Directory B2C](implicit-flow-single-page-application.md)
+- [Set up OAuth 2.0 client credentials flow in Azure Active Directory B2C](client-credentials-grant-flow.md)
+- [Tutorial: Create user flows and custom policies in Azure Active Directory B2C](tutorial-create-user-flows.md)
+- [Configure TheAccessHub Admin Tool by using Azure Active Directory B2C](partner-n8identity.md)
+- [Monitor Azure AD B2C with Azure Monitor](azure-monitor.md)
+
 
 ## May 2022
 

articles/active-directory/app-provisioning/application-provisioning-quarantine-status.md

@@ -69,6 +69,20 @@ A job can go into quarantine regardless of failure counts for issues such as adm
 - A job with 20,000 failures and 100,000 success wouldn't go into quarantine because it does not exceed the 40% failure threshold or the 40,000 failure max.  
 - There's an absolute threshold of 60,000 failures that accounts for both reference and non-reference failures. For example, 40,000 users failed to be provisioned and 21,000 manager updates failed. The total is 61,000 failures and exceeds the 60,000 limit.
 
+**Retry duration**
+
+The logic documented here may be different for certain connectors to ensure best customer experience, but we generally have the below retry cycles after a failure:
+
+After the first failure, the first retry happens within the next 2 hours (usually in the next sync cycle).
+- The second retry happens 6 hours after the first failure.
+- The third retry happens 12 hours after the first failure.
+- The fourth retry happens 24 hours after the first failure.
+- The fifth retry happens 48 hours after the first failure.
+- The sixth retry happens 96 hours after the first failure
+- The seventh retry happens 168 hours after the first failure.
+
+After the 7th failure, entry is flagged and no further retries are run.
+
 
 ## How do I get my application out of quarantine?
 

articles/active-directory/roles/admin-units-assign-roles.md

@@ -9,7 +9,7 @@ ms.service: active-directory
 ms.topic: how-to
 ms.subservice: roles
 ms.workload: identity
-ms.date: 06/01/2022
+ms.date: 06/30/2022
 ms.author: rolyon
 ms.reviewer: anandy
 ms.custom: oldportal;it-pro;
@@ -65,6 +65,12 @@ The following security principals can be assigned to a role with an administrati
 * Azure AD role-assignable groups
 * Service principals
 
+## Service principals and guest users
+
+Service principals and guest users will not be able to use a role assignment scoped to an administrative unit unless they are also assigned corresponding permissions to read the objects. This is because service principals and guest users do not receive directory read permissions by default, which are required to perform administrative actions. To enable a service principal or guest user to use a role assignment scoped to an administrative unit, you must assign the [Directory Readers](permissions-reference.md#directory-readers) role (or another role that includes read permissions) at a tenant scope.
+
+It is not currently possible to assign directory read permissions scoped to an administrative unit. For more information about default permissions for users, see [default user permissions](../fundamentals/users-default-permissions.md). 
+
 ## Assign a role with an administrative unit scope
 
 You can assign an Azure AD role with an administrative unit scope by using the Azure portal, PowerShell, or Microsoft Graph.

articles/aks/operator-best-practices-scheduler.md

@@ -92,7 +92,7 @@ If you upgrade a cluster or update a deployment template, the Kubernetes schedul
 Let's look at an example of a replica set with five pods that run NGINX. The pods in the replica set are assigned the label `app: nginx-frontend`. During a voluntary disruption event, such as a cluster upgrade, you want to make sure at least three pods continue to run. The following YAML manifest for a *PodDisruptionBudget* object defines these requirements:
 
 ```yaml
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
    name: nginx-pdb
@@ -108,7 +108,7 @@ You can also define a percentage, such as *60%*, which allows you to automatical
 You can define a maximum number of unavailable instances in a replica set. Again, a percentage for the maximum unavailable pods can also be defined. The following pod disruption budget YAML manifest defines that no more than two pods in the replica set be unavailable:
 
 ```yaml
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
    name: nginx-pdb

articles/app-service/includes/quickstart-java/quickstart-java-linux-azure-portal-pivot.md

@@ -0,0 +1,161 @@
+---
+author: cephalin
+ms.service: app-service
+ms.devlang: java
+ms.topic: quickstart
+ms.date: 06/30/2022
+ms.author: cephalin
+---
+
+[Azure App Service](../../overview.md) provides a highly scalable, self-patching web hosting service. This quickstart tutorial shows how to deploy a Java SE app to Azure App Service on Linux using the Azure portal. To follow a quickstart that deploys to Tomcat or JBoss EAP, select one of the Maven options above.
+
+This quickstart configures an App Service app in the **Free** tier and incurs no cost for your Azure subscription.
+
+This quickstart shows you how to make these changes within your browser, without having to install the development environment tools on your machine.
+
+![Screenshot of the sample app running in Azure, showing 'Hello World!'.](../../media/quickstart-java/hello-world-in-browser.png)
+
+You can follow the steps here using a Mac, Windows, or Linux machine. Once the prerequisites are installed, it takes about five minutes to complete the steps.
+
+To complete this quickstart you need:
+
+1. An Azure account with an active subscription. [Create an account for free](https://azure.microsoft.com/free/?utm_source=campaign&utm_campaign=visual-studio-code-tutorial-app-service-extension&mktingSource=visual-studio-code-tutorial-app-service-extension).
+1. A GitHub account to fork a repository.
+
+## 1 - Fork the sample repository
+
+1. In your browser, navigate to the repository containing [the sample code](https://github.com/Azure-Samples/java-docs-spring-hello-world).
+
+1. In the upper right corner, select **Fork**.
+
+    ![Screenshot of the Azure-Samples/java-docs-spring-hello-world repo in GitHub, with the Fork option highlighted.](../../media/quickstart-java/fork-java-docs-spring-hello-world-repo.png)
+
+1. On the **Create a new fork** screen, confirm the **Owner** and **Repository name** fields. Select **Create fork**.
+
+    ![Screenshot of the Create a new fork page in GitHub for creating a new fork of Azure-Samples/java-docs-spring-hello-world.](../../media/quickstart-java/fork-details-java-docs-spring-hello-world-repo.png)
+
+    >[!NOTE]
+    > This should take you to the new fork. Your fork URL will look something like this: https://github.com/YOUR_GITHUB_ACCOUNT_NAME/java-docs-spring-hello-world
+
+## 2 - Deploy to Azure
+
+1. Log in to the Azure portal.
+
+1. Type **app services** in the search. Under **Services**, select **App Services**.
+
+    ![Screenshot of the Azure portal with 'app services' typed in the search text box. In the results, the App Services option under Services is highlighted.](../../media/quickstart-java/azure-portal-search-for-app-services.png)
+
+
+1. In the **App Services** page, select **Create**.
+
+    ![Screenshot of the App Services page in the Azure portal. The Create button in the action bar is highlighted.](../../media/quickstart-java/azure-portal-create-app-service.png)
+
+1. Fill out the **Create Web App** page as follows.
+   - **Resource Group**: Create a resource group named _myResourceGroup_.
+   - **Name**: Type a globally unique name for your web app. 
+   - **Publish**: Select _Code_.
+   - **Runtime stack**: Select _Java 11_. 
+   - **Java web-server stack**: Select _Java SE (Embedded Web Server)_.
+   - **Operating system**: Select _Linux_.
+   - **Region**: Select an Azure region close to you.
+   - **App Service Plan**: Create an app service plan named _myAppServicePlan_.
+
+1.  To change to the Free tier, next to **Sku and size**, select **Change size**. 
+   
+1.  In the Spec Picker, select **Dev/Test** tab, select **F1**, and select the **Apply** button at the bottom of the page.
+
+    ![Screenshot of the Spec Picker for the App Service Plan pricing tiers in the Azure portal. Dev/Test, F1, and Apply are highlighted.](../../media/quickstart-java/azure-portal-create-app-service-select-free-tier-linux.png)   
+
+1. Select the **Review + create** button at the bottom of the page.
+
+1. After validation runs, select the **Create** button at the bottom of the page. This will create an Azure resource group, app service plan, and app service.
+
+1. After the Azure resources are created, select **Go to resource**.
+
+1. From the left navigation, select **Deployment Center**.
+
+    ![Screenshot of the App Service in the Azure Portal. The Deployment Center option in the Deployment section of the left navigation is highlighted.](../../media/quickstart-java/azure-portal-configure-app-service-deployment-center.png)  
+
+1. Under **Settings**, select a **Source**. For this quickstart, select _GitHub_.
+
+1. In the section under **GitHub**, select the following settings:
+    - Organization: Select your organization.
+    - Repository: Select _java-docs-spring-hello-world_.
+    - Branch: Select _main_.
+
+1. Select **Save**.
+
+    ![Screenshot of the Deployment Center for the App Service, focusing on the GitHub integration settings. The Save button in the action bar is highlighted.](../../media/quickstart-java/azure-portal-configure-app-service-github-integration.png)  
+
+> [!TIP]
+> This quickstart uses GitHub. Additional continuous deployment sources include Bitbucket, Local Git, Azure Repos, and External Git. FTPS is also a supported deployment method.
+  
+1. Once the GitHub integration is saved, select **Overview** > **URL**.
+
+    ![Screenshot of the App Service resource's overview with the URL highlighted.](../../media/quickstart-java/azure-portal-app-service-url.png)  
+
+The Java sample code is running in an Azure App Service Linux web app.
+
+![Screenshot of the sample app running in Azure, showing 'Hello World!'.](../../media/quickstart-java/hello-world-in-browser.png)
+
+**Congratulations!** You've deployed your first Java app to App Service using the Azure portal.
+
+## 3 - Update in GitHub and redeploy the code
+
+1. Browse to your GitHub fork of java-docs-spring-hello-world.
+
+1. On your repo page, press `.` to start Visual Studio code within your browser.
+
+    > [!NOTE]
+    > The URL will change from GitHub.com to GitHub.dev. This feature only works with repos that have files. This does not work on empty repos.
+
+    ![Screenshot of forked GitHub repo with an annotation to Press the period key.](../../media/quickstart-java/github-forked-repo-press-period.png)
+
+1. Navigate to **src/main/java/com/example/demo/DemoApplication.java**.
+
+    ![Screenshot of Visual Studio Code in the browser, highlighting src/main/java/com/example/demo/DemoApplication.java in the Explorer pane.](../../media/quickstart-java/visual-studio-code-in-browser-navigate-to-application-controller.png)
+
+1. Edit the **sayHello** method so that it shows "Hello Azure!" instead of "Hello World!"
+
+    ```java
+    @RequestMapping("/")
+	String sayHello() {
+		return "Hello Azure!";
+	}
+    ```
+
+1. From the **Source Control** menu, select the **Stage Changes** button to stage the change.
+
+    ![Screenshot of Visual Studio Code in the browser, highlighting the Source Control navigation in the sidebar, then highlighting the Stage Changes button in the Source Control panel.](../../media/quickstart-java/visual-studio-code-in-browser-stage-changes.png)
+
+1. Enter a commit message such as `Hello Azure`. Then, select **Commit and Push**.
+
+    ![Screenshot of Visual Studio Code in the browser, Source Control panel with a commit message of 'Hello Azure' and the Commit and Push button highlighted.](../../media/quickstart-java/visual-studio-code-in-browser-commit-push.png)
+
+1. Once deployment has completed, return to the browser window that opened during the **Browse to the app** step, and refresh the page.
+
+    ![Screenshot of the updated sample app running in Azure, showing 'Hello Azure!'.](../../media/quickstart-java/hello-azure-in-browser.png)
+
+## 4 - Manage your new Azure app
+
+1. Go to the [Azure portal](https://portal.azure.com) to manage the web app you created. Search for and select **App Services**.
+
+    ![Screenshot of the Azure portal with 'app services' typed in the search text box. In the results, the App Services option under Services is highlighted.](../../media/quickstart-java/azure-portal-search-for-app-services.png)    
+
+1. Select the name of your Azure app.
+
+    ![Screenshot of the App Services list in Azure. The name of the demo app service is highlighted.](../../media/quickstart-java/app-service-list.png)
+
+Your web app's **Overview** page will be displayed. Here, you can perform basic management tasks like **Browse**, **Stop**, **Restart**, and **Delete**.
+
+![Screenshot of the App Service overview page in Azure portal. In the action bar, the Browse, Stop, Swap (disabled), Restart, and Delete button group is highlighted.](../../media/quickstart-java/app-service-details.png)
+
+The web app menu provides different options for configuring your app.
+
+## 5 - Clean up resources
+
+When you're finished with the sample app, you can remove all of the resources for the app from Azure. It will not incur extra charges and keep your Azure subscription uncluttered. Removing the resource group also removes all resources in the resource group and is the fastest way to remove all Azure resources for your app.
+
+1. From your App Service **Overview** page, select the resource group you created earlier.
+
+1. From the resource group page, select **Delete resource group**. Confirm the name of the resource group to finish deleting the resources.