Skip to content

Commit 498cb3c

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into mqtt-broker-batch2
2 parents 618e704 + 8b7e749 commit 498cb3c

File tree

15 files changed

+139
-134
lines changed

15 files changed

+139
-134
lines changed

articles/api-center/import-api-management-apis.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ This article shows two options for using the Azure CLI to add APIs to your API c
2727
After importing API definitions or APIs from API Management, you can add metadata and documentation in your API center to help stakeholders discover, understand, and consume the API.
2828

2929
> [!TIP]
30-
> You can also set up automatic synchronization of APIS from API Management to your API center. For more information, see [Link an API Management instance to synchronize APIs to your API center](synchronize-api-management-apis.md).
30+
> You can also set up automatic synchronization of APIs from API Management to your API center. For more information, see [Link an API Management instance to synchronize APIs to your API center](synchronize-api-management-apis.md).
3131
3232
## Prerequisites
3333

articles/api-management/api-management-howto-disaster-recovery-backup-restore.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ author: dlepow
77

88
ms.service: azure-api-management
99
ms.topic: how-to
10-
ms.date: 09/06/2024
10+
ms.date: 01/06/2025
1111
ms.author: danlep
1212
ms.custom: devx-track-azurepowershell
1313
---
@@ -29,7 +29,8 @@ This article shows how to automate backup and restore operations of your API Man
2929
> Each backup expires after 30 days. If you attempt to restore a backup after the 30-day expiration period has expired, the restore will fail with a `Cannot restore: backup expired` message.
3030
3131
> [!IMPORTANT]
32-
> Restore operation doesn't change custom hostname configuration of the target service. We recommend to use the same custom hostname and TLS certificate for both active and standby services, so that, after restore operation completes, the traffic can be re-directed to the standby instance by a simple DNS CNAME change.
32+
> * Backup and restore aren't supported in the [v2 service tiers](v2-service-tiers-overview.md) or in API Management instances configured with [workspaces](workspaces-overview.md).
33+
> * Restore operation doesn't change custom hostname configuration of the target service. We recommend to use the same custom hostname and TLS certificate for both active and standby services, so that, after restore operation completes, the traffic can be re-directed to the standby instance by a simple DNS CNAME change.
3334
3435

3536
[!INCLUDE [updated-for-az](~/reusable-content/ce-skilling/azure/includes/updated-for-az.md)]

articles/api-management/virtual-network-reference.md

Lines changed: 46 additions & 42 deletions
Large diffs are not rendered by default.

articles/cost-management-billing/reservations/calculate-ea-reservations-savings.md

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
---
22
title: Calculate EA reservations cost savings
33
titleSuffix: Microsoft Cost Management
4-
description: Learn how Enterprise Agreement users manually calculate their reservations savings.
4+
description: Learn how Enterprise Agreement users can manually calculate reservation savings by downloading data, preparing an Excel worksheet, and performing calculations.
55
author: bandersmsft
66
ms.reviewer: primittal
77
ms.service: cost-management-billing
88
ms.subservice: reservations
99
ms.topic: how-to
10-
ms.date: 12/06/2024
10+
ms.date: 01/13/2024
1111
ms.author: banders
12+
#customer intent: As an Enterprise Agreement user, I want to learn about manually calculating my reservations savings.
1213
---
1314

