Skip to content

Commit 4bfea26

Browse files
committed
Merge branch 'main' into release-blob-backup
2 parents 08f3e28 + 91ae87c commit 4bfea26

File tree

128 files changed

+2016
-983
lines changed

Some content is hidden

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

128 files changed

+2016
-983
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4502,6 +4502,11 @@
45024502
"source_path_from_root": "/articles/kubernetes-fleet/configuration-propagation.md",
45034503
"redirect_url": "/azure/kubernetes-fleet/resource-propagation"
45044504
},
4505+
{
4506+
"source_path_from_root": "/articles/aks/network-observability-byo-cli.md",
4507+
"redirect_url": "/azure/aks/network-observability-overview",
4508+
"redirect_document_id": false
4509+
},
45054510
{
45064511
"source_path_from_root": "/articles/orbital/license-spacecraft.md",
45074512
"redirect_url": "/azure/orbital/initiate-licensing",

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/speech-service/how-to-pronunciation-assessment.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,23 +91,23 @@ In the `SpeechRecognizer`, you can specify the language to learn or practice imp
9191
::: zone pivot="programming-language-csharp"
9292

9393
```csharp
94-
var recognizer = new SpeechRecognizer(config, "en-US", audioInput);
94+
var recognizer = new SpeechRecognizer(speechConfig, "en-US", audioConfig);
9595
```
9696

9797
::: zone-end
9898

9999
::: zone pivot="programming-language-cpp"
100100

101101
```cpp
102-
auto recognizer = SpeechRecognizer::FromConfig(config, "en-US", audioConfig);
102+
auto recognizer = SpeechRecognizer::FromConfig(speechConfig, "en-US", audioConfig);
103103
```
104104

105105
::: zone-end
106106

107107
::: zone pivot="programming-language-java"
108108

109109
```Java
110-
SpeechRecognizer recognizer = new SpeechRecognizer(config, "en-US", audioInput);
110+
SpeechRecognizer recognizer = new SpeechRecognizer(speechConfig, "en-US", audioConfig);
111111
```
112112

113113
::: zone-end
@@ -131,15 +131,15 @@ speechConfig.speechRecognitionLanguage = "en-US";
131131
::: zone pivot="programming-language-objectivec"
132132

133133
```ObjectiveC
134-
SPXSpeechRecognizer* speechRecognizer = [[SPXSpeechRecognizer alloc] initWithSpeechConfiguration:speechConfig language:@"en-US" audioConfiguration:pronAudioSource];
134+
SPXSpeechRecognizer* recognizer = [[SPXSpeechRecognizer alloc] initWithSpeechConfiguration:speechConfig language:@"en-US" audioConfiguration:audioConfig];
135135
```
136136
137137
::: zone-end
138138
139139
::: zone pivot="programming-language-swift"
140140
141141
```swift
142-
let reco = try! SPXSpeechRecognizer(speechConfiguration: speechConfig, language: "en-US", audioConfiguration: audioInput)
142+
let recognizer = try! SPXSpeechRecognizer(speechConfiguration: speechConfig, language: "en-US", audioConfiguration: audioConfig)
143143
```
144144

145145
::: zone-end

articles/aks/TOC.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -693,8 +693,10 @@
693693
href: cost-analysis.md
694694
- name: Network Observability
695695
items:
696+
- name: Network Observability
697+
href: network-observability-managed-cli.md
696698
- name: Advanced Network Observability - Azure managed Prometheus and Grafana
697-
href: advanced-network-observability-cli.md
699+
href: advanced-network-observability-cli.md
698700
- name: Advanced Network Observability - Bring Your Own Prometheus and Grafana
699701
href: advanced-network-observability-bring-your-own-cli.md
700702
- name: Service Mesh

articles/aks/azure-csi-blob-storage-provision.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ The following table includes parameters you can use to define a custom storage c
4747
|skuName | Specify an Azure storage account type (alias: `storageAccountType`). | `Standard_LRS`, `Premium_LRS`, `Standard_GRS`, `Standard_RAGRS` | No | `Standard_LRS`|
4848
|location | Specify an Azure location. | `eastus` | No | If empty, driver will use the same location name as current cluster.|
4949
|resourceGroup | Specify an Azure resource group name. | myResourceGroup | No | If empty, driver will use the same resource group name as current cluster.|
50-
|storageAccount | Specify an Azure storage account name.| storageAccountName | - No for blobfuse mount </br> - Yes for NFSv3 mount. | - For blobfuse mount: if empty, driver finds a suitable storage account that matches `skuName` in the same resource group. If a storage account name is provided, storage account must exist. </br> - For NFSv3 mount, storage account name must be provided.|
50+
|storageAccount | Specify an Azure storage account name.| storageAccountName | - No | When a specific storage account name is not provided, the driver will look for a suitable storage account that matches the account settings within the same resource group. If it fails to find a matching storage account, it will create a new one. However, if a storage account name is specified, the storage account must already exist. |
5151
|networkEndpointType| Specify network endpoint type for the storage account created by driver. If privateEndpoint is specified, a [private endpoint][storage-account-private-endpoint] is created for the storage account. For other cases, a service endpoint will be created for NFS protocol.<sup>1</sup> | `privateEndpoint` | No | For an AKS cluster, add the AKS cluster name to the Contributor role in the resource group hosting the VNET.|
5252
|protocol | Specify blobfuse mount or NFSv3 mount. | `fuse`, `nfs` | No | `fuse`|
5353
|containerName | Specify the existing container (directory) name. | container | No | If empty, driver creates a new container name, starting with `pvc-fuse` for blobfuse or `pvc-nfs` for NFS v3. |

articles/aks/azure-csi-files-storage-provision.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: Learn how to create a static or dynamic persistent volume with Azur
55
ms.topic: article
66
ms.custom: devx-track-azurecli
77
ms.subservice: aks-storage
8-
ms.date: 06/28/2024
8+
ms.date: 07/09/2024
99
author: tamram
1010
ms.author: tamram
1111

@@ -57,6 +57,7 @@ The following table includes parameters you can use to define a custom storage c
5757
|shareName | Specify Azure file share name. | Existing or new Azure file share name. | No | If empty, driver generates an Azure file share name. |
5858
|shareNamePrefix | Specify Azure file share name prefix created by driver. | Share name can only contain lowercase letters, numbers, hyphens, and length should be fewer than 21 characters. | No |
5959
|skuName | Azure Files storage account type (alias: `storageAccountType`)| `Standard_LRS`, `Standard_ZRS`, `Standard_GRS`, `Standard_RAGRS`, `Standard_RAGZRS`,`Premium_LRS`, `Premium_ZRS` | No | `StandardSSD_LRS`<br> Minimum file share size for Premium account type is 100 GB.<br> ZRS account type is supported in limited regions.<br> NFS file share only supports Premium account type.|
60+
|storageAccount | Specify an Azure storage account name.| storageAccountName | - No | When a specific storage account name is not provided, the driver will look for a suitable storage account that matches the account settings within the same resource group. If it fails to find a matching storage account, it will create a new one. However, if a storage account name is specified, the storage account must already exist. |
6061
|storageEndpointSuffix | Specify Azure storage endpoint suffix. | `core.windows.net`, `core.chinacloudapi.cn`, etc. | No | If empty, driver uses default storage endpoint suffix according to cloud environment. For example, `core.windows.net`. |
6162
|tags | [Tags][tag-resources] are created in new storage account. | Tag format: 'foo=aaa,bar=bbb' | No | "" |
6263
|--- | **Following parameters are only for SMB protocol** | --- | --- |

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/aks/long-term-support.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,8 @@ To carry out an in-place upgrade to the latest LTS version, you need to specify
128128
az aks upgrade --resource-group myResourceGroup --name myAKSCluster --kubernetes-version 1.32.2
129129
```
130130
> [!NOTE]
131-
> The next Long Term Support Version after 1.27 is to be determined. However Customers will get a minimum 6 months of overlap between 1.27 LTS and the next LTS version to plan upgrades.
131+
132+
> 1.30 is the next LTS version after 1.27. Customers will be able to upgrade from 1.27 LTS to 1.30 LTS starting August, 2024. 1.27 LTS goes End of Life by July 2025.
132133
> Kubernetes 1.32.2 is used as an example version in this article. Check the [AKS release tracker](release-tracker.md) for available Kubernetes releases.
133134
134135
## Frequently asked questions

0 commit comments

Comments
 (0)