Skip to content

Commit 456766c

Browse files
authored
Merge pull request #157772 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/azure-docs (branch master)
2 parents 42c6d94 + bc82481 commit 456766c

File tree

7 files changed

+28
-25
lines changed

7 files changed

+28
-25
lines changed

articles/dms/tutorial-sql-server-managed-instance-online.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,9 @@ To complete this tutorial, you need to:
7979
* Make a note of a Windows user (and password) that has full control privilege on the network share that you previously created. Azure Database Migration Service impersonates the user credential to upload the backup files to Azure Storage container for restore operation.
8080
* Create an Azure Active Directory Application ID that generates the Application ID key that Azure Database Migration Service can use to connect to target Azure Database Managed Instance and Azure Storage Container. For more information, see the article [Use portal to create an Azure Active Directory application and service principal that can access resources](../active-directory/develop/howto-create-service-principal-portal.md).
8181

82+
> [!NOTE]
83+
> The Application ID used by the Azure Database Migration Service supports secret (password-based) authentication for service principals. It does not support certificate-based authentication.
84+
8285
> [!NOTE]
8386
> Azure Database Migration Service requires the Contributor permission on the subscription for the specified Application ID. Alternatively, you can create custom roles that grant the specific permissions that Azure Database Migration Service requires. For step-by-step guidance about using custom roles, see the article [Custom roles for SQL Server to SQL Managed Instance online migrations](./resource-custom-roles-sql-db-managed-instance.md).
8487

articles/frontdoor/standard-premium/concept-private-link.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ When you enable Private Link to your origin in Azure Front Door Premium configur
3434
:::image type="content" source="../media/concept-private-link/enable-private-endpoint.png" alt-text="Enable Private Endpoint":::
3535

3636
> [!NOTE]
37-
> Once you enable a Private Link origin and approve the private endpoint conenction, it takes a few minutes for the connection to be established. During this time, requests to the origin will receive a Front Door error message. The error message will go away once the connection is established.
37+
> Once you enable a Private Link origin and approve the private endpoint connection, it takes a few minutes for the connection to be established. During this time, requests to the origin will receive a Front Door error message. The error message will go away once the connection is established.
3838
3939
## Limitations
4040

articles/storage/blobs/network-file-system-protocol-support.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ The status of items that appear in this tables will change over time as support
123123

124124
- NFS 3.0 support can't be enabled on existing storage accounts.
125125

126-
- NFS 3.0 support cant' be disabled in a storage account after you've enabled it.
126+
- NFS 3.0 support can't be disabled in a storage account after you've enabled it.
127127

128128
- Files can't be viewed in either the Azure portal or Azure Storage Explorer. To list files and directories, either [mount a Blob Storage container by using the NFS 3.0 protocol](network-file-system-protocol-support-how-to.md), or use the [Blob service REST API](/rest/api/storageservices/blob-service-rest-api).
129129

articles/storage/common/storage-auth-aad-msi.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ To create a service principal with Azure CLI and assign an Azure role, call the
6767

6868
If you do not have sufficient permissions to assign a role to the service principal, you may need to ask the account owner or administrator to perform the role assignment.
6969

70-
The following example uses the Azure CLI to create a new service principal and assign the **Storage Blob Data Reader** role to it with account scope
70+
The following example uses the Azure CLI to create a new service principal and assign the **Storage Blob Data Contributor** role to it with account scope
7171

