Skip to content

Commit 696c0ac

Browse files
committed
Merge branch 'main' into release-files-vaulted-backup
2 parents 8dcbc7d + d110040 commit 696c0ac

File tree

424 files changed

+2993
-6155
lines changed

Some content is hidden

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

424 files changed

+2993
-6155
lines changed

articles/ai-services/document-intelligence/concept-read.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ The pages collection is a list of pages within the document. Each page is repres
123123
| --- | --- | --- |
124124
|Images (JPEG/JPG, PNG, BMP, HEIF) | Each image = 1 page unit | Total images |
125125
|PDF | Each page in the PDF = 1 page unit | Total pages in the PDF |
126-
|TIFF | Each image in the TIFF = 1 page unit | Total images in the PDF |
126+
|TIFF | Each image in the TIFF = 1 page unit | Total images in the TIFF |
127127
|Word (DOCX) | Up to 3,000 characters = 1 page unit, embedded or linked images not supported | Total pages of up to 3,000 characters each |
128128
|Excel (XLSX) | Each worksheet = 1 page unit, embedded or linked images not supported | Total worksheets |
129129
|PowerPoint (PPTX) | Each slide = 1 page unit, embedded or linked images not supported | Total slides |

articles/ai-services/openai/concepts/assistants.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ title: Azure OpenAI Service Assistant API concepts
33
titleSuffix: Azure OpenAI Service
44
description: Learn about the concepts behind the Azure OpenAI Assistants API.
55
ms.topic: conceptual
6-
ms.date: 02/05/2023
6+
ms.date: 03/04/2024
7+
ms.service: azure-ai-openai
78
manager: nitinme
89
author: mrbullwinkle
910
ms.author: mbullwin

articles/ai-studio/how-to/configure-managed-network.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,7 @@ The Azure AI managed VNet feature is free. However, you're charged for the follo
322322
323323
## Limitations
324324

325+
* Azure AI Studio currently doesn't support bring your own virtual network, it only supports managed VNet isolation.
325326
* Azure AI services provisioned with Azure AI and Azure AI Search attached with Azure AI should be public.
326327
* The "Add your data" feature in the Azure AI Studio playground doesn't support private storage account.
327328
* Once you enable managed VNet isolation of your Azure AI, you can't disable it.

articles/ai-studio/how-to/create-manage-compute.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,6 @@ To create a compute instance in Azure AI Studio:
6666
- **Assign a managed identity**: You can attach system assigned or user assigned managed identities to grant access to resources. The name of the created system managed identity will be in the format `/workspace-name/computes/compute-instance-name` in your Microsoft Entra ID.
6767
- **Enable SSH access**: Enter credentials for an administrator user account that will be created on each compute node. These can be used to SSH to the compute nodes.
6868
Note that disabling SSH prevents SSH access from the public internet. When a private virtual network is used, users can still SSH from within the virtual network.
69-
- **Enable virtual network**:
70-
- If you're using an Azure Virtual Network, specify the Resource group, Virtual network, and Subnet to create the compute instance inside an Azure Virtual Network. You can also select No public IP to prevent the creation of a public IP address, which requires a private link workspace. You must also satisfy these network requirements for virtual network setup.
71-
- If you're using a managed virtual network, the compute instance is created inside the managed virtual network. You can also select No public IP to prevent the creation of a public IP address. For more information, see managed compute with a managed network.
7269

7370
1. On the **Applications** page you can add custom applications to use on your compute instance, such as RStudio or Posit Workbench. Then select **Next**.
7471
1. On the **Tags** page you can add additional information to categorize the resources you create. Then select **Review + Create** or **Next** to review your settings.

articles/aks/best-practices-cost.md

Lines changed: 108 additions & 31 deletions
Large diffs are not rendered by default.

