Skip to content

Commit ac13368

Browse files
committed
Merge branch 'main' of https://github.com/microsoftdocs/azure-docs-pr into phsm-misc
2 parents 916ae56 + 36036d0 commit ac13368

File tree

104 files changed

+2330
-1794
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+2330
-1794
lines changed

articles/active-directory/authentication/howto-sspr-deployment.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ For more information about pricing, see [Azure Active Directory pricing](https:/
7070

7171
### Guided walkthrough
7272

73-
For a guided walkthrough of many of the recommendations in this article, see the [Plan your self-service password reset deployment](https://go.microsoft.com/fwlink/?linkid=2221600) guide.
73+
For a guided walkthrough of many of the recommendations in this article, see the [Plan your self-service password reset deployment](https://go.microsoft.com/fwlink/?linkid=2221501) guide when signed in to the Microsoft 365 Admin Center. To review best practices without signing in and activating automated setup features, go to the [M365 Setup portal](https://go.microsoft.com/fwlink/?linkid=2221600).
7474

7575
### Training resources
7676

articles/active-directory/develop/active-directory-jwt-claims-customization.md

Lines changed: 57 additions & 58 deletions
Large diffs are not rendered by default.

articles/active-directory/develop/multi-service-web-app-access-microsoft-graph-as-app.md

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ Run the install commands.
144144

145145
```dotnetcli
146146
dotnet add package Microsoft.Identity.Web.MicrosoftGraph
147+
dotnet add package Microsoft.Graph
147148
```
148149

149150
#### Package Manager Console
@@ -153,6 +154,7 @@ Open the project/solution in Visual Studio, and open the console by using the **
153154
Run the install commands.
154155
```powershell
155156
Install-Package Microsoft.Identity.Web.MicrosoftGraph
157+
Install-Package Microsoft.Graph
156158
```
157159

158160
### Example
@@ -162,9 +164,9 @@ using System;
162164
using System.Collections.Generic;
163165
using System.Threading.Tasks;
164166
using Microsoft.AspNetCore.Mvc.RazorPages;
165-
using Azure.Identity;​
166-
using Microsoft.Graph.Core;​​
167-
using System.Net.Http.Headers;
167+
using Microsoft.Extensions.Logging;
168+
using Microsoft.Graph;
169+
using Azure.Identity;
168170

169171
...
170172

@@ -178,27 +180,18 @@ public async Task OnGetAsync()
178180
var credential = new ChainedTokenCredential(
179181
new ManagedIdentityCredential(),
180182
new EnvironmentCredential());
181-
var token = credential.GetToken(
182-
new Azure.Core.TokenRequestContext(
183-
new[] { "https://graph.microsoft.com/.default" }));
184183

185-
var accessToken = token.Token;
186-
var graphServiceClient = new GraphServiceClient(
187-
new DelegateAuthenticationProvider((requestMessage) =>
188-
{
189-
requestMessage
190-
.Headers
191-
.Authorization = new AuthenticationHeaderValue("bearer", accessToken);
184+
string[] scopes = new[] { "https://graph.microsoft.com/.default" };
192185

193-
return Task.CompletedTask;
194-
}));
186+
var graphServiceClient = new GraphServiceClient(
187+
credential, scopes);
195188

196-
// MSGraphUser is a DTO class being used to hold User information from the graph service client call
197189
List<MSGraphUser> msGraphUsers = new List<MSGraphUser>();
198190
try
199191
{
200-
var users =await graphServiceClient.Users.Request().GetAsync();
201-
foreach(var u in users)
192+
//var users = await graphServiceClient.Users.Request().GetAsync();
193+
var users = await graphServiceClient.Users.GetAsync();
194+
foreach (var u in users.Value)
202195
{
203196
MSGraphUser user = new MSGraphUser();
204197
user.userPrincipalName = u.UserPrincipalName;
@@ -209,7 +202,7 @@ public async Task OnGetAsync()
209202
msGraphUsers.Add(user);
210203
}
211204
}
212-
catch(Exception ex)
205+
catch (Exception ex)
213206
{
214207
string msg = ex.Message;
215208
}

articles/active-directory/fundamentals/concept-secure-remote-workers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ This guide assumes that your cloud only or hybrid identities have been establish
3434

3535
### Guided walkthrough
3636

37-
For a guided walkthrough of many of the recommendations in this article, see the [Set up Azure AD](https://go.microsoft.com/fwlink/?linkid=2221308) guide.
37+
For a guided walkthrough of many of the recommendations in this article, see the [Set up Azure AD](https://go.microsoft.com/fwlink/?linkid=2224193) guide when signed in to the Microsoft 365 Admin Center. To review best practices without signing in and activating automated setup features, go to the [M365 Setup portal](https://go.microsoft.com/fwlink/?linkid=2221308).
3838

3939
## Guidance for Azure AD Free, Office 365, or Microsoft 365 customers.
4040

articles/active-directory/identity-protection/concept-identity-protection-risks.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ Premium detections are visible only to Azure AD Premium P2 customers. Customers
6868
| Activity from anonymous IP address | Offline | This detection is discovered by [Microsoft Defender for Cloud Apps](/cloud-app-security/anomaly-detection-policy#activity-from-anonymous-ip-addresses). This detection identifies that users were active from an IP address that has been identified as an anonymous proxy IP address. |
6969
| Suspicious inbox forwarding | Offline | This detection is discovered by [Microsoft Defender for Cloud Apps](/cloud-app-security/anomaly-detection-policy#suspicious-inbox-forwarding). This detection looks for suspicious email forwarding rules, for example, if a user created an inbox rule that forwards a copy of all emails to an external address. |
7070
| Mass Access to Sensitive Files | Offline | This detection is discovered by [Microsoft Defender for Cloud Apps](/defender-cloud-apps/investigate-anomaly-alerts#unusual-file-access-by-user). This detection looks at your environment and triggers alerts when users access multiple files from Microsoft SharePoint or Microsoft OneDrive. An alert is triggered only if the number of accessed files is uncommon for the user and the files might contain sensitive information|
71+
| Verified threat actor IP | Real-time | This risk detection type indicates sign-in activity that is consistent with known IP addresses associated with nation state actors or cyber crime groups, based on Microsoft Threat Intelligence Center (MSTIC).|
7172

7273
#### Nonpremium sign-in risk detections
7374

articles/active-directory/reports-monitoring/howto-use-recommendations.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@ Each recommendation provides the same set of details that explain what the recom
7272

7373
- The **Impacted resources** table contains a list of resources identified by the recommendation. The resource's name, ID, date it was first detected, and status are provided. The resource could be an application or resource service principal, for example.
7474

75+
> [!NOTE]
76+
> In the Azure portal the impacted resources are limited to a maximum of 50 resources. To view more resources, you should use the expand query parameter at the end of your API query on Microsoft graph. For example: Get: https://graph.microsoft.com/beta/directory/recommendations?$expand=impactedResources
77+
7578
## How to update a recommendation
7679

7780
To update the status of a recommendation or a related resource, sign in to Azure using a least-privileged role for updating a recommendation.
@@ -136,4 +139,4 @@ For more information, see the [Microsoft Graph documentation for recommendations
136139
## Next steps
137140
138141
- [Review the Azure AD recommendations overview](overview-recommendations.md)
139-
- [Learn about Service Health notifications](overview-service-health-notifications.md)
142+
- [Learn about Service Health notifications](overview-service-health-notifications.md)

articles/app-service/app-service-configure-premium-tier.md

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,26 @@ description: Learn how to better performance for your web, mobile, and API app i
44
keywords: app service, azure app service, scale, scalable, app service plan, app service cost
55
ms.assetid: ff00902b-9858-4bee-ab95-d3406018c688
66
ms.topic: article
7-
ms.date: 03/21/2022
7+
ms.date: 04/06/2023
88
ms.custom: seodec18, devx-track-azurecli, devx-track-azurepowershell
99

1010
---
1111

1212
# Configure PremiumV3 tier for Azure App Service
1313

14-
The new **PremiumV3** pricing tier gives you faster processors, SSD storage, and quadruple the memory-to-core ratio of the existing pricing tiers (double the **PremiumV2** tier). With the performance advantage, you could save money by running your apps on fewer instances. In this article, you learn how to create an app in **PremiumV3** tier or scale up an app to **PremiumV3** tier.
14+
The new **PremiumV3** pricing tier gives you faster processors, SSD storage, memory-optimized options, and quadruple the memory-to-core ratio of the existing pricing tiers (double the **PremiumV2** tier). With the performance and memory advantage, you could save money by running your apps on fewer instances. In this article, you learn how to create an app in **PremiumV3** tier or scale up an app to **PremiumV3** tier.
1515

1616
## Prerequisites
1717

18-
To scale-up an app to **PremiumV3**, you need to have an Azure App Service app that runs in a pricing tier lower than **PremiumV3**, and the app must be running in an App Service deployment that supports PremiumV3.
18+
To scale-up an app to **PremiumV3**, you need to have an Azure App Service app that runs in a pricing tier lower than **PremiumV3**, and the app must be running in an App Service deployment that supports **PremiumV3**. Additionally the App Service deployment must support the desired SKU within **PremiumV3**.
1919

2020
<a name="availability"></a>
2121

2222
## PremiumV3 availability
2323

2424
The **PremiumV3** tier is available for both native and custom containers, including both Windows containers and Linux containers.
2525

26-
> [!NOTE]
27-
> Any Windows containers running in the **Premium Container** tier during the preview period continue to function as is, but the **Premium Container** tier will continue to remain in preview. The **PremiumV3** tier is the official replacement for the **Premium Container** tier.
28-
29-
**PremiumV3** is available in some Azure regions and availability in additional regions is being added continually. To see if it's available in your region, run the following Azure CLI command in the [Azure Cloud Shell](../cloud-shell/overview.md):
26+
**PremiumV3** as well as specific **PremiumV3** SKUs are available in some Azure regions and availability in additional regions is being added continually. To see if a specific **PremiumV3** offering is available in your region, run the following Azure CLI command in the [Azure Cloud Shell](../cloud-shell/overview.md) (substitute _P1v3_ with the desired SKU):
3027

3128
```azurecli-interactive
3229
az appservice list-locations --sku P1V3
@@ -40,16 +37,16 @@ The pricing tier of an App Service app is defined in the [App Service plan](over
4037

4138
When configuring the App Service plan in the <a href="https://portal.azure.com" target="_blank">Azure portal</a>, select **Pricing tier**.
4239

43-
Select **Production**, then select **P1V3**, **P2V3**, or **P3V3**, then click **Apply**.
40+
Select **Production**, then select **P0V3**, **P1V3**, **P2V3**, **P3V3**, **P1mV3**, **P2mV3**, **P3mV3**, **P4mV3**, or **P5mV3**, then click **Apply**.
4441

4542
![Screenshot showing the recommended pricing tiers for your app.](media/app-service-configure-premium-tier/scale-up-tier-select.png)
4643

4744
> [!IMPORTANT]
48-
> If you don't see **P1V3**, **P2V3**, and **P3V3** as options, or if the options are greyed out, then **PremiumV3** likely isn't available in the underlying App Service deployment that contains the App Service plan. See [Scale up from an unsupported resource group and region combination](#unsupported) for more details.
45+
> If you don't see any of **P0V3**, **P1V3**, **P2V3**, **P3V3**, **P1mV3**, **P2mV3**, **P3mV3**, **P4mV3**, and **P5mV3** as options, or if some options are greyed out, then either **PremiumV3** or an individual SKU within **PremiumV3** isn't available in the underlying App Service deployment that contains the App Service plan. See [Scale up from an unsupported resource group and region combination](#unsupported) for more details.
4946
5047
## Scale up an existing app to PremiumV3 tier
5148

52-
Before scaling an existing app to **PremiumV3** tier, make sure that **PremiumV3** is available. For information, see [PremiumV3 availability](#availability). If it's not available, see [Scale up from an unsupported resource group and region combination](#unsupported).
49+
Before scaling an existing app to **PremiumV3** tier, make sure that both **PremiumV3** as well as the specific SKU within **PremiumV3** are available. For information, see [PremiumV3 availability](#availability). If it's not available, see [Scale up from an unsupported resource group and region combination](#unsupported).
5350

5451
Depending on your hosting environment, scaling up may require extra steps.
5552

@@ -59,7 +56,7 @@ In the left navigation of your App Service app page, select **Scale up (App Serv
5956

6057
![Screenshot showing how to scale up your app service plan.](media/app-service-configure-premium-tier/scale-up-tier-portal.png)
6158

62-
Select **Production**, then select **P1V3**, **P2V3**, or **P3V3**, then click **Apply**.
59+
Select **Production**, then select **P0V3**, **P1V3**, **P2V3**, **P3V3**, **P1mV3**, **P2mV3**, **P3mV3**, **P4mV3**, or **P5mV3**, then click **Apply**.
6360

6461
![Screenshot showing the recommended pricing tiers for your app.](media/app-service-configure-premium-tier/scale-up-tier-select.png)
6562

@@ -69,33 +66,28 @@ If your operation finishes successfully, your app's overview page shows that it'
6966

7067
### If you get an error
7168

72-
Some App Service plans can't scale up to the PremiumV3 tier if the underlying App Service deployment doesn’t support PremiumV3. See [Scale up from an unsupported resource group and region combination](#unsupported) for more details.
69+
Some App Service plans can't scale up to the **PremiumV3** tier, or to a newer SKU within **PremiumV3**, if the underlying App Service deployment doesn’t support the requested **PremiumV3** SKU. See [Scale up from an unsupported resource group and region combination](#unsupported) for more details.
7370

7471
<a name="unsupported"></a>
7572

7673
## Scale up from an unsupported resource group and region combination
7774

78-
If your app runs in an App Service deployment where **PremiumV3** isn't available, or if your app runs in a region that currently does not support **PremiumV3**, you need to re-deploy your app to take advantage of **PremiumV3**. You have two options:
75+
If your app runs in an App Service deployment where **PremiumV3** isn't available, or if your app runs in a region that currently does not support **PremiumV3**, you need to re-deploy your app to take advantage of **PremiumV3**. Alternatively newer **PremiumV3** SKUs may not be available, in which case you also need to re-deploy your app to take advantage of newer SKUs within **PremiumV3**. You have two options:
7976

80-
- Create an app in a new resource group and with a new App Service plan. When creating the App Service plan, select a **PremiumV3** tier. This step ensures that the App Service plan is deployed into a deployment unit that supports **PremiumV3**. Then, redeploy your application code into the newly created app. Even if you scale the App Service plan down to a lower tier to save costs, you can always scale back up to **PremiumV3** because the deployment unit supports it.
77+
- Create an app in a new resource group and with a new App Service plan. When creating the App Service plan, select the desired **PremiumV3** tier. This step ensures that the App Service plan is deployed into a deployment unit that supports **PremiumV3** as well as the specific SKU within **PremiumV3**. Then, redeploy your application code into the newly created app. Even if you scale the new App Service plan down to a lower tier to save costs, you can always scale back up to **PremiumV3** and the desired SKU within **PremiumV3** because the deployment unit supports it.
8178
- If your app already runs in an existing **Premium** tier, then you can clone your app with all app settings, connection strings, and deployment configuration into a new resource group on a new app service plan that uses **PremiumV3**.
8279

8380
![Screenshot showing how to clone your app.](media/app-service-configure-premium-tier/clone-app.png)
8481

8582
In the **Clone app** page, you can create an App Service plan using **PremiumV3** in the region you want, and specify the app settings and configuration that you want to clone.
8683

87-
88-
## Moving from Premium Container to Premium V3 SKU
89-
90-
The Premium Container SKU will be retired on **30th June 2022**. You should move your applications to the **Premium V3 SKU** ahead of this date. Use the clone functionality in the Azure App Service CLI experience to [move your application from your Premium Container App Service Plan to a new Premium V3 App Service plan](https://aka.ms/pcsku).
91-
9284
## Automate with scripts
9385

9486
You can automate app creation in the **PremiumV3** tier with scripts, using the [Azure CLI](/cli/azure/install-azure-cli) or [Azure PowerShell](/powershell/azure/).
9587

9688
### Azure CLI
9789

98-
The following command creates an App Service plan in _P1V3_. You can run it in the Cloud Shell. The options for `--sku` are P1V3, _P2V3_, and _P3V3_.
90+
The following command creates an App Service plan in _P1V3_. You can run it in the Cloud Shell. The options for `--sku` are _P0V3_, _P1V3_, _P2V3_, _P3V3_, _P1mV3_, _P2mV3_, _P3mV3_, _P4mV3_, and _P5mV3_.
9991

10092
```azurecli-interactive
10193
az appservice plan create \

0 commit comments

Comments
 (0)