Skip to content

Commit 09981be

Browse files
authored
Merge branch 'main' into patch-49
2 parents 53cc9f9 + 0305e34 commit 09981be

16 files changed

+48
-29
lines changed

articles/ai-services/openai/how-to/deployment-types.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ Our global deployments will be the first location for all new models and feature
2929
Azure OpenAI offers three types of deployments. These provide a varied level of capabilities that provide trade-offs on: throughput, SLAs, and price. Below is a summary of the options followed by a deeper description of each.
3030

3131
| **Offering** | **Global-Standard** <sup>**1**</sup> | **Standard** | **Provisioned** |
32-
|---|---|---|---|
32+
|---|:---|:---|:---|
3333
| **Best suited for** | Applications that don’t require data residency. Recommended starting place for customers. | For customers with data residency requirements. Optimized for low to medium volume. | Real-time scoring for large consistent volume. Includes the highest commitments and limits.|
3434
| **How it works** | Traffic may be routed anywhere in the world | | |
3535
| **Getting started** | [Model deployment](./create-resource.md) | [Model deployment](./create-resource.md) | [Provisioned onboarding](./provisioned-throughput-onboarding.md) |
3636
| **Cost** | [Baseline](https://azure.microsoft.com/pricing/details/cognitive-services/openai-service/) | [Regional Pricing](https://azure.microsoft.com/pricing/details/cognitive-services/openai-service/) | May experience cost savings for consistent usage |
3737
| **What you get** | Easy access to all new models with highest default pay-per-call limits.<br><br> Customers with high volume usage may see higher latency variability | Easy access with [SLA on availability](https://azure.microsoft.com/support/legal/sla/). Optimized for low to medium volume workloads with high burstiness. <br><br>Customers with high consistent volume may experience greater latency variability. | Regional access with very high & predictable throughput. Determine throughput per PTU using the provided [capacity calculator](./provisioned-throughput-onboarding.md#estimate-provisioned-throughput-and-cost) |
38-
| **What you don’t get** | Data residency guarantees | High volume w/consistent low latency | Pay-per-call flexibility |
38+
| **What you don’t get** | Data residency guarantees | High volume w/consistent low latency | Pay-per-call flexibility |
3939
| **Per-call Latency** | Optimized for real-time calling & low to medium volume usage. Customers with high volume usage may see higher latency variability. Threshold set per model | Optimized for real-time calling & low to medium volume usage. Customers with high volume usage may see higher latency variability. Threshold set per model | Optimized for real-time. |
4040
| **Sku Name in code** | `GlobalStandard` | `Standard` | `ProvisionedManaged` |
4141
| **Billing model** | Pay-per-token | Pay-per-token | Monthly Commitments |

articles/azure-monitor/logs/cost-logs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ The following [standard columns](log-standard-columns.md) are common to all tabl
4444

4545
### Excluded tables
4646

47-
Some tables are free from data ingestion charges altogether, including [AzureActivity](/azure/azure-monitor/reference/tables/azureactivity), [Heartbeat](/azure/azure-monitor/reference/tables/heartbeat), [Usage](/azure/azure-monitor/reference/tables/usage), and [Operation](/azure/azure-monitor/reference/tables/operation). This information will always be indicated by the [_IsBillable](log-standard-columns.md#_isbillable) column, which indicates whether a record was excluded from billing for data ingestion, retention and archive.
47+
Some tables are free from data ingestion charges altogether, including, for example, [AzureActivity](/azure/azure-monitor/reference/tables/azureactivity), [Heartbeat](/azure/azure-monitor/reference/tables/heartbeat), [Usage](/azure/azure-monitor/reference/tables/usage), and [Operation](/azure/azure-monitor/reference/tables/operation). This information will always be indicated by the [_IsBillable](log-standard-columns.md#_isbillable) column, which indicates whether a record was excluded from billing for data ingestion, retention and archive.
4848

4949
### Charges for other solutions and services
5050

articles/communication-services/how-tos/telephony/domain-validation.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: boris-bazilevskiy
66

77
ms.service: azure-communication-services
88
ms.subservice: pstn
9-
ms.date: 10/02/2023
9+
ms.date: 05/23/2024
1010
ms.topic: how-to
1111
ms.custom: include file
1212
ms.author: nikuklic
@@ -23,8 +23,7 @@ To use direct routing in Azure Communication Services, you need to validate that
2323
When you're verifying the ownership of the SBC FQDN, keep in mind that the `*.onmicrosoft.com` and `*.azure.com` domain names aren't supported. For example, if you have two domain names, `contoso.com` and `contoso.onmicrosoft.com`, use `sbc.contoso.com` as the SBC name.
2424

2525
Validating domain part makes sense if you plan to add multiple SBCs from the same domain name space. For example if you're using `sbc-eu.contoso.com`, `sbc-us.contoso.com`, and `sbc-af.contoso.com` you can validate `contoso.com` domain once and add SBCs from that domain later without extra validation.
26-
Validating entire FQDN is helpful if you're a service provider and don't want to validate your base domain ownership with every customer. For example if you're running SBCs `customer1.Azure Communication Services.adatum.biz`, `customer2.Azure Communication Services.adatum.biz`, and `customer3.Azure Communication Services.adatum.biz`, you don't need to validate `acs.adatum.biz` for every Communication resource, instead you validate the entire FQDN each time. This option provides more granular security approach.
27-
26+
Validating entire FQDN is helpful if you're a service provider and don't want to validate your base domain ownership with every customer. In that case, you must validate base domain only in resource you control. For example if you're running SBCs `customer1.acs.adatum.biz`, `customer2.acs.adatum.biz`, and `customer3.acs.adatum.biz`, you don't need to validate `acs.adatum.biz` for every Communication resource, instead you validate `acs.adatum.biz` in your resource (resource you own), and your customers validate the entire FQDN as a domain name in their resources. This option provides more granular security approach.
2827

2928
## Add a new domain name
3029

articles/container-apps/java-config-server-usage.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
2-
title: Configure settings for the Spring Cloud Configure Server component in Azure Container Apps (preview)
2+
title: Configure settings for the Spring Cloud Config Server component in Azure Container Apps (preview)
33
description: Learn how to configure a Spring Cloud Config Server component for your container app.
44
services: container-apps
55
author: craigshoemaker
66
ms.service: container-apps
77
ms.custom: devx-track-azurecli
88
ms.topic: how-to
9-
ms.date: 03/13/2024
9+
ms.date: 05/23/2024
1010
ms.author: cshoe
1111
---
1212

articles/dms/migrate-azure-mysql-consistent-backup.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@ With this feature, we don't take a read lock on the server. We instead read tabl
2828
:::image type="content" source="media/migrate-azure-mysql-consistent-backup/reconciliation-tab.png" alt-text="MySQL to Azure Database for MySQL Data Migration Wizard - Reconciliation progress." lightbox="media/migrate-azure-mysql-consistent-backup/reconciliation-tab.png":::
2929

3030
Key features of Consistent Snapshot without locks:
31-
*Ability to support heavy workload servers or servers with long-running transactions without the need for read locks.
32-
*Resilient in completing migrations even in the event of failures caused by transient network/server blips that result in loss of all the precreated connections.
31+
32+
* Ability to support heavy workload servers or servers with long-running transactions without the need for read locks.
33+
* Resilient in completing migrations even in the event of failures caused by transient network/server blips that result in loss of all the pre-created connections.
3334

3435
### Enable Consistent Snapshot with read lock (GA)
3536

articles/hdinsight/hadoop/apache-hadoop-use-hive-dotnet-sdk.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Learn how to submit Apache Hadoop jobs to Azure HDInsight Apache Ha
44
ms.service: hdinsight
55
ms.topic: how-to
66
ms.custom: hdinsightactive, devx-track-csharp, devx-track-dotnet
7-
ms.date: 05/23/2023
7+
ms.date: 05/23/2024
88
---
99

1010
# Run Apache Hive queries using HDInsight .NET SDK

articles/hdinsight/hdinsight-hadoop-manage-ambari.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Learn how to use Apache Ambari UI to monitor and manage HDInsight c
44
ms.service: hdinsight
55
ms.topic: how-to
66
ms.custom: hdinsightactive
7-
ms.date: 04/25/2023
7+
ms.date: 05/23/2024
88
---
99

1010
# Manage HDInsight clusters by using the Apache Ambari Web UI

articles/hdinsight/hdinsight-restrict-outbound-traffic.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Configure outbound network traffic restriction - Azure HDInsight
33
description: Learn how to configure outbound network traffic restriction for Azure HDInsight clusters.
44
ms.service: hdinsight
55
ms.topic: how-to
6-
ms.date: 04/24/2023
6+
ms.date: 05/23/2024
77
---
88

99
# Configure outbound network traffic for Azure HDInsight clusters using Firewall
@@ -26,7 +26,7 @@ A summary of the steps to lock down egress from your existing HDInsight with Azu
2626

2727
1. Create a subnet.
2828
1. Create a firewall.
29-
1. Add application rules to the firewall.
29+
1. `Add application` rules to the firewall.
3030
1. Add network rules to the firewall.
3131
1. Create a routing table.
3232

@@ -66,7 +66,7 @@ Create an application rule collection that allows the cluster to send and receiv
6666

6767
**Target FQDNs section**
6868

69-
| Name | Source addresses | Protocol:Port | Target FQDNS | Notes |
69+
| Name | Source addresses | Protocol: Port | Target FQDNS | Notes |
7070
| --- | --- | --- | --- | --- |
7171
| Rule_2 | * | https:443 | login.windows.net | Allows Windows login activity |
7272
| Rule_3 | * | https:443 | login.microsoftonline.com | Allows Windows login activity |
@@ -81,9 +81,9 @@ Create an application rule collection that allows the cluster to send and receiv
8181

8282
Create the network rules to correctly configure your HDInsight cluster.
8383

84-
1. Continuing from the prior step, navigate to **Network rule collection** > **+ Add network rule collection**.
84+
1. Continuing from the prior step, navigate to **Network rule collection** > `+ Add network rule collection`.
8585

86-
1. On the **Add network rule collection** screen, provide the following information:
86+
1. On the `Add network rule collection` screen, provide the following information:
8787

8888
**Top section**
8989

@@ -97,7 +97,7 @@ Create the network rules to correctly configure your HDInsight cluster.
9797

9898
| Name | Protocol | Source Addresses | Service Tags | Destination Ports | Notes |
9999
| --- | --- | --- | --- | --- | --- |
100-
| Rule_6 | TCP | * | SQL | 1433 , 11000-11999 | If you are using the default sql servers provided by HDInsight, configure a network rule in the Service Tags section for SQL that will allow you to log and audit SQL traffic. Unless you configured Service Endpoints for SQL Server on the HDInsight subnet, which will bypass the firewall. If you are using custom SQL server for Ambari, Oozie, Ranger and Hive metastores then you only need to allow the traffic to your own custom SQL Servers. Refer to [Azure SQL Database and Azure Synapse Analytics connectivity architecture](/azure/azure-sql/database/connectivity-architecture) to see why 11000-11999 port range is also needed in addition to 1433. |
100+
| Rule_6 | TCP | * | SQL | 1433, 11000-11999 | If you are using the default sql servers provided by HDInsight, configure a network rule in the Service Tags section for SQL that will allow you to log and audit SQL traffic. Unless you configured Service Endpoints for SQL Server on the HDInsight subnet, which will bypass the firewall. If you are using custom SQL server for Ambari, Oozie, Ranger and Hive metastore then you only need to allow the traffic to your own custom SQL Servers. Refer to [Azure SQL Database and Azure Synapse Analytics connectivity architecture](/azure/azure-sql/database/connectivity-architecture) to see why 11000-11999 port range is also needed in addition to 1433. |
101101
| Rule_7 | TCP | * | Azure Monitor | * | (optional) Customers who plan to use auto scale feature should add this rule. |
102102

103103
:::image type="content" source="./media/hdinsight-restrict-outbound-traffic/hdinsight-restrict-outbound-traffic-add-network-rule-collection.png" alt-text="Title: Enter application rule collection.":::

articles/hdinsight/hdinsight-rotate-storage-keys.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Update Azure Storage account access key in Azure HDInsight
33
description: Learn how to update Azure Storage account access key in Azure HDInsight cluster.
44
ms.service: hdinsight
55
ms.topic: how-to
6-
ms.date: 04/26/2023
6+
ms.date: 05/23/2024
77
---
88

99
# Update Azure storage account access keys in HDInsight cluster

articles/mysql/migrate/migrate-single-flexible-in-place-auto-migration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ The in-place migration provides a highly resilient and self-healing offline migr
3030
3131
## Eligibility
3232

33-
If you own a Single Server workload with Basic, General Purpose or Memory Optimized SKU, data storage used <= 20 GiB and no complex features (CMK, Microsoft Entra ID, Read Replica, Private Link) enabled, you can now nominate yourself (if not already scheduled by the service) for automigration by submitting your server details through this [form](https://forms.office.com/Pages/ResponsePage.aspx?id=v4j5cvGGr0GRqy180BHbR4lhLelkCklCuumNujnaQ-ZUQzRKSVBBV0VXTFRMSDFKSUtLUDlaNTA5Wi4u).
33+
If you own a Single Server workload with data storage used <= 100 GiB and no complex features (CMK, Microsoft Entra ID, Read Replica, Private Link) enabled, you can now nominate yourself (if not already scheduled by the service) for automigration by submitting your server details through this [form](https://forms.office.com/Pages/ResponsePage.aspx?id=v4j5cvGGr0GRqy180BHbR4lhLelkCklCuumNujnaQ-ZUQzRKSVBBV0VXTFRMSDFKSUtLUDlaNTA5Wi4u).
3434

3535
## Configure migration alerts and review migration schedule
3636

0 commit comments

Comments
 (0)