Skip to content

Commit 8792236

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into ssmUpdates
2 parents f73e80f + 829658a commit 8792236

File tree

77 files changed

+830
-291
lines changed

Some content is hidden

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

77 files changed

+830
-291
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3258,6 +3258,11 @@
32583258
"redirect_url": "/azure/iot-edge/how-to-register-device",
32593259
"redirect_document_id": false
32603260
},
3261+
{
3262+
"source_path": "articles/iot-edge/how-to-install-production-certificates.md",
3263+
"redirect_url": "/azure/iot-edge/how-to-manage-device-certificates",
3264+
"redirect_document_id": true
3265+
},
32613266
{
32623267
"source_path": "articles/cognitive-services/cognitive-services-recommendations-quick-start.md",
32633268
"redirect_url": "/azure/cognitive-services/recommendations/overview",

articles/active-directory/managed-identities-azure-resources/overview.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ Learn how to use a managed identity with other Azure services:
137137
* [Azure Kubernetes Service](/azure/aks/use-managed-identity)
138138
* [Azure Logic Apps](/azure/logic-apps/create-managed-service-identity)
139139
* [Azure Service Bus](../../service-bus-messaging/service-bus-managed-service-identity.md)
140+
* [Azure Data Factory](../../data-factory/data-factory-service-identity.md)
140141

141142

142143
## What Azure services support the feature?<a name="which-azure-services-support-managed-identity"></a>

articles/active-directory/managed-identities-azure-resources/tutorial-linux-vm-access-cosmos-db.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,14 @@ Next, add a data collection in the Cosmos DB account that you can query in later
6363

6464
## Retrieve the `principalID` of the Linux VM's system-assigned managed identity
6565

66-
To gain access to the Cosmos DB account access keys from the Resource Manager in the following section, you need to retrieve the `principalID` of the Linux VM's system-assigned managed identity. Be sure to replace the `<SUBSCRIPTION ID>`, `<RESOURCE GROUP>` (resource group in which you VM resides), and `<VM NAME>` parameter values with your own values.
66+
To gain access to the Cosmos DB account access keys from the Resource Manager in the following section, you need to retrieve the `principalID` of the Linux VM's system-assigned managed identity. Be sure to replace the `<SUBSCRIPTION ID>`, `<RESOURCE GROUP>` (resource group in which your VM resides), and `<VM NAME>` parameter values with your own values.
6767

6868
```azurecli-interactive
6969
az resource show --id /subscriptions/<SUBSCRIPTION ID>/resourceGroups/<RESOURCE GROUP>/providers/Microsoft.Compute/virtualMachines/<VM NAMe> --api-version 2017-12-01
7070
```
7171
The response includes the details of the system-assigned managed identity (note the principalID as it is used in the next section):
7272

73-
```bash
73+
```output
7474
{
7575
"id": "/subscriptions/<SUBSCRIPTION ID>/<RESOURCE GROUP>/providers/Microsoft.Compute/virtualMachines/<VM NAMe>",
7676
"identity": {
@@ -92,7 +92,7 @@ az role assignment create --assignee <MI PRINCIPALID> --role '<ROLE NAME>' --sco
9292

9393
The response includes the details for the role assignment created:
9494

95-
```
95+
```output
9696
{
9797
"id": "/subscriptions/<SUBSCRIPTION ID>/resourceGroups/<RESOURCE GROUP>/providers/Microsoft.DocumentDB/databaseAccounts/<COSMOS DB ACCOUNT>/providers/Microsoft.Authorization/roleAssignments/5b44e628-394e-4e7b-bbc3-d6cd4f28f15b",
9898
"name": "5b44e628-394e-4e7b-bbc3-d6cd4f28f15b",
@@ -155,13 +155,13 @@ The CURL response gives you the list of Keys. For example, if you get the read-
155155

156156
Now that you have the access key for the Cosmos DB account you can pass it to a Cosmos DB SDK and make calls to access the account. For a quick example, you can pass the access key to the Azure CLI. You can get the `<COSMOS DB CONNECTION URL>` from the **Overview** tab on the Cosmos DB account blade in the Azure portal. Replace the `<ACCESS KEY>` with the value you obtained above:
157157

158-
```bash
158+
```azurecli
159159
az cosmosdb collection show -c <COLLECTION ID> -d <DATABASE ID> --url-connection "<COSMOS DB CONNECTION URL>" --key <ACCESS KEY>
160160
```
161161

162162
This CLI command returns details about the collection:
163163

164-
```bash
164+
```output
165165
{
166166
"collection": {
167167
"_conflicts": "conflicts/",

articles/active-directory/managed-identities-azure-resources/tutorial-windows-vm-access-cosmos-db.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,13 +123,13 @@ The response give you the list of Keys. For example, if you get read-only keys:
123123
```
124124
Now that you have the access key for the Cosmos DB account you can pass it to a Cosmos DB SDK and make calls to access the account. For a quick example, you can pass the access key to the Azure CLI. You can get the `<COSMOS DB CONNECTION URL>` from the **Overview** tab on the Cosmos DB account blade in the Azure portal. Replace the `<ACCESS KEY>` with the value you obtained above:
125125

126-
```bash
126+
```azurecli
127127
az cosmosdb collection show -c <COLLECTION ID> -d <DATABASE ID> --url-connection "<COSMOS DB CONNECTION URL>" --key <ACCESS KEY>
128128
```
129129

130130
This CLI command returns details about the collection:
131131

132-
```bash
132+
```output
133133
{
134134
"collection": {
135135
"_conflicts": "conflicts/",

articles/aks/deployment-center-launcher.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ In this tutorial, you will:
3434

3535
1. To create the AKS cluster, run the following commands:
3636

37-
```cmd
37+
```azurecli
3838
# Create a resource group in the South India location:
3939
4040
az group create --name azooaks --location southindia

articles/analysis-services/analysis-services-logging.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.reviewer: minewiskan
1111
---
1212
# Setup diagnostic logging
1313

14-
An important part of any Analysis Services solution is monitoring how your servers are performing. With [Azure resource diagnostic logs](../azure-monitor/platform/platform-logs-overview.md), you can monitor and send logs to [Azure Storage](https://azure.microsoft.com/services/storage/), stream them to [Azure Event Hubs](https://azure.microsoft.com/services/event-hubs/), and export them to [Azure Monitor logs](../azure-monitor/azure-monitor-log-hub.md).
14+
An important part of any Analysis Services solution is monitoring how your servers are performing. With [Azure resource logs](../azure-monitor/platform/platform-logs-overview.md), you can monitor and send logs to [Azure Storage](https://azure.microsoft.com/services/storage/), stream them to [Azure Event Hubs](https://azure.microsoft.com/services/event-hubs/), and export them to [Azure Monitor logs](../azure-monitor/azure-monitor-log-hub.md).
1515

1616
![Diagnostic logging to Storage, Event Hubs, or Azure Monitor logs](./media/analysis-services-logging/aas-logging-overview.png)
1717

articles/analysis-services/analysis-services-samples.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ The [Analysis Services](https://github.com/Microsoft/Analysis-Services) reposito
2121

2222
[Adventure Works for Analysis Services](https://github.com/Microsoft/sql-server-samples/releases/tag/adventureworks-analysis-services) on GitHub is the most commonly used sample tabular model project. You can download a VS project or a completed sample tabular model database.
2323

24+
## Sample database on Azure
25+
26+
Azure Synapse Analytics (SQL Data Warehouse) provides a sample AdventureWorksDW database that can be included in a provisioned resource. To learn more, see [Quickstart: Create and query an Azure Synapse Analytics SQL pool](/azure/sql-data-warehouse/create-data-warehouse-portal).
2427

2528
## Sample databases on GitHub
2629

articles/analysis-services/analysis-services-scale-out.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Replicate Azure Analysis Services servers with scale-out. Client qu
44
author: minewiskan
55
ms.service: azure-analysis-services
66
ms.topic: conceptual
7-
ms.date: 01/16/2020
7+
ms.date: 03/02/2020
88
ms.author: owend
99
ms.reviewer: minewiskan
1010

@@ -69,19 +69,23 @@ For maximum performance for both processing and query operations, you can choose
6969

7070
## Monitor QPU usage
7171

72-
To determine if scale-out for your server is necessary, monitor your server in Azure portal by using Metrics. If your QPU regularly maxes out, it means the number of queries against your models is exceeding the QPU limit for your plan. The Query pool job queue length metric also increases when the number of queries in the query thread pool queue exceeds available QPU.
72+
To determine if scale-out for your server is necessary, [monitor your server](analysis-services-monitor.md) in Azure portal by using Metrics. If your QPU regularly maxes out, it means the number of queries against your models is exceeding the QPU limit for your plan. The Query pool job queue length metric also increases when the number of queries in the query thread pool queue exceeds available QPU.
7373

7474
Another good metric to watch is average QPU by ServerResourceType. This metric compares average QPU for the primary server with the query pool.
7575

7676
![Query scale out metrics](media/analysis-services-scale-out/aas-scale-out-monitor.png)
7777

78-
### To configure QPU by ServerResourceType
78+
**To configure QPU by ServerResourceType**
79+
7980
1. In a Metrics line chart, click **Add metric**.
8081
2. In **RESOURCE**, select your server, then in **METRIC NAMESPACE**, select **Analysis Services standard metrics**, then in **METRIC**, select **QPU**, and then in **AGGREGATION**, select **Avg**.
8182
3. Click **Apply Splitting**.
8283
4. In **VALUES**, select **ServerResourceType**.
8384

84-
To learn more, see [Monitor server metrics](analysis-services-monitor.md).
85+
### Detailed diagnostic logging
86+
87+
Use Azure Monitor Logs for more detailed diagnostics of scaled out server resources. With logs, you can use Log Analytics queries to break out QPU and memory by server and replica. To learn more, see example queries in [Analysis Services diagnostics logging](analysis-services-logging.md#example-queries).
88+
8589

8690
## Configure scale-out
8791

articles/app-service/app-service-web-get-started-html.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ In the following example, replace <app_name> with a unique app name.
4545

4646
```bash
4747
cd html-docs-hello-world
48+
```
4849

50+
```azurecli
4951
az webapp up --location westeurope --name <app_name> --html
5052
```
5153

@@ -97,7 +99,7 @@ Save your changes and exit nano. Use the command `^O` to save and `^X` to exit.
9799

98100
You'll now redeploy the app with the same `az webapp up` command.
99101

100-
```bash
102+
```azurecli
101103
az webapp up --location westeurope --name <app_name> --html
102104
```
103105

@@ -125,7 +127,7 @@ The left menu provides different pages for configuring your app.
125127

126128
In the preceding steps, you created Azure resources in a resource group. If you don't expect to need these resources in the future, delete the resource group by running the following command in the Cloud Shell. Remember that the resource group name was automatically generated for you in the [create a web app](#create-a-web-app) step.
127129

128-
```bash
130+
```azurecli
129131
az group delete --name appsvc_rg_Windows_westeurope
130132
```
131133

articles/app-service/containers/deploy-container-github-action.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ az ad sp create-for-rbac --name "myApp" --role contributor \
3636
--scopes /subscriptions/{subscription-id}/resourceGroups/{resource-group} \
3737
--sdk-auth
3838
39-
# Replace {subscription-id}, {resource-group} with the subscription, resource group details of the WebApp
39+
# Replace {subscription-id}, {resource-group} with the subscription, resource group details of the WebApp
4040
```
4141

4242
The output is a JSON object with the role assignment credentials that provide access to your App Service app similar to below. Copy this JSON object to authenticate from GitHub.
4343

44-
```azurecli
44+
```output
4545
{
4646
"clientId": "<GUID>",
4747
"clientSecret": "<GUID>",

0 commit comments

Comments
 (0)