Skip to content

Commit 930905f

Browse files
authored
Merge branch 'MicrosoftDocs:main' into cosmos-retire-notebooks
2 parents ffc5294 + b9f223c commit 930905f

File tree

89 files changed

+979
-4020
lines changed

Some content is hidden

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

89 files changed

+979
-4020
lines changed

.openpublishing.redirection.json

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1242,7 +1242,22 @@
12421242
},
12431243
{
12441244
"source_path_from_root": "/articles/azure-maps/tutorial-creator-feature-stateset.md",
1245-
"redirect_url": "/azure/azure-maps/how-to-creator-feature-stateset",
1245+
"redirect_url": "/azure/azure-maps/about-creator",
1246+
"redirect_document_id": false
1247+
},
1248+
{
1249+
"source_path_from_root": "/articles/azure-maps/schema-stateset-stylesobject.md",
1250+
"redirect_url": "/azure/azure-maps/about-creator",
1251+
"redirect_document_id": false
1252+
},
1253+
{
1254+
"source_path_from_root": "/articles/azure-maps/indoor-map-dynamic-styling.md",
1255+
"redirect_url": "/azure/azure-maps/about-creator",
1256+
"redirect_document_id": false
1257+
},
1258+
{
1259+
"source_path_from_root": "/articles/azure-maps/how-to-creator-feature-stateset.md",
1260+
"redirect_url": "/azure/azure-maps/about-creator",
12461261
"redirect_document_id": false
12471262
},
12481263
{

articles/ai-services/document-intelligence/faq.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@ sections:
5959
- You can find more details in the [technical community blog](https://techcommunity.microsoft.com/t5/azure-ai-services-blog/document-generative-ai-the-power-of-azure-ai-document/ba-p/3875015).
6060
6161
- question: |
62-
Does Document Intelligence offer a semantic chunking solution for retrieval-augmented generation?
62+
Can Document Intelligence help with semantic chunking within documents for retrieval-augmented generation?
6363
answer: |
6464
**Yes.**
65-
66-
Semantic chunking is a key step in retrieval-augmented generation (RAG) to ensure its efficient storage and retrieval.
65+
66+
Document Intelligence can provide the building blocks to enable semantic chunking. Semantic chunking is a key step in retrieval-augmented generation (RAG) to ensure its efficient storage and retrieval.
6767
6868
- Document Intelligence provides a layout model that segments documents into coherent units based on their semantic content.
6969

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ The following Embeddings models are available with [Azure Government](/azure/azu
312312

313313
### Assistants (Preview)
314314

315-
For Assistants you need a combination of a supported model, and a supported region. Certain tools and capabilities require the latest models. The following models are available in the Assistants API, SDK, Azure AI Studio and Azure OpenAI Studio. The following table is for pay-as-you-go. For information on Provisioned Throughput Unit (PTU) availability, see [provisioned throughput](./provisioned-throughput.md).
315+
For Assistants you need a combination of a supported model, and a supported region. Certain tools and capabilities require the latest models. The following models are available in the Assistants API, SDK, Azure AI Studio and Azure OpenAI Studio. The following table is for pay-as-you-go. For information on Provisioned Throughput Unit (PTU) availability, see [provisioned throughput](./provisioned-throughput.md). The listed models and regions can be used with both Assistants v1 and v2.
316316

317317
| Region | `gpt-35-turbo (0613)` | `gpt-35-turbo (1106)`| `fine tuned gpt-3.5-turbo-0125` | `gpt-4 (0613)` | `gpt-4 (1106)` | `gpt-4 (0125)` | `gpt-4o (2024-05-13)` |
318318
|-----|:---:|:---:|:---:|:---:|:---:|:---:|:---:|

articles/ai-services/openai/how-to/use-your-data-securely.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -265,9 +265,10 @@ So far you have already setup each resource work independently. Next you need to
265265
|--|--|--|--|
266266
| `Search Index Data Reader` | Azure OpenAI | Azure AI Search | Inference service queries the data from the index. |
267267
| `Search Service Contributor` | Azure OpenAI | Azure AI Search | Inference service queries the index schema for auto fields mapping. Data ingestion service creates index, data sources, skill set, indexer, and queries the indexer status. |
268-
| `Storage Blob Data Contributor` | Azure OpenAI | Storage Account | Reads from the input container, and writes the preprocess result to the output container. |
269-
| `Cognitive Services OpenAI Contributor` | Azure AI Search | Azure OpenAI | Custom skill |
270-
| `Storage Blob Data Contributor` | Azure AI Search | Storage Account | Reads blob and writes knowledge store. |
268+
| `Storage Blob Data Contributor` | Azure OpenAI | Storage Account | Reads from the input container, and writes the preprocessed result to the output container. |
269+
| `Cognitive Services OpenAI Contributor` | Azure AI Search | Azure OpenAI | Custom skill. |
270+
| `Storage Blob Data Reader` | Azure AI Search | Storage Account | Reads document blobs and chunk blobs. |
271+
| `Cognitive Services OpenAI User` | Web app | Azure OpenAI | Inference. |
271272

272273

273274
In the above table, the `Assignee` means the system assigned managed identity of that resource.

articles/ai-services/openai/includes/api-surface.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ Each API surface/specification encapsulates a different set of Azure OpenAI capa
2222
| API | Latest preview release | Latest GA release | Specifications | Description |
2323
|:---|:----|:----|:----|:---|
2424
| **Control plane** | `2024-04-01-preview` | [`2023-05-01`](/rest/api/aiservices/accountmanagement/deployments/create-or-update?view=rest-aiservices-accountmanagement-2023-05-01&tabs=HTTP&preserve-view=true) | [Spec files](https://github.com/Azure/azure-rest-api-specs/tree/main/specification/cognitiveservices/resource-manager/Microsoft.CognitiveServices) | Azure OpenAI shares a common control plane with all other Azure AI Services. The control plane API is used for things like [creating Azure OpenAI resources](/rest/api/aiservices/accountmanagement/accounts/create?view=rest-aiservices-accountmanagement-2023-05-01&tabs=HTTP&preserve-view=true), [model deployment](/rest/api/aiservices/accountmanagement/deployments/create-or-update?view=rest-aiservices-accountmanagement-2023-05-01&tabs=HTTP&preserve-view=true), and other higher level resource management tasks. The control plane also governs what is possible to do with capabilities like Azure Resource Manager, Bicep, Terraform, and Azure CLI.|
25-
| **Data plane - authoring** | `2024-05-01-preview` | `2024-06-01` | [Spec files](https://github.com/Azure/azure-rest-api-specs/tree/main/specification/cognitiveservices/data-plane/AzureOpenAI/authoring) | The data plane authoring API controls [fine-tuning](/rest/api/azureopenai/fine-tuning?view=rest-azureopenai-2024-05-01-preview&preserve-view=true), [file-upload](/rest/api/azureopenai/files/upload?view=rest-azureopenai-2024-05-01-preview&tabs=HTTP&preserve-view=true), [ingestion jobs](/rest/api/azureopenai/ingestion-jobs/create?view=rest-azureopenai-2024-05-01-preview&tabs=HTTP&preserve-view=true), and certain [model level queries](/rest/api/azureopenai/models/get?view=rest-azureopenai-2024-05-01-preview&tabs=HTTP&preserve-view=true)
26-
| **Data plane - inference** | `2024-05-01-preview` | `2024-06-01` | [Spec files](https://github.com/Azure/azure-rest-api-specs/tree/main/specification/cognitiveservices/data-plane/AzureOpenAI/inference) | The data plane inference API provides the inference capabilities/endpoints for features like completions, chat completions, embeddings, speech/whisper, on your data, Dall-e, assistants, etc. |
25+
| **Data plane - authoring** | [`2024-05-01-preview`](/rest/api/azureopenai/operation-groups?view=rest-azureopenai-2024-05-01-preview&preserve-view=true) | [`2024-06-01`](/rest/api/azureopenai/operation-groups?view=rest-azureopenai-2024-06-01&preserve-view=true) | [Spec files](https://github.com/Azure/azure-rest-api-specs/tree/main/specification/cognitiveservices/data-plane/AzureOpenAI/authoring) | The data plane authoring API controls [fine-tuning](/rest/api/azureopenai/fine-tuning?view=rest-azureopenai-2024-05-01-preview&preserve-view=true), [file-upload](/rest/api/azureopenai/files/upload?view=rest-azureopenai-2024-05-01-preview&tabs=HTTP&preserve-view=true), [ingestion jobs](/rest/api/azureopenai/ingestion-jobs/create?view=rest-azureopenai-2024-05-01-preview&tabs=HTTP&preserve-view=true), and certain [model level queries](/rest/api/azureopenai/models/get?view=rest-azureopenai-2024-05-01-preview&tabs=HTTP&preserve-view=true)
26+
| **Data plane - inference** | [`2024-05-01-preview`](/azure/ai-services/openai/reference-preview#data-plane-inference) | [`2024-06-01`](/azure/ai-services/openai/reference#data-plane-inference) | [Spec files](https://github.com/Azure/azure-rest-api-specs/tree/main/specification/cognitiveservices/data-plane/AzureOpenAI/inference) | The data plane inference API provides the inference capabilities/endpoints for features like completions, chat completions, embeddings, speech/whisper, on your data, Dall-e, assistants, etc. |
2727

2828
## Authentication
2929

articles/aks/dapr-settings.md

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ ms.author: hannahhunter
66
ms.topic: article
77
ms.custom: build-2023, devx-track-azurecli, linux-related-content
88
ms.subservice: aks-developer
9-
ms.date: 04/01/2024
9+
ms.date: 07/09/2024
1010
---
1111

1212
# Configure the Dapr extension for your Azure Kubernetes Service (AKS) and Arc-enabled Kubernetes project
1313

14-
Once you've [created the Dapr extension](./dapr.md), you can configure the [Dapr](https://dapr.io/) extension to work best for you and your project using various configuration options, like:
14+
After [creating the Dapr extension](./dapr.md), you can configure the [Dapr](https://dapr.io/) extension to work best for you and your project using various configuration options, like:
1515

1616
- Limiting which of your nodes use the Dapr extension
17-
- Setting automatic CRD updates
17+
- Setting automatic custom resource definition (CRD) updates
1818
- Configuring the Dapr release namespace
1919

2020
The extension enables you to set Dapr configuration options by using the `--configuration-settings` parameter in the Azure CLI or `configurationSettings` property in a Bicep template.
@@ -137,7 +137,7 @@ properties: {
137137

138138
## Install Dapr in multiple availability zones while in HA mode
139139

140-
By default, the placement service uses a storage class of type `standard_LRS`. It is recommended to create a **zone redundant storage class** while installing Dapr in HA mode across multiple availability zones. For example, to create a `zrs` type storage class, add the `storageaccounttype` parameter:
140+
By default, the placement service uses a storage class of type `standard_LRS`. It's recommended to create a **zone redundant storage class** while installing Dapr in HA mode across multiple availability zones. For example, to create a `zrs` type storage class, add the `storageaccounttype` parameter:
141141

142142
```yaml
143143
kind: StorageClass
@@ -186,7 +186,7 @@ You can configure the release namespace.
186186

187187
# [Azure CLI](#tab/cli)
188188

189-
The Dapr extension gets installed in the `dapr-system` namespace by default. To override it, use `--release-namespace`. Include the cluster `--scope` to redefine the namespace.
189+
The Dapr extension gets installed in the `dapr-system` namespace by default. To override it, use `--release-namespace`. To redefine the namespace, include the cluster `--scope`.
190190

191191
```azurecli
192192
az k8s-extension create \
@@ -218,7 +218,7 @@ properties: {
218218

219219
---
220220

221-
[Learn how to configure the Dapr release namespace if you already have Dapr installed](./dapr-migration.md).
221+
[Learn how to configure the Dapr release namespace when migrating from Dapr open source to the Dapr extension](./dapr-migration.md).
222222

223223
## Show current configuration settings
224224

@@ -240,7 +240,7 @@ az k8s-extension show --cluster-type managedClusters \
240240
>
241241
> HA is enabled by default. Disabling it requires deletion and recreation of the extension.
242242

243-
To update your Dapr configuration settings, recreate the extension with the desired state. For example, assume we've previously created and installed the extension using the following configuration:
243+
To update your Dapr configuration settings, recreate the extension with the desired state. For example, let's say you previously created and installed the extension using the following configuration:
244244

245245
```azurecli-interactive
246246
az k8s-extension create --cluster-type managedClusters \
@@ -368,14 +368,13 @@ properties: {
368368

369369
## Meet network requirements
370370

371-
The Dapr extension for AKS and Arc for Kubernetes requires the following outbound URLs on `https://:443` to function:
371+
The Dapr extension requires the following outbound URLs on `https://:443` to function on AKS and Arc for Kubernetes:
372372
1. `https://mcr.microsoft.com/daprio` URL for pulling Dapr artifacts.
373-
2. `https://linuxgeneva-microsoft.azurecr.io/` URL for pulling some Dapr dependencies.
374-
3. The [outbound URLs required for AKS or Arc for Kubernetes](../azure-arc/kubernetes/network-requirements.md).
373+
1. The [outbound URLs required for AKS or Arc for Kubernetes](../azure-arc/kubernetes/network-requirements.md).
375374

376375
## Next Steps
377376

378-
Once you have successfully provisioned Dapr in your AKS cluster, try deploying a [sample application][sample-application].
377+
Once you successfully provisioned Dapr in your AKS cluster, try deploying a [sample application][sample-application].
379378

380379
<!-- LINKS INTERNAL -->
381380
[deploy-cluster]: ./tutorial-kubernetes-deploy-cluster.md

articles/app-service/environment/ase-multi-tenant-comparison.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ An App Service Environment is an Azure App Service feature that provides a fully
2121
|Dedicated host group|[Available](overview.md#dedicated-environment) |No |
2222
|Remote file storage|Fully dedicated to the App Service Environment |Remote file storage for the application is dedicated, but the storage is hosted on a shared file server |
2323
|Private inbound configuration|Yes, using ILB App Service Environment variation |Yes, via private endpoint |
24-
|Planned maintenance|[Manual upgrade preference is available](how-to-upgrade-preference.md) |The platform handles maintenance. [Service health notifications are available](../../app-service/routine-maintenance.md). |
24+
|Planned maintenance|[Manual upgrade preference is available](how-to-upgrade-preference.md) |[The platform handles maintenance](../../app-service/routine-maintenance.md) |
2525
|Aggregate remote file share storage limit|1 TB for all apps in an App Service Environment v3|250 GB for all apps in a single App Service plan. 500 GB for all apps across all App Service plans in a single resource group.|
2626

2727
### Scaling

articles/azure-arc/edge-storage-accelerator/create-pv.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ This section describes the prerequisites for creating a persistent volume (PV).
1919
1. Create a storage account [following the instructions here](/azure/storage/common/storage-account-create?tabs=azure-portal).
2020

2121
> [!NOTE]
22-
> When you create your storage account, create it under the same resource group and region/location as your Kubernetes cluster.
22+
> When you create your storage account, create it under the same resource group as your Kubernetes cluster. It is recommended that you also create it under the same region/location as your Kubernetes cluster.
2323
2424
1. Create a container in the storage account that you created in the previous step, [following the instructions here](/azure/storage/blobs/storage-quickstart-blobs-portal#create-a-container).
2525

@@ -65,8 +65,6 @@ Note the `metadata: name:` as you must specify it in the `spec: volumeName` of t
6565
metadata:
6666
### Create a name here ###
6767
name: CREATE_A_NAME_HERE
68-
### Use a namespace that matches your intended consuming pod, or "default" ###
69-
namespace: INTENDED_CONSUMING_POD_OR_DEFAULT_HERE
7068
spec:
7169
capacity:
7270
### This storage capacity value is not enforced at this layer. ###

articles/azure-arc/edge-storage-accelerator/create-pvc.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,6 @@ This size does not affect the ceiling of blob storage used in the cloud to suppo
3636
volumeMode: Filesystem
3737
### This name references your PV name in your PV config ###
3838
volumeName: INSERT_YOUR_PV_NAME
39-
status:
40-
accessModes:
41-
- ReadWriteMany
42-
capacity:
43-
storage: 5Gi
4439
```
4540
4641
> [!NOTE]

articles/azure-arc/edge-storage-accelerator/release-notes.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@ This article provides information about new features and known issues in Edge St
1616

1717
- Kernel versions: the minimum supported Linux kernel version is 5.1. Currently there are known issues with 6.4 and 6.2.
1818

19+
## Version 1.2.0-preview
20+
21+
- Extension identity and OneLake support: ESA now allows use of a system-assigned extension identity for access to blob storage or OneLake lake houses.
22+
- Security fixes: security maintenance (package/module version updates).
23+
1924
## Next steps
2025

2126
[Edge Storage Accelerator overview](overview.md)

0 commit comments

Comments
 (0)