Skip to content

Commit a74bef9

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-rbac-roles-azure-ai
2 parents bd73bac + c33e9b1 commit a74bef9

File tree

4 files changed

+69
-25
lines changed

4 files changed

+69
-25
lines changed

articles/app-service/tutorial-connect-app-access-sql-database-as-user-dotnet.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ Currently, your Azure app connects to SQL Database uses SQL authentication (user
130130
131131
The app registration in Microsoft Entra ID now has the required permissions to connect to SQL Database by impersonating the signed-in user. Next, you configure your App Service app to give you a usable access token.
132132
133-
In the Cloud Shell, run the following commands on the app to add the `scope` parameter to the authentication setting `identityProviders.azureActiveDirectory.login.loginParameters`.
133+
In the Cloud Shell, run the following commands on the app to add the `scope` parameter to the authentication setting `identityProviders.azureActiveDirectory.login.loginParameters`. It uses [jq] for JSON processing, which is installed already in the Cloud Shell.
134134
135135
```azurecli-interactive
136136
authSettings=$(az webapp auth show --resource-group <group-name> --name <app-name>)

articles/cloud-services/cloud-services-guestos-msrc-releases.md

Lines changed: 47 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,60 @@ author: jejackson
77
ms.assetid: d0a272a9-ed01-4f4c-a0b3-bd5e841bdd77
88
ms.service: cloud-services
99
ms.topic: article
10-
ms.date: 04/10/2024
10+
ms.date: 05/03/2024
1111
ms.author: jejackson
1212
ms.custom: compute-evergreen
1313
---
1414

1515
# Azure Guest OS
1616
The following tables show the Microsoft Security Response Center (MSRC) updates applied to the Azure Guest OS. Search this article to determine if a particular update applies to the Guest OS you are using. Updates always carry forward for the particular [family][family-explain] they were introduced in.
1717

18-
>[!NOTE]
19-
>The April Guest OS is currently being rolled out to Cloud Service VMs that are configured for automatic updates. When the rollout is complete, this version will be made available for manual updates through the Azure portal and configuration files. The following patches are included in the March Guest OS. This list is subject to change.
18+
## May 2024 Guest OS
19+
20+
| Product Category | Parent KB Article | Vulnerability Description | Guest OS | Date First Introduced |
21+
| --- | --- | --- | --- | --- |
22+
| Rel 24-05 | [5036626] | .NET Framework 3.5 Security and Quality Rollup | [2.151] | May 14, 2024 |
23+
| Rel 24-05 | [5036607] | .NET Framework 4.7.2 Cumulative Update LKG | [2.151] | Apr 9, 2024 |
24+
| Rel 24-05 | [5036627] | .NET Framework 3.5 Security and Quality Rollup LKG | [4.131] | May 14, 2024 |
25+
| Rel 24-05 | [5036606] | .NET Framework 4.7.2 Cumulative Update LKG | [4.131] | Apr 9, 2024 |
26+
| Rel 24-05 | [5036624] | .NET Framework 3.5 Security and Quality Rollup LKG | [3.139] | May 14, 2024 |
27+
| Rel 24-05 | [5036605] | .NET Framework 4.7.2 Cumulative Update LKG | [3.139] | Apr 9, 2024 |
28+
| Rel 24-05 | [5036604] | . NET Framework DotNet | [6.71] | Apr 9, 2024 |
29+
| Rel 24-05 | [5036613] | .NET Framework 4.8 Security and Quality Rollup LKG | [7.41] | Apr 9, 2024 |
30+
| Rel 24-05 | [5037780] | Monthly Rollup | [2.151] | May 14, 2024 |
31+
| Rel 24-05 | [5037778] | Monthly Rollup | [3.139] | May 14, 2024 |
32+
| Rel 24-05 | [5037823] | Monthly Rollup | [4.131] | May 14, 2024 |
33+
| Rel 24-05 | [5037022] | Servicing Stack Update | [3.139] | Apr 9, 2024 |
34+
| Rel 24-05 | [5037021] | Servicing Stack Update | [4.131] | Apr 9, 2024 |
35+
| Rel 24-05 | [5037016] | Servicing Stack Update | [5.95] | Apr 9, 2024 |
36+
| Rel 24-05 | [5034865] | Servicing Stack Update LKG | [2.151] | Feb 13, 2024 |
37+
| Rel 24-05 | [4494175] | January '20 Microcode | [5.95] | Sep 1, 2020 |
38+
| Rel 24-05 | [4494175] | January '20 Microcode | [6.71] | Sep 1, 2020 |
39+
40+
[5036626]: https://support.microsoft.com/kb/5036626
41+
[5036607]: https://support.microsoft.com/kb/5036607
42+
[5036627]: https://support.microsoft.com/kb/5036627
43+
[5036606]: https://support.microsoft.com/kb/5036606
44+
[5036624]: https://support.microsoft.com/kb/5036624
45+
[5036605]: https://support.microsoft.com/kb/5036605
46+
[5036604]: https://support.microsoft.com/kb/5036604
47+
[5036613]: https://support.microsoft.com/kb/5036613
48+
[5037780]: https://support.microsoft.com/kb/5037780
49+
[5037778]: https://support.microsoft.com/kb/5037778
50+
[5037823]: https://support.microsoft.com/kb/5037823
51+
[5037022]: https://support.microsoft.com/kb/5037022
52+
[5037021]: https://support.microsoft.com/kb/5037021
53+
[5037016]: https://support.microsoft.com/kb/5037016
54+
[5034865]: https://support.microsoft.com/kb/5034865
55+
[4494175]: https://support.microsoft.com/kb/4494175
56+
[4494175]: https://support.microsoft.com/kb/4494175
57+
[2.151]: ./cloud-services-guestos-update-matrix.md#family-2-releases
58+
[3.139]: ./cloud-services-guestos-update-matrix.md#family-3-releases
59+
[4.131]: ./cloud-services-guestos-update-matrix.md#family-4-releases
60+
[5.95]: ./cloud-services-guestos-update-matrix.md#family-5-releases
61+
[6.71]: ./cloud-services-guestos-update-matrix.md#family-6-releases
62+
[7.41]: ./cloud-services-guestos-update-matrix.md#family-7-releases
63+
2064

2165
## April 2024 Guest OS
2266

articles/cost-management-billing/azure-hybrid-benefits/index.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ metadata:
1212
author: bandersmsft
1313
ms.author: banders
1414
ms.reviewer: kyleikeda
15-
ms.date: 03/11/2024
15+
ms.date: 06/04/2024
1616

1717
highlightedContent:
1818
# top-level single cards with predefined symbols
@@ -55,8 +55,8 @@ additionalContent:
5555
url: /azure/aks/hybrid/azure-hybrid-benefit
5656
- text: Azure Hybrid Benefit for Azure Stack HCI - Azure Stack HCI
5757
url: /azure-stack/hci/concepts/azure-hybrid-benefit-hci
58-
- text: Azure Hybrid Benefit for Windows Server, SQL Server, or Linux subscriptions
59-
url: ../../azure-vmware/sql-server-hybrid-benefit.md
58+
- text: License SQL Server, Windows Server, and Linux in Azure VMware Solution
59+
url: ../../azure-vmware/license-sql-windows-in-avs.md
6060
- text: Overview of Azure Dedicated Hosts for virtual machines
6161
url: ../../virtual-machines/dedicated-hosts.md
6262
- title: SQL Server VMs in Azure # < 60 chars (optional)
@@ -80,8 +80,8 @@ additionalContent:
8080
links:
8181
- text: Azure Hybrid Benefit - Azure SQL Database and SQL Managed Instance
8282
url: /azure/azure-sql/azure-hybrid-benefit
83-
- text: Azure Hybrid Benefit for Windows Server, SQL Server, or Linux subscriptions
84-
url: /azure/azure-vmware/sql-server-hybrid-benefit
83+
- text: License SQL Server, Windows Server, and Linux in Azure VMware Solution
84+
url: ../../azure-vmware/license-sql-windows-in-avs.md
8585
- text: Enable Azure Hybrid Benefit for SQL Server in Azure VMware Solution
8686
url: ../../azure-vmware/enable-sql-azure-hybrid-benefit.md
8787
- text: Run SQL Server VM on an Azure Dedicated Host - SQL Server on Azure VMs
@@ -101,8 +101,8 @@ additionalContent:
101101
url: /shows/inside-azure-for-it/rhel-subscription-mobility-with-azure-hybrid-benefit-for-linux
102102
- title: Deployment options
103103
links:
104-
- text: Azure Hybrid Benefit for Windows Server, SQL Server, or Linux subscriptions
105-
url: ../../azure-vmware/sql-server-hybrid-benefit.md
104+
- text: License SQL Server, Windows Server, and Linux in Azure VMware Solution
105+
url: ../../azure-vmware/license-sql-windows-in-avs.md
106106
- text: Overview of Azure Dedicated Hosts for virtual machines
107107
url: ../../virtual-machines/dedicated-hosts.md
108108
- title: Additional resources # < 60 chars (optional)

articles/storage/file-sync/file-sync-disaster-recovery-best-practices.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
---
22
title: Best practices for disaster recovery with Azure File Sync
3-
description: Learn about best practices for disaster recovery with Azure File Sync, including high availability, data protection, and data redundancy.
3+
description: Learn about best practices for disaster recovery with Azure File Sync, including high availability, data protection/backup, and data redundancy.
44
author: khdownie
55
ms.service: azure-file-storage
66
ms.topic: how-to
7-
ms.date: 04/18/2023
7+
ms.date: 06/04/2024
88
ms.author: kendownie
99
---
1010

11-
# Best practices for disaster recovery with Azure File Sync
11+
# Disaster recovery best practices with Azure File Sync
1212

1313
For Azure File Sync, there are three main areas to consider for disaster recovery: high availability, data protection/backup, and data redundancy. This article covers each area and helps you decide what configuration to use for your own disaster recovery solution.
1414

@@ -31,11 +31,11 @@ There are two different strategies you can use to achieve high availability for
3131

3232
For a failover cluster, you don't need to take any special steps to use Azure File Sync. For a standby server, you should make the following configurations:
3333

34-
Have a secondary server with different server endpoints that sync to the same sync group as your primary server but don't enable end-user access to the server. This allows all files to sync from the primary server to the standby server. You can consider enabling namespace-only tiering so that only the namespace is downloaded initially. If your primary server fails, you can use DFS-N to quickly reconfigure end-user access to your standby server.
34+
Have a secondary server with different server endpoints that sync to the same sync group as your primary server, but don't enable end-user access to the server. This allows all files to sync from the primary server to the standby server. You can consider enabling namespace-only tiering so that only the namespace is downloaded initially. If your primary server fails, you can use DFS-N to quickly reconfigure end-user access to your standby server.
3535

3636
## Data protection/backup
3737

38-
Protecting your actual data is a key component of a disaster recovery solution. There are two main ways to do this with your Azure file shares: you can either back up your data in the cloud or on-premises. We highly recommend you back up your data in the cloud because your cloud endpoint will contain a full copy of your data, while server endpoints might only contain a subset of your data.
38+
Protecting your data is a key component of a disaster recovery solution. There are two main ways to do this with your Azure file shares: you can either back up your data in the cloud or on-premises. We highly recommend you back up your data in the cloud because your cloud endpoint will contain a full copy of your data, while server endpoints might only contain a subset of your data.
3939

4040
### Back up your data in the cloud
4141

@@ -49,13 +49,13 @@ For more information, see [About Azure file share backup](../../backup/azure-fil
4949

5050
### Back up your data on-premises
5151

52-
If you enable cloud tiering, don't implement an on-premises backup solution. With cloud tiering enabled, only a subset of your data will be stored locally on your server, the rest of your data is stored in your cloud endpoint. Depending on what backup solution you use for a local backup, tiered files will either be:
52+
If you enable cloud tiering, don't implement an on-premises backup solution. With cloud tiering enabled, only a subset of your data will be stored locally on your server, and the rest of your data is stored in your cloud endpoint. Depending on what backup solution you use for a local backup, tiered files will either be:
5353

5454
- skipped and not backed up (due to their `FILE_ATTRIBUTE_RECALL_ONDATA_ACCESS` attribute), or
55-
- they will be backed up only as a tiered file and might not be accessible upon restore due to changes in the live share, or
56-
- they will be recalled to your disk, which will result in high egress charges.
55+
- backed up only as a tiered file and might not be accessible upon restore due to changes in the live share, or
56+
- recalled to your disk, which will result in high egress charges.
5757

58-
If you decide to use an on-premises backup solution, you should perform backups on a server in the sync group with cloud tiering disabled. When performing a restore, use the volume-level or file-level restore options. Files restored using the file-level restore option will sync to all endpoints in the sync group and existing files will be replaced with the version restored from backup. Volume-level restores won't replace newer file versions in the cloud endpoint or other server endpoints.
58+
If you decide to use an on-premises backup solution, you should perform backups on a server in the sync group with cloud tiering disabled. When performing a restore, use the volume-level or file-level restore options. Files restored using the file-level restore option will sync to all endpoints in the sync group, and existing files will be replaced with the version restored from backup. Volume-level restores won't replace newer file versions in the cloud endpoint or other server endpoints.
5959

6060
[Volume Shadow Copy Service (VSS) snapshots](file-sync-deployment-guide.md#optional-self-service-restore-through-previous-versions-and-vss-volume-shadow-copy-service) (including the **Previous Versions** tab) are supported on volumes with cloud tiering enabled. This allows you to perform self-service restores instead of relying on an admin to perform restores for you. However, you must enable previous version compatibility through PowerShell, which will increase your snapshot storage costs. VSS snapshots don't protect against disasters on the server endpoint itself, so they should only be used alongside cloud-side backups. For details, see [Self Service restore through Previous Versions and VSS](file-sync-deployment-guide.md#optional-self-service-restore-through-previous-versions-and-vss-volume-shadow-copy-service).
6161

@@ -64,9 +64,9 @@ If you decide to use an on-premises backup solution, you should perform backups
6464
To ensure a robust disaster recovery solution, add some form of data redundancy to your infrastructure. There are four redundancy offerings for Azure Files: [Locally-redundant storage (LRS)](../files/files-redundancy.md#locally-redundant-storage), [zone-redundant storage (ZRS)](../files/files-redundancy.md#zone-redundant-storage), [geo-redundant storage (GRS)](../files/files-redundancy.md#geo-redundant-storage), and [geo-zone-redundant storage (GZRS)](../files/files-redundancy.md#geo-zone-redundant-storage).
6565

6666
- [Locally-redundant storage (LRS)](../files/files-redundancy.md#locally-redundant-storage): With LRS, every file is stored three times within an Azure storage cluster. This protects against loss of data due to hardware faults, such as a bad disk drive. However, if a disaster such as fire or flooding occurs within the data center, all replicas of a storage account using LRS may be lost or unrecoverable.
67-
- [Zone-redundant storage (ZRS)](../files/files-redundancy.md#zone-redundant-storage): With ZRS, three copies of each file stored, however these copies are physically isolated in three distinct storage clusters in different Azure *availability zones*. Availability zones are unique physical locations within an Azure region. Each zone is made up of one or more data centers equipped with independent power, cooling, and networking. A write to storage is not accepted until it is written to the storage clusters in all three availability zones.
68-
- [Geo-redundant storage (GRS)](../files/files-redundancy.md#geo-redundant-storage): With GRS, you have two regions, a primary and secondary region. Files are stored three times within an Azure storage cluster in the primary region. Writes are asynchronously replicated to a Microsoft-defined secondary region. GRS provides six copies of your data spread between two Azure regions.
69-
- [Geo-zone-redundant storage (GZRS)](../files/files-redundancy.md#geo-zone-redundant-storage): You can think of GZRS as if it were like ZRS but with geo-redundancy. With GZRS, files are stored three times across three distinct storage clusters in the primary region. All writes are then asynchronously replicated to a Microsoft-defined secondary region.
67+
- [Zone-redundant storage (ZRS)](../files/files-redundancy.md#zone-redundant-storage): With ZRS, three copies of each file stored, however these copies are physically isolated in three distinct storage clusters in different Azure *availability zones*. Availability zones are unique physical locations within an Azure region. Each zone is made up of one or more data centers equipped with independent power, cooling, and networking. A write to storage isn't accepted until it's written to the storage clusters in all three availability zones.
68+
- [Geo-redundant storage (GRS)](../files/files-redundancy.md#geo-redundant-storage): With GRS, you have two regions: a primary and secondary region. Files are stored three times within an Azure storage cluster in the primary region. Writes are asynchronously replicated to a Microsoft-defined secondary region. GRS provides six copies of your data spread between two Azure regions.
69+
- [Geo-zone-redundant storage (GZRS)](../files/files-redundancy.md#geo-zone-redundant-storage): Think of GZRS as ZRS but with geo-redundancy. With GZRS, files are stored three times across three distinct storage clusters in the primary region. All writes are then asynchronously replicated to a Microsoft-defined secondary region.
7070

7171
For a robust disaster recovery solution, most customers should consider ZRS. ZRS adds the least amount of extra cost for its added data redundancy benefits and is also the most seamless in the event of an outage. If your organization's policy or regulatory requirements require geo-redundancy for your data, consider either GRS or GZRS.
7272

@@ -77,10 +77,10 @@ If your storage account is configured with either GRS or GZRS replication, Micro
7777
Although you can manually request a failover of your Storage Sync Service to your GRS or GZRS paired region, we don't recommend doing this outside of large-scale regional outages because the process isn't seamless and might incur extra cost. To initiate the process, open a support ticket and request that both your Azure storage accounts that contain your Azure file share and your Storage Sync Service be failed over.
7878

7979
> [!WARNING]
80-
> You must contact support to request your Storage Sync Service be failed over if you are initiating this process manually. Attempting to create a new Storage Sync Service using the same server endpoints in the secondary region might result in extra data staying in your storage account because the previous installation of Azure File Sync won't be cleaned up.
80+
> You must contact support to request your Storage Sync Service be failed over if you're initiating this process manually. Attempting to create a new Storage Sync Service using the same server endpoints in the secondary region might result in extra data staying in your storage account because the previous installation of Azure File Sync won't be cleaned up.
8181
8282
Once a failover occurs, server endpoints will switch over to sync with the cloud endpoint in the secondary region automatically. However, the server endpoints must reconcile with the cloud endpoints. This might result in file conflicts, as the data in the secondary region might not be caught up to the primary.
8383

84-
## Next steps
84+
## Next step
8585

8686
[Learn about Azure file share backup](../../backup/azure-file-share-backup-overview.md?toc=/azure/storage/file-sync/toc.json)

0 commit comments

Comments
 (0)