Skip to content

Commit cb9281c

Browse files
authored
Merge pull request #215647 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 289e4e4 + bad0910 commit cb9281c

File tree

8 files changed

+19
-18
lines changed

8 files changed

+19
-18
lines changed

articles/cost-management-billing/reservations/prepay-databricks-reserved-capacity.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,11 @@ Before you buy, calculate the total DBU quantity consumed for different workload
3434

3535
## Purchase Databricks commit units
3636

37-
You can buy Databricks plans in the [Azure portal](https://portal.azure.com/#blade/Microsoft_Azure_Reservations/CreateBlade/referrer/documentation/filters/%7B%22reservedResourceType%22%3A%22Databricks%22%7D). To buy reserved capacity, you must have the owner role for at least one enterprise subscription.
37+
You can buy Databricks plans in the [Azure portal](https://portal.azure.com/#blade/Microsoft_Azure_Reservations/CreateBlade/referrer/documentation/filters/%7B%22reservedResourceType%22%3A%22Databricks%22%7D). To buy reserved capacity, you must have the owner role for at least one enterprise or Microsoft Customer Agreement or an individual subscription with pay-as-you-go rates subscription, or the required role for CSP subscriptions.
3838

3939
- You must be in an Owner role for at least one Enterprise Agreement (offer numbers: MS-AZR-0017P or MS-AZR-0148P) or Microsoft Customer Agreement or an individual subscription with pay-as-you-go rates (offer numbers: MS-AZR-0003P or MS-AZR-0023P).
4040
- For Enterprise subscriptions, **Add Reserved Instances** must be enabled in the [EA portal](https://ea.azure.com/). Or, if that setting is disabled, you must be an EA Admin of the subscription to enable it. Direct EA customers can now update **Reserved Instance** setting on [Azure portal](https://portal.azure.com/#blade/Microsoft_Azure_GTM/ModernBillingMenuBlade/AllBillingScopes). Navigate to the Policies menu to change settings.
41+
- For CSP subscriptions, follow the steps in [Acquire, provision, and manage Azure reserved VM instances (RI) + server subscriptions for customers](/partner-center/azure-ri-server-subscriptions).
4142

4243

4344
**To Purchase:**

articles/cost-management-billing/reservations/prepay-sql-data-warehouse-charges.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Save on Azure Synapse Analytics (data warehousing only) charges with Azure reserved capacity
2+
title: Save on Azure Synapse Analytics - Dedicated SQL pool (formerly SQL DW) charges with Azure reserved capacity
33
description: Learn how you save costs for Azure Synapse Analytics charges with reserved capacity to save money.
44
author: bandersmsft
55
ms.reviewer: sapnakeshari
@@ -10,9 +10,9 @@ ms.date: 10/19/2021
1010
ms.author: banders
1111
---
1212

13-
# Save costs for Azure Synapse Analytics (data warehousing only) charges with reserved capacity
13+
# Save costs for Azure Synapse Analytics - Dedicated SQL pool (formerly SQL DW) charges with reserved capacity
1414

15-
You can save money with Azure Synapse Analytics (data warehousing only) by committing to a reservation for your cDWU usage for a duration of one or three years. To purchase Azure Synapse Analytics reserved capacity, you need to choose the Azure region, and term. Then, add the Azure Synapse Analytics SKU to your cart and choose the quantity of cDWU units that you want to purchase.
15+
You can save money with Azure Synapse Analytics - Dedicated SQL pool (formerly SQL DW) by committing to a reservation for your cDWU usage for a duration of one or three years. To purchase Azure Synapse Analytics reserved capacity, you need to choose the Azure region, and term. Then, add the Azure Synapse Analytics SKU to your cart and choose the quantity of cDWU units that you want to purchase.
1616

1717
When you purchase a reservation, the Azure Synapse Analytics usage that matches the reservation attributes is no longer charged at the pay-as-you go rates.
1818

articles/cost-management-billing/reservations/synapse-analytics-pre-purchase-plan.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,11 @@ For more information about available SCU tiers and pricing discounts, you'll use
3434

3535
## Purchase Synapse commit units
3636

37-
You buy Synapse plans in the [Azure portal](https://portal.azure.com). To buy a Pre-Purchase Plan, you must have the owner role for at least one enterprise subscription.
37+
You buy Synapse plans in the [Azure portal](https://portal.azure.com). To buy a Pre-Purchase Plan, you must have the owner role for at least one enterprise or Microsoft Customer Agreement or an individual subscription with pay-as-you-go rates subscription, or the required role for CSP subscriptions.
3838

3939
- You must be in an Owner role for at least one Enterprise Agreement (offer numbers: MS-AZR-0017P or MS-AZR-0148P) or Microsoft Customer Agreement or an individual subscription with pay-as-you-go rates (offer numbers: MS-AZR-0003P or MS-AZR-0023P).
4040
- For Enterprise Agreement (EA) subscriptions, the **Add Reserved Instances** option must be enabled in the [EA portal](https://ea.azure.com/). Or, if that setting is disabled, you must be an EA Admin of the subscription.
41+
- For CSP subscriptions, follow the steps in [Acquire, provision, and manage Azure reserved VM instances (RI) + server subscriptions for customers](/partner-center/azure-ri-server-subscriptions).
4142

4243
### To Purchase:
4344

articles/digital-twins/concepts-data-explorer-plugin.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,9 @@ Once the target table is created, you can use the Azure Digital Twins plugin to
134134

135135
Here's an example of a schema that might be used to represent shared data.
136136
137-
| `timestamp` | `twinId` | `modelId` | `name` | `value` | `relationshipTarget` | `relationshipID` |
138-
| --- | --- | --- | --- | --- | --- | --- |
139-
| 2021-02-01 17:24 | ConfRoomTempSensor | `dtmi:com:example:TemperatureSensor;1` | temperature | 301.0 | | |
137+
| `TimeStamp` | `SourceTimeStamp` | `TwinId` | `ModelId` | `Name` | `Value` | `RelationshipTarget` | `RelationshipID` |
138+
| --- | --- | --- | --- | --- | --- | --- | --- |
139+
| 2021-02-01 17:24 | 2021-02-01 17:11 | ConfRoomTempSensor | `dtmi:com:example:TemperatureSensor;1` | temperature | 301.0 | | |
140140
141141
Digital twin properties are stored as key-value pairs (`name, value`). `name` and `value` are stored as dynamic data types.
142142

articles/service-bus-messaging/service-bus-go-how-to-use-queues.md

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -148,10 +148,7 @@ func GetMessage(count int, client *azservicebus.Client) {
148148
}
149149
150150
for _, message := range messages {
151-
body, err := message.Body()
152-
if err != nil {
153-
panic(err)
154-
}
151+
body := message.Body
155152
fmt.Printf("%s\n", string(body))
156153
157154
err = receiver.CompleteMessage(context.TODO(), message, nil)
@@ -317,10 +314,7 @@ func GetMessage(count int, client *azservicebus.Client) {
317314
}
318315
319316
for _, message := range messages {
320-
body, err := message.Body()
321-
if err != nil {
322-
panic(err)
323-
}
317+
body := message.Body
324318
fmt.Printf("%s\n", string(body))
325319
326320
err = receiver.CompleteMessage(context.TODO(), message, nil)
@@ -430,4 +424,4 @@ go run main.go
430424
For more information, check out the following links:
431425
432426
- [Azure Service Bus SDK for Go](https://pkg.go.dev/github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus)
433-
- [Azure Service Bus SDK for Go on GitHub](https://github.com/Azure/azure-sdk-for-go/tree/main/sdk/messaging/azservicebus)
427+
- [Azure Service Bus SDK for Go on GitHub](https://github.com/Azure/azure-sdk-for-go/tree/main/sdk/messaging/azservicebus)

articles/stream-analytics/blob-storage-azure-data-lake-gen2-output.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ To receive exactly once delivery for your Blob storage or ADLS Gen2 account, you
7070

7171
### Regions Availability
7272

73-
This feature is currently supported in West Central US, Japan East and Canada Central.
73+
The feature is currently supported in West Central US, Japan East, Canada Central, Korea Central, North Europe, and South India.
7474

7575
## Blob output files
7676

articles/synapse-analytics/sql-data-warehouse/maintenance-scheduling.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@ To view the maintenance schedule that has been applied to your Synapse SQL pool,
5858

5959
A maintenance schedule can be updated or changed at any time. If the selected instance is going through an active maintenance cycle, the settings will be saved. They'll become active during the next identified maintenance period. [Learn more](../../service-health/resource-health-overview.md?toc=/azure/synapse-analytics/sql-data-warehouse/toc.json&bc=/azure/synapse-analytics/sql-data-warehouse/breadcrumb/toc.json) about monitoring your data warehouse during an active maintenance event.
6060

61+
> [!NOTE]
62+
> In case you are using DW400c or lower, you will not be able to change the maintenance schedule because DW400c and lower data warehouse tiers could complete maintenance outside of a designated maintenance window.
63+
64+
6165
## Identifying the primary and secondary windows
6266

6367
The primary and secondary windows must have separate day ranges. An example is a primary window of Tuesday–Thursday and a secondary of window of Saturday–Sunday.

articles/virtual-network/ip-services/ipv6-overview.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ The current IPv6 for Azure virtual network release has the following limitations
7575
- Forward DNS for IPv6 is supported for Azure public DNS today but Reverse DNS is not yet supported.
7676
- While it is possible to create NSG rules for IPv4 and IPv6 within the same NSG, it is not currently possible to combine an IPv4 Subnet with an IPv6 subnet in the same rule when specifying IP prefixes.
7777
- ICMPv6 is not currently supported in Network Security Groups.
78+
- Azure Virtual WAN currently supports IPv4 traffic only.
7879

7980
## Pricing
8081

0 commit comments

Comments
 (0)