Skip to content

Commit f5b4c16

Browse files
authored
Merge branch 'master' into patch-2
2 parents faf68a5 + 36024ac commit f5b4c16

File tree

8 files changed

+113
-82
lines changed

8 files changed

+113
-82
lines changed

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/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/iot-hub/iot-hub-devguide-messages-read-builtin.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ By default, messages are routed to the built-in service-facing endpoint (**messa
1919
| **Partition count** | Set this property at creation to define the number of [partitions](../event-hubs/event-hubs-features.md#partitions) for device-to-cloud event ingestion. |
2020
| **Retention time** | This property specifies how long in days messages are retained by IoT Hub. The default is one day, but it can be increased to seven days. |
2121

22-
IoT Hub allows data retention in the built-in Event Hubs for a maximum of 7 days. You can set the retention time during creation of your IoT Hub. Data retention time in IoT Hub depends on your IoT hub tier and unit type. In terms of size, the built-in Event Hubs can retain messages of the maximum message size up to at least 24 hours of quota. For example, for 1 S1 unit IoT Hub provides enough storage to retain at least 400K messages of 4k size each. If your devices are sending smaller messages, they may be retained for longer (up to 7 days) depending on how much storage is consumed. We guarantee retaining the data for the specified retention time as a minimum.
22+
IoT Hub allows data retention in the built-in Event Hubs for a maximum of 7 days. You can set the retention time during creation of your IoT Hub. Data retention time in IoT Hub depends on your IoT hub tier and unit type. In terms of size, the built-in Event Hubs can retain messages of the maximum message size up to at least 24 hours of quota. For example, for 1 S1 unit IoT Hub provides enough storage to retain at least 400K messages of 4k size each. If your devices are sending smaller messages, they may be retained for longer (up to 7 days) depending on how much storage is consumed. We guarantee retaining the data for the specified retention time as a minimum. Messages will expire and will not be accessible after the retention time has passed.
2323

2424
IoT Hub also enables you to manage consumer groups on the built-in device-to-cloud receive endpoint. You can have up to 20 consumer groups for each IoT Hub.
2525

articles/load-balancer/load-balancer-standard-diagnostics.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,21 @@ For API guidance for retrieving multi-dimensional metric definitions and values,
6666

6767
### <a name = "DiagnosticScenarios"></a>Common diagnostic scenarios and recommended views
6868

69+
### Configure alerts for multi-dimensional metrics ###
70+
71+
Azure Standard Load Balancer supports easily configurable alerts for multi-dimensional metrics. Configure custom thresholds for specific metrics to trigger alerts with varying levels of severity to empower a touchless resource monitoring experience.
72+
73+
To configure alerts:
74+
1. Go to the alert sub-blade for the load balancer
75+
1. Create new alert rule
76+
1. Configure alert condition
77+
1. (Optional) Add action group for automated repair
78+
1. Assign alert severity, name and description that enables intuitive reaction
79+
80+
81+
>[!NOTE]
82+
>Alert condition configuration window will show time series for signal history. There is an option to filter this time series by dimensions such as Backend IP. This will filter the time series graph but **not** the alert itself. You cannot configure alerts for specific Backend IP addresses.
83+
6984
#### Is the data path up and available for my load balancer VIP?
7085

7186
The VIP availability metric describes the health of the data path within the region to the compute host where your VMs are located. The metric is a reflection of the health of the Azure infrastructure. You can use the metric to:

articles/marketplace/partner-center-portal/commercial-marketplace-co-sell.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.author: dsindona
66
ms.service: marketplace
77
ms.subservice: partnercenter-marketplace-publisher
88
ms.topic: conceptual
9-
ms.date: 12/06/2019
9+
ms.date: 03/31/2020
1010
---
1111

1212
# Co-sell option in Partner Center

articles/media-services/latest/limits-quotas-constraints.md

Lines changed: 5 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: Quotas and limitations in Azure Media Services v3 | Microsoft Docs
3-
description: This topic describes quotas and limitations in Microsoft Azure Media Services v3.
2+
title: Quotas and limitations in Azure Media Services
3+
description: This topic describes quotas and limitations in Microsoft Azure Media Services.
44
services: media-services
55
documentationcenter: ''
66
author: Juliako
@@ -10,61 +10,13 @@ editor: ''
1010
ms.service: media-services
1111
ms.workload:
1212
ms.topic: article
13-
ms.date: 10/17/2019
13+
ms.date: 03/31/2020
1414
ms.author: juliako
1515
---
1616

17-
# Quotas and limitations in Azure Media Services v3
17+
# Azure Media Services quotas and limitations
1818

19-
This article describes quotas and limitations in Azure Media Services v3.
20-
21-
| Resource | Default Limit |
22-
| --- | --- |
23-
| Assets per Azure Media Services account | 1,000,000|
24-
| Dynamic Manifest Filters|100|
25-
| Job inputs per Job | 50 (fixed)|
26-
| Job outputs per Job | 20 (fixed) |
27-
| Transform outputs in a Transform | 20 (fixed) |
28-
| Files per job input|10 (fixed)|
29-
| File size| In some scenarios, there is a limit on the maximum file size supported for processing in Media Services. <sup>(1)</sup> |
30-
| Jobs per Media Services account | 500,000 <sup>(2)</sup> (fixed)|
31-
| Live Events per Media Services account |5|
32-
| Media Services accounts in a single subscription | 25 (fixed) |
33-
| Live Outputs per Live Event |3 <sup>(3)</sup> |
34-
| Max Live Output duration | 25 hours |
35-
| Storage accounts | 100<sup>(4)</sup> (fixed) |
36-
| Streaming Endpoints (stopped or running) per Media Services account|2 (fixed)|
37-
| Streaming Policies | 100 <sup>(5)</sup> |
38-
| Transforms per Media Services account | 100 (fixed)|
39-
| Unique Streaming Locators associated with an Asset at one time | 100<sup>(6)</sup> (fixed) |
40-
| Options per Content Key Policy |30 |
41-
| Licenses per month for each of the DRM types on Media Services key delivery service per account|1,000,000|
42-
43-
<sup>1</sup> The maximum size supported for a single blob is currently up to 5 TB in Azure Blob Storage. Additional limits apply in Media Services based on the VM sizes that are used by the service. The size limit applies to the files that you upload and also the files that get generated as a result of Media Services processing (encoding or analyzing). If your source file is larger than 260-GB, your Job will likely fail.
44-
45-
The following table shows the limits on the media reserved units S1, S2, and S3. If your source file is larger than the limits defined in the table, your encoding job fails. If you encode 4K resolution sources of long duration, you're required to use S3 media reserved units to achieve the performance needed. If you have 4K content that's larger than the 260-GB limit on the S3 media reserved units, open a support ticket.
46-
47-
|Media reserved unit type |Maximum input size (GB)|
48-
|---|---|
49-
|S1 | 26|
50-
|S2 | 60|
51-
|S3 |260|
52-
53-
<sup>2</sup> This number includes queued, finished, active, and canceled Jobs. It does not include deleted Jobs.
54-
55-
Any Job record in your account older than 90 days will be automatically deleted, even if the total number of records is below the maximum quota.
56-
57-
<sup>3</sup> Live Outputs start on creation and stop when deleted.
58-
59-
<sup>4</sup> The storage accounts must be from the same Azure subscription.
60-
61-
<sup>5</sup> When using a custom [Streaming Policy](https://docs.microsoft.com/rest/api/media/streamingpolicies), you should design a limited set of such policies for your Media Service account, and re-use them for your StreamingLocators whenever the same encryption options and protocols are needed. You should not be creating a new Streaming Policy for each Streaming Locator.
62-
63-
<sup>6</sup> Streaming Locators are not designed for managing per-user access control. To give different access rights to individual users, use Digital Rights Management (DRM) solutions.
64-
65-
## Support ticket
66-
67-
For resources that are not fixed, you may ask for the quotas to be raised, by opening a [support ticket](https://portal.azure.com/#blade/Microsoft_Azure_Support/HelpAndSupportBlade/newsupportrequest). Include detailed information in the request on the desired quota changes, use-case scenarios, and regions required. <br/>Do **not** create additional Azure Media Services accounts in an attempt to obtain higher limits.
19+
[!INCLUDE [media-servieces-limits-quotas-constraints](../../../includes/media-servieces-limits-quotas-constraints.md)]
6820

6921
## Next steps
7022

articles/storage/blobs/TOC.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
href: storage-blobs-introduction.md
1414
- name: Quickstarts
1515
items:
16-
- name: Manage blobs without code
16+
- name: Work with blobs
1717
items:
1818
- name: Azure portal
1919
href: storage-quickstart-blobs-portal.md
@@ -23,8 +23,6 @@
2323
href: storage-quickstart-blobs-powershell.md
2424
- name: CLI
2525
href: storage-quickstart-blobs-cli.md
26-
- name: Develop with blobs
27-
items:
2826
- name: .NET
2927
items:
3028
- name: .NET (v12 SDK)

0 commit comments

Comments
 (0)