Skip to content

Commit cc353c3

Browse files
authored
Merge pull request #259720 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 5b7dd76 + 2bd01b9 commit cc353c3

File tree

15 files changed

+84
-65
lines changed

15 files changed

+84
-65
lines changed

articles/ai-services/openai/how-to/migration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ client = AzureOpenAI(
149149
api_key=os.getenv("AZURE_OPENAI_KEY"),
150150
api_version="2023-10-01-preview",
151151
azure_endpoint = os.getenv("AZURE_OPENAI_ENDPOINT")
152-
)
152+
)
153153

154154
deployment_name='REPLACE_WITH_YOUR_DEPLOYMENT_NAME' #This will correspond to the custom name you chose for your deployment when you deployed a model.
155155

articles/ai-services/openai/how-to/switching-endpoints.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ OpenAI uses the `model` keyword argument to specify what model to use. Azure Ope
123123
```python
124124
completion = client.completions.create(
125125
model='gpt-3.5-turbo-instruct',
126-
prompt="<prompt>)
126+
prompt="<prompt>")
127127
)
128128

129129
chat_completion = client.chat.completions.create(

articles/ai-services/translator/translator-text-apis.md

Lines changed: 58 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -519,14 +519,20 @@ public class TranslatorText {
519519

520520
```javascript
521521
const axios = require('axios').default;
522-
const { v4: uuidv4 } = require('uuid');
522+
const { v4: uuidv4 } = require('uuid');
523523

524-
let key = "<your-translator-key>";
525-
let endpoint = "https://api.cognitive.microsofttranslator.com";
524+
let key = "<your-translator-key>";
525+
let endpoint = "https://api.cognitive.microsofttranslator.com";
526526

527-
// location, also known as region.
528-
// required if you're using a multi-service or regional (not global) resource. It can be found in the Azure portal on the Keys and Endpoint page.
529-
let location = "<YOUR-RESOURCE-LOCATION>";
527+
// location, also known as region.
528+
// required if you're using a multi-service or regional (not global) resource. It can be found in the Azure portal on the Keys and Endpoint page.
529+
let location = "<YOUR-RESOURCE-LOCATION>";
530+
531+
let params = new URLSearchParams();
532+
params.append("api-version", "3.0");
533+
params.append("from", "en");
534+
params.append("to", "sw");
535+
params.append("to", "it");
530536

