Skip to content

Commit 7c6def0

Browse files
TaojunshenTaojunshen
authored
Merge pull request #1013 from MicrosoftDocs/main
10/24/2024 AM Publish
2 parents f8a58ce + f3c141b commit 7c6def0

File tree

9 files changed

+144
-150
lines changed

9 files changed

+144
-150
lines changed

‎.openpublishing.redirection.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,16 @@
99
"source_path_from_root": "/articles/search/search-howto-create-indexers.md",
1010
"redirect_url": "/azure/search/search-how-to-create-indexers",
1111
"redirect_document_id": false
12+
},
13+
{
14+
"source_path_from_root": "/articles/search/search-howto-dotnet-sdk.md",
15+
"redirect_url": "/azure/search/search-how-to-dotnet-sdk",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path_from_root": "/articles/search/search-howto-index-csv-blobs.md",
20+
"redirect_url": "/azure/search/search-how-to-index-csv-blobs",
21+
"redirect_document_id": false
1222
}
1323
]
1424
}

‎articles/ai-services/computer-vision/how-to/identity-access-token.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ curl -X POST 'https://<isv-endpoint>/sts/v1.0/issueLimitedAccessToken?expiredTim
6060
-H 'Ocp-Apim-Subscription-Key: <isv-face-key>' \
6161
-H 'Content-Type: application/json' \
6262
-d '{
63-
"resourceId": "/subscriptions/<subscription-id>/resourceGroups/<resource-group-name>/providers/Microsoft.CognitiveServices/accounts/<face-resource-name>",
63+
"targetAzureResourceId": "/subscriptions/<subscription-id>/resourceGroups/<resource-group-name>/providers/Microsoft.CognitiveServices/accounts/<face-resource-name>",
6464
"featureFlags": ["Face.Identification", "Face.Verification"]
6565
}'
6666
```

‎articles/open-datasets/dataset-genomics-data-lake.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ The Genomics Data Lake is hosted in the West US 2 and West Central US Azure regi
3131
| [TCGA Open Data](dataset-the-cancer-genome-atlas.md) | TCGA Open Data |
3232
| [Pan UK-Biobank](dataset-panancestry-uk-bio-bank.md) | Pan UK-Biobank |
3333
| [ImmuneCODE database](dataset-immunecode.md) | ImmuneCODE database |
34-
| [Open Targets dataset](dataset-panancestry-uk-bio-bank.md) | Open Targets dataset |
34+
| [Open Targets dataset](dataset-open-targets.md) | Open Targets dataset |
3535

3636
## Next steps
3737

‎articles/search/search-howto-dotnet-sdk.md renamed to ‎articles/search/search-how-to-dotnet-sdk.md

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

‎articles/search/search-howto-index-csv-blobs.md renamed to ‎articles/search/search-how-to-index-csv-blobs.md

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
2-
title: Search over CSV blobs
2+
title: Search over CSV blobs using delimitedText parsing
33
titleSuffix: Azure AI Search
4-
description: Extract CSV blobs from Azure Blob Storage or Azure Files and import as search documents into Azure AI Search using the delimitedText parsing mode.
4+
description: Extract CSV blobs from Azure Blob Storage or Azure Files, and import as search documents into Azure AI Search using the delimitedText parsing mode.
55

66
manager: nitinme
77
author: HeidiSteen
@@ -11,12 +11,12 @@ ms.service: azure-ai-search
1111
ms.custom:
1212
- ignite-2023
1313
ms.topic: how-to
14-
ms.date: 01/17/2024
14+
ms.date: 10/23/2024
1515
---
1616

1717
# Index CSV blobs and files using delimitedText parsing mode
1818

19-
**Applies to**: [Blob indexers](search-howto-indexing-azure-blob-storage.md), [File indexers](search-file-storage-integration.md)
19+
**Applies to**: [Blob storage indexers](search-howto-indexing-azure-blob-storage.md), [Files indexers](search-file-storage-integration.md)
2020

2121
In Azure AI Search, indexers for Azure Blob Storage and Azure Files support a `delimitedText` parsing mode for CSV files that treats each line in the CSV as a separate search document. For example, given the following comma-delimited text, the `delimitedText` parsing mode would result in two documents in the search index:
2222

@@ -26,7 +26,7 @@ id, datePublished, tags
2626
2, 2016-07-07, "cloud,mobile"
2727
```
2828

