Skip to content

Commit 24da990

Browse files
committed
Merge branch 'master' of https://github.com/microsoftdocs/azure-docs-pr into asb
2 parents 151134d + 0e868ea commit 24da990

File tree

6 files changed

+34
-26
lines changed

6 files changed

+34
-26
lines changed

articles/cognitive-services/Speech-Service/quickstart-custom-speech-commands-create-new.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,8 @@ For now, we have no parameters so we can move on to **Completion rules** section
120120
### Add a Completion rule
121121
122122
Now add a Completion rule with the following configuration. This rule indicates user that a fulfillment action is being taken.
123+
124+
123125
| Setting | Suggested value | Description |
124126
| ---------- | ---------------------------------------- | -------------------------------------------------- |
125127
| Rule Name | ConfirmationResponse | A name describing the purpose of the rule |

articles/marketplace/partner-center-portal/create-new-managed-service-offer.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Create a Managed Service offer in the Microsoft commercial marketplace
2+
title: Create a Managed Service offer in Microsoft commercial marketplace
33
description: How to create a new Managed Service offer for listing in Azure Marketplace using the Commercial Marketplace portal in Partner Center.
44
author: JnHs
55
ms.author: jenhayes

articles/synapse-analytics/toc.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@
2626
href: quickstart-create-apache-spark-pool.md
2727
- name: Create SQL pool
2828
href: quickstart-create-sql-pool.md
29+
- name: Load data with SQL pools
30+
items:
31+
- name: COPY statement
32+
href: ./sql-data-warehouse/quickstart-bulk-load-copy-tsql.md
2933
- name: Use SQL on-demand
3034
href: quickstart-sql-on-demand.md
3135
- name: Tutorials

articles/virtual-machines/linux/image-builder-gallery-update-image-version.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Create a new VM image version from an existing image version using Azure
33
description: Create a new VM image version from an existing image version using Azure Image Builder.
44
author: cynthn
55
ms.author: cynthn
6-
ms.date: 05/02/2019
6+
ms.date: 05/05/2020
77
ms.topic: how-to
88
ms.service: virtual-machines-linux
99
ms.subservice: imaging
@@ -33,15 +33,17 @@ Check your registration.
3333

3434
```azurecli-interactive
3535
az provider show -n Microsoft.VirtualMachineImages | grep registrationState
36-
36+
az provider show -n Microsoft.KeyVault | grep registrationState
37+
az provider show -n Microsoft.Compute | grep registrationState
3738
az provider show -n Microsoft.Storage | grep registrationState
3839
```
3940

4041
If they do not say registered, run the following:
4142

4243
```azurecli-interactive
4344
az provider register -n Microsoft.VirtualMachineImages
44-
45+
az provider register -n Microsoft.Compute
46+
az provider register -n Microsoft.KeyVault
4547
az provider register -n Microsoft.Storage
4648
```
4749

@@ -50,8 +52,6 @@ az provider register -n Microsoft.Storage
5052

5153
If you used [Create an image and distribute to a Shared Image Gallery](image-builder-gallery.md) to create your Shared Image Gallery, you've already created some of the variables we need. If not, please setup some variables to be used for this example.
5254

53-
For Preview, image builder will only support creating custom images in the same Resource Group as the source managed image. Update the resource group name in this example to be the same resource group as your source managed image.
54-
5555

5656
```console
5757
# Resource group name
@@ -84,17 +84,16 @@ sigDefImgVersionId=$(az sig image-version list \
8484
--subscription $subscriptionID --query [].'id' -o json | grep 0. | tr -d '"' | tr -d '[:space:]')
8585
```
8686

87-
88-
If you already have your own Shared Image Gallery, and did not follow the previous example, you will need to assign permissions for Image Builder to access the Resource Group, so it can access the gallery.
89-
87+
## Create a user-assigned identity and set permissions on the resource group
88+
As you had set the user-identity up in the previous example, you just need to get the Resource ID of it, this will then be appended to the template.
9089

9190
```azurecli-interactive
92-
az role assignment create \
93-
--assignee cf32a0cc-373c-47c9-9156-0db11f6a6dfc \
94-
--role Contributor \
95-
--scope /subscriptions/$subscriptionID/resourceGroups/$sigResourceGroup
91+
#get identity used previously
92+
imgBuilderId=$(az identity list -g $sigResourceGroup --query "[?contains(name, 'aibBuiUserId')].id" -o tsv)
9693
```
9794

95+
If you already have your own Shared Image Gallery, and did not follow the previous example, you will need to assign permissions for Image Builder to access the Resource Group, so it can access the gallery. Please review the steps in the [Create an image and distribute to a Shared Image Gallery](image-builder-gallery.md) example.
96+
9897