531537
axios({
532538
baseURL: endpoint,
@@ -539,11 +545,7 @@ axios({
539545
'Content-type': 'application/json',
540546
'X-ClientTraceId': uuidv4().toString()
541547
},
542-
params: {
543-
'api-version': '3.0',
544-
'from': 'en',
545-
'to': ['sw', 'it']
546-
},
548+
params: params,
547549
data: [{
548550
'text': 'Hello, friend! What did you do today?'
549551
}],
@@ -810,6 +812,11 @@ let endpoint = "https://api.cognitive.microsofttranslator.com";
810812
// This is required if using an Azure AI multi-service resource.
811813
let location = "<YOUR-RESOURCE-LOCATION>";
812814

815+
let params = new URLSearchParams();
816+
params.append("api-version", "3.0");
817+
params.append("to", "en");
818+
params.append("to", "it");
819+
813820
axios({
814821
baseURL: endpoint,
815822
url: '/translate',
@@ -821,10 +828,7 @@ axios({
821828
'Content-type': 'application/json',
822829
'X-ClientTraceId': uuidv4().toString()
823830
},
824-
params: {
825-
'api-version': '3.0',
826-
'to': ['en', 'it']
827-
},
831+
params: params,
828832
data: [{
829833
'text': 'Halo, rafiki! Ulifanya nini leo?'
830834
}],
@@ -1086,6 +1090,9 @@ let endpoint = "https://api.cognitive.microsofttranslator.com";
10861090
// This is required if using an Azure AI multi-service resource.
10871091
let location = "<YOUR-RESOURCE-LOCATION>";
10881092

1093+
let params = new URLSearchParams();
1094+
params.append("api-version", "3.0");
1095+
10891096
axios({
10901097
baseURL: endpoint,
10911098
url: '/detect',
@@ -1097,9 +1104,7 @@ axios({
10971104
'Content-type': 'application/json',
10981105
'X-ClientTraceId': uuidv4().toString()
10991106
},
1100-
params: {
1101-
'api-version': '3.0'
1102-
},
1107+
params: params,
11031108
data: [{
11041109
'text': 'Hallo Freund! Was hast du heute gemacht?'
11051110
}],
@@ -1365,6 +1370,11 @@ let endpoint = "https://api.cognitive.microsofttranslator.com";
13651370
// This is required if using an Azure AI multi-service resource.
13661371
let location = "<YOUR-RESOURCE-LOCATION>";
13671372

1373+
let params = new URLSearchParams();
1374+
params.append("api-version", "3.0");
1375+
params.append("to", "th");
1376+
params.append("toScript", "latn");
1377+
13681378
axios({
13691379
baseURL: endpoint,
13701380
url: '/translate',
@@ -1376,11 +1386,7 @@ axios({
13761386
'Content-type': 'application/json',
13771387
'X-ClientTraceId': uuidv4().toString()
13781388
},
1379-
params: {
1380-
'api-version': '3.0',
1381-
'to': 'th',
1382-
'toScript': 'latn'
1383-
},
1389+
params: params,
13841390
data: [{
13851391
'text': 'Hello, friend! What did you do today?'
13861392
}],
@@ -1650,6 +1656,12 @@ let endpoint = "https://api.cognitive.microsofttranslator.com";
16501656
// This is required if using an Azure AI multi-service resource.
16511657
let location = "<YOUR-RESOURCE-LOCATION>";
16521658

1659+
let params = new URLSearchParams();
1660+
params.append("api-version", "3.0");
1661+
params.append("language", "th");
1662+
params.append("fromScript", "thai");
1663+
params.append("toScript", "latn");
1664+
16531665
axios({
16541666
baseURL: endpoint,
16551667
url: '/transliterate',
@@ -1661,12 +1673,7 @@ axios({
16611673
'Content-type': 'application/json',
16621674
'X-ClientTraceId': uuidv4().toString()
16631675
},
1664-
params: {
1665-
'api-version': '3.0',
1666-
'language': 'th',
1667-
'fromScript': 'thai',
1668-
'toScript': 'latn'
1669-
},
1676+
params: params,
16701677
data: [{
16711678
'text': 'สวัสดีเพื่อน! วันนี้คุณทำอะไร'
16721679
}],
@@ -1926,6 +1933,11 @@ let endpoint = "https://api.cognitive.microsofttranslator.com";
19261933
// This is required if using an Azure AI multi-service resource.
19271934
let location = "<YOUR-RESOURCE-LOCATION>";
19281935

1936+
let params = new URLSearchParams();
1937+
params.append("api-version", "3.0");
1938+
params.append("to", "es");
1939+
params.append("includeSentenceLength", true);
1940+
19291941
axios({
19301942
baseURL: endpoint,
19311943
url: '/translate',
@@ -1937,11 +1949,7 @@ axios({
19371949
'Content-type': 'application/json',
19381950
'X-ClientTraceId': uuidv4().toString()
19391951
},
1940-
params: {
1941-
'api-version': '3.0',
1942-
'to': 'es',
1943-
'includeSentenceLength': true
1944-
},
1952+
params: params,
19451953
data: [{
19461954
'text': 'Can you tell me how to get to Penn Station? Oh, you aren\'t sure? That\'s fine.'
19471955
}],
@@ -2209,6 +2217,9 @@ let endpoint = "https://api.cognitive.microsofttranslator.com";
22092217
// This is required if using an Azure AI multi-service resource.
22102218
let location = "<YOUR-RESOURCE-LOCATION>";
22112219

2220+
let params = new URLSearchParams();
2221+
params.append("api-version", "3.0");
2222+
22122223
axios({
22132224
baseURL: endpoint,
22142225
url: '/breaksentence',
@@ -2220,9 +2231,7 @@ axios({
22202231
'Content-type': 'application/json',
22212232
'X-ClientTraceId': uuidv4().toString()
22222233
},
2223-
params: {
2224-
'api-version': '3.0'
2225-
},
2234+
params: params,
22262235
data: [{
22272236
'text': 'Can you tell me how to get to Penn Station? Oh, you aren\'t sure? That\'s fine.'
22282237
}],
@@ -2477,6 +2486,11 @@ let endpoint = "https://api.cognitive.microsofttranslator.com";
24772486
// This is required if using an Azure AI multi-service resource.
24782487
let location = "<YOUR-RESOURCE-LOCATION>";
24792488

2489+
let params = new URLSearchParams();
2490+
params.append("api-version", "3.0");
2491+
params.append("from", "en");
2492+
params.append("to", "es");
2493+
24802494
axios({
24812495
baseURL: endpoint,
24822496
url: '/dictionary/lookup',
@@ -2488,11 +2502,7 @@ axios({
24882502
'Content-type': 'application/json',
24892503
'X-ClientTraceId': uuidv4().toString()
24902504
},
2491-
params: {
2492-
'api-version': '3.0',
2493-
'from': 'en',
2494-
'to': 'es'
2495-
},
2505+
params: params,
24962506
data: [{
24972507
'text': 'sunlight'
24982508
}],
@@ -2900,6 +2910,11 @@ let endpoint = "https://api.cognitive.microsofttranslator.com";
29002910
// This is required if using an Azure AI multi-service resource.
29012911
let location = "<YOUR-RESOURCE-LOCATION>";
29022912

2913+
let params = new URLSearchParams();
2914+
params.append("api-version", "3.0");
2915+
params.append("from", "en");
2916+
params.append("to", "es");
2917+
29032918
axios({
29042919
baseURL: endpoint,
29052920
url: '/dictionary/examples',
@@ -2911,11 +2926,7 @@ axios({
29112926
'Content-type': 'application/json',
29122927
'X-ClientTraceId': uuidv4().toString()
29132928
},
2914-
params: {
2915-
'api-version': '3.0',
2916-
'from': 'en',
2917-
'to': 'es'
2918-
},
2929+
params: params,
29192930
data: [{
29202931
'text': 'sunlight',
29212932
'translation': 'luz solar'

articles/azure-monitor/containers/container-insights-troubleshoot.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@ To diagnose the problem if you can't view status information or no results are r
8888
ama-logs-windows-6drwq 1/1 Running 0 1d
8989
```
9090
91+
1. If the pods are in a running state, but there is no data in Log Analytics or data appears to only send during a certain part of the day, it might be an indication that the daily cap has been met. When this limit is met each day, data stops ingesting into the Log Analytics Workspace and resets at the reset time. For more information, see [Log Analytics Daily Cap](../../azure-monitor/logs/daily-cap.md#determine-your-daily-cap).
92+
9193
## Container insights agent ReplicaSet Pods aren't scheduled on a non-AKS cluster
9294
9395
Container insights agent ReplicaSet Pods have a dependency on the following node selectors on the worker (or agent) nodes for the scheduling:

articles/azure-monitor/essentials/data-platform-metrics.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ For a complete list of data sources that can send data to Azure Monitor Metrics,
6161
## REST API
6262
Azure Monitor provides REST APIs that allow you to get data in and out of Azure Monitor Metrics.
6363
- **Custom metrics API** - [Custom metrics](./metrics-custom-overview.md) allow you to load your own metrics into the Azure Monitor Metrics database. Those metrics can then be used by the same analysis tools that process Azure Monitor platform metrics.
64-
- **Azure Monitor Metrics REST API** - Allows you to access Azure Monitor platform metrics definitions and values. For more information, see [Azure Monitor REST API](/rest/api/monitor/). For information on how to use the API, see the [Azure monitoring REST API walkthrough](./rest-api-walkthrough.md).
64+
- **Azure Monitor Metrics REST API** - Allows you to access Azure Monitor platform metrics definitions and values. For more information, see [Azure Monitor REST API](/rest/api/monitor/metrics/list). For information on how to use the API, see the [Azure monitoring REST API walkthrough](./rest-api-walkthrough.md).
6565
- **Azure Monitor Metrics Batch REST API** - [Azure Monitor Metrics Batch API](/rest/api/monitor/metrics-batch/) is a high-volume API designed for customers with large volume metrics queries. It's similar to the existing standard Azure Monitor Metrics REST API, but provides the capability to retrieve metric data for up to 50 resource IDs in the same subscription and region in a single batch API call. This improves query throughput and reduces the risk of throttling.
6666

6767
## Security
@@ -145,6 +145,8 @@ Platform and custom metrics are stored for **93 days** with the following except
145145
146146
While platform and custom metrics are stored for 93 days, you can only query (in the **Metrics** tile) for a maximum of 30 days' worth of data on any single chart. This limitation doesn't apply to log-based metrics. If you see a blank chart or your chart displays only part of metric data, verify that the difference between start and end dates in the time picker doesn't exceed the 30-day interval. After you've selected a 30-day interval, you can [pan](./metrics-charts.md#pan) the chart to view the full retention window.
147147

148+
> [!NOTE]
149+
> Moving or renaming an Azure Resource may result in a lost of metric history for that resource.
148150
149151
### Prometheus metrics
150152
Prometheus metrics are stored for **18 months**, but a PromQL query can only span a maximum of 32 days.

articles/communication-services/quickstarts/advanced-messaging/whatsapp/connect-whatsapp-business-account.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ Get started with the Azure Communication Services Advanced Messaging, which exte
2020
- Receive inquiries from your customers for product feedback or support, price quotes, and reschedule appointments.
2121
- Send your customer's notifications like appointment reminders, product discounts, transaction receipts, and one-time passcodes.
2222

23+
## Overview
24+
25+
This document provides information about registering a WhatsApp Business Account with Azure Communication Services. This [video](https://learn.microsoft.com/_themes/docs.theme/master/en-us/_themes/global/video-embed.html?id=04c63978-6f27-4289-93d6-625d8569ee28) demonstrates the process.
26+
2327
## Prerequisites
2428

2529
- [Create Azure Communication Resource](../../create-communication-resource.md)

articles/container-apps/tutorial-ci-cd-runners-jobs.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ You can now create a job that uses to use the container image. In this section,
415415
az containerapp job create -n "$JOB_NAME" -g "$RESOURCE_GROUP" --environment "$ENVIRONMENT" `
416416
--trigger-type Event `
417417
--replica-timeout 1800 `
418-
--replica-retry-limit 1 `
418+
--replica-retry-limit 0 `
419419
--replica-completion-count 1 `
420420
--parallelism 1 `
421421
--image "$CONTAINER_REGISTRY_NAME.azurecr.io/$CONTAINER_IMAGE_NAME" `
@@ -695,7 +695,7 @@ You can run a manual job to register an offline placeholder agent. The job runs
695695
az containerapp job create -n "$PLACEHOLDER_JOB_NAME" -g "$RESOURCE_GROUP" --environment "$ENVIRONMENT" \
696696
--trigger-type Manual \
697697
--replica-timeout 300 \
698-
--replica-retry-limit 1 \
698+
--replica-retry-limit 0 \
699699
--replica-completion-count 1 \
700700
--parallelism 1 \
701701
--image "$CONTAINER_REGISTRY_NAME.azurecr.io/$CONTAINER_IMAGE_NAME" \
@@ -812,7 +812,7 @@ az containerapp job create -n "$JOB_NAME" -g "$RESOURCE_GROUP" --environment "$E
812812
--polling-interval 30 \
813813
--scale-rule-name "azure-pipelines" \
814814
--scale-rule-type "azure-pipelines" \
815-
--scale-rule-metadata "poolName=container-apps" "targetPipelinesQueueLength=1" \
815+
--scale-rule-metadata "poolName=$AZP_POOL" "targetPipelinesQueueLength=1" \
816816
--scale-rule-auth "personalAccessToken=personal-access-token" "organizationURL=organization-url" \
817817
--cpu "2.0" \
818818
--memory "4Gi" \
@@ -835,7 +835,7 @@ az containerapp job create -n "$JOB_NAME" -g "$RESOURCE_GROUP" --environment "$E
835835
--polling-interval 30 `
836836
--scale-rule-name "azure-pipelines" `
837837
--scale-rule-type "azure-pipelines" `
838-
--scale-rule-metadata "poolName=container-apps" "targetPipelinesQueueLength=1" `
838+
--scale-rule-metadata "poolName=$AZP_POOL" "targetPipelinesQueueLength=1" `
839839
--scale-rule-auth "personalAccessToken=personal-access-token" "organizationURL=organization-url" `
840840
--cpu "2.0" `
841841
--memory "4Gi" `

articles/cost-management-billing/savings-plan/savings-plan-compute-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ You can buy savings plans in the [Azure portal](https://portal.azure.com/) or wi
2222

2323
## Why buy a savings plan?
2424

25-
If you have consistent compute spend, but your use of disparate resources makes reservations infeasible, buying a savings plan gives you the ability to reduce your costs. For example, If you consistently spend at least $X every hour, but your usage comes from different resources and/or different datacenter regions, you likely can't effectively cover these costs with reservations. When you buy a savings plan, your hourly usage, up to your commitment amount, is discounted. For this usage, you no longer charged at the pay-as-you-go rates.
25+
If you have consistent compute spend, but your use of disparate resources makes reservations infeasible, buying a savings plan gives you the ability to reduce your costs. For example, if you consistently spend at least $X every hour, but your usage comes from different resources and/or different datacenter regions, you likely can't effectively cover these costs with reservations. When you buy a savings plan, your hourly usage, up to your commitment amount, is discounted. For this usage, you no longer charged at the pay-as-you-go rates.
2626

2727
## How savings plan benefits are applied
2828

@@ -107,4 +107,4 @@ If you have Azure savings plan for compute questions, contact your account team,
107107

108108
- Learn [how discounts apply to savings plans](discount-application.md).
109109
- [Trade in reservations for a savings plan](reservation-trade-in.md).
110-
- [Buy a savings plan](buy-savings-plan.md).
110+
- [Buy a savings plan](buy-savings-plan.md).

articles/machine-learning/how-to-assign-roles.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Azure Machine Learning workspaces have a five built-in roles that are available
3636
| Role | Access level |
3737
| --- | --- |
3838
| **AzureML Data Scientist** | Can perform all actions within an Azure Machine Learning workspace, except for creating or deleting compute resources and modifying the workspace itself. |
39-
| **AzureML Compute Operator** | Can create, manage and access compute resources within a workspace.|
39+
| **AzureML Compute Operator** | Can create, manage, delete, and access compute resources within a workspace.|
4040
| **Reader** | Read-only actions in the workspace. Readers can list and view assets, including [datastore](how-to-access-data.md) credentials, in a workspace. Readers can't create or update these assets. |
4141
| **Contributor** | View, create, edit, or delete (where applicable) assets in a workspace. For example, contributors can create an experiment, create or attach a compute cluster, submit a run, and deploy a web service. |
4242
| **Owner** | Full access to the workspace, including the ability to view, create, edit, or delete (where applicable) assets in a workspace. Additionally, you can change role assignments. |

articles/openshift/howto-create-private-cluster-4x.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ az aro create \
220220
```
221221

222222
> [!NOTE]
223-
> The UserDefinedRouting flag can only be used when creating clusters with `--apiserver-visibility Private` and `--ingress-visibility Private` parameters.
223+
> The UserDefinedRouting flag can only be used when creating clusters with `--apiserver-visibility Private` and `--ingress-visibility Private` parameters. Ensure you are using the latest Azure CLI. Clusters deployed with Azure CLI 2.52.0 and older will get deployed with public IPs.
224224
>
225225
226226
This User Defined Routing option prevents a public IP address from being provisioned. User Defined Routing (UDR) allows you to create custom routes in Azure to override the default system routes or to add more routes to a subnet's route table. See

0 commit comments

Comments
 (0)