Skip to content

Commit 96226ad

Browse files
authored
Merge branch 'MicrosoftDocs:main' into patch-4
2 parents d41d5d6 + 8de1108 commit 96226ad

28 files changed

+431
-193
lines changed

articles/ai-services/language-service/personally-identifiable-information/concepts/conversations-entity-categories.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ ms.custom: language-service-pii, build-2024
1616

1717
Use this article to find the entity categories that can be returned by the [conversational PII detection feature](../how-to-call-for-conversations.md). This feature runs a predictive model to identify, categorize, and redact sensitive information from an input conversation.
1818

19-
The PII preview feature includes the ability to detect personal (`PII`) information from conversations.
20-
2119
## Entity categories
2220

2321
The following entity categories are returned when you're sending API requests PII feature.

articles/ai-services/language-service/personally-identifiable-information/how-to-call-for-conversations.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ By default, this feature will use the latest available AI model on your input. Y
2626

2727
### Language support
2828

29-
Currently the conversational PII preview API only supports English language.
29+
See the [PII Language Support page](language-support.md) for more details. Currently the conversational PII GA model only supports the English language. The preview model and API support the [same list languages](../concepts/language-support.md) as the other Language services.
3030

3131
### Region support
3232

33-
Currently the conversational PII preview API supports all Azure regions supported by the Language service.
33+
The conversational PII API supports all Azure regions supported by the Language service.
3434

3535
## Submitting data
3636

@@ -82,7 +82,7 @@ When you get results from PII detection, you can stream the results to an applic
8282
Use the following example if you have conversations transcribed using the Speech service's [speech to text](../../Speech-Service/speech-to-text.md) feature:
8383

8484
```bash
85-
curl -i -X POST https://your-language-endpoint-here/language/analyze-conversations/jobs?api-version=2022-05-15-preview \
85+
curl -i -X POST https://your-language-endpoint-here/language/analyze-conversations/jobs?api-version=2024-05-01 \
8686
-H "Content-Type: application/json" \
8787
-H "Ocp-Apim-Subscription-Key: your-key-here" \
8888
-d \
@@ -195,7 +195,7 @@ curl -i -X POST https://your-language-endpoint-here/language/analyze-conversatio
195195
"taskName": "analyze 1",
196196
"kind": "ConversationalPIITask",
197197
"parameters": {
198-
"modelVersion": "2022-05-15-preview",
198+
"modelVersion": "2023-04-15-preview",
199199
"redactionSource": "text",
200200
"includeAudioRedaction": true,
201201
"piiCategories": [
@@ -213,7 +213,7 @@ curl -i -X POST https://your-language-endpoint-here/language/analyze-conversatio
213213
Use the following example if you have conversations that originated in text. For example, conversations through a text-based chat client.
214214
215215
```bash
216-
curl -i -X POST https://your-language-endpoint-here/language/analyze-conversations/jobs?api-version=2022-05-15-preview \
216+
curl -i -X POST https://your-language-endpoint-here/language/analyze-conversations/jobs?api-version=2024-05-01 \
217217
-H "Content-Type: application/json" \
218218
-H "Ocp-Apim-Subscription-Key: your-key-here" \
219219
-d \
@@ -251,7 +251,7 @@ curl -i -X POST https://your-language-endpoint-here/language/analyze-conversatio
251251
"taskName": "analyze 1",
252252
"kind": "ConversationalPIITask",
253253
"parameters": {
254-
"modelVersion": "2022-05-15-preview"
254+
"modelVersion": "2023-04-15-preview"
255255
}
256256
}
257257
]

articles/ai-services/language-service/personally-identifiable-information/language-support.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ Use this article to learn which natural languages are supported by the PII and c
102102
|Chinese-Simplified |`zh-hans` |`zh` also accepted|
103103
|Chinese-Traditional |`zh-hant` | |
104104

105-
# [PII for conversations (preview)](#tab/conversations)
105+
# [PII for conversations](#tab/conversations)
106106

107107
## PII language support
108108

articles/azure-arc/resource-bridge/overview.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,6 @@ The following private cloud environments and their versions are officially suppo
131131

132132
### Supported versions
133133

134-
The minimum supported version of Arc resource bridge is 1.0.15.
135-
136134
Generally, the latest released version and the previous three versions (n-3) of Arc resource bridge are supported. For example, if the current version is 1.0.18, then the typical n-3 supported versions are:
137135

138136
* Current version: 1.0.18

articles/azure-monitor/app/azure-ad-authentication.md

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ The following Software Development Kits (SDKs) and features are unsupported for
3333
Microsoft Entra authentication is only available for Application Insights Java Agent greater than or equal to 3.2.0.
3434
- [ApplicationInsights JavaScript web SDK](javascript.md).
3535
- [Application Insights OpenCensus Python SDK](/previous-versions/azure/azure-monitor/app/opencensus-python) with Python version 3.4 and 3.5.
36-
- On-by-default [autoinstrumentation/codeless monitoring](codeless-overview.md) (for languages) for Azure App Service, Azure Virtual Machines/Azure Virtual Machine Scale Sets, and Azure Functions.
36+
- [AutoInstrumentation for Python on Azure App Service](azure-web-apps-python.md)
3737
- [Profiler](profiler-overview.md).
3838

3939
<a name='configure-and-enable-azure-ad-based-authentication'></a>
@@ -93,10 +93,24 @@ services.AddApplicationInsightsTelemetry(new ApplicationInsightsServiceOptions
9393
ConnectionString = "InstrumentationKey=00000000-0000-0000-0000-000000000000;IngestionEndpoint=https://xxxx.applicationinsights.azure.com/"
9494
});
9595
```
96+
#### Environment variable configuration
9697

97-
### [Node.js](#tab/nodejs)
98+
Use the `APPLICATIONINSIGHTS_AUTHENTICATION_STRING` environment variable to let Application Insights authenticate to Microsoft Entra ID and send telemetry when using [Azure App Services autoinstrumentation](./azure-web-apps-net-core.md).
99+
100+
- For system-assigned identity:
98101

102+
| App setting | Value |
103+
| -------------- |--------- |
104+
| APPLICATIONINSIGHTS_AUTHENTICATION_STRING | `Authorization=AAD` |
99105

106+
- For user-assigned identity:
107+
108+
| App setting | Value |
109+
| ------------- | -------- |
110+
| APPLICATIONINSIGHTS_AUTHENTICATION_STRING | `Authorization=AAD;ClientId={Client id of the User-Assigned Identity}` |
111+
112+
113+
### [Node.js](#tab/nodejs)
100114

101115
Azure Monitor OpenTelemetry and Application Insights Node.JS supports the credential classes provided by [Azure Identity](https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/identity/identity#credential-classes).
102116

-4.5 KB
Loading
-13.5 KB
Loading
-5.77 KB
Loading
-12.9 KB
Loading

articles/search/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@
322322
href: vector-search-how-to-index-binary-data.md
323323
- name: Query vectors
324324
href: vector-search-how-to-query.md
325-
- name: Filter vectors
325+
- name: Add filters to a vector query
326326
href: vector-search-filters.md
327327
- name: Vector quotas and limits
328328
href: vector-search-index-size.md

0 commit comments

Comments
 (0)