1415
# Calculate EA reservations cost savings
@@ -56,19 +57,22 @@ Because Azure usage files are in CSV format, you need to prepare the data for us
5657
:::image type="content" source="./media/calculate-ea-reservations-savings/charge-type-selection-small.png" alt-text="Screenshot showing ChargeType selection." lightbox="./media/calculate-ea-reservations-savings/charge-type-selection.png" :::
5758
8. To the right of **UnitPrice** , insert add a column and label it with a title like **TotalUsedSavings**.
5859
9. In the first cell under TotalUsedSavings, create a formula that calculates (_UnitPrice – EffectivePrice) \* Quantity_.
60+
> [!NOTE]
61+
> If the unit price is $0.00, make sure that you don’t have any [Cost Allocation rules](../costs/allocate-costs.md#current-limitations) enabled. If Cost allocation rules are enabled, the unit price isn't displayed.
62+
5963
:::image type="content" source="./media/calculate-ea-reservations-savings/total-used-savings-formula.png" alt-text="Screenshot showing the TotalUsedSavings formula." lightbox="./media/calculate-ea-reservations-savings/total-used-savings-formula.png" :::
60-
10. Copy the formula to all the other empty TotalUsedSavings cells.
61-
11. At the bottom of the TotalUsedSavings column, sum the column's values.
64+
11. Copy the formula to all the other empty TotalUsedSavings cells.
65+
12. At the bottom of the TotalUsedSavings column, sum the column's values.
6266
:::image type="content" source="./media/calculate-ea-reservations-savings/total-used-savings-summed.png" alt-text="Screenshot showing the summed values." lightbox="./media/calculate-ea-reservations-savings/total-used-savings-summed.png" :::
63-
12. Somewhere under your data, create a cell named _TotalUsedSavingsValue_. Next to it, copy the TotalUsed cell and paste it as **Values**. This step is important because the next step will change the applied filter and affect the summed total.
67+
13. Somewhere under your data, create a cell named _TotalUsedSavingsValue_. Next to it, copy the TotalUsed cell and paste it as **Values**. This step is important because the next step will change the applied filter and affect the summed total.
6468
:::image type="content" source="./media/calculate-ea-reservations-savings/paste-value-used.png" alt-text="Screenshot showing pasting the TotalUsedSavings cell as Values." lightbox="./media/calculate-ea-reservations-savings/paste-value-used.png" :::
65-
13. For the **ChargeType** column, set a filter on it to select only **UnusedReservation**. Clear any other selections.
66-
14. To the right of the TotalUsedSavings column, insert a column and label it with a title like **TotalUnused**.
67-
15. In the first cell under TotalUnused, create a formula that calculates _EffectivePrice \* Quantity_.
69+
14. For the **ChargeType** column, set a filter on it to select only **UnusedReservation**. Clear any other selections.
70+
15. To the right of the TotalUsedSavings column, insert a column and label it with a title like **TotalUnused**.
71+
16. In the first cell under TotalUnused, create a formula that calculates _EffectivePrice \* Quantity_.
6872
:::image type="content" source="./media/calculate-ea-reservations-savings/total-unused-formula.png" alt-text="Screenshot showing the TotalUnused formula." lightbox="./media/calculate-ea-reservations-savings/total-unused-formula.png" :::
69-
16. At the bottom of the TotalUnused column, sum the column's values.
70-
17. Somewhere under your data, create a cell named _TotalUnusedValue_. Next to it, copy the TotalUnused cell and paste it as **Values**.
71-
18. Under the TotalUsedSavingsValue and TotalUnusedValue cells, create a cell named _ReservationSavings_. Next to it, subtract TotalUnusedValue from TotalUsedSavingsValue. The calculation result is your reservation savings.
73+
17. At the bottom of the TotalUnused column, sum the column's values.
74+
18. Somewhere under your data, create a cell named _TotalUnusedValue_. Next to it, copy the TotalUnused cell and paste it as **Values**.
75+
19. Under the TotalUsedSavingsValue and TotalUnusedValue cells, create a cell named _ReservationSavings_. Next to it, subtract TotalUnusedValue from TotalUsedSavingsValue. The calculation result is your reservation savings.
7276
:::image type="content" source="./media/calculate-ea-reservations-savings/reservation-savings.png" alt-text="Screenshot showing the ReservationSavings calculation and final savings." lightbox="./media/calculate-ea-reservations-savings/reservation-savings.png" :::
7377

7478
If you see a negative savings value, then you likely have many unused reservations. You should review your reservation usage to maximize them. For more information, see [Optimize reservation use](manage-reserved-vm-instance.md#optimize-reservation-use).

articles/dns/private-dns-autoregistration.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: What is auto registration feature in Azure DNS private zones?
3-
description: Overview of auto registration feature in Azure DNS private zones.
2+
title: What is autoregistration feature in Azure DNS private zones?
3+
description: Overview of autoregistration feature in Azure DNS private zones.
44
services: dns
55
author: greg-lindsay
66
ms.service: azure-dns
@@ -9,19 +9,19 @@ ms.date: 06/28/2024
99
ms.author: greglin
1010
---
1111

12-
# What is the auto registration feature in Azure DNS private zones?
12+
# What is the autoregistration feature in Azure DNS private zones?
1313

14-
The Azure DNS private zones auto registration feature manages DNS records for virtual machines deployed in a virtual network. When you [link a virtual network](./private-dns-virtual-network-links.md) with a private DNS zone with this setting enabled, a DNS record gets created for each virtual machine deployed in the virtual network.
14+
The Azure DNS private zones autoregistration feature manages DNS records for virtual machines deployed in a virtual network. When you [link a virtual network](./private-dns-virtual-network-links.md) with a private DNS zone with this setting enabled, a DNS record gets created for each virtual machine deployed in the virtual network.
1515

1616
For each virtual machine, an A record and a PTR record are created. DNS records for newly deployed virtual machines are also automatically created in the linked private DNS zone. When a virtual machine gets deleted, any associated DNS records also get deleted from the private DNS zone.
1717

18-
To enable auto registration, select the checkbox for "Enable auto registration" when you create the virtual network link.
18+
To enable autoregistration, select the checkbox for "Enable auto registration" when you create the virtual network link.
1919

2020
:::image type="content" source="./media/privatedns-concepts/enable-autoregistration.png" alt-text="Screenshot of enable auto registration on add virtual network link page.":::
2121

2222
## Restrictions
2323

24-
* Auto registration works only for virtual machines. For all other resources like internal load balancers, you can create DNS records manually in the private DNS zone linked to the virtual network.
24+
* Autoregistration works only for virtual machines. For all other resources like internal load balancers, you can create DNS records manually in the private DNS zone linked to the virtual network.
2525
* DNS records are created automatically only for the primary virtual machine NIC. If your virtual machines have more than one NIC, you can manually create the DNS records for other network interfaces.
2626
* A specific virtual network can be linked to only one private DNS zone when automatic registration is enabled. You can, however, link multiple virtual networks to a single DNS zone.
2727

articles/iot-operations/troubleshoot/known-issues.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,4 +109,6 @@ kubectl delete pod aio-opc-opc.tcp-1-f95d76c54-w9v9c -n azure-iot-operations
109109
<!-- TODO: double check -->
110110
- Creating an X.509 secret in the operations experience portal results in a secret with incorrectly encoded data. To work around this issue, create the [multi-line secrets through Azure Key Vault](/azure/key-vault/secrets/multiline-secrets), then select it from the list of secrets in the operations experience portal.
111111

112-
- When connecting multiple IoT Operations instances to the same Event Grid MQTT namespace, connection failures may occur due to client ID conflicts. Client IDs are currently derived from dataflow resource names, and when using Infrastructure as Code (IaC) patterns for deployment, the generated client IDs may be identical. As a temporary workaround, add randomness to the dataflow names in your deployment templates.
112+
- When connecting multiple IoT Operations instances to the same Event Grid MQTT namespace, connection failures may occur due to client ID conflicts. Client IDs are currently derived from dataflow resource names, and when using Infrastructure as Code (IaC) patterns for deployment, the generated client IDs may be identical. As a temporary workaround, add randomness to the dataflow names in your deployment templates.
113+
114+
- When network connection is disrupted, Dataflows may encounter errors sending messages due to a mismatched producer ID. If you experience this issue, restart your Dataflows pods.

articles/service-bus-messaging/test-locally-with-service-bus-emulator.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ CONFIG_PATH="<Replace with path to Config.json file>"
213213
# SQL Edge EULA : https://go.microsoft.com/fwlink/?linkid=2139274
214214
ACCEPT_EULA="N"
215215
216-
# 3. MSSQL_SA_PASSWORD to be filled by user as per policy : https://learn.microsoft.com/sql/relational-databases/security/strong-passwords?view=sql-server-linux-ver16
216+
# 3. MSSQL_SA_PASSWORD to be filled by user as per policy
217217
MSSQL_SA_PASSWORD=""
218218
```
219219

articles/storage/blobs/data-lake-storage-use-databricks-spark.md

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: normesta
66

77
ms.service: azure-data-lake-storage
88
ms.topic: tutorial
9-
ms.date: 11/18/2024
9+
ms.date: 01/13/2025
1010
ms.author: normesta
1111
ms.reviewer: dineshm
1212
ms.custom: py-fresh-zinc
@@ -39,13 +39,11 @@ If you don't have an Azure subscription, create a [free account](https://azure.m
3939

4040
See [Tutorial: Connect to Azure Data Lake Storage](/azure/databricks/getting-started/connect-to-azure-storage) (Steps 1 through 3). After completing these steps, make sure to paste the tenant ID, app ID, and client secret values into a text file. You use them later in this tutorial.
4141

42-
## Create an Azure Databricks workspace, cluster, and notebook
42+
## Create an Azure Databricks workspace and notebook
4343

4444
1. Create an Azure Databricks workspace. See [Create an Azure Databricks workspace](/azure/databricks/getting-started/#--create-an-azure-databricks-workspace).
4545

46-
2. Create a cluster. See [Create a cluster](/azure/databricks/getting-started/quick-start#step-1-create-a-cluster).
47-
48-
3. Create a notebook. See [Create a notebook](/azure/databricks/notebooks/notebooks-manage#--create-a-notebook). Choose Python as the default language of the notebook.
46+
2. Create a notebook. See [Create a notebook](/azure/databricks/notebooks/quick-start#create-notebook). Choose Python as the default language of the notebook.
4947

5048
Keep your notebook open. You use it in the following sections.
5149

@@ -109,7 +107,7 @@ In this section, you mount your Azure Data Lake Storage cloud object storage to
109107

110108
1. In the notebook you created previously, select the **Connect** button in the upper right corner of the [notebook toolbar](/azure/databricks/notebooks/notebook-ui#--notebook-toolbar-icons-and-buttons). This button opens the compute selector. (If you've already connected your notebook to a cluster, the name of that cluster is shown in the button text rather than **Connect**).
111109

112-
1. In the cluster dropdown menu, select the cluster you previously created.
110+
1. In the cluster dropdown menu, select any cluster you've previously created.
113111

114112
1. Notice that the text in the cluster selector changes to *starting*. Wait for the cluster to finish starting and for the name of the cluster to appear in the button before continuing.
115113

@@ -293,7 +291,7 @@ In this tutorial, you:
293291

294292
- Created Azure resources, including an Azure Data Lake Storage storage account and Azure AD service principal, and assigned permissions to access the storage account.
295293

296-
- Created an Azure Databricks workspace, notebook, and compute cluster.
294+
- Created an Azure Databricks workspace and notebook.
297295

298296
- Used AzCopy to upload unstructured *.csv* flight data to the Azure Data Lake Storage storage account.
299297

0 commit comments

Comments
 (0)