29-
If a field inside the CSV file contains the delimeter, it should be wrapped in quotes. If the field contains a quote, it must be escaped using double quotes (`""`).
29+
If a field inside the CSV file contains the delimiter, it should be wrapped in quotes. If the field contains a quote, it must be escaped using double quotes (`""`).
3030

3131
```text
3232
id, datePublished, tags
@@ -35,9 +35,9 @@ id, datePublished, tags
3535

3636
Without the `delimitedText` parsing mode, the entire contents of the CSV file would be treated as one search document.
3737

38-
Whenever you're creating multiple search documents from a single blob, be sure to review [Indexing blobs to produce multiple search documents](search-howto-index-one-to-many-blobs.md) to understand how document key assignments work. The blob indexer is capable of finding or generating values that uniquely define each new document. Specifically, it can create a transitory `AzureSearch_DocumentKey` that generated when a blob is parsed into smaller parts, where the value is then used as the search document's key in the index.
38+
Whenever you create multiple search documents from a single blob, be sure to review [Indexing blobs to produce multiple search documents](search-howto-index-one-to-many-blobs.md) to understand how document key assignments work. The blob indexer is capable of finding or generating values that uniquely define each new document. Specifically, it can create a transitory `AzureSearch_DocumentKey` when a blob is parsed into smaller parts, where the value is then used as the search document's key in the index.
3939

40-
## Setting up CSV indexing
40+
## Set up CSV indexing
4141

4242
To index CSV blobs, create or update an indexer definition with the `delimitedText` parsing mode on a [Create Indexer](/rest/api/searchservice/indexers/create) request.
4343

@@ -51,8 +51,7 @@ Only UTF-8 encoding is supported.
5151
}
5252
```
5353

54-
`firstLineContainsHeaders` indicates that the first (nonblank) line of each blob contains headers.
55-
If blobs don't contain an initial header line, the headers should be specified in the indexer configuration:
54+
`firstLineContainsHeaders` indicates that the first (nonblank) line of each blob contains headers. If blobs don't contain an initial header line, the headers should be specified in the indexer configuration:
5655

5756
```http
5857
"parameters" : { "configuration" : { "parsingMode" : "delimitedText", "delimitedTextHeaders" : "id,datePublished,tags" } }
@@ -99,7 +98,7 @@ api-key: [admin key]
9998
}
10099
```
101100

102-
## See also
101+
## Related content
103102

104-
+ [Index data from Blob Storage](search-howto-indexing-azure-blob-storage.md)
105-
+ [Index data from File Storage](search-file-storage-integration.md)
103+
+ [Index data from Azure Blob Storage](search-howto-indexing-azure-blob-storage.md)
104+
+ [Index data from Azure Files](search-file-storage-integration.md)

‎articles/search/search-region-support.md

Lines changed: 63 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -35,105 +35,94 @@ You can create an Azure AI Search resource in any of the following Azure public
3535

3636
### Americas
3737

