Skip to content

Commit c358b2a

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-rbac-terminology-v23
2 parents 419b4a0 + f5a7272 commit c358b2a

File tree

58 files changed

+565
-430
lines changed

Some content is hidden

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

58 files changed

+565
-430
lines changed

.openpublishing.redirection.json

Lines changed: 27 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -31824,8 +31824,8 @@
3182431824
},
3182531825
{
3182631826
"source_path": "articles/marketplace/cloud-partner-portal-orig/cloud-partner-portal-automate-offer-publishing.md",
31827-
"redirect_url": "/azure/marketplace/azure-vm-create",
31828-
"redirect_document_id": true
31827+
"redirect_url": "/azure/marketplace/marketplace-virtual-machines",
31828+
"redirect_document_id": false
3182931829
},
3183031830
{
3183131831
"source_path": "articles/marketplace/cloud-partner-portal-orig/appsource-package-preparation.md",
@@ -31837,6 +31837,11 @@
3183731837
"redirect_url": "/azure/marketplace/enable-appsource-marketplace-using-azure-ad",
3183831838
"redirect_document_id": true
3183931839
},
31840+
{
31841+
"source_path": "articles/marketplace/partner-center-portal/azure-vm-create-offer.md",
31842+
"redirect_url": "/azure/marketplace/marketplace-virtual-machines",
31843+
"redirect_document_id": true
31844+
},
3184031845
{
3184131846
"source_path": "articles/marketplace/gtm-promote-your-business.md",
3184231847
"redirect_url": "/azure/marketplace/gtm-marketing-best-practices",
@@ -32054,7 +32059,7 @@
3205432059
},
3205532060
{
3205632061
"source_path": "articles/marketplace-publishing/marketplace-publishing-vm-image-post-publishing.md",
32057-
"redirect_url": "/azure/marketplace/azure-vm-create",
32062+
"redirect_url": "/azure/marketplace/marketplace-virtual-machines",
3205832063
"redirect_document_id": false
3205932064
},
3206032065
{
@@ -32064,7 +32069,7 @@
3206432069
},
3206532070
{
3206632071
"source_path": "articles/marketplace/cloud-partner-portal-orig/cloud-partner-portal-publish-virtual-machine.md",
32067-
"redirect_url": "/azure/marketplace/azure-vm-create",
32072+
"redirect_url": "/azure/marketplace/marketplace-virtual-machines",
3206832073
"redirect_document_id": false
3206932074
},
3207032075
{
@@ -45524,32 +45529,32 @@
4552445529
},
4552545530
{
4552645531
"source_path": "articles/marketplace/cloud-partner-portal/virtual-machine/cpp-create-offer.md",
45527-
"redirect_url": "/azure/marketplace/azure-vm-create",
45532+
"redirect_url": "/azure/marketplace/marketplace-virtual-machines",
4552845533
"redirect_document_id": false
4552945534
},
4553045535
{
4553145536
"source_path": "articles/marketplace/cloud-partner-portal/virtual-machine/cpp-offer-settings-tab.md",
45532-
"redirect_url": "/azure/marketplace/azure-vm-create",
45537+
"redirect_url": "/azure/marketplace/marketplace-virtual-machines",
4553345538
"redirect_document_id": false
4553445539
},
4553545540
{
4553645541
"source_path": "articles/marketplace/cloud-partner-portal/virtual-machine/cpp-skus-tab.md",
45537-
"redirect_url": "/azure/marketplace/azure-vm-create",
45542+
"redirect_url": "/azure/marketplace/marketplace-virtual-machines",
4553845543
"redirect_document_id": false
4553945544
},
4554045545
{
4554145546
"source_path": "articles/marketplace/cloud-partner-portal/virtual-machine/cpp-test-drive-tab.md",
45542-
"redirect_url": "/azure/marketplace/azure-vm-create",
45547+
"redirect_url": "/azure/marketplace/marketplace-virtual-machines",
4554345548
"redirect_document_id": false
4554445549
},
4554545550
{
4554645551
"source_path": "articles/marketplace/cloud-partner-portal/virtual-machine/cpp-marketplace-tab.md",
45547-
"redirect_url": "/azure/marketplace/azure-vm-create",
45552+
"redirect_url": "/azure/marketplace/marketplace-virtual-machines",
4554845553
"redirect_document_id": false
4554945554
},
4555045555
{
4555145556
"source_path": "articles/marketplace/cloud-partner-portal/virtual-machine/cpp-support-tab.md",
45552-
"redirect_url": "/azure/marketplace/azure-vm-create",
45557+
"redirect_url": "/azure/marketplace/marketplace-virtual-machines",
4555345558
"redirect_document_id": false
4555445559
},
4555545560
{
@@ -45564,7 +45569,12 @@
4556445569
},
4556545570
{
4556645571
"source_path": "articles/marketplace/cloud-partner-portal/virtual-machine/cpp-common-vhd-creation-issues.md",
45567-
"redirect_url": "/azure/marketplace/partner-center-portal/common-issues-during-vhd-creation",
45572+
"redirect_url": "/azure/marketplace/azure-vm-create-certification-faq",
45573+
"redirect_document_id": false
45574+
},
45575+
{
45576+
"source_path": "articles/marketplace/partner-center-portal/common-issues-during-vhd-creation.md",
45577+
"redirect_url": "/azure/marketplace/azure-vm-create-certification-faq",
4556845578
"redirect_document_id": false
4556945579
},
4557045580
{
@@ -45584,12 +45594,12 @@
4558445594
},
4558545595
{
4558645596
"source_path": "articles/marketplace/cloud-partner-portal/virtual-machine/cpp-winrm-over-https.md",
45587-
"redirect_url": "/azure/marketplace/azure-vm-create",
45597+
"redirect_url": "/azure/marketplace/marketplace-virtual-machines",
4558845598
"redirect_document_id": false
4558945599
},
4559045600
{
4559145601
"source_path": "articles/marketplace/cloud-partner-portal/virtual-machine/cpp-configure-winrm-after-vm-creation.md",
45592-
"redirect_url": "/azure/marketplace/azure-vm-create",
45602+
"redirect_url": "/azure/marketplace/marketplace-virtual-machines",
4559345603
"redirect_document_id": false
4559445604
},
4559545605
{
@@ -45604,7 +45614,7 @@
4560445614
},
4560545615
{
4560645616
"source_path": "articles/marketplace/partner-center-portal/create-azure-vm-technical-asset.md",
45607-
"redirect_url": "/azure/marketplace/azure-vm-create-technical-assets",
45617+
"redirect_url": "/azure/marketplace/azure-vm-create-using-approved-base",
4560845618
"redirect_document_id": false
4560945619
},
4561045620
{
@@ -45664,12 +45674,12 @@
4566445674
},
4566545675
{
4566645676
"source_path": "articles/marketplace/cloud-partner-portal/virtual-machine/cpp-publish-offer.md",
45667-
"redirect_url": "/azure/marketplace/azure-vm-create",
45677+
"redirect_url": "/azure/marketplace/marketplace-virtual-machines",
4566845678
"redirect_document_id": false
4566945679
},
4567045680
{
4567145681
"source_path": "articles/marketplace/cloud-partner-portal/virtual-machine/cpp-update-existing-offer.md",
45672-
"redirect_url": "/azure/marketplace/azure-vm-create",
45682+
"redirect_url": "/azure/marketplace/marketplace-virtual-machines",
4567345683
"redirect_document_id": false
4567445684
},
4567545685
{
@@ -56840,7 +56850,7 @@
5684056850
},
5684156851
{
5684256852
"source_path": "articles/marketplace/cloud-partner-portal/virtual-machine/cpp-virtual-machine-offer.md",
56843-
"redirect_url": "/azure/marketplace/azure-vm-create",
56853+
"redirect_url": "/azure/marketplace/marketplace-virtual-machines",
5684456854
"redirect_document_id": false
5684556855
},
5684656856
{

articles/azure-monitor/platform/agent-linux.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,11 @@ Starting with versions released after August 2018, we are making the following c
3939
>[!NOTE]
4040
>If you are using a distro or version that is not currently supported and doesn't align to our support model, we recommend that you fork this repo, acknowledging that Microsoft support will not provide assistance with forked agent versions.
4141
42-
### Python 2 requirement
42+
### Python requirement
4343

44-
The Log Analytics agent requires Python 2. If your virtual machine is using a distro that doesn't include Python 2 by default then you must install it. The following sample commands will install Python 2 on different distros.
44+
Starting from Agent version 1.13.27, the Linux Agent will support both Python 2 and 3. We always recommend using the latest agent.
45+
46+
If you are using an older version of the agent, you must have the Virtual Machine use python 2 by default. If your virtual machine is using a distro that doesn't include Python 2 by default then you must install it. The following sample commands will install Python 2 on different distros.
4547

4648
- Red Hat, CentOS, Oracle: `yum install -y python2`
4749
- Ubuntu, Debian: `apt-get install -y python2`
@@ -67,7 +69,7 @@ The OMS Agent has limited customization support for Linux.
6769
The following are currently supported:
6870
- FIPs
6971
70-
The following are planned but not yet supported:
72+
The following are in consideration but not yet supported:
7173
- CIS
7274
- SELINUX
7375

articles/cosmos-db/concepts-limits.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ You can provision throughput at a container-level or a database-level in terms o
3030
| Maximum storage per container | Unlimited |
3131
| Maximum storage per database | Unlimited |
3232
| Maximum attachment size per Account (Attachment feature is being deprecated) | 2 GB |
33-
| Minimum RUs required per 1 GB | 10 RU/s |
33+
| Minimum RU/s required per 1 GB | 10 RU/s<br>**Note:** if your container or database contains more than 1 TB of data, your account may be eligible to our ["high storage / low throughput" program](set-throughput.md#high-storage-low-throughput-program) |
3434

3535
> [!NOTE]
3636
> To learn about best practices for managing workloads that have partition keys requiring higher limits for storage or throughput, see [Create a synthetic partition key](synthetic-partition-keys.md).

articles/cosmos-db/set-throughput.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ You can combine the two models. Provisioning throughput on both the database and
9191

9292
After you create an Azure Cosmos container or a database, you can update the provisioned throughput. There is no limit on the maximum provisioned throughput that you can configure on the database or the container.
9393

94-
### Current provisioned throughput
94+
### <a id="current-provisioned-throughput"></a> Current provisioned throughput
9595

9696
You can retrieve the provisioned throughput of a container or a database in the Azure portal or by using the SDKs:
9797

@@ -131,6 +131,14 @@ You can programmatically check the scaling progress by reading the [current prov
131131

132132
You can use [Azure Monitor metrics](monitor-cosmos-db.md#view-operation-level-metrics-for-azure-cosmos-db) to view the history of provisioned throughput (RU/s) and storage on a resource.
133133

134+
## <a id="high-storage-low-throughput-program"></a> High storage / low throughput program
135+
136+
As described in the [Current provisioned throughput](#current-provisioned-throughput) section above, the minimum throughput you can provision on a container or database depends on a number of factors. One of them is the amount of data currently stored, as Azure Cosmos DB enforces a minimum throughput of 10 RU/s per GB of storage.
137+
138+
This can be a concern in situations where you need to store large amounts of data, but have low throughput requirements in comparison. To better accommodate these scenarios, Azure Cosmos DB has introduced a **"high storage / low throughput" program** that decreases the RU/s per GB constraint from 10 to 1 on eligible accounts.
139+
140+
You currently need to have at least 1 container or shared-throughput database containing more than 1 TB of data in your account to be eligible. To join this program and assess your full eligibility, all you have to do is to fill [this survey](https://customervoice.microsoft.com/Pages/ResponsePage.aspx?id=v4j5cvGGr0GRqy180BHbRzBPrdEMjvxPuDm8fCLUtXpUREdDU0pCR0lVVFY5T1lRVEhWNUZITUJGMC4u). The Azure Cosmos DB team will then follow up and proceed with your onboarding.
141+
134142
## Comparison of models
135143
This table shows a comparison between provisioning standard (manual) throughput on a database vs. on a container.
136144

articles/event-hubs/network-security.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Network security for Azure Event Hubs
33
description: This article describes how to configure access from private endpoints
44
ms.topic: conceptual
5-
ms.date: 06/23/2020
5+
ms.date: 10/20/2020
66
---
77

88
# Network security for Azure Event Hubs
@@ -67,8 +67,8 @@ For more information, see [How to configure virtual network service endpoints fo
6767

6868
A private endpoint is a network interface that connects you privately and securely to a service powered by Azure Private Link. The private endpoint uses a private IP address from your VNet, effectively bringing the service into your VNet. All traffic to the service can be routed through the private endpoint, so no gateways, NAT devices, ExpressRoute or VPN connections, or public IP addresses are needed. Traffic between your virtual network and the service traverses over the Microsoft backbone network, eliminating exposure from the public Internet. You can connect to an instance of an Azure resource, giving you the highest level of granularity in access control.
6969

70-
> [!NOTE]
71-
> This feature is supported only with the **dedicated** tier. For more information about the dedicated tier, see [Overview of Event Hubs Dedicated](event-hubs-dedicated-overview.md).
70+
> [!IMPORTANT]
71+
> This feature is supported for both **standard** and **dedicated** tiers. It's not supported in the **basic** tier.
7272
7373
For more information, see [How to configure private endpoints for an event hub](private-link-service.md)
7474

articles/frontdoor/front-door-faq.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.devlang: na
99
ms.topic: article
1010
ms.tgt_pltfrm: na
1111
ms.workload: infrastructure-services
12-
ms.date: 09/18/2020
12+
ms.date: 10/20/2020
1313
ms.author: duau
1414
---
1515

@@ -157,6 +157,10 @@ Learn about all the documented [timeouts and limits for Azure Front Door](../azu
157157

158158
The Rules Engine configuration takes about 10 to 15 minutes to complete an update. You can expect the rule to take effect as soon as the update is completed.
159159

160+
### Can I configure Azure CDN behind my Front Door profile or vice versa?
161+
162+
Azure Front Door and Azure CDN can't be configured together because both services utilizes the same Azure edge sites when responding to requests.
163+
160164
## Performance
161165

162166
### How does Azure Front Door support high availability and scalability?
@@ -269,4 +273,4 @@ Yes, Azure Front Door does support alerts. Alerts are configured on metrics.
269273
## Next steps
270274

271275
- Learn how to [create a Front Door](quickstart-create-front-door.md).
272-
- Learn [how Front Door works](front-door-routing-architecture.md).
276+
- Learn [how Front Door works](front-door-routing-architecture.md).

articles/index.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,13 @@ productDirectory:
252252
- ai-machine-learning
253253
url: genomics/index.yml
254254
# Card
255+
- title: Metrics Advisor (Preview)
256+
summary: An AI service that monitors metrics and diagnoses issues
257+
imageSrc: ./media/index/metrics-advisor.svg
258+
azureCategories:
259+
- ai-machine-learning
260+
url: cognitive-services/metrics-advisor/index.yml
261+
# Card
255262
- title: Personalizer
256263
summary: An AI service that delivers a personalized user experience
257264
imageSrc: https://static.docs.com/ui/media/product/azure/cognitive-services.svg

articles/key-vault/certificates/how-to-integrate-certificate-authority.md

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ After gathering above information from DigiCert CertCentral account, you can now
4949
1. To add DigiCert certificate authority, navigate to the key vault you want to add DigiCert.
5050
2. On the Key Vault properties pages, select **Certificates**.
5151
3. Select **Certificate Authorities** tab.
52-
![Certificate properties](../media/certificates/how-to-integrate-certificate-authority/select-certificate-authorities.png)
52+
![select certificate authorities](../media/certificates/how-to-integrate-certificate-authority/select-certificate-authorities.png)
5353
4. Select **Add** option.
54-
![Certificate properties](../media/certificates/how-to-integrate-certificate-authority/add-certificate-authority.png)
54+
![add certificate authorities](../media/certificates/how-to-integrate-certificate-authority/add-certificate-authority.png)
5555
5. On the **Create a certificate Authority** screen choose the following values:
5656
- **Name**: Add an identifiable Issuer name. Example DigicertCA
5757
- **Provider**: Select DigiCert from the menu.
@@ -98,24 +98,22 @@ New-AzKeyVault -Name 'Contoso-Vaultname' -ResourceGroupName 'ContosoResourceGrou
9898
- Define **Account ID** variable
9999
- Define **Org ID** variable
100100
- Define **API Key** variable
101-
- Define **Issuer Name** variable
102101

103102
```azurepowershell-interactive
104103
$accountId = "myDigiCertCertCentralAccountID"
105-
$org = New-AzKeyVaultCertificateOrganizationDetails -Id OrganizationIDfromDigiCertAccount
104+
$org = New-AzKeyVaultCertificateOrganizationDetail -Id OrganizationIDfromDigiCertAccount
106105
$secureApiKey = ConvertTo-SecureString DigiCertCertCentralAPIKey -AsPlainText –Force
107-
$issuerName = "DigiCertCA"
108106
```
109107

110-
4. Set **Issuer**. This will add Digicert as a Certificate Authority in the key vault.
108+
4. Set **Issuer**. This will add Digicert as a Certificate Authority in the key vault. To learn more about the parameters, [read here](https://docs.microsoft.com/powershell/module/az.keyvault/Set-AzKeyVaultCertificateIssuer)
111109
```azurepowershell-interactive
112-
Set-AzureKeyVaultCertificateIssuer -VaultName $vaultName -IssuerName $issuerName -IssuerProvider DigiCert -AccountId $accountId -ApiKey $secureApiKey -OrganizationDetails $org
110+
Set-AzKeyVaultCertificateIssuer -VaultName "Contoso-Vaultname" -Name "TestIssuer01" -IssuerProvider DigiCert -AccountId $accountId -ApiKey $secureApiKey -OrganizationDetails $org -PassThru
113111
```
114112

115113
5. **Setting Policy for the certificate and issuing certificate** from DigiCert directly inside Key Vault.
116114

117115
```azurepowershell-interactive
118-
$Policy = New-AzKeyVaultCertificatePolicy -SecretContentType "application/x-pkcs12" -SubjectName "CN=contoso.com" -IssuerName DigiCertCA -ValidityInMonths 12 -RenewAtNumberOfDaysBeforeExpiry 60
116+
$Policy = New-AzKeyVaultCertificatePolicy -SecretContentType "application/x-pkcs12" -SubjectName "CN=contoso.com" -IssuerName "TestIssuer01" -ValidityInMonths 12 -RenewAtNumberOfDaysBeforeExpiry 60
119117
Add-AzKeyVaultCertificate -VaultName "Contoso-Vaultname" -Name "ExampleCertificate" -CertificatePolicy $Policy
120118
```
121119

@@ -125,7 +123,7 @@ Certificate has now been successfully issued by Digicert CA inside specified Key
125123

126124
If the certificate issued is in 'disabled' status in the Azure portal, proceed to view the **Certificate Operation** to review the DigiCert error message for that certificate.
127125

128-
![Certificate properties](../media/certificates/how-to-integrate-certificate-authority/certificate-operation-select.png)
126+
![Certificate operation](../media/certificates/how-to-integrate-certificate-authority/certificate-operation-select.png)
129127

130128
For more information, see the [Certificate operations in the Key Vault REST API reference](/rest/api/keyvault). For information on establishing permissions, see [Vaults - Create or Update](/rest/api/keyvault/vaults/createorupdate) and [Vaults - Update Access Policy](/rest/api/keyvault/vaults/updateaccesspolicy).
131129

articles/machine-learning/policy-reference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Built-in policy definitions for Azure Machine Learning
33
description: Lists Azure Policy built-in policy definitions for Azure Machine Learning. These built-in policy definitions provide common approaches to managing your Azure resources.
4-
ms.date: 10/07/2020
4+
ms.date: 10/20/2020
55
author: j-martens
66
ms.author: jmartens
77
ms.topic: reference

articles/mariadb/policy-reference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Built-in policy definitions for Azure Database for MariaDB
33
description: Lists Azure Policy built-in policy definitions for Azure Database for MariaDB. These built-in policy definitions provide common approaches to managing your Azure resources.
4-
ms.date: 10/07/2020
4+
ms.date: 10/20/2020
55
ms.topic: reference
66
author: ajlam
77
ms.author: andrela

0 commit comments

Comments
 (0)