articles/aks/concepts-sustainable-software-engineering.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ A service mesh deploys extra containers for communication, typically in a [sidec
195195

196196
Sending and storing all logs from all possible sources (workloads, services, diagnostics, and platform activity) can increase storage and network traffic, which impacts costs and carbon emissions.
197197

198-
* Make sure you're collecting and retaining only the necessary log data to support your requirements. [Configure data collection rules for your AKS workloads](../azure-monitor/containers/container-insights-data-collection-configmap.md#data-collection-settings) and implement design considerations for optimizing your Log Analytics costs.
198+
* Make sure you're collecting and retaining only the necessary log data to support your requirements. [Configure data collection rules for your AKS workloads](../azure-monitor/containers/container-insights-data-collection-configmap.md#data-collection-settings) and implement design considerations for [optimizing your Log Analytics costs](../azure-monitor/best-practices-cost.md).
199199

200200
### Cache static data
201201

articles/app-service/configure-common.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,10 @@ At runtime, connection strings are available as environment variables, prefixed
216216
* Custom: `CUSTOMCONNSTR_`
217217
* PostgreSQL: `POSTGRESQLCONNSTR_`
218218

219+
>[!Note]
220+
> .NET apps targeting PostgreSQL should set the connection string to **Custom** as workaround for a [knows issue in .NET EnvironmentVariablesConfigurationProvider](https://github.com/dotnet/runtime/issues/36123)
221+
>
222+
219223
For example, a MySQL connection string named *connectionstring1* can be accessed as the environment variable `MYSQLCONNSTR_connectionString1`. For language-stack specific steps, see:
220224

221225
- [ASP.NET Core](configure-language-dotnetcore.md#access-environment-variables)

articles/azure-monitor/app/convert-classic-resource.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,10 @@ Update-AzApplicationInsights -Name "aiName" -ResourceGroupName "rgName" -Ingesti
197197

198198
### Azure Resource Manager templates
199199

200-
This section provides templates.
200+
This section provides templates.
201+
202+
> [!CAUTION]
203+
> Ensure that you have removed all Continous Export settings from your resource before running the migration templates. See [Prerequisites](#prerequisites)
201204
202205
#### Template file
203206

articles/azure-monitor/app/java-standalone-sampling-overrides.md

Lines changed: 64 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.reviewer: mmcc
1111
# Sampling overrides (preview) - Azure Monitor Application Insights for Java
1212

1313
> [!NOTE]
14-
> The sampling overrides feature is in preview, starting from 3.0.3.
14+
> The sampling overrides feature is in GA, starting from 3.5.0.
1515
1616
Sampling overrides allow you to override the [default sampling percentage](./java-standalone-config.md#sampling),
1717
for example:
@@ -43,26 +43,22 @@ To begin, create a configuration file named *applicationinsights.json*. Save it
4343
"connectionString": "...",
4444
"sampling": {
4545
"percentage": 10
46-
},
47-
"preview": {
48-
"sampling": {
49-
"overrides": [
50-
{
51-
"telemetryType": "request",
52-
"attributes": [
53-
...
54-
],
55-
"percentage": 0
56-
},
57-
{
58-
"telemetryType": "request",
59-
"attributes": [
60-
...
61-
],
62-
"percentage": 100
63-
}
64-
]
65-
}
46+
"overrides": [
47+
{
48+
"telemetryType": "request",
49+
"attributes": [
50+
...
51+
],
52+
"percentage": 0
53+
},
54+
{
55+
"telemetryType": "request",
56+
"attributes": [
57+
...
58+
],
59+
"percentage": 100
60+
}
61+
]
6662
}
6763
}
6864
```
@@ -100,22 +96,20 @@ This example also suppresses collecting any downstream spans (dependencies) that
10096
```json
10197
{
10298
"connectionString": "...",
103-
"preview": {
104-
"sampling": {
105-
"overrides": [
106-
{
107-
"telemetryType": "request",
108-
"attributes": [
109-
{
110-
"key": "http.url",
111-
"value": "https?://[^/]+/health-check",
112-
"matchType": "regexp"
113-
}
114-
],
115-
"percentage": 0
116-
}
117-
]
118-
}
99+
"sampling": {
100+
"overrides": [
101+
{
102+
"telemetryType": "request",
103+
"attributes": [
104+
{
105+
"key": "url.path",
106+
"value": "/health-check",
107+
"matchType": "strict"
108+
}
109+
],
110+
"percentage": 0
111+
}
112+
]
119113
}
120114
}
121115
```
@@ -127,27 +121,25 @@ This example suppresses collecting telemetry for all `GET my-noisy-key` redis ca
127121
```json
128122
{
129123
"connectionString": "...",
130-
"preview": {
131-
"sampling": {
132-
"overrides": [
133-
{
134-
"telemetryType": "dependency",
135-
"attributes": [
136-
{
137-
"key": "db.system",
138-
"value": "redis",
139-
"matchType": "strict"
140-
},
141-
{
142-
"key": "db.statement",
143-
"value": "GET my-noisy-key",
144-
"matchType": "strict"
145-
}
146-
],
147-
"percentage": 0
148-
}
149-
]
150-
}
124+
"sampling": {
125+
"overrides": [
126+
{
127+
"telemetryType": "dependency",
128+
"attributes": [
129+
{
130+
"key": "db.system",
131+
"value": "redis",
132+
"matchType": "strict"
133+
},
134+
{
135+
"key": "db.statement",
136+
"value": "GET my-noisy-key",
137+
"matchType": "strict"
138+
}
139+
],
140+
"percentage": 0
141+
}
142+
]
151143
}
152144
}
153145
```
@@ -166,22 +158,20 @@ those are also collected for all '/login' requests.
166158
"sampling": {
167159
"percentage": 10
168160
},
169-
"preview": {
170-
"sampling": {
171-
"overrides": [
172-
{
173-
"telemetryType": "request",
174-
"attributes": [
175-
{
176-
"key": "http.url",
177-
"value": "https?://[^/]+/login",
178-
"matchType": "regexp"
179-
}
180-
],
181-
"percentage": 100
182-
}
183-
]
184-
}
161+
"sampling": {
162+
"overrides": [
163+
{
164+
"telemetryType": "request",
165+
"attributes": [
166+
{
167+
"key": "url.path",
168+
"value": "/login",
169+
"matchType": "strict"
170+
}
171+
],
172+
"percentage": 100
173+
}
174+
]
185175
}
186176
}
187177
```

articles/azure-monitor/app/java-standalone-telemetry-processors-examples.md

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ This section shows how to include spans for an attribute processor. The processo
2222
A match requires the span name to be equal to `spanA` or `spanB`.
2323

2424
These spans match the include properties, and the processor actions are applied:
25-
* Span1 Name: 'spanA' Attributes: {env: dev, test_request: 123, credit_card: 1234}
26-
* Span2 Name: 'spanB' Attributes: {env: dev, test_request: false}
27-
* Span3 Name: 'spanA' Attributes: {env: 1, test_request: dev, credit_card: 1234}
25+
* `Span1` Name: 'spanA' Attributes: {env: dev, test_request: 123, credit_card: 1234}
26+
* `Span2` Name: 'spanB' Attributes: {env: dev, test_request: false}
27+
* `Span3` Name: 'spanA' Attributes: {env: 1, test_request: dev, credit_card: 1234}
2828

2929
This span doesn't match the include properties, and the processor actions aren't applied:
3030
* Span4 Name: 'spanC' Attributes: {env: dev, test_request: false}
@@ -62,9 +62,9 @@ This section demonstrates how to exclude spans for an attribute processor. This
6262
A match requires the span name to be equal to `spanA` or `spanB`.
6363

6464
The following spans match the exclude properties, and the processor actions aren't applied:
65-
* Span1 Name: 'spanA' Attributes: {env: dev, test_request: 123, credit_card: 1234}
66-
* Span2 Name: 'spanB' Attributes: {env: dev, test_request: false}
67-
* Span3 Name: 'spanA' Attributes: {env: 1, test_request: dev, credit_card: 1234}
65+
* `Span1` Name: 'spanA' Attributes: {env: dev, test_request: 123, credit_card: 1234}
66+
* `Span2` Name: 'spanB' Attributes: {env: dev, test_request: false}
67+
* `Span3` Name: 'spanA' Attributes: {env: 1, test_request: dev, credit_card: 1234}
6868

6969
This span doesn't match the exclude properties, and the processor actions are applied:
7070
* Span4 Name: 'spanC' Attributes: {env: dev, test_request: false}
@@ -104,11 +104,11 @@ A match requires the following conditions to be met:
104104
* The span must have an attribute that has key `test_request`.
105105

106106
The following spans match the exclude properties, and the processor actions aren't applied.
107-
* Span1 Name: 'spanB' Attributes: {env: dev, test_request: 123, credit_card: 1234}
108-
* Span2 Name: 'spanA' Attributes: {env: dev, test_request: false}
107+
* `Span1` Name: 'spanB' Attributes: {env: dev, test_request: 123, credit_card: 1234}
108+
* `Span2` Name: 'spanA' Attributes: {env: dev, test_request: false}
109109

110110
The following span doesn't match the exclude properties, and the processor actions are applied:
111-
* Span3 Name: 'spanB' Attributes: {env: 1, test_request: dev, credit_card: 1234}
111+
* `Span3` Name: 'spanB' Attributes: {env: 1, test_request: dev, credit_card: 1234}
112112
* Span4 Name: 'spanC' Attributes: {env: dev, dev_request: false}
113113

114114

@@ -155,11 +155,11 @@ properties indicate which spans should be processed. The exclude properties filt
155155

156156
In the following configuration, these spans match the properties, and processor actions are applied:
157157

158-
* Span1 Name: 'spanB' Attributes: {env: production, test_request: 123, credit_card: 1234, redact_trace: "false"}
159-
* Span2 Name: 'spanA' Attributes: {env: staging, test_request: false, redact_trace: true}
158+
* `Span1` Name: 'spanB' Attributes: {env: production, test_request: 123, credit_card: 1234, redact_trace: "false"}
159+
* `Span2` Name: 'spanA' Attributes: {env: staging, test_request: false, redact_trace: true}
160160

161161
These spans don't match the include properties, and processor actions aren't applied:
162-
* Span3 Name: 'spanB' Attributes: {env: production, test_request: true, credit_card: 1234, redact_trace: false}
162+
* `Span3` Name: 'spanB' Attributes: {env: production, test_request: true, credit_card: 1234, redact_trace: false}
163163
* Span4 Name: 'spanC' Attributes: {env: dev, test_request: false}
164164

165165
```json
@@ -329,12 +329,12 @@ The following sample shows how to hash existing attribute values.
329329
### Extract
330330

331331
The following sample shows how to use a regular expression (regex) to create new attributes based on the value of another attribute.
332-
For example, given `http.url = http://example.com/path?queryParam1=value1,queryParam2=value2`, the following attributes are inserted:
332+
For example, given `url.path = /path?queryParam1=value1,queryParam2=value2`, the following attributes are inserted:
333333
* httpProtocol: `http`
334334
* httpDomain: `example.com`
335335
* httpPath: `path`
336336
* httpQueryParams: `queryParam1=value1,queryParam2=value2`
337-
* http.url: *no* change
337+
* url.path: *no* change
338338

339339
```json
340340
{
@@ -345,7 +345,7 @@ For example, given `http.url = http://example.com/path?queryParam1=value1,queryP
345345
"type": "attribute",
346346
"actions": [
347347
{
348-
"key": "http.url",
348+
"key": "url.path",
349349
"pattern": "^(?<httpProtocol>.*):\\/\\/(?<httpDomain>.*)\\/(?<httpPath>.*)(\\?|\\&)(?<httpQueryParams>.*)",
350350
"action": "extract"
351351
}
@@ -358,7 +358,7 @@ For example, given `http.url = http://example.com/path?queryParam1=value1,queryP
358358

359359
### Mask
360360

361-
For example, given `http.url = https://example.com/user/12345622` is updated to `http.url = https://example.com/user/****` using either of the below configurations.
361+
For example, given `url.path = https://example.com/user/12345622` is updated to `url.path = https://example.com/user/****` using either of the below configurations.
362362

363363

364364
First configuration example:
@@ -372,7 +372,7 @@ First configuration example:
372372
"type": "attribute",
373373
"actions": [
374374
{
375-
"key": "http.url",
375+
"key": "url.path",
376376
"pattern": "user\\/\\d+",
377377
"replace": "user\\/****",
378378
"action": "mask"
@@ -396,7 +396,7 @@ Second configuration example with regular expression group name:
396396
"type": "attribute",
397397
"actions": [
398398
{
399-
"key": "http.url",
399+
"key": "url.path",
400400
"pattern": "^(?<userGroupName>[a-zA-Z.:\/]+)\d+",
401401
"replace": "${userGroupName}**",
402402
"action": "mask"
@@ -407,9 +407,9 @@ Second configuration example with regular expression group name:
407407
}
408408
}
409409
```
410-
### Non-string typed attributes samples
410+
### Nonstring typed attributes samples
411411

412-
Starting 3.4.19 GA, telemetry processors support non-string typed attributes:
412+
Starting 3.4.19 GA, telemetry processors support nonstring typed attributes:
413413
`boolean`, `double`, `long`, `boolean-array`, `double-array`, `long-array`, and `string-array`.
414414

415415
When `attributes.type` is not provided in the json, it's default to `string`.
@@ -461,7 +461,7 @@ The following sample inserts the new attribute `{"newAttributeKeyStrict": "newAt
461461

462462
```
463463

464-
Additionally, non-string typed attributes support `regexp`.
464+
Additionally, nonstring typed attributes support `regexp`.
465465

466466
The following sample inserts the new attribute `{"newAttributeKeyRegexp": "newAttributeValueRegexp"}` into spans and logs where the attribute `longRegexpAttributeKey` matches the value from `400` to `499`.
467467

0 commit comments

Comments
 (0)