38-
| Region | AI integration | Semantic ranker | Availability zones |
39-
|--|--|--|--|
40-
| Brazil South​​ ​ | ✅ | ✅ | |
41-
| Canada Central​​ | ✅ | ✅ | ✅ |
42-
| Canada East​​ ​ | | ✅ | |
43-
| East US​ <sup>1</sup>| ✅ | ✅ | ✅ |
44-
| East US 2 ​ | ✅ | ✅ | ✅ |
45-
| ​Central US​​ <sup>2</sup> | ✅ | ✅ | ✅ |
46-
| North Central US​ ​ | ✅ | ✅ | |
47-
| South Central US​ <sup>1</sup>​ | ✅ | ✅ | ✅ |
48-
| West US​ ​ | ✅ | ✅ | |
49-
| West US 2​ ​ | ✅ | ✅ | ✅ |
50-
| West US 3​ <sup>1</sup>​ | ✅ | ✅ |✅ |
51-
| West Central US​ ​ | ✅ | ✅ | |
52-
53-
<sup>1</sup> Currently, this region is at full capacity and not accepting new search services.
54-
55-
<sup>2</sup> This region has capacity, but some tiers are [not available](search-sku-tier.md#region-availability-by-tier).
38+
| Region | AI integration | Semantic ranker | Availability zones | Capacity constrained |
39+
|--|--|--|--|--|
40+
| Brazil South​​ ​ | ✅ | ✅ | | |
41+
| Canada Central​​ | ✅ | ✅ | ✅ | |
42+
| Canada East​​ ​ | | ✅ | | |
43+
| East US​ | ✅ | ✅ | ✅ | |
44+
| East US 2 ​ | ✅ | ✅ | ✅ | Basic, S1 |
45+
| ​Central US​​ | ✅ | ✅ | ✅ | |
46+
| North Central US​ ​ | ✅ | ✅ | | |
47+
| South Central US​ | ✅ | ✅ | ✅ | All Tiers |
48+
| West US​ ​ | ✅ | ✅ | | |
49+
| West US 2​ ​ | ✅ | ✅ | ✅ | |
50+
| West US 3​ | ✅ | ✅ |✅ | Basic, S1 |
51+
| West Central US​ ​ | ✅ | ✅ | | |
5652

5753
### Europe
5854

59-
| Region | AI integration | Semantic ranker | Availability zones |
60-
|--|--|--|--|
61-
| North Europe​​ | ✅ | ✅ | ✅ |
62-
| West Europe​​ <sup>1, 2</sup>| ✅ | ✅ | ✅ |
63-
| France Central​​ | ✅ | ✅ | ✅ |
64-
| Germany West Central​ ​| ✅ | | ✅ |
65-
| Italy North​​ | | | ✅ |
66-
| Norway East​​ | ✅ | | ✅ |
67-
| Poland Central​​ | | | |
68-
| Spain Central <sup>2</sup> | | | ✅ |
69-
| Sweden Central​​ | ✅ | | ✅ |
70-
| Switzerland North​ | ✅ | ✅ | ✅ |
71-
| Switzerland West​ | ✅ | ✅ | ✅ |
72-
| UK South​ | ✅ | ✅ | ✅ |
73-
| UK West​ ​| | ✅ | |
74-
75-
<sup>1</sup> Currently, this region is at full capacity and not accepting new search services.
76-
77-
<sup>2</sup> This region runs on older infrastructure that has lower storage limits per partition at every tier. Choose a different region if you want [higher limits](search-limits-quotas-capacity.md#service-limits).
55+
| Region | AI integration | Semantic ranker | Availability zones | Capacity constrained |
56+
|--|--|--|--|--|
57+
| North Europe​​ | ✅ | ✅ | ✅ | |
58+
| West Europe​​ <sup>1</sup>| ✅ | ✅ | ✅ | All Tiers |
59+
| France Central​​ | ✅ | ✅ | ✅ | |
60+
| Germany West Central​ ​| ✅ | | ✅ | |
61+
| Italy North​​ | | | ✅ | |
62+
| Norway East​​ | ✅ | | ✅ | |
63+
| Poland Central​​ | | | | |
64+
| Spain Central <sup>1</sup> | | | ✅ | |
65+
| Sweden Central​​ | ✅ | | ✅ | |
66+
| Switzerland North​ | ✅ | ✅ | ✅ | |
67+
| Switzerland West​ | ✅ | ✅ | ✅ | |
68+
| UK South​ | ✅ | ✅ | ✅ | |
69+
| UK West​ ​| | ✅ | | |
7870

79-
### Middle East
71+
<sup>1</sup> This region runs on older infrastructure that has lower storage limits per partition at every tier. Choose a different region if you want [higher limits](search-limits-quotas-capacity.md#service-limits).
8072

81-
| Region | AI integration | Semantic ranker | Availability zones |
82-
|--|--|--|--|
83-
| Israel Central​ <sup>2</sup> | | | ✅ |
84-
| Qatar Central​ <sup>1, 2</sup> | | | ✅ |
85-
| UAE North​​ | ✅ | | ✅ |
73+
### Middle East
8674

87-
<sup>1</sup> Currently, this region is at full capacity and not accepting new search services.
75+
| Region | AI integration | Semantic ranker | Availability zones | Capacity constrained |
76+
|--|--|--|--|--|
77+
| Israel Central​ <sup>1</sup> | | | ✅ | |
78+
| Qatar Central​ <sup>1</sup> | | | ✅ | |
79+
| UAE North​​ | ✅ | | ✅ | |
8880

89-
<sup>2</sup> This region runs on older infrastructure that has lower storage limits per partition at every tier. Choose a different region if you want [higher limits](search-limits-quotas-capacity.md#service-limits).
81+
<sup>1</sup> This region runs on older infrastructure that has lower storage limits per partition at every tier. Choose a different region if you want [higher limits](search-limits-quotas-capacity.md#service-limits).
9082

9183
### Africa
9284

93-
| Region | AI integration | Semantic ranker | Availability zones |
94-
|--|--|--|--|
95-
| South Africa North​ | ✅ | | ✅ |
85+
| Region | AI integration | Semantic ranker | Availability zones | Capacity constrained |
86+
|--|--|--|--|--|
87+
| South Africa North​ | ✅ | | ✅ | |
9688

9789
### Asia Pacific
9890

99-
| Region | AI integration | Semantic ranker | Availability zones |
100-
|--|--|--|--|
101-
| Australia East​ ​ | ✅ | ✅ | ✅ |
102-
| Australia Southeast​​​ | | ✅ | |
103-
| East Asia​ | ✅ | ✅ | ✅ |
104-
| Southeast Asia​ ​ ​ | ✅ | ✅ | ✅ |
105-
| Central India <sup>1</sup> | ✅ | ✅ | ✅ |
91+
| Region | AI integration | Semantic ranker | Availability zones | Capacity constrained |
92+
|--|--|--|--|--|
93+
| Australia East​ ​ | ✅ | ✅ | ✅ | |
94+
| Australia Southeast​​​ | | ✅ | | |
95+
| East Asia​ | ✅ | ✅ | ✅ | |
96+
| Southeast Asia​ ​ ​ | ✅ | ✅ | ✅ | |
97+
| Central India | ✅ | ✅ | ✅ | S2, S3, S3HD, L1, L2 |
10698
| Jio India West​ ​ | ✅ | ✅ | |
107-
| South India <sup>2</sup> | | | ✅ |
108-
| Japan East <sup>1</sup> | ✅ | ✅ | ✅ |
99+
| South India <sup>1</sup> | | | ✅ |
100+
| Japan East | ✅ | ✅ | ✅ |
109101
| Japan West​ | ✅ | ✅ | |
110102
| Korea Central | ✅ | ✅ | ✅ |
111103
| Korea South​ ​ | | ✅ | |
112104

113-
<sup>1</sup> This region has capacity, but some tiers are [not available](search-sku-tier.md#region-availability-by-tier).
114-
115-
<sup>2</sup> This region runs on older infrastructure that has lower storage limits per partition at every tier. Choose a different region if you want [higher limits](search-limits-quotas-capacity.md#service-limits).
105+
<sup>1</sup> This region runs on older infrastructure that has lower storage limits per partition at every tier. Choose a different region if you want [higher limits](search-limits-quotas-capacity.md#service-limits).
116106

117107
## Azure Government regions
118108

119-
| Region | AI integration | Semantic ranker | Availability zones |
120-
|--|--|--|--|
121-
| Arizona | ✅ | ✅ | |
122-
| Texas | | | |
123-
| Virginia <sup>1</sup> | ✅ | ✅ | ✅ |
109+
| Region | AI integration | Semantic ranker | Availability zones | Capacity constrained |
110+
|--|--|--|--|--|
111+
| Arizona | ✅ | ✅ | | |
112+
| Texas | | | | |
113+
| Virginia | ✅ | ✅ | ✅ | All Tiers |
124114

125-
<sup>1</sup> Currently, this region is at full capacity and not accepting new search services.
126115

127116
## Azure operated by 21Vianet
128117

129-
| Region | AI integration | Semantic ranker | Availability zones |
130-
|--|--|--|--|
118+
| Region | AI integration | Semantic ranker | Availability zones | Capacity constrained |
119+
|--|--|--|--|--|
131120
| China East | | | |
132-
| China East 2 <sup>1</sup> | ✅ | | |
133-
| China East 3 | | | |
134-
| China North | | | |
135-
| China North 2 <sup>1</sup> | | | |
136-
| China North 3 | | ✅ | ✅ |
121+
| China East 2 <sup>1</sup> | ✅ | | | |
122+
| China East 3 | | | | |
123+
| China North | | | | |
124+
| China North 2 <sup>1</sup> | | | | |
125+
| China North 3 | | ✅ | ✅ | |
137126

138127
<sup>1</sup> This region runs on older infrastructure that has lower storage limits per partition at every tier. Choose a different region if you want [higher limits](search-limits-quotas-capacity.md#service-limits).
139128

@@ -143,4 +132,4 @@ You can create an Azure AI Search resource in any of the following Azure public
143132
- [Azure OpenAI model region availability](/azure/ai-services/openai/concepts/models#model-summary-table-and-region-availability)
144133
- [Azure AI Vision region list](/azure/ai-services/computer-vision/overview-image-analysis#region-availability)
145134
- [Availability zone region availability](/azure/reliability/availability-zones-service-support#azure-regions-with-availability-zone-support)
146-
- [Azure product by region page](https://azure.microsoft.com/explore/global-infrastructure/products-by-region/?products=search)
135+
- [Azure product by region page](https://azure.microsoft.com/explore/global-infrastructure/products-by-region/?products=search)

‎articles/search/search-sku-tier.md

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,18 +57,14 @@ The supported [regions list](search-region-support.md) provides the locations wh
5757

5858
Currently, several regions are at capacity for specific tiers and can't be used for new search services. If you use the Azure portal to create a search service, the portal excludes any region-tier combinations that aren't available.
5959

60-
| Region | Disabled tier (SKU) due to over-capacity |
61-
|--------|------------------------------------------|
62-
| Central US | S2, S3, S3HD, L1, L2 |
63-
| Central India | S2, S3, S3HD, L1, L2|
64-
| East US| All tiers|
65-
| East US 2| Basic, S1|
66-
| Japan East | S2, S3, S3HD, L1, L2 |
67-
| Qatar Central | All tiers|
68-
| South Central US | All tiers |
69-
| US Gov Virginia | All tiers |
70-
| West Europe | All tiers |
71-
| West US 3| All tiers |
60+
| Region | Disabled tier (SKU) due to over-capacity | Suggested alternative |
61+
|--------|------------------------------------------|-----------------------|
62+
| Central India | S2, S3, S3HD, L1, L2| South India |
63+
| East US 2| Basic, S1| Central US |
64+
| South Central US | All tiers | Central US |
65+
| US Gov Virginia | All tiers | US Gov Arizona |
66+
| West Europe | All tiers | Sweden Central/North Europe |
67+
| West US 3| Basic, S1 | Central US |
7268

7369
## Feature availability by tier
7470

‎articles/search/toc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ items:
252252
- name: Index plain text
253253
href: search-howto-index-plaintext-blobs.md
254254
- name: Index CSV
255-
href: search-howto-index-csv-blobs.md
255+
href: search-how-to-index-csv-blobs.md
256256
- name: Index JSON
257257
href: search-howto-index-json-blobs.md
258258
- name: Troubleshooting guidance
@@ -480,7 +480,7 @@ items:
480480
- name: Upgrade .NET libraries
481481
href: search-dotnet-sdk-migration-version-11.md
482482
- name: Develop in .NET
483-
href: search-howto-dotnet-sdk.md
483+
href: search-how-to-dotnet-sdk.md
484484
- name: Manage with Azure SDKs
485485
href: search-dotnet-mgmt-sdk-migration.md
486486
- name: Handle concurrent updates

‎articles/search/vector-search-how-to-create-index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -337,13 +337,13 @@ Vector fields are characterized by [their data type](/rest/api/searchservice/sup
337337
"retrievable": false,
338338
"stored": false,
339339
"dimensions": 1536,
340-
"vectorSearchProfile": "-vector-profile-1"
340+
"vectorSearchProfile": "vector-profile-1"
341341
}
342342
],
343343
"vectorSearch": {
344344
"algorithms": [
345345
{
346-
"name": "hsnw-1",
346+
"name": "hnsw-1",
347347
"kind": "hnsw",
348348
"hnswParameters": {
349349
"m": 4,

0 commit comments

Comments
 (0)