7272
```azurecli-interactive
7373
az ad sp create-for-rbac \
@@ -167,4 +167,4 @@ async static Task CreateBlockBlobAsync(string accountName, string containerName,
167167
- [Manage access rights to storage data with Azure RBAC](./storage-auth-aad-rbac-portal.md).
168168
- [Use Azure AD with storage applications](storage-auth-aad-app.md).
169169
- [Run PowerShell commands with Azure AD credentials to access blob data](../blobs/authorize-data-operations-powershell.md)
170-
- [Tutorial: Access storage from App Service using managed identities](../../app-service/scenario-secure-app-access-storage.md)
170+
- [Tutorial: Access storage from App Service using managed identities](../../app-service/scenario-secure-app-access-storage.md)

articles/virtual-machines/linux/disk-encryption-sample-scripts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ To configure encryption during the distribution installation, do the following s
263263
264264
![openSUSE 13.2 Setup - Provide passphrase on boot](./media/disk-encryption/opensuse-encrypt-fig2.png)
265265
266-
3. Prepare the VM for uploading to Azure by following the instructions in [Prepare a SLES or openSUSE virtual machine for Azure](./suse-create-upload-vhd.md?toc=/azure/virtual-machines/linux/toc.json#prepare-opensuse-131). Don't run the last step (deprovisioning the VM) yet.
266+
3. Prepare the VM for uploading to Azure by following the instructions in [Prepare a SLES or openSUSE virtual machine for Azure](./suse-create-upload-vhd.md?toc=/azure/virtual-machines/linux/toc.json#prepare-opensuse-152). Don't run the last step (deprovisioning the VM) yet.
267267
268268
To configure encryption to work with Azure, do the following steps:
269269
1. Edit the /etc/dracut.conf, and add the following line:

articles/virtual-machines/linux/suse-create-upload-vhd.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,20 @@ ms.date: 12/01/2020
1111
ms.author: danis
1212

1313
---
14-
# Prepare a SLES or openSUSE virtual machine for Azure
14+
# Prepare a SLES or openSUSE Leap virtual machine for Azure
1515

1616

17-
This article assumes that you have already installed a SUSE or openSUSE Linux operating system to a virtual hard disk. Multiple tools exist to create .vhd files, for example a virtualization solution such as Hyper-V. For instructions, see [Install the Hyper-V Role and Configure a Virtual Machine](/previous-versions/windows/it-pro/windows-server-2012-R2-and-2012/hh846766(v=ws.11)).
17+
This article assumes that you have already installed a SUSE or openSUSE Leap Linux operating system to a virtual hard disk. Multiple tools exist to create .vhd files, for example a virtualization solution such as Hyper-V. For instructions, see [Install the Hyper-V Role and Configure a Virtual Machine](/previous-versions/windows/it-pro/windows-server-2012-R2-and-2012/hh846766(v=ws.11)).
1818

19-
## SLES / openSUSE installation notes
19+
## SLES / openSUSE Leap installation notes
2020
* Please see also [General Linux Installation Notes](create-upload-generic.md#general-linux-installation-notes) for more tips on preparing Linux for Azure.
2121
* The VHDX format is not supported in Azure, only **fixed VHD**. You can convert the disk to VHD format using Hyper-V Manager or the convert-vhd cmdlet.
2222
* When installing the Linux system it is recommended that you use standard partitions rather than LVM (often the default for many installations). This will avoid LVM name conflicts with cloned VMs, particularly if an OS disk ever needs to be attached to another VM for troubleshooting. [LVM](/previous-versions/azure/virtual-machines/linux/configure-lvm) or [RAID](/previous-versions/azure/virtual-machines/linux/configure-raid) may be used on data disks if preferred.
2323
* Do not configure a swap partition on the OS disk. The Linux agent can be configured to create a swap file on the temporary resource disk. More information about this can be found in the steps below.
2424
* All VHDs on Azure must have a virtual size aligned to 1MB. When converting from a raw disk to VHD you must ensure that the raw disk size is a multiple of 1MB before conversion. See [Linux Installation Notes](create-upload-generic.md#general-linux-installation-notes) for more information.
2525

2626
## Use SUSE Studio
27-
[SUSE Studio](https://studioexpress.opensuse.org/) can easily create and manage your SLES and openSUSE images for Azure and Hyper-V. This is the recommended approach for customizing your own SLES and openSUSE images.
27+
[SUSE Studio](https://studioexpress.opensuse.org/) can easily create and manage your SLES and openSUSE Leap images for Azure and Hyper-V. This is the recommended approach for customizing your own SLES and openSUSE Leap images.
2828

2929
As an alternative to building your own VHD, SUSE also publishes BYOS (Bring Your Own Subscription) images for SLES at [VM Depot](https://www.microsoft.com/research/wp-content/uploads/2016/04/using-and-contributing-vms-to-vm-depot.pdf).
3030

@@ -152,23 +152,23 @@ As an alternative to building your own VHD, SUSE also publishes BYOS (Bring Your
152152
16. Click **Action -> Shut Down** in Hyper-V Manager. Your Linux VHD is now ready to be uploaded to Azure.
153153

154154
---
155-
## Prepare openSUSE 13.1+
155+
## Prepare openSUSE 15.2+
156156
1. In the center pane of Hyper-V Manager, select the virtual machine.
157157
2. Click **Connect** to open the window for the virtual machine.
158158
3. On the shell, run the command '`zypper lr`'. If this command returns output similar to the following, then the repositories are configured as expected--no adjustments are necessary (note that version numbers may vary):
159159

160160
| # | Alias | Name | Enabled | Refresh
161161
| - | :-------------------- | :-------------------- | :------ | :------
162-
| 1 | Cloud:Tools_13.1 | Cloud:Tools_13.1 | Yes | Yes
163-
| 2 | openSUSE_13.1_OSS | openSUSE_13.1_OSS | Yes | Yes
164-
| 3 | openSUSE_13.1_Updates | openSUSE_13.1_Updates | Yes | Yes
162+
| 1 | Cloud:Tools_15.2 | Cloud:Tools_15.2 | Yes | Yes
163+
| 2 | openSUSE_15.2_OSS | openSUSE_15.2_OSS | Yes | Yes
164+
| 3 | openSUSE_15.2_Updates | openSUSE_15.2_Updates | Yes | Yes
165165

166166
If the command returns "No repositories defined..." then use the following commands to add these repos:
167167

168168
```console
169-
# sudo zypper ar -f http://download.opensuse.org/repositories/Cloud:Tools/openSUSE_13.1 Cloud:Tools_13.1
170-
# sudo zypper ar -f https://download.opensuse.org/distribution/13.1/repo/oss openSUSE_13.1_OSS
171-
# sudo zypper ar -f http://download.opensuse.org/update/13.1 openSUSE_13.1_Updates
169+
# sudo zypper ar -f http://download.opensuse.org/repositories/Cloud:Tools/openSUSE_15.2 Cloud:Tools_15.2
170+
# sudo zypper ar -f https://download.opensuse.org/distribution/15.2/repo/oss openSUSE_15.2_OSS
171+
# sudo zypper ar -f http://download.opensuse.org/update/15.2 openSUSE_15.2_Updates
172172
```
173173

174174
You can then verify the repositories have been added by running the command '`zypper lr`' again. In case one of the relevant update repositories is not enabled, enable it with following command:
@@ -250,4 +250,4 @@ As an alternative to building your own VHD, SUSE also publishes BYOS (Bring Your
250250
13. Click **Action -> Shut Down** in Hyper-V Manager. Your Linux VHD is now ready to be uploaded to Azure.
251251

252252
## Next steps
253-
You're now ready to use your SUSE Linux virtual hard disk to create new virtual machines in Azure. If this is the first time that you're uploading the .vhd file to Azure, see [Create a Linux VM from a custom disk](upload-vhd.md#option-1-upload-a-vhd).
253+
You're now ready to use your SUSE Linux virtual hard disk to create new virtual machines in Azure. If this is the first time that you're uploading the .vhd file to Azure, see [Create a Linux VM from a custom disk](upload-vhd.md#option-1-upload-a-vhd).

includes/event-grid-service-bus.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ Service Bus emits the following event types:
1717
| Event type | Description |
1818
| ---------- | ----------- |
1919
| Microsoft.ServiceBus.ActiveMessagesAvailableWithNoListeners | Raised when there are active messages in a Queue or Subscription and no receivers listening. |
20-
| Microsoft.ServiceBus.DeadletterMessagesAvailableWithNoListener | Raised when there are active messages in a Dead Letter Queue and no active listeners. |
20+
| Microsoft.ServiceBus.DeadletterMessagesAvailableWithNoListeners | Raised when there are active messages in a Dead Letter Queue and no active listeners. |
2121
| Microsoft.ServiceBus.ActiveMessagesAvailablePeriodicNotifications | Raised periodically if there are active messages in a Queue or Subscription, even if there are active listeners on that specific Queue or Subscription. |
2222
| Microsoft.ServiceBus.DeadletterMessagesAvailablePeriodicNotifications | Raised periodically if there are messages in the dead-letter entity of a Queue or Subscription, even if there are active listeners on the dead-letter entity of that specific Queue or Subscription. |
2323

2424
## Example event
2525

2626
# [Event Grid event schema](#tab/event-grid-event-schema)
2727

28-
### Active messages available with no listeners
28+
### Active Messages Available With No Listeners
2929
This event is generated if you have active messages in a queue or a subscription and there are no receivers listening.
3030

3131
```json
@@ -48,15 +48,15 @@ This event is generated if you have active messages in a queue or a subscription
4848
}]
4949
```
5050

51-
#### Deadletter Messages Available With No Listener
51+
#### Deadletter Messages Available With No Listeners
5252

5353
The schema for a dead letter queue event is similar. You get at least one event per dead-letter queue that has messages and no active receivers.
5454

5555
```json
5656
[{
5757
"topic": "/subscriptions/{subscription-id}/resourcegroups/{your-rg}/providers/Microsoft.ServiceBus/namespaces/{your-service-bus-namespace}",
5858
"subject": "topics/{your-service-bus-topic}/subscriptions/{your-service-bus-subscription}",
59-
"eventType": "Microsoft.ServiceBus.DeadletterMessagesAvailableWithNoListener",
59+
"eventType": "Microsoft.ServiceBus.DeadletterMessagesAvailableWithNoListeners",
6060
"eventTime": "2018-02-14T05:12:53.4133526Z",
6161
"id": "dede87b0-3656-419c-acaf-70c95ddc60f5",
6262
"data": {
@@ -120,7 +120,7 @@ This event is generated periodically if you have deadletter messages on the spec
120120

121121
# [Cloud event schema](#tab/cloud-event-schema)
122122

123-
### Active messages available with no listeners
123+
### Active Messages Available With No Listeners
124124
This event is generated if you have active messages in a queue or a subscription and there are no receivers listening.
125125

126126
```json
@@ -142,15 +142,15 @@ This event is generated if you have active messages in a queue or a subscription
142142
}]
143143
```
144144

145-
#### Deadletter Messages Available With No Listener
145+
#### Deadletter Messages Available With No Listeners
146146

147147
The schema for a dead letter queue event is similar. You get at least one event per dead-letter queue that has messages and no active receivers.
148148

149149
```json
150150
[{
151151
"source": "/subscriptions/{subscription-id}/resourcegroups/{your-rg}/providers/Microsoft.ServiceBus/namespaces/{your-service-bus-namespace}",
152152
"subject": "topics/{your-service-bus-topic}/subscriptions/{your-service-bus-subscription}",
153-
"type": "Microsoft.ServiceBus.DeadletterMessagesAvailableWithNoListener",
153+
"type": "Microsoft.ServiceBus.DeadletterMessagesAvailableWithNoListeners",
154154
"time": "2018-02-14T05:12:53.4133526Z",
155155
"id": "dede87b0-3656-419c-acaf-70c95ddc60f5",
156156
"data": {
@@ -254,4 +254,4 @@ The data object has the following properties:
254254
| `entityType` | string | The type of Service Bus entity emitting events (queue or subscription). |
255255
| `queueName` | string | The queue with active messages if subscribing to a queue. Value null if using topics / subscriptions. |
256256
| `topicName` | string | The topic the Service Bus subscription with active messages belongs to. Value null if using a queue. |
257-
| `subscriptionName` | string | The Service Bus subscription with active messages. Value null if using a queue. |
257+
| `subscriptionName` | string | The Service Bus subscription with active messages. Value null if using a queue. |

0 commit comments

Comments
 (0)