Skip to content

Commit 476764d

Browse files
authored
Merge pull request #189263 from MicrosoftDocs/main
2/21 AM Publish
2 parents ec69790 + e516148 commit 476764d

File tree

183 files changed

+519
-476
lines changed

Some content is hidden

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

183 files changed

+519
-476
lines changed

articles/active-directory/governance/access-reviews-downloadable-review-history.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Create and manage downloadable access review history report (Preview) - Azure Active Directory
2+
title: Create and manage downloadable access review history report - Azure Active Directory
33
description: Using Azure Active Directory access reviews, you can download a review history for access reviews in your organization.
44
services: active-directory
55
documentationcenter: ''
@@ -10,11 +10,11 @@ ms.workload: identity
1010
ms.tgt_pltfrm: na
1111
ms.topic: conceptual
1212
ms.subservice: compliance
13-
ms.date: 03/25/2021
13+
ms.date: 02/18/2022
1414
ms.author: ajburnle
1515
---
1616

17-
# Create and manage downloadable access review history report (Preview) in Azure AD access reviews
17+
# Create and manage downloadable access review history report in Azure AD access reviews
1818

1919
With Azure Active Directory (Azure AD) Access Reviews, you can create a downloadable review history to help your organization gain more insight. The report pulls the decisions that were taken by reviewers when a report is created. These reports can be constructed to include specific access reviews, for a specific time frame, and can be filtered to include different review types and review results.
2020

articles/aks/howto-deploy-java-liberty-app-with-postgresql.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.service: container-service
88
ms.topic: how-to
99
ms.date: 11/19/2021
1010
keywords: java, jakartaee, javaee, microprofile, open-liberty, websphere-liberty, aks, kubernetes
11-
ms.custom: devx-track-java, devx-track-javaee, devx-track-javaee-liberty, devx-track-javaee-liberty-aks
11+
ms.custom: devx-track-java, devx-track-javaee, devx-track-javaee-liberty, devx-track-javaee-liberty-aks, devx-track-azurecli
1212
---
1313

1414
# Deploy a Java application with Azure Database for PostgreSQL server to Open Liberty or WebSphere Liberty on an Azure Kubernetes Service (AKS) cluster

articles/aks/howto-deploy-java-liberty-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.service: container-service
88
ms.topic: conceptual
99
ms.date: 02/01/2021
1010
keywords: java, jakartaee, javaee, microprofile, open-liberty, websphere-liberty, aks, kubernetes
11-
ms.custom: devx-track-java, devx-track-javaee, devx-track-javaee-liberty, devx-track-javaee-liberty-aks
11+
ms.custom: devx-track-java, devx-track-javaee, devx-track-javaee-liberty, devx-track-javaee-liberty-aks, devx-track-azurecli
1212
---
1313

1414
# Deploy a Java application with Open Liberty or WebSphere Liberty on an Azure Kubernetes Service (AKS) cluster

articles/app-service/app-service-web-restore-snapshots.md

Lines changed: 85 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -4,60 +4,114 @@ description: Learn how to restore your app from a snapshot. Recover from unexpec
44

55
ms.assetid: 4164f9b5-f735-41c6-a2bb-71f15cdda417
66
ms.topic: article
7-
ms.date: 09/02/2021
7+
ms.date: 02/17/2022
88
ms.reviewer: nicking
99
ms.custom: seodec18
1010

1111
---
1212
# Restore an app in Azure from a snapshot
13-
This article shows you how to restore an app in [Azure App Service](../app-service/overview.md) from a snapshot. You can restore your app to a previous state, based on one of your app's snapshots. You do not need to enable snapshots, the platform automatically saves a snapshot of all apps for data recovery purposes.
13+
This article shows you how to restore an app in [Azure App Service](../app-service/overview.md) from a snapshot. You can restore your app to a previous state, based on one of your app's snapshots. You do not need to enable snapshot backups; the platform automatically saves a hourly snapshot of each app's content and configuration for data recovery purposes. Hourly snapshots for the last 30 days are available. The retention period and snapshot frequency are not configurable.
1414

15-
Snapshots are incremental shadow copies of your App Service app. When your app is in Premium tier or higher, App Service takes periodic snapshots of both the app's content and its configuration. They offer several advantages over [standard backups](manage-backup.md):
15+
Restoring from snapshots is available to apps running in one of the **Standard** or **Premium** tiers. For information about scaling up your app, see [Scale up an app in Azure](manage-scale-up.md).
16+
17+
> [!NOTE]
18+
> Snapshot restore is not available for:
19+
>
20+
> - App Service environments (**Isolated** tier)
21+
> - Azure Functions in the [**Consumption**](../azure-functions/consumption-plan.md) or [**Elastic Premium**](../azure-functions/functions-premium-plan.md) pricing plans.
22+
>
23+
> Snapshot restore is available in preview for Azure Functions in [dedicated (App Service)](../azure-functions/dedicated-plan.md) **Standard** or **Premium** tiers.
24+
25+
## Snapshots vs Backups
26+
27+
Snapshots are incremental shadow copies and offer several advantages over [standard backups](manage-backup.md):
1628