9998
## Modify helloImage example
10099
You can review the example we are about to use by opening the .json file here: [helloImageTemplateforSIGfromSIG.json](https://raw.githubusercontent.com/danielsollondon/azvmimagebuilder/master/quickquickstarts/2_Creating_a_Custom_Linux_Shared_Image_Gallery_Image_from_SIG/helloImageTemplateforSIGfromSIG.json) along with the [Image Builder template reference](image-builder-json.md).
@@ -112,6 +111,7 @@ sed -i -e "s%<sigDefImgVersionId>%$sigDefImgVersionId%g" helloImageTemplateforSI
112111
sed -i -e "s/<region1>/$location/g" helloImageTemplateforSIGfromSIG.json
113112
sed -i -e "s/<region2>/$additionalregion/g" helloImageTemplateforSIGfromSIG.json
114113
sed -i -e "s/<runOutputName>/$runOutputName/g" helloImageTemplateforSIGfromSIG.json
114+
sed -i -e "s%<imgBuilderId>%$imgBuilderId%g" helloImageTemplateforSIGfromSIG.json
115115
```
116116

117117
## Create the image
@@ -179,4 +179,4 @@ az sig image-version list -g $sigResourceGroup -r $sigName -i $imageDefName -o t
179179

180180
## Next steps
181181

182-
To learn more about the components of the .json file used in this article, see [Image builder template reference](../linux/image-builder-json.md?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
182+
To learn more about the components of the .json file used in this article, see [Image builder template reference](../linux/image-builder-json.md?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).

articles/virtual-machines/windows/image-builder-gallery-update-image-version.md

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Create a new image version from an existing image version using Azure Ima
33
description: Create a new VM image version from an existing image version using Azure Image Builder.
44
author: cynthn
55
ms.author: cynthn
6-
ms.date: 05/02/2019
6+
ms.date: 05/05/2020
77
ms.topic: how-to
88
ms.service: virtual-machines-windows
99
---
@@ -35,16 +35,18 @@ Check your registration.
3535

3636
```azurecli-interactive
3737
az provider show -n Microsoft.VirtualMachineImages | grep registrationState
38-
az provider show -n Microsoft.Storage | grep registrationState
38+
az provider show -n Microsoft.KeyVault | grep registrationState
3939
az provider show -n Microsoft.Compute | grep registrationState
40+
az provider show -n Microsoft.Storage | grep registrationState
4041
```
4142

4243
If they do not say registered, run the following:
4344

4445
```azurecli-interactive
4546
az provider register -n Microsoft.VirtualMachineImages
46-
az provider register -n Microsoft.Storage
4747
az provider register -n Microsoft.Compute
48+
az provider register -n Microsoft.KeyVault
49+
az provider register -n Microsoft.Storage
4850
```
4951

5052

@@ -88,17 +90,16 @@ sigDefImgVersionId=$(az sig image-version list \
8890
--subscription $subscriptionID --query [].'id' -o json | grep 0. | tr -d '"' | tr -d '[:space:]')
8991
```
9092

91-
92-
If you already have your own Shared Image Gallery, and did not follow the previous example, you will need to assign permissions for Image Builder to access the Resource Group, so it can access the gallery.
93-
93+
## Create a user-assigned identity and set permissions on the resource group
94+
As you had set the user-identity up in the previous example, you just need to get the Resource ID of it, this will then be appended to the template.
9495

9596
```azurecli-interactive
96-
az role assignment create \
97-
--assignee cf32a0cc-373c-47c9-9156-0db11f6a6dfc \
98-
--role Contributor \
99-
--scope /subscriptions/$subscriptionID/resourceGroups/$sigResourceGroup
97+
#get identity used previously
98+
imgBuilderId=$(az identity list -g $sigResourceGroup --query "[?contains(name, 'aibBuiUserId')].id" -o tsv)
10099
```
101100

101+
If you already have your own Shared Image Gallery, and did not follow the previous example, you will need to assign permissions for Image Builder to access the Resource Group, so it can access the gallery. Please review the steps in the [Create an image and distribute to a Shared Image Gallery](image-builder-gallery.md) example.
102+
102103

103104
## Modify helloImage example
104105
You can review the example we are about to use by opening the .json file here: [helloImageTemplateforSIGfromSIG.json](https://raw.githubusercontent.com/danielsollondon/azvmimagebuilder/master/quickquickstarts/2_Creating_a_Custom_Linux_Shared_Image_Gallery_Image_from_SIG/helloImageTemplateforSIGfromSIG.json) along with the [Image Builder template reference](../linux/image-builder-json.md?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
@@ -116,6 +117,7 @@ sed -i -e "s%<sigDefImgVersionId>%$sigDefImgVersionId%g" helloImageTemplateforSI
116117
sed -i -e "s/<region1>/$location/g" helloImageTemplateforSIGfromWinSIG.json
117118
sed -i -e "s/<region2>/$additionalregion/g" helloImageTemplateforSIGfromWinSIG.json
118119
sed -i -e "s/<runOutputName>/$runOutputName/g" helloImageTemplateforSIGfromWinSIG.json
120+
sed -i -e "s%<imgBuilderId>%$imgBuilderId%g" helloImageTemplateforSIGfromWinSIG.json
119121
```
120122

121123
## Create the image
@@ -170,4 +172,4 @@ You should now see two directories:
170172

171173
## Next steps
172174

173-
To learn more about the components of the .json file used in this article, see [Image builder template reference](../linux/image-builder-json.md?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
175+
To learn more about the components of the .json file used in this article, see [Image builder template reference](../linux/image-builder-json.md?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).

includes/azure-monitor-limits-alerts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.custom: "include file"
1313
| Resource | Default limit | Maximum limit |
1414
| --- | --- | --- |
1515
| Metric alerts (classic) |100 active alert rules per subscription. | Call support. |
16-
| Metric alerts |2,000 active alert rules per subscription in Azure public, Azure China 21Vianet and Azure Government clouds. | Call support. |
16+
| Metric alerts |2,000 active alert rules per subscription in Azure public, Azure China 21Vianet and Azure Government clouds. If you are hitting this limit, explore if you can use [same type multi-resource alerts](https://docs.microsoft.com/azure/azure-monitor/platform/alerts-metric-overview#monitoring-at-scale-using-metric-alerts-in-azure-monitor) | Call support. |
1717
| Activity log alerts | 100 active alert rules per subscription. | Same as default. |
1818
| Log alerts | 512 active alert rules per subscription. 200 active alert rules per resource. | Call support. |
1919
| Action groups |2,000 action groups per subscription. | Call support. |

0 commit comments

Comments
 (0)