Skip to content

Commit 97c4df6

Browse files
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into retry-javascript
2 parents f4d408c + fceb34f commit 97c4df6

File tree

67 files changed

+1409
-353
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+1409
-353
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/aks/howto-deploy-java-wls-app.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,7 @@ In the previous steps, you created the auxiliary image including models and WDT.
554554
555555
| Variable | Description | Example |
556556
|------------------------|--------------------------------------------|-----------------------------------------------------------------------------------------------|
557-
| `DB_CONNECTION_STRING` | The connection string of SQL server. | `jdbc:sqlserver://sqlserverforwlsaks.database.windows.net:1433;database=wlsaksquickstart0125` |
557+
| `DB_CONNECTION_STRING` | The connection string of SQL server. | `jdbc:sqlserver://server-name.database.windows.net:1433;database=wlsaksquickstart0125` |
558558
| `DB_USER` | The username to sign in to the SQL server. | `welogic@sqlserverforwlsaks` |
559559
| `DB_PASSWORD` | The password to sign in to the sQL server. | `Secret123456` |
560560
@@ -577,7 +577,7 @@ In the previous steps, you created the auxiliary image including models and WDT.
577577
In the following commands, be sure to set the variables `DB_CONNECTION_STRING`, `DB_USER`, and `DB_PASSWORD` correctly by replacing the placeholder examples with the values described in the previous steps. Be sure to enclose the value of the `DB_` variables in single quotes to prevent the shell from interfering with the values.
578578
579579
```bash
580-
export DB_CONNECTION_STRING='<example-jdbc:sqlserver://sqlserverforwlsaks.database.windows.net:1433;database=wlsaksquickstart0125>'
580+
export DB_CONNECTION_STRING='<example-jdbc:sqlserver://server-name.database.windows.net:1433;database=wlsaksquickstart0125>'
581581
export DB_USER='<example-welogic@sqlserverforwlsaks>'
582582
export DB_PASSWORD='<example-Secret123456>'
583583
export WLS_DOMAIN_NS=sample-domain1-ns

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/azure-vmware/architecture-private-clouds.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ Azure VMware Solution monitors the following conditions on the host:
153153
154154
## Backup and restore
155155

156-
Azure VMware Solution private cloud vCenter Server, NSX, and HCX Manager (if enabled) configurations are on a daily backup schedule. Open a [support request](https://rc.portal.azure.com/#create/Microsoft.Support) in the Azure portal to request restoration.
156+
Azure VMware Solution private cloud vCenter Server and HCX Manager (if enabled) configurations are on a daily backup schedule and NSX configuration is on hourly backup schedule. The backups are retained for a minimum of three days.Open a [support request](https://rc.portal.azure.com/#create/Microsoft.Support) in the Azure portal to request restoration.
157157

158158
> [!NOTE]
159159
> Restorations are intended for catastrophic situations only.

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/container-registry/buffer-gate-public-content.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ Developers of application images should ensure that their code references local
121121

122122
## Automate application image updates
123123

124-
Expanding on image import, set up an [Azure Container Registry task](container-registry-tasks-overview.md) to automate application image builds when base images are updated. An automated build task can track both [base image updates](container-registry-tasks-base-images.md) and [source code updates](container-registry-tasks-overview.md#trigger-task-on-source-code-update).
124+
Expanding on image import, set up an [Azure Container Registry task](container-registry-tasks-overview.md) to automate application image builds when base images are updated. An automated build task can track both [base image updates](container-registry-tasks-base-images.md) and [source code updates](container-registry-tasks-overview.md#trigger-a-task-on-a-source-code-update).
125125

126126
For a detailed example, see [How to consume and maintain public content with Azure Container Registry Tasks](tasks-consume-public-content.md).
127127

0 commit comments

Comments
 (0)