Skip to content

Commit 0836ae2

Browse files
committed
fixed merge conflict
1 parent b5679d1 commit 0836ae2

File tree

3 files changed

+45
-27
lines changed

3 files changed

+45
-27
lines changed

articles/search/search-create-service-portal.md

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,30 +18,30 @@ ms.date: 07/09/2024
1818

1919
[**Azure AI Search**](search-what-is-azure-search.md) is a comprehensive information retrieval platform for the enterprise. It supports traditional search and conversational AI-driven search for "chat with your data" experiences over your proprietary content.
2020

21-
The easiest way to create a service is using the [Azure portal](https://portal.azure.com/), which is covered in this article. You can also use [Azure PowerShell](search-manage-powershell.md#create-or-delete-a-service), [Azure CLI](search-manage-azure-cli.md#create-or-delete-a-service), the [Management REST API](search-manage-rest.md#create-or-update-a-service), an [Azure Resource Manager service template](search-get-started-arm.md), a [Bicep file](search-get-started-bicep.md), or [Terraform](search-get-started-terraform.md).
21+
The easiest way to create a service is using the [Azure portal](https://portal.azure.com/), which is covered in this article.
22+
23+
You can also use [Azure PowerShell](search-manage-powershell.md#create-or-delete-a-service), [Azure CLI](search-manage-azure-cli.md#create-or-delete-a-service), the [Management REST API](search-manage-rest.md#create-or-update-a-service), an [Azure Resource Manager service template](search-get-started-arm.md), a [Bicep file](search-get-started-bicep.md), or [Terraform](search-get-started-terraform.md).
2224

2325
[![Animated GIF](./media/search-create-service-portal/AnimatedGif-AzureSearch-small.gif)](./media/search-create-service-portal/AnimatedGif-AzureSearch.gif#lightbox)
2426

2527
## Before you start
2628

27-
A few service properties are fixed for the lifetime of the service. Before you create the service, decide on a name, region, and tier.
29+
A few service properties are fixed for the lifetime of the service. Before creating the service, decide on a name, region, and tier.
2830

2931
+ [Service name](#name-the-service) becomes part of the URL endpoint. The name must be unique and it must conform to naming rules.
3032

31-
+ [Region](search-region-support.md) determines data residency and the availability of certain features. Semantic ranking, Azure AI integration, and availability zones come with region requirements. Make sure your region of choice supports the features you need.
33+
+ [Region](search-region-support.md) determines data residency and the availability of certain features. Semantic ranking and Azure AI integration come with region requirements. Make sure your region of choice supports the features you need.
3234

33-
+ [Service tier](search-sku-tier.md) (Free, Basic, Standard, and so forth) determines infrastructure, service limits, and billing. Some features aren't available on lower or specialized tiers.
35+
+ [Service tier](search-sku-tier.md) determines infrastructure, service limits, and billing. Some features aren't available on lower or specialized tiers.
3436

3537
## Subscribe (free or paid)
3638

37-
Free services have limitations, but you can complete all of the quickstarts and most tutorials, except for those featuring semantic ranking (it requires a billable service).
39+
Paid (or billable) search occurs when you choose a billable tier (Basic or higher) when creating the resource on a billable Azure subscription.
3840

39-
To try search for free, [open a free Azure account](https://azure.microsoft.com/pricing/free-trial/?WT.mc_id=A261C142F) and then create your search service by choosing the **Free** tier. You can have one free search service per Azure subscription. Free search services are intended for short-term evaluation of the product for nonproduction applications. If you want to move forward with a production application, create a new search service on a billable tier.
41+
To try Azure AI Search for free, [open a trial subscription](https://azure.microsoft.com/pricing/free-trial/?WT.mc_id=A261C142F) and then create your search service by choosing the **Free** tier. You can have one free search service per Azure subscription. Free search services are intended for short-term evaluation of the product for nonproduction applications. Generally, you can complete all of the quickstarts and most tutorials, except for those featuring semantic ranking (it requires a billable service).
4042

4143
Alternatively, you can use free credits to try out paid Azure services. With this approach, you can create your search service at **Basic** or higher to get more capacity. Your credit card is never charged unless you explicitly change your settings and ask to be charged. Another approach is to [activate Azure credits in a Visual Studio subscription](https://azure.microsoft.com/pricing/member-offers/msdn-benefits-details/?WT.mc_id=A261C142F). A Visual Studio subscription gives you credits every month you can use for paid Azure services.
4244

43-
Paid (or billable) search occurs when you choose a billable tier (Basic or higher) when creating the resource on a billable Azure subscription.
44-
4545
## Find the Azure AI Search offering
4646

4747
1. Sign in to the [Azure portal](https://portal.azure.com/).
@@ -91,7 +91,7 @@ Service name requirements:
9191
9292
Review the [supported regions list](search-region-support.md) for supported regions at the service and feature level.
9393

94-
We strongly recommend the following regions because they provide [more storage per partition](search-limits-quotas-capacity.md#service-limits), three to seven times more depending on the tier, at the same billing rate. Extra capacity applies to search services created after specific dates.
94+
<!-- We strongly recommend the following regions because they provide [more storage per partition](search-limits-quotas-capacity.md#service-limits), three to seven times more depending on the tier, at the same billing rate. Extra capacity applies to search services created after specific dates.
9595
9696
| Country | Regions providing extra capacity per partition |
9797
|---------|------------------------------------------------|
@@ -115,7 +115,7 @@ We strongly recommend the following regions because they provide [more storage p
115115
| **Asia Pacific** | East Asia, Southeast Asia​ ​ |
116116
| **Australia** | Australia East​, Australia Southeast​​ |
117117
| **Azure Government** | Texas, Arizona, Virginia |
118-
| **Azure operated by 21Vianet** | China North 3, China East 3 |
118+
| **Azure operated by 21Vianet** | China North 3, China East 3 | -->
119119

120120
<!-- ### Roll out on May 2024
121121
@@ -162,13 +162,15 @@ Some features are subject to [regional availability](search-region-support.md):
162162
+ [Availability Zones](search-reliability.md#availability-zones)
163163
+ [Azure roles for data plane operations](search-security-rbac.md) (Azure public cloud only)
164164
+ [Semantic ranker](semantic-search-overview.md)
165-
+ [Applied AI](cognitive-search-concept-intro.md)
165+
+ [Azure AI integration](cognitive-search-concept-intro.md)
166166

167-
Applied AI includes Azure AI services and Azure OpenAI, and integration is through an Azure AI multi-service account. The account must be in the same physical region as Azure AI Search. There are just a few regions that *don't* provide both.
167+
Azure AI integration refers to Azure AI services and Azure OpenAI, and integration is through an Azure AI multi-service account. The account must be in the same physical region as Azure AI Search. There are just a few regions that *don't* provide both.
168168

169169
## Choose a tier
170170

171-
Azure AI Search is offered in [multiple pricing tiers](https://azure.microsoft.com/pricing/details/search/): Free, Basic, Standard, or Storage Optimized. Each tier has its own [capacity and limits](search-limits-quotas-capacity.md). There are also several [features that are tier-dependent](search-sku-tier.md#feature-availability-by-tier).
171+
Azure AI Search is offered in [multiple pricing tiers](https://azure.microsoft.com/pricing/details/search/): Free, Basic, Standard, or Storage Optimized. Each tier has its own [capacity and limits](search-limits-quotas-capacity.md). There are also several features that are tier-dependent.
172+
173+
Review the [tier descriptions](search-sku-tier.md) for computing characteristics and feature availability.
172174

173175
Basic and Standard are the most common choices for production workloads, but many customers start with the Free service. Among the billable tiers, key differences are partition size and speed, and limits on the number of objects you can create.
174176

articles/search/search-get-started-portal-image-search.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,15 @@ Sample data consists of image files in the [azure-search-sample-data](https://gi
2727

2828
+ An [Azure AI services multiservice account](/azure/ai-services/multi-service-resource) to use for image vectorization and optical character recognition (OCR). The account must be in a region that provides Azure AI Vision multimodal embeddings.
2929

30+
<<<<<<< HEAD
3031
Currently, those regions are: EastUS, WestUS, WestUS2, NorthEurope, WestEurope, FranceCentral, SwedenCentral, SwitzerlandNorth, SoutheastAsia, KoreaCentral, AustraliaEast, JapanEast. [Check the documentation](/azure/ai-services/computer-vision/overview-image-analysis#region-availability) for an updated list.
32+
=======
33+
<<<<<<< HEAD
34+
Currently, eligible regions are: SwedenCentral, EastUS, NorthEurope, WestEurope, WestUS, SoutheastAsia, KoreaCentral, FranceCentral, AustraliaEast, WestUS2, SwitzerlandNorth, JapanEast. [Check the documentation](/azure/ai-services/computer-vision/how-to/image-retrieval) for an updated list.
35+
=======
36+
Currently, those regions are: EastUS, WestUS, WestUS2, NorthEurope, WestEurope, FranceCentral, SwedenCentral, SwitzerlandNorth, SoutheastAsia, KoreaCentral, AustraliaEast, JapanEast. [Check the documentation](/azure/ai-services/computer-vision/overview-image-analysis#region-availability) for an updated list.
37+
>>>>>>> ad5a77f176d0 (Region support page)
38+
>>>>>>> e58e47af5089 (fixed merge conflict and formatting bugs)
3139
3240
+ Azure AI Search for indexing and queries. It can be on any tier, but it must be in the same region as Azure AI services.
3341

articles/search/search-region-support.md

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.date: 07/09/2024
1313

1414
---
1515

16-
# Azure AI Search feature availability across clouds regions
16+
# Azure AI Search feature availability across cloud regions
1717

1818
This article identifies the cloud regions in which Azure AI Search is available. It also lists which premium features are available in each region:
1919

@@ -37,7 +37,6 @@ You can create an Azure AI Search resource in any of the following Azure public
3737
|--|--|--|
3838
| East US​ |||
3939
| East US 2 ​ |||
40-
| East US 2 EUAP/PPE ​ |||
4140
| ​Central US​ ​ |||
4241
| North Central US​ ​ |||
4342
| South Central US​ ​ |||
@@ -51,13 +50,13 @@ You can create an Azure AI Search resource in any of the following Azure public
5150
| Region | Azure AI integration | Semantic ranking |
5251
|--|--|--|
5352
| UK South​ |||
54-
| UK West​ ​| ||
53+
| UK West​ ​| ||
5554

5655
### United Arab Emirates
5756

5857
| Region | Azure AI integration | Semantic ranking |
5958
|--|--|--|
60-
| UAE North​​ || |
59+
| UAE North​​ || |
6160

6261
### Switzerland
6362

@@ -69,32 +68,33 @@ You can create an Azure AI Search resource in any of the following Azure public
6968

7069
| Region | Azure AI integration | Semantic ranking |
7170
|--|--|--|
72-
| Sweden Central​​ |||
71+
| Sweden Central​​ || |
72+
| Sweden North​ |||
7373

7474
### South Africa
7575

7676
| Region | Azure AI integration | Semantic ranking |
7777
|--|--|--|
78-
| South Africa North​ || |
78+
| South Africa North​ || |
7979

8080
### Poland
8181

8282
| Region | Azure AI integration | Semantic ranking |
8383
|--|--|--|
84-
| Poland Central​​ | | |
84+
| Poland Central​​ | | |
8585

8686
### Norway
8787

8888
| Region | Azure AI integration | Semantic ranking |
8989
|--|--|--|
90-
| Norway East​​ || |
90+
| Norway East​​ || |
9191

9292
### Korea
9393

9494
| Region | Azure AI integration | Semantic ranking |
9595
|--|--|--|
9696
| Korea Central |||
97-
| Korea South​ ​ | ||
97+
| Korea South​ ​ | ||
9898

9999
### Japan
100100

@@ -107,7 +107,7 @@ You can create an Azure AI Search resource in any of the following Azure public
107107

108108
| Region | Azure AI integration | Semantic ranking |
109109
|--|--|--|
110-
| Italy North​​ | | |
110+
| Italy North​​ | | |
111111

112112
### India
113113

@@ -120,8 +120,8 @@ You can create an Azure AI Search resource in any of the following Azure public
120120

121121
| Region | Azure AI integration | Semantic ranking |
122122
|--|--|--|
123-
| Germany North ​| | |
124-
| Germany West Central​ ​|| |
123+
| Germany North ​| | |
124+
| Germany West Central​ ​|| |
125125

126126
### France
127127

@@ -134,13 +134,21 @@ You can create an Azure AI Search resource in any of the following Azure public
134134
| Region | Azure AI integration | Semantic ranking |
135135
|--|--|--|
136136
| North Europe​​ |||
137+
| West Europe​​ |||
138+
139+
### Canary (US)
140+
141+
| Region | Azure AI integration | Semantic ranking |
142+
|--|--|--|
143+
| Central US EUAP​ | ||
144+
| East US 2 EUAP ​ | ||
137145

138146
### Canada
139147

140148
| Region | Azure AI integration | Semantic ranking |
141149
|--|--|--|
142150
| Canada Central​​ |||
143-
| Canada East​​ ​ | ||
151+
| Canada East​​ ​ | ||
144152

145153
### Bazil
146154

@@ -160,7 +168,7 @@ You can create an Azure AI Search resource in any of the following Azure public
160168
| Region | Azure AI integration | Semantic ranking |
161169
|--|--|--|
162170
| Australia East​ ​ |||
163-
| Australia Southeast​​​ | ||
171+
| Australia Southeast​​​ | ||
164172

165173
## Azure Government regions
166174

0 commit comments

Comments
 (0)