Skip to content

Commit 3599656

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into cleanTOC
2 parents 6e5d056 + 7d9a477 commit 3599656

File tree

106 files changed

+784
-565
lines changed

Some content is hidden

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

106 files changed

+784
-565
lines changed

.openpublishing.redirection.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11992,12 +11992,17 @@
1199211992
},
1199311993
{
1199411994
"source_path": "articles/blockchain-workbench/hyperledger-fabric-single-member-blockchain.md",
11995-
"redirect_url": "/azure/blockchain/templates/hyperledger-fabric-consortium-blockchain",
11995+
"redirect_url": "/azure/blockchain/templates/hyperledger-fabric-consortium-azure-kubernetes-service",
1199611996
"redirect_document_id": false
1199711997
},
1199811998
{
1199911999
"source_path": "articles/blockchain/templates/hyperledger-fabric-single-member-blockchain.md",
12000-
"redirect_url": "/azure/blockchain/templates/hyperledger-fabric-consortium-blockchain",
12000+
"redirect_url": "/azure/blockchain/templates/hyperledger-fabric-consortium-azure-kubernetes-service",
12001+
"redirect_document_id": false
12002+
},
12003+
{
12004+
"source_path": "articles/blockchain/templates/hyperledger-fabric-consortium-blockchain.md",
12005+
"redirect_url": "/azure/blockchain/templates/hyperledger-fabric-consortium-azure-kubernetes-service",
1200112006
"redirect_document_id": false
1200212007
},
1200312008
{

articles/app-service/deploy-local-git.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ To get the URL to enable local Git deployment for an existing app, run [`az weba
4545
```azurecli-interactive
4646
az webapp deployment source config-local-git --name <app-name> --resource-group <group-name>
4747
```
48+
> [!NOTE]
49+
> If you are using a linux app-service-plan, you need to add this parameter: --runtime python|3.7
50+
4851

4952
Or, to create a new Git-enabled app, run [`az webapp create`](/cli/azure/webapp?view=azure-cli-latest#az-webapp-create) in the Cloud Shell with the `--deployment-local-git` parameter. Replace \<app-name>, \<group-name>, and \<plan-name> with the names for your new Git app, its Azure resource group, and its Azure App Service plan.
5053

articles/azure-monitor/platform/data-platform.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Azure resources generate a significant amount of monitoring data. Azure Monitor
3333

3434
Metrics in Azure Monitor are stored in a time-series database which is optimized for analyzing time-stamped data. This makes metrics particularly suited for alerting and fast detection of issues. They can tell you how your system is performing but typically need to be combined with logs to identify the root cause of issues.
3535

36-
Metrics are available for interactive analysis in the Azure portal with [Metrics Explorer](../app/metrics-explorer.md). They can be added to an [Azure dashboard](../learn/tutorial-app-dashboards.md) for visualization in combination with other data and used for near-real time [alerting](alerts-metric.md).
36+
Metrics are available for interactive analysis in the Azure portal with [Azure Metrics Explorer](../platform/metrics-getting-started.md). They can be added to an [Azure dashboard](../learn/tutorial-app-dashboards.md) for visualization in combination with other data and used for near-real time [alerting](alerts-metric.md).
3737

3838
Read more about Azure Monitor Metrics including their sources of data in [Metrics in Azure Monitor](data-platform-metrics.md).
3939

articles/azure-monitor/platform/template-workspace-configuration.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -297,9 +297,7 @@ The following template sample illustrates how to:
297297
"immediatePurgeDataOn30Days": "[parameters('immediatePurgeDataOn30Days')]"
298298
},
299299
"sku": {
300-
"name": "[parameters('pricingTier')]",
301-
"name": "CapacityReservation",
302-
"capacityReservationLevel": 100
300+
"name": "[parameters('pricingTier')]"
303301
}
304302
},
305303
"resources": [

articles/azure-resource-manager/management/azure-subscription-service-limits.md

Lines changed: 196 additions & 283 deletions
Large diffs are not rendered by default.

articles/azure-resource-manager/management/resource-name-rules.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Resource naming restrictions
33
description: Shows the rules and restrictions for naming Azure resources.
44
ms.topic: conceptual
5-
ms.date: 01/16/2020
5+
ms.date: 02/11/2020
66
---
77

88
# Naming rules and restrictions for Azure resources
@@ -523,6 +523,13 @@ In the following tables, the term alphanumeric refers to:
523523
> | clusters | resource group | 4-63 | Alphanumerics and hyphens.<br><br>Start and end with alphanumeric. |
524524
> | workspaces | resource group | 4-63 | Alphanumerics and hyphens.<br><br>Start and end with alphanumeric. |
525525
526+
## Microsoft.Portal
527+
528+
> [!div class="mx-tableFixed"]
529+
> | Entity | Scope | Length | Valid Characters |
530+
> | --- | --- | --- | --- |
531+
> | dashboards | resource group | 3-160 | Alphanumerics and hyphens.<br><br>To use restricted characters, add a tag named **hidden-title** with the dashboard name you want to use. The portal displays that name when showing the dashboard. |
532+
526533
## Microsoft.PowerBI
527534

528535
> [!div class="mx-tableFixed"]

articles/blockchain/templates/hyperledger-fabric-consortium-blockchain.md

Lines changed: 0 additions & 139 deletions
This file was deleted.

0 commit comments

Comments
 (0)