Skip to content

Commit fd69f1f

Browse files
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into pauljewell-v11-samples
2 parents 4a680e9 + 1837347 commit fd69f1f

File tree

14 files changed

+145
-94
lines changed

14 files changed

+145
-94
lines changed

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-undelete.md

Lines changed: 34 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Restore deleted apps
33
description: Learn how to restore a deleted app in Azure App Service. Avoid the headache of an accidentally deleted app.
44
author: seligj95
55
ms.author: jordanselig
6-
ms.date: 11/4/2022
6+
ms.date: 4/3/2023
77
ms.topic: article
88
ms.custom: devx-track-azurepowershell
99
---
@@ -14,8 +14,8 @@ If you happened to accidentally delete your app in Azure App Service, you can re
1414

1515
> [!NOTE]
1616
> - Deleted apps are purged from the system 30 days after the initial deletion. After an app is purged, it can't be recovered.
17-
> - Undelete functionality isn't supported for the Consumption plan.
18-
> - Apps Service apps running in an App Service Environment don't support snapshots. Therefore, undelete functionality and clone functionality aren't supported for App Service apps running in an App Service Environment.
17+
> - Undelete functionality isn't supported for function apps hosted on the Consumption plan or Elastic Premium plan.
18+
> - App Service apps running in an App Service Environment don't support snapshots. Therefore, undelete functionality and clone functionality aren't supported for App Service apps running in an App Service Environment.
1919
>
2020
2121
## Re-register App Service resource provider
@@ -49,12 +49,12 @@ The detailed information includes:
4949
## Restore deleted app
5050

5151
>[!NOTE]
52-
>- `Restore-AzDeletedWebApp` isn't supported for function apps.
52+
>- `Restore-AzDeletedWebApp` isn't supported for function apps hosted on the Consumption plan or Elastic Premium plan.
5353
>- The Restore-AzDeletedWebApp cmdlet restores a deleted web app. The web app specified by TargetResourceGroupName, TargetName, and TargetSlot will be overwritten with the contents and settings of the deleted web app. If the target parameters are not specified, they will automatically be filled with the deleted web app's resource group, name, and slot. If the target web app does not exist, it will automatically be created in the app service plan specified by TargetAppServicePlanName.
5454
>- By default `Restore-AzDeletedWebApp` will restore both your app configuration as well any content. If you want to only restore content, you use the **`-RestoreContentOnly`** flag with this commandlet.
5555
5656

57-
Once the app you want to restore has been identified, you can restore it using `Restore-AzDeletedWebApp`, please see below examples
57+
After identifying the app you want to restore, you can restore it using `Restore-AzDeletedWebApp`, as shown in the following examples.
5858
>*You can find the full commandlet reference here: **[Restore-AzDeletedWebApp](/powershell/module/az.websites/restore-azdeletedwebapp)*** .
5959
6060
>Restore to the original app name:
@@ -90,16 +90,43 @@ Restore-AzDeletedWebApp -ResourceGroupName <original_rg> -Name <original_app> -D
9090

9191
The inputs for command are:
9292

93-
- **Target Resource Group**: Target resource group where the app will be restored
93+
- **Target Resource Group**: Target resource group where the app is to be restored
9494
- **TargetName**: Target app for the deleted app to be restored to
9595
- **TargetAppServicePlanName**: App Service plan linked to the app
9696
- **Name**: Name for the app, should be globally unique.
9797
- **ResourceGroupName**: Original resource group for the deleted app
9898
- **Slot**: Slot for the deleted app
99-
- **RestoreContentOnly**: By default `Restore-AzDeletedWebApp` will restore both your app configuration as well any content. If you want to only restore content, you can use the `-RestoreContentOnly` flag with this commandlet.
99+
- **RestoreContentOnly**: By default `Restore-AzDeletedWebApp` restores both your app configuration as well any content. If you want to only restore content, you can use the `-RestoreContentOnly` flag with this commandlet.
100100

101101
> [!NOTE]
102102
> If the app was hosted on and then deleted from an App Service Environment, it can be restored only if the corresponding App Service Environment still exists.
103103
104+
## Restore deleted function app
105+
106+
If the function app was hosted on a **Dedicated app service plan**, it can be restored, as long as it was using the default App Service storage.
107+
108+
1. Fetch the DeletedSiteId of the app version you want to restore, using Get-AzDeletedWebApp cmdlet:
109+
110+
```powershell
111+
Get-AzDeletedWebApp -ResourceGroupName <RGofDeletedApp> -Name <NameofApp>
112+
```
113+
2. Create a new function app in a Dedicated plan. Refer to the instructions for [how to create an app in the portal](../azure-functions/functions-create-function-app-portal.md#create-a-function-app).
114+
3. Restore to the newly created function app using this cmdlet:
115+
116+
```powershell
117+
Restore-AzDeletedWebApp -ResourceGroupName <RGofnewapp> -Name <newApp> -deletedId "/subscriptions/xxxx/providers/Microsoft.Web/locations/xxxx/deletedSites/xxxx"
118+
```
119+
120+
Currently there's no support for Undelete (Restore-AzDeletedWebApp) Function app that's hosted in a Consumption plan or Elastic premium plan since the content resides on Azure Files in a Storage account. If you haven't 'hard' deleted that Azure Files storage account, or if the account exists and file shares haven't been deleted, then you may use the steps as workaround:
121+
122+
123+
1. Create a new function app in a Consumption or Premium plan. Refer the instructions for [how to create an app in the portal](../azure-functions/functions-create-function-app-portal.md#create-a-function-app).
124+
2. Set the following [app settings](../azure-functions/functions-how-to-use-azure-function-app-settings.md?tabs=portal#settings) to refer to the old storage account , which contains the content from the previous app.
125+
126+
| App Setting | Suggested value |
127+
| ------------ | ---------------- |
128+
| **AzureWebJobsStorage** | Connection String for the storage account used by the deleted app. |
129+
| **WEBSITE_CONTENTAZUREFILECONNECTIONSTRING** | Connection String for the storage account used by the deleted app. |
130+
| **WEBSITE_CONTENTSHARE** | File share on storage account used by the deleted app. |
104131

105132

articles/azure-functions/functions-networking-options.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,15 @@ The following APIs let you programmatically manage regional virtual network inte
283283
+ **Azure CLI**: Use the [`az functionapp vnet-integration`](/cli/azure/functionapp/vnet-integration) commands to add, list, or remove a regional virtual network integration.
284284
+ **ARM templates**: Regional virtual network integration can be enabled by using an Azure Resource Manager template. For a full example, see [this Functions quickstart template](https://azure.microsoft.com/resources/templates/function-premium-vnet-integration/).
285285

286+
## Testing
287+
288+
When testing functions in a function app with private endpoints, you must do your testing from within the same virtual network, such as on a virtual machine (VM) in that network. To use the **Code + Test** option in the portal from that VM, you need to add following [CORS origins](./functions-how-to-use-azure-function-app-settings.md?tabs=portal#cors) to your function app:
289+
290+
* https://functions-next.azure.com
291+
* https://functions-staging.azure.com
292+
* https://functions.azure.com
293+
* https://portal.azure.com
294+
286295
## Troubleshooting
287296

288297
[!INCLUDE [app-service-web-vnet-troubleshooting](../../includes/app-service-web-vnet-troubleshooting.md)]

0 commit comments

Comments
 (0)