Skip to content

Commit 5397311

Browse files
2 parents 6e08a32 + d84a3ae commit 5397311

32 files changed

+379
-346
lines changed

.openpublishing.redirection.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50487,6 +50487,10 @@
5048750487
{
5048850488
"source_path": "articles/sql-database/sql-database-features-index.yml",
5048950489
"redirect_url": "/azure/sql-database/sql-database-features"
50490+
},
50491+
{
50492+
"source_path": "articles/service-fabric/service-fabric-deploy-multiple-apps.md",
50493+
"redirect_url": "/azure/service-fabric/service-fabric-deploy-existing-app"
5049050494
}
5049150495
]
5049250496
}

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,11 @@ The following table details the features and limits of the Basic, Standard, and
239239

240240
## Media Services limits
241241

242-
[!INCLUDE [azure-mediaservices-limits](../../../includes/azure-mediaservices-limits.md)]
242+
[!INCLUDE [azure-mediaservices-limits](../../../includes/media-servieces-limits-quotas-constraints.md)]
243+
244+
### Media Services v2 (legacy)
245+
246+
For limits specific to Media Services v2 (legacy), see [Media Services v2 (legacy)](https://docs.microsoft.com/azure/media-services/previous/media-services-quotas-and-limitations)
243247

244248
## Mobile Services limits
245249

articles/azure-resource-manager/templates/toc.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
items:
1515
- name: AKS
1616
href: ../../aks/kubernetes-walkthrough-rm-template.md?toc=/azure/azure-resource-manager/templates/toc.json
17+
- name: Application Gateway
18+
href: ../../application-gateway/quick-create-template.md?toc=/azure/azure-resource-manager/templates/toc.json
1719
- name: Backup
1820
href: ../../backup/quick-backup-vm-template.md?toc=/azure/azure-resource-manager/templates/toc.json
1921
- name: Cosmos DB
@@ -22,6 +24,18 @@
2224
href: ../../event-grid/blob-event-quickstart-template.md?toc=/azure/azure-resource-manager/templates/toc.json
2325
- name: Event Hub
2426
href: ../../event-hubs/event-hubs-resource-manager-namespace-event-hub.md?toc=/azure/azure-resource-manager/templates/toc.json
27+
- name: HDInsight - Spark
28+
href: ../../hdinsight/spark/apache-spark-jupyter-spark-sql.md?toc=/azure/azure-resource-manager/templates/toc.json
29+
- name: HDInsight - Hadoop
30+
href: ../../hdinsight/hadoop/apache-hadoop-linux-tutorial-get-started.md?toc=/azure/azure-resource-manager/templates/toc.json
31+
- name: HDInsight - Kafka
32+
href: ../../hdinsight/kafka/apache-kafka-quickstart-resource-manager-template.md?toc=/azure/azure-resource-manager/templates/toc.json
33+
- name: HDInsight - HBase
34+
href: ../../hdinsight/hbase/quickstart-resource-manager-template.md?toc=/azure/azure-resource-manager/templates/toc.json
35+
- name: HDInsight - Interactive Query
36+
href: ../../hdinsight/interactive-query/quickstart-resource-manager-template.md?toc=/azure/azure-resource-manager/templates/toc.json
37+
- name: HDInsight - ML Services
38+
href: ../../hdinsight/r-server/quickstart-resource-manager-template.md?toc=/azure/azure-resource-manager/templates/toc.json
2539
- name: Key Vault
2640
href: ../../key-vault/quick-create-template.md?toc=/azure/azure-resource-manager/templates/toc.json
2741
- name: Load Balancer
@@ -32,6 +46,10 @@
3246
href: ../../service-bus-messaging/service-bus-resource-manager-namespace-queue.md?toc=/azure/azure-resource-manager/templates/toc.json
3347
- name: SQL Database
3448
href: ../../sql-database/sql-database-single-database-get-started-template.md?toc=/azure/azure-resource-manager/templates/toc.json
49+
- name: Virtual machine scale sets - Linux
50+
href: ../../virtual-machine-scale-sets/quick-create-template-linux.md?toc=/azure/azure-resource-manager/templates/toc.json
51+
- name: Virtual machine scale sets - Windows
52+
href: ../../virtual-machine-scale-sets/quick-create-template-windows.md?toc=/azure/azure-resource-manager/templates/toc.json
3553
- name: Tutorials
3654
items:
3755
- name: Beginner templates

articles/cosmos-db/sql-api-nodejs-application.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ Now let's learn to create a basic Hello World Node.js project using the Express
7979
npm start
8080
```
8181

82-
1. You can view your new application by navigating your browser to [http://localhost:3000](http://localhost:3000).
82+
1. You can view your new application by navigating your browser to `http://localhost:3000`.
8383

8484
![Learn Node.js - Screenshot of the Hello World application in a browser window](./media/sql-api-nodejs-application/cosmos-db-node-js-express.png)
8585

@@ -355,7 +355,7 @@ Now that you have completed the initial setup and configuration, next you will w
355355

356356
## <a name="_Toc395783181"></a>Build a user interface
357357

358-
Now lets build the user interface so that a user can interact with the application. The Express application we created in the previous sections uses **Jade** as the view engine.
358+
Now let's build the user interface so that a user can interact with the application. The Express application we created in the previous sections uses **Jade** as the view engine.
359359

360360
1. The **layout.jade** file in the **views** directory is used as a global template for other **.jade** files. In this step you will modify it to use Twitter Bootstrap, which is a toolkit used to design a website.
361361

articles/cost-management-billing/costs/cost-analysis-common-uses.md

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Viewing costs by an Azure service can help you to better understand the parts of
2121
1. Select **Cost by service** and then group by **Service tier**.
2222
1. Change the view to **Table**.
2323

24-
![Cost breakdown by Azure service](./media/cost-analysis-common-uses/breakdown-by-service.png)
24+
[![Cost breakdown by Azure service](./media/cost-analysis-common-uses/breakdown-by-service.png)](./media/cost-analysis-common-uses/breakdown-by-service.png#lightbox)
2525

2626
## View cost breakdown by Azure resource
2727

@@ -31,18 +31,18 @@ Your services are built with Azure resources. Reviewing costs based on resources
3131
1. Select **Cost by resource**.
3232
1. Change the view to **Table**.
3333

34-
![View cost breakdown by Azure resource](./media/cost-analysis-common-uses/cost-by-resource.png)
34+
[![View cost breakdown by Azure resource](./media/cost-analysis-common-uses/cost-by-resource.png)](./media/cost-analysis-common-uses/cost-by-resource.png#lightbox)
3535

3636
## View cost breakdown by selected dimensions
3737

3838
Dimensions allow you to organize your costs based on various metadata values shown in your charges. For example, you could group your costs by location.
3939

4040
1. In the Azure portal, navigate to cost analysis for your scope. For example: **Cost Management + Billing** > **Cost Management** > **Cost analysis**.
4141
1. Select the **Group by** filter.
42-
![Select a Group by item](./media/cost-analysis-common-uses/group-by.png)
42+
[![Select a Group by item](./media/cost-analysis-common-uses/group-by.png)](./media/cost-analysis-common-uses/group-by.png#lightbox)
4343
1. Optionally, you save the view for later use.
4444
1. Click a pie chart below the graph to view more detailed data.
45-
![View cost breakdown by selected dimensions](./media/cost-analysis-common-uses/drill-down.png)
45+
[![View cost breakdown by selected dimensions](./media/cost-analysis-common-uses/drill-down.png)](./media/cost-analysis-common-uses/drill-down.png#lightbox)
4646

4747
## View costs per day or by month
4848

@@ -51,7 +51,19 @@ Looking at daily and monthly costs can help you to better understand if there's
5151
1. In the Azure portal, navigate to cost analysis for your scope. For example: **Cost Management + Billing** > **Cost Management** > **Cost analysis**.
5252
1. Set the **Granularity** to **Monthly** or **Daily**.
5353

54-
![View costs per day](./media/cost-analysis-common-uses/daily-granularity.png)
54+
[![View costs per day](./media/cost-analysis-common-uses/daily-granularity.png)](./media/cost-analysis-common-uses/daily-granularity.png#lightbox)
55+
56+
57+
## View your Spot VM charges
58+
59+
Spot VMs can provide large cost savings for workloads that can handle interruptions. Workloads are run on unused Azure capacity. Since they can be evicted at any time, Spot VMs get a significant discount. Use the following steps to view your Spot VM charges.
60+
61+
1. In the Azure portal, navigate to cost analysis for your scope. For example, **Cost Management + Billing** > **Cost Management** > **Cost analysis**.
62+
2. Add a filter for **Pricing Model: Spot**.
63+
64+
![Example showing Spot VM filter](./media/cost-analysis-common-uses/spot-vm-filter.png)
65+
66+
The Pricing Model dimension is also used to view on demand and reservation charges.
5567

5668
## View your reservation charges
5769

@@ -69,17 +81,6 @@ Each metric affects how data is shown for your reservation charges.
6981

7082
**Amortized cost** - Shows a reservation purchase split as an amortized cost over the duration of the reservation term. Using the same example above, cost analysis shows a $100 cost for each month throughout the year, if you purchased a one-year reservation for $1200 in January. If you group costs by VM in this example, you'd see cost attributed to each VM that received the reservation benefit.
7183

72-
## View your Spot VM charges
73-
74-
Spot VMs can provide large cost savings for workloads that can handle interruptions. Workloads are run on unused Azure capacity. Since they can be evicted at any time, Spot VMs get a significant discount. Use the following steps to view your Spot VM charges.
75-
76-
1. In the Azure portal, navigate to cost analysis for your scope. For example, **Cost Management + Billing** > **Cost Management** > **Cost analysis**.
77-
2. Add a filter for **Pricing Model: Spot**.
78-
79-
![Example showing Spot VM filter](./media/cost-analysis-common-uses/spot-vm-filter.png)
80-
81-
The Pricing Model dimension is also used to view on demand and reservation charges.
82-
8384
## View your reservation utilization
8485

8586
After you buy a reservation, it's important to track its utilization so that you get what you paid for. For example, if you bought 10 VMs for a year and only use five of them, then essentially half of the purchase is wasted. There are two different ways to assess your utilization:
@@ -97,7 +98,7 @@ To identify how much cost is currently being wasted each month for your reservat
9798
1. Group charges by **Charge Type**.
9899
1. Review the results for `unusedreservation` values.
99100

100-
![Example showing reservation use](./media/cost-analysis-common-uses/view-reservation-cost.png)
101+
[![Example showing reservation use](./media/cost-analysis-common-uses/view-reservation-cost.png)](./media/cost-analysis-common-uses/view-reservation-cost.png#lightbox)
101102

102103
### View utilization in Reservations
103104

@@ -112,15 +113,15 @@ Support for tags applies to usage reported *after* the tag was applied to the re
112113
1. In the Azure portal, navigate to cost analysis for your scope. For example: **Cost Management + Billing** > **Cost Management** > **Cost analysis**.
113114
1. Select **Group by** for your tag.
114115

115-
![View costs for a specific tag](./media/cost-analysis-common-uses/tag.png)
116+
[![View costs for a specific tag](./media/cost-analysis-common-uses/tag.png)](./media/cost-analysis-common-uses/tag.png#lightbox)
116117

117118
## Download your usage details
118119

119120
Your usage details report file, in CSV format, provides a breakdown of all the charges that accrued towards an invoice. You can use the report to compare it to, and better understand, your invoice. Each billed charge on your invoice corresponds to broken-down charges in the usage report.
120121

121122
1. In the Azure portal, navigate to the **Usage and Charges** tab for a billing account or subscription. For example: **Cost Management + Billing** > **Billing** > **Usage + charges**.
122123
1. Select the line item to download from and then click the download symbol.
123-
![Download usage and charges](./media/cost-analysis-common-uses/download1.png)
124+
[![Download usage and charges](./media/cost-analysis-common-uses/download1.png)](./media/cost-analysis-common-uses/download1.png#lightbox)
124125
1. Select the usage file to download.
125126
![Choose a usage file to download](./media/cost-analysis-common-uses/download2.png)
126127

@@ -133,9 +134,9 @@ Costs are only shown for your active enrollment. If you transferred an enrollmen
133134

134135
1. In the Azure portal, navigate to **Cost Management + Billing** > **Overview**.
135136
1. Click **Breakdown** for the current month and view your monetary commitment burn down.
136-
![EA costs overview - breakdown summary](./media/cost-analysis-common-uses/breakdown1.png)
137+
[![EA costs overview - breakdown summary](./media/cost-analysis-common-uses/breakdown1.png)](./media/cost-analysis-common-uses/breakdown1.png#lightbox)
137138
1. Click the **Usage and Charges** tab and view the prior month's breakdown in the chosen timespan.
138-
![Usage and charges tab](./media/cost-analysis-common-uses/breakdown2.png)
139+
[![Usage and charges tab](./media/cost-analysis-common-uses/breakdown2.png)](./media/cost-analysis-common-uses/breakdown2.png#lightbox)
139140

140141
## View enrollment monthly cost by term
141142

@@ -147,7 +148,7 @@ Use a graphical view of your enrollment's monthly costs to understand the cost t
147148

148149
You can group by and filter your data for a more detailed analysis.
149150

150-
![Monthly enrollment cost by term](./media/cost-analysis-common-uses/enrollment-term1.png)
151+
[![Monthly enrollment cost by term](./media/cost-analysis-common-uses/enrollment-term1.png)](./media/cost-analysis-common-uses/enrollment-term1.png#lightbox)
151152

152153
## View EA enrollment accumulated costs
153154

@@ -156,7 +157,7 @@ View the net accumulated charges over time to understand overall expenditures fo
156157
1. In the Azure portal, navigate to cost analysis for your scope. For example: **Cost Management + Billing** > **Cost Management** > **Cost analysis**.
157158
1. Select your enrollment and then view your current accumulated costs.
158159

159-
![Enrollment accumulated costs](./media/cost-analysis-common-uses/cost-analysis-enrollment.png)
160+
[![Enrollment accumulated costs](./media/cost-analysis-common-uses/cost-analysis-enrollment.png)](./media/cost-analysis-common-uses/cost-analysis-enrollment.png#lightbox)
160161

161162
## Next steps
162163
- If you haven't already completed the first quickstart for Cost Management, read it at [Start analyzing costs](quick-acm-cost-analysis.md).

articles/cost-management-billing/manage/review-service-usage-api.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ title: Review Azure service resource usage with REST API
33
description: Learn how to use Azure REST APIs to review Azure service resource usage.
44
author: lleonard-msft
55
ms.service: cost-management-billing
6-
ms.topic: article
7-
ms.date: 02/12/2020
6+
ms.topic: reference
7+
ms.date: 03/31/2020
88
ms.author: banders
99

1010
# As an administrator or developer, I want to use REST APIs to review resource and service usage data under my control.
@@ -30,7 +30,9 @@ Content-Type: application/json
3030
Authorization: Bearer
3131
```
3232

33-
The `{subscriptionGuid}` parameter is required and should contain a subscription ID that can be read using the credentials provided in the API token. The `{reportName}`
33+
The `{subscriptionGuid}` parameter is required and should contain a subscription ID that can be read using the credentials provided in the API token.
34+
35+
The `{reportName}` parameter specifies the name of the report. To get a list of report names, you can use the Reports_List operation to get a list: `/subscriptions/{subscriptionId}/providers/Microsoft.CostManagement/reports`. View example output on [GitHub](https://github.com/Azure/azure-rest-api-specs/blob/master/specification/cost-management/resource-manager/Microsoft.CostManagement/preview/2018-08-01-preview/examples/ReportList.json).
3436

3537
The following headers are required:
3638

articles/event-hubs/authenticate-shared-access-signature.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ This article covers authenticating the access to Event Hubs resources using SAS.
2929
3030

3131
## Configuring for SAS authentication
32-
You can configure the EventHubs shared access authorization rule on an Event Hubs namespace, or an entity (event hub instance or Kafka Topic in an Event Hubs for Kafka enabled namespace). Configuring a shared access authorization rule on a consumer group is currently not supported, but you can use rules configured on a namespace or entity to secure access to consumer group.
32+
You can configure the EventHubs shared access authorization rule on an Event Hubs namespace, or an entity (event hub instance or Kafka Topic in an event hub). Configuring a shared access authorization rule on a consumer group is currently not supported, but you can use rules configured on a namespace or entity to secure access to consumer group.
3333

3434
The following image shows how the authorization rules apply on sample entities.
3535

articles/event-hubs/event-hubs-kafka-akka-streams-tutorial.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Using Akka Streams for Apache Kafka - Azure Event Hubs| Microsoft Docs
3-
description: This article provides information on how to connect Akka Streams to an Apache Kafka enabled Azure event hub.
3+
description: This article provides information on how to connect Akka Streams to an Azure event hub.
44
services: event-hubs
55
documentationcenter: ''
66
author: ShubhaVijayasarathy
@@ -46,7 +46,7 @@ To complete this tutorial, make sure you have the following prerequisites:
4646

4747
## Create an Event Hubs namespace
4848

49-
An Event Hubs namespace is required to send or receive from any Event Hubs service. See [Create Kafka Enabled Event Hubs](event-hubs-create.md) for information about getting an Event Hubs Kafka endpoint. Make sure to copy the Event Hubs connection string for later use.
49+
An Event Hubs namespace is required to send or receive from any Event Hubs service. See [Create an event hub](event-hubs-create.md) for detailed information. Make sure to copy the Event Hubs connection string for later use.
5050

5151
## Clone the example project
5252

articles/event-hubs/event-hubs-kafka-connect-tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ To complete this walkthrough, make sure you have the following prerequisites:
4040
- Read through the [Event Hubs for Apache Kafka](https://docs.microsoft.com/azure/event-hubs/event-hubs-for-kafka-ecosystem-overview) introduction article
4141

4242
## Create an Event Hubs namespace
43-
An Event Hubs namespace is required to send and receive from any Event Hubs service. See [Creating a Kafka enabled Event Hub](event-hubs-create.md) for instructions on getting an Event Hubs Kafka endpoint. Get the Event Hubs connection string and fully qualified domain name (FQDN) for later use. For instructions, see [Get an Event Hubs connection string](event-hubs-get-connection-string.md).
43+
An Event Hubs namespace is required to send and receive from any Event Hubs service. See [Creating an event hub](event-hubs-create.md) for instructions to create a namespace and an event hub. Get the Event Hubs connection string and fully qualified domain name (FQDN) for later use. For instructions, see [Get an Event Hubs connection string](event-hubs-get-connection-string.md).
4444

4545
## Clone the example project
4646
Clone the Azure Event Hubs repository and navigate to the tutorials/connect subfolder:

0 commit comments

Comments
 (0)