1729
- No file copy errors due to file locks.
18-
- Higher maximum snapshot size (30GB).
19-
- No configuration required for supported pricing tiers.
20-
- Snapshots can be restored to a new App Service app in any Azure region.
30+
- Higher snapshot size (maximum 30 GB).
31+
- Enabled by default in supported pricing tiers and no configuration required.
32+
- Restore to a new or existing App Service app or slot in any Azure region.
33+
34+
## What snapshot restore includes
35+
36+
The following table shows which content is restored when you restore a snapshot:
37+
38+
|Settings| Restored?|
39+
|-|-|
40+
| **Windows apps**: All app content under `%HOME%` directory<br/>**Linux apps**: All app content under `/home` directory<br/>**Custom containers (Windows and Linux)**: Content in [persistent storage](configure-custom-container.md?pivots=container-linux#use-persistent-shared-storage)| Yes |
41+
| Content of the [run-from-ZIP package](deploy-run-package.md)| No |
42+
| Content from any [custom mounted Azure storage](configure-connect-to-azure-storage.md?pivots=container-windows)| No |
2143

22-
Restoring from snapshots is available to apps running in **Premium** tier or higher. For information about scaling
23-
up your app, see [Scale up an app in Azure](manage-scale-up.md).
44+
> [!NOTE]
45+
> Maximum supported size for snapshot restore is 30GB. Snapshot restore fails if your storage size is greater than 30GB. To reduce your storage size, consider moving files like logs, images, audios, and videos to [Azure Storage](../storage/index.yml), for example.
2446
25-
## Limitations
47+
The following table shows which app configuration is restored:
2648

27-
- Maximum supported size for snapshot restore is 30GB. Snapshot restore fails if your storage size is greater than 30GB. To reduce your storage size, consider moving files like logs, images, audios, and videos to [Azure Storage](../storage/index.yml), for example.
28-
- Any connected database that [standard backup](manage-backup.md#what-gets-backed-up) supports or [mounted Azure storage](configure-connect-to-azure-storage.md?pivots=container-windows) is *not* included in the snapshot. Consider using the native backup capabilities of the connected Azure service (for example, [SQL Database](../azure-sql/database/automated-backups-overview.md) and [Azure Files](../storage/files/storage-snapshots-files.md)).
29-
- App Service stops the target app or target slot while restoring a snapshot. To minimize downtime for the production app, restore the snapshot to a [staging slot](deploy-staging-slots.md) first, then swap into production.
30-
- Snapshots for the last 30 days are available. The retention period and snapshot frequency are not configurable.
31-
- App Services running on an App Service environment do not support snapshots.
49+
|Settings| Restored?|
50+
|-|-|
51+
|[Native log settings](troubleshoot-diagnostic-logs.md), including the Azure Storage account and container settings | Yes |
52+
|Application Insights configuration | Yes |
53+
|[Health check](monitor-instances-health-check.md) | Yes |
54+
| Network features, such as [private endpoints](networking/private-endpoint.md), [hybrid connections](app-service-hybrid-connections.md), and [virtual network integration](overview-vnet-integration.md) | No|
55+
|[Authentication](overview-authentication-authorization.md)| No|
56+
|[Managed identities](overview-managed-identity.md)| No |
57+
|[Custom domains](app-service-web-tutorial-custom-domain.md)| No |
58+
|[TLS/SSL](configure-ssl-bindings.md)| No |
59+
|[Scale out](../azure-monitor/autoscale/autoscale-get-started.md?toc=/azure/app-service/toc.json)| No |
60+
|[Diagnostics with Azure Monitor](troubleshoot-diagnostic-logs.md#send-logs-to-azure-monitor)| No |
61+
|[Alerts and Metrics](../azure-monitor/alerts/alerts-classic-portal.md)| No |
62+
|[Backup](manage-backup.md)| No |
63+
|Associated [deployment slots](deploy-staging-slots.md)| No |
64+
|Any connected database that [standard backup](manage-backup.md#what-gets-backed-up) supports| No |
3265

33-
## Restore an app from a snapshot
66+
## Restore from a snapshot
3467

35-
1. On the **Settings** page of your app in the [Azure portal](https://portal.azure.com), click **Backups** to display the **Backups** page. Then click **Restore** under the **Snapshot(Preview)** section.
68+
> [!NOTE]
69+
> App Service stops the target app or target slot while restoring a snapshot. To minimize downtime for the production app, restore the snapshot to a [deployment slot](deploy-staging-slots.md) first, then [swap](deploy-staging-slots.md#swap-two-slots) into production.
70+
71+
# [Azure portal](#tab/portal)
72+
73+
1. On the **Settings** page of your app in the [Azure portal](https://portal.azure.com), click **Backups** to display the **Backups** page. Then click **Restore** under the **Snapshot** section.
3674

37-
![Screenshot that shows how to restore an app from a snapshot.](./media/app-service-web-restore-snapshots/1.png)
75+
:::image type="content" source="./media/app-service-web-restore-snapshots/1.png" alt-text="Screenshot that shows how to restore an app from a snapshot.":::
3876

3977
2. In the **Restore** page, select the snapshot to restore.
4078

41-
![Screenshot that shows how to select the snapshot to restore. ](./media/app-service-web-restore-snapshots/2.png)
79+
<!-- ![Screenshot that shows how to select the snapshot to restore. ](./media/app-service-web-restore-snapshots/2.png) -->
4280

43-
3. Specify the destination for the app restore in **Restore destination**.
81+
3. Specify the destination for the app restore in **Restore destination**. To restore to a [deployment slot](deploy-staging-slots.md), select **Existing app**.
4482

45-
![Screenshot that shows how to specify the restoration destination.](./media/app-service-web-restore-snapshots/3.png)
83+
<!-- ![Screenshot that shows how to specify the restoration destination.](./media/app-service-web-restore-snapshots/3.png) -->
4684

47-
> [!WARNING]
48-
> As a best practice we recommend restoring to a new slot then performing a swap. If you choose **Overwrite**, all existing data in your app's current file system is erased and overwritten. Before you click **OK**, make sure that it is what you want to do.
49-
>
85+
> [!NOTE]
86+
> It's recommended that you restore to a deployment slot and then perform a swap into production. If you choose **Overwrite**, all existing data in your app's current file system is erased and overwritten. Before you click **OK**, make sure that it is what you want to do.
5087
>
5188
52-
> [!Note]
53-
> Due to current technical limitations, you can only restore to apps in the same scale unit. This limitation will be removed in a future release.
54-
>
55-
>
56-
57-
You can select **Existing App** to restore to a slot. Before you use this option, you should have already created a slot in your app.
58-
5989
4. You can choose to restore your site configuration.
6090

61-
![Screenshot that shows how to restore site configuration.](./media/app-service-web-restore-snapshots/4.png)
91+
:::image type="content" source="./media/app-service-web-restore-snapshots/4.png" alt-text="Screenshot that shows how to restore site configuration.":::
6292

6393
5. Click **OK**.
94+
95+
# [Azure CLI](#tab/cli)
96+
97+
1. List the restorable snapshots for your app and copy the timestamp of the one you want to restore.
98+
99+
```azurecli-interactive
100+
az webapp config snapshot list --name <app-name> --resource-group <group-name>
101+
```
102+
103+
2. To restore the snapshot by overwriting the app's content and configuration:
104+
105+
```azurecli-interactive
106+
az webapp config snapshot restore --name <app-name> --resource-group <group-name> --time <snapshot-timestamp>
107+
```
108+
109+
To restore the snapshot to a different app:
110+
111+
```azurecli-interactive
112+
az webapp config snapshot restore --name <target-app-name> --resource-group <target-group-name> --source-name <source-app-name> --source-resource-group <source-group-name> --time <source-snapshot-timestamp>
113+
```
114+
115+
To restore app content only and not the app configuration, use the `--restore-content-only` parameter. For more information, see [az webapp config snapshot restore](/cli/webapp/config/snapshot#az_webapp_config_snapshot_restore).
116+
117+
-----
20.5 KB
Loading
10.4 KB
Loading

articles/azure-arc/data/create-complete-managed-instance-indirectly-connected.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ services: azure-arc
77
ms.service: azure-arc-data
88
ms.topic: quickstart
99
ms.date: 12/09/2021
10-
ms.custom: template-quickstart
10+
ms.custom: template-quickstart , devx-track-azurecli
1111
---
1212

1313
# Quickstart: Deploy Azure Arc-enable data services - indirectly connected mode - Azure CLI

articles/azure-arc/data/release-notes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.service: azure-arc
99
ms.subservice: azure-arc-data
1010
ms.date: 01/27/2022
1111
ms.topic: conceptual
12-
ms.custom: references_regions
12+
ms.custom: references_regions, devx-track-azurecli
1313
# Customer intent: As a data professional, I want to understand why my solutions would benefit from running with Azure Arc-enabled data services so that I can leverage the capability of the feature.
1414
---
1515

articles/azure-cache-for-redis/cache-event-grid-quickstart-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.author: franlanglois
66
ms.date: 1/5/2021
77
ms.topic: quickstart
88
ms.service: cache
9-
ms.custom: mode-api
9+
ms.custom: mode-api, devx-track-azurecli
1010
---
1111

1212
# Quickstart: Route Azure Cache for Redis events to web endpoint with Azure CLI

articles/azure-monitor/containers/container-insights-enable-existing-clusters.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Monitor an Azure Kubernetes Service (AKS) cluster deployed | Microsoft Do
33
description: Learn how to enable monitoring of an Azure Kubernetes Service (AKS) cluster with Container insights already deployed in your subscription.
44
ms.topic: conceptual
55
ms.date: 09/12/2019
6-
ms.custom: devx-track-terraform, devx-track-azurepowershell
6+
ms.custom: devx-track-terraform, devx-track-azurepowershell, devx-track-azurecli
77
---
88

99
# Enable monitoring of Azure Kubernetes Service (AKS) cluster already deployed

0 commit comments

Comments
 (0)