Skip to content

Commit 67f9d5a

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into tamram24-0422
2 parents 482a73d + 10b6a9b commit 67f9d5a

File tree

104 files changed

+1447
-382
lines changed

Some content is hidden

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

104 files changed

+1447
-382
lines changed

articles/active-directory-b2c/partner-saviynt.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@ The following architecture diagram illustrates the implementation.
7070
2. Create delegated administration policies.
7171
3. Assign users the delegated administrator role.
7272

73+
>[!NOTE]
74+
>User administrator role will be required for a Service Principal Name (SPN) to integrate with Saviynt EIC system.
75+
7376
## Configure Azure AD B2C with Saviynt
7477

7578
Use the following instructions to create an application, delete users, and more.

articles/ai-services/openai/faq.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,10 @@ sections:
248248
Can I bring my own data store to use with Assistants?
249249
answer: |
250250
No. Currently Assistants supports only local files uploaded to the Assistants-managed storage. You cannot use your private storage account with Assistants.
251+
- question: |
252+
Does Assistants support customer-managed key encryption (CMK)?
253+
answer: |
254+
Today we support CMK for Threads and Files in Assistants. See the [What's new page](./whats-new.md#customer-managed-key-cmk-support-for-assistants) for available regions for this feature.
251255
- question: |
252256
Is my data used by Microsoft for training models?
253257
answer: |
@@ -259,9 +263,8 @@ sections:
259263
- question: |
260264
How am I charged for Assistants?
261265
answer: |
262-
Currently, when you use Assistants API, you're billed for the following:
263-
- Inference cost (input and output) of the base model you're using for each Assistant (for example gpt-4-0125). If you've created multiple Assistants, you will be charged for the base model attached to each Assistant.
264-
- If you've enabled the Code Interpreter tool. For example if your assistant calls Code Interpreter simultaneously in two different threads, this would create two Code Interpreter sessions, each of which would be charged. Each session is active by default for one hour, which means that you would only pay this fee once if your user keeps giving instructions to Code Interpreter in the same thread for up to one hour.
266+
* Inference cost (input and output) of the base model you're using for each Assistant (for example gpt-4-0125). If you've created multiple Assistants, you will be charged for the base model attached to each Assistant.
267+
* If you've enabled the Code Interpreter tool. For example if your assistant calls Code Interpreter simultaneously in two different threads, this would create two Code Interpreter sessions, each of which would be charged. Each session is active by default for one hour, which means that you would only pay this fee once if your user keeps giving instructions to Code Interpreter in the same thread for up to one hour.
265268
266269
For more information, see the [pricing page](https://azure.microsoft.com/pricing/details/cognitive-services/openai-service/).
267270
- question: |

articles/ai-services/openai/whats-new.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@ recommendations: false
1818

1919
This article provides a summary of the latest releases and major documentation updates for Azure OpenAI.
2020

21+
## June 2024
22+
23+
### Customer-managed key (CMK) support for Assistants
24+
25+
Threads and Files in Assistants now supports CMK in the following region:
26+
* West US 3
27+
2128
## May 2024
2229

2330
### GPT-4o provisioned deployments

articles/ai-services/speech-service/speech-container-overview.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ The following table lists the Speech containers available in the Microsoft Conta
2121

2222
| Container | Features | Supported versions and locales |
2323
|--|--|--|
24-
| [Speech to text](speech-container-stt.md) | Transcribes continuous real-time speech or batch audio recordings with intermediate results. | Latest: 4.6.0<br/><br/>For all supported versions and locales, see the [Microsoft Container Registry (MCR)](https://mcr.microsoft.com/product/azure-cognitive-services/speechservices/speech-to-text/tags) and [JSON tags](https://mcr.microsoft.com/v2/azure-cognitive-services/speechservices/speech-to-text/tags/list).|
25-
| [Custom speech to text](speech-container-cstt.md) | Using a custom model from the [custom speech portal](https://speech.microsoft.com/customspeech), transcribes continuous real-time speech or batch audio recordings into text with intermediate results. | Latest: 4.6.0<br/><br/>For all supported versions and locales, see the [Microsoft Container Registry (MCR)](https://mcr.microsoft.com/product/azure-cognitive-services/speechservices/custom-speech-to-text/tags) and [JSON tags](https://mcr.microsoft.com/v2/azure-cognitive-services/speechservices/speech-to-text/tags/list). |
26-
| [Speech language identification](speech-container-lid.md)<sup>1, 2</sup> | Detects the language spoken in audio files. | Latest: 1.12.0<br/><br/>For all supported versions and locales, see the [Microsoft Container Registry (MCR)](https://mcr.microsoft.com/product/azure-cognitive-services/speechservices/language-detection/tags) and [JSON tags](https://mcr.microsoft.com/v2/azure-cognitive-services/speechservices/language-detection/tags/list). |
27-
| [Neural text to speech](speech-container-ntts.md) | Converts text to natural-sounding speech by using deep neural network technology, which allows for more natural synthesized speech. | Latest: 3.1.0<br/><br/>For all supported versions and locales, see the [Microsoft Container Registry (MCR)](https://mcr.microsoft.com/product/azure-cognitive-services/speechservices/neural-text-to-speech/tags) and [JSON tags](https://mcr.microsoft.com/v2/azure-cognitive-services/speechservices/neural-text-to-speech/tags/list). |
24+
| [Speech to text](speech-container-stt.md) | Transcribes continuous real-time speech or batch audio recordings with intermediate results. | Latest: 4.7.0<br/><br/>For all supported versions and locales, see the [Microsoft Container Registry (MCR)](https://mcr.microsoft.com/product/azure-cognitive-services/speechservices/speech-to-text/tags) and [JSON tags](https://mcr.microsoft.com/v2/azure-cognitive-services/speechservices/speech-to-text/tags/list).|
25+
| [Custom speech to text](speech-container-cstt.md) | Using a custom model from the [custom speech portal](https://speech.microsoft.com/customspeech), transcribes continuous real-time speech or batch audio recordings into text with intermediate results. | Latest: 4.7.0<br/><br/>For all supported versions and locales, see the [Microsoft Container Registry (MCR)](https://mcr.microsoft.com/product/azure-cognitive-services/speechservices/custom-speech-to-text/tags) and [JSON tags](https://mcr.microsoft.com/v2/azure-cognitive-services/speechservices/speech-to-text/tags/list). |
26+
| [Speech language identification](speech-container-lid.md)<sup>1, 2</sup> | Detects the language spoken in audio files. | Latest: 1.13.0<br/><br/>For all supported versions and locales, see the [Microsoft Container Registry (MCR)](https://mcr.microsoft.com/product/azure-cognitive-services/speechservices/language-detection/tags) and [JSON tags](https://mcr.microsoft.com/v2/azure-cognitive-services/speechservices/language-detection/tags/list). |
27+
| [Neural text to speech](speech-container-ntts.md) | Converts text to natural-sounding speech by using deep neural network technology, which allows for more natural synthesized speech. | Latest: 3.3.0<br/><br/>For all supported versions and locales, see the [Microsoft Container Registry (MCR)](https://mcr.microsoft.com/product/azure-cognitive-services/speechservices/neural-text-to-speech/tags) and [JSON tags](https://mcr.microsoft.com/v2/azure-cognitive-services/speechservices/neural-text-to-speech/tags/list). |
2828

2929
<sup>1</sup> The container is available in public preview. Containers in preview are still under development and don't meet Microsoft's stability and support requirements.
3030
<sup>2</sup> Not available as a disconnected container.

articles/aks/csi-secrets-store-identity-access.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -347,10 +347,10 @@ A key vault certificate also contains public x509 certificate metadata. The key
347347
348348
## Next steps
349349
350-
In this article, you learned how to create and provide an identity to access your Azure Key Vault. If you want to configure extra configuration options or perform troubleshooting, continue to the next article.
350+
In this article, you learned how to create and provide an identity to access your Azure Key Vault. The [Service Connector](../service-connector/overview.md) integration helps simplify the connection configuration for AKS workloads and Azure backing services. It securely handles authentication and network configurations and follows best practices for connecting to Azure services. For more information, see [Use the Azure Key Vault provider for Secrets Store CSI Driver in an AKS cluster](../service-connector/tutorial-python-aks-keyvault-csi-driver.md) and the [Service Connector introduction](https://azure.github.io/AKS/2024/05/23/service-connector-intro).
351+
352+
If you want to configure extra configuration options or perform troubleshooting, see [Configuration options and troubleshooting resources for Azure Key Vault provider with Secrets Store CSI Driver in AKS](./csi-secrets-store-configuration-options.md).
351353
352-
> [!div class="nextstepaction"]
353-
> [Configuration options and troubleshooting resources for Azure Key Vault provider with Secrets Store CSI Driver in AKS](./csi-secrets-store-configuration-options.md)
354354
355355
<!-- LINKS INTERNAL -->
356356

articles/aks/workload-identity-deploy-cluster.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,8 @@ az aks update \
361361

362362
In this article, you deployed a Kubernetes cluster and configured it to use a workload identity in preparation for application workloads to authenticate with that credential. Now you're ready to deploy your application and configure it to use the workload identity with the latest version of the [Azure Identity][azure-identity-libraries] client library. If you can't rewrite your application to use the latest client library version, you can [set up your application pod][workload-identity-migration] to authenticate using managed identity with workload identity as a short-term migration solution.
363363

364+
The [Service Connector](../service-connector/overview.md) integration helps simplify the connection configuration for AKS workloads and Azure backing services. It securely handles authentication and network configurations and follows best practices for connecting to Azure services. For more information, see [Connect to Azure OpenAI Service in AKS using Workload Identity](../service-connector/tutorial-python-aks-openai-workload-identity.md) and the [Service Connector introduction](https://azure.github.io/AKS/2024/05/23/service-connector-intro).
365+
364366
<!-- EXTERNAL LINKS -->
365367
[kubectl-describe]: https://kubernetes.io/docs/reference/generated/kubectl/kubectl-commands#describe
366368

articles/azure-cache-for-redis/cache-nodejs-get-started.md

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: flang-msft
55
ms.service: cache
66
ms.devlang: javascript
77
ms.topic: quickstart
8-
ms.date: 02/16/2023
8+
ms.date: 06/04/2024
99
ms.author: franlanglois
1010
ms.custom: mvc, devx-track-js, mode-api, engagement-fy23
1111
#Customer intent: As a Node.js developer, new to Azure Cache for Redis, I want to create a new Node.js app that uses Azure Cache for Redis.
@@ -29,7 +29,7 @@ For examples of using other Node.js clients, see the individual documentation fo
2929

3030
Add environment variables for your **HOST NAME** and **Primary** access key. Use these variables from your code instead of including the sensitive information directly in your code.
3131

32-
```powershell
32+
```cmd
3333
set AZURE_CACHE_FOR_REDIS_HOST_NAME=contosoCache
3434
set AZURE_CACHE_FOR_REDIS_ACCESS_KEY=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
3535
```
@@ -40,15 +40,14 @@ The latest builds of [node_redis](https://github.com/mranney/node_redis) provide
4040

4141
## Create a new Node.js app
4242

43-
1. Create a new script file named *redistest.js*.
43+
1. Create a new script file named *redistest.js*.
4444
1. Use the command to install a redis package.
4545

4646
```bash
4747
`npm install redis`
4848
```
4949

50-
1. Add the following example JavaScript to the file.
51-
50+
1. Add the following example JavaScript to the file.
5251

5352
```javascript
5453
const redis = require("redis");
@@ -101,17 +100,16 @@ The latest builds of [node_redis](https://github.com/mranney/node_redis) provide
101100
102101
testCache().then((result) => console.log(result)).catch(ex => console.log(ex));
103102
```
104-
105-
This code shows you how to connect to an Azure Cache for Redis instance using the cache host name and key environment variables. The code also stores and retrieves a string value in the cache. The `PING` and `CLIENT LIST` commands are also executed. For more examples of using Redis with the [node_redis](https://github.com/mranney/node_redis) client, see [https://redis.js.org/](https://redis.js.org/).
106103
104+
This code shows you how to connect to an Azure Cache for Redis instance using the cache host name and key environment variables. The code also stores and retrieves a string value in the cache. The `PING` and `CLIENT LIST` commands are also executed. For more examples of using Redis with the [node_redis](https://github.com/mranney/node_redis) client, see [https://redis.js.org/](https://redis.js.org/).
107105
108106
1. Run the script with Node.js.
109107
110108
```bash
111109
node redistest.js
112110
```
113111
114-
1. Example the output.
112+
1. Example the output.
115113
116114
```console
117115
Cache command: PING

articles/azure-monitor/logs/logs-dedicated-clusters.md

Lines changed: 37 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,10 @@ Deleted clusters take two weeks to be completely removed. You can have up to sev
9494

9595
#### [Portal](#tab/azure-portal)
9696

97-
N/A
97+
Click **Create** in the **Log Analytics dedicated clusters** menu in the Azure portal. You will be prompted for details such as the name of the cluster and the commitment tier.
98+
99+
:::image type="content" source="./media/logs-dedicated-cluster/create-cluster.png" alt-text="Screenshot for creating dedicated cluster in the Azure portal." lightbox="./media/logs-dedicated-cluster/create-cluster.png":::
100+
98101

99102
#### [CLI](#tab/cli)
100103

@@ -161,7 +164,7 @@ The provisioning of the Log Analytics cluster takes a while to complete. Use one
161164

162165
#### [Portal](#tab/azure-portal)
163166

164-
N/A
167+
The portal will provide a status as the cluster is being provisioned.
165168

166169
#### [CLI](#tab/cli)
167170

@@ -250,7 +253,11 @@ Use the following steps to link a workspace to a cluster. You can use automation
250253

251254
#### [Portal](#tab/azure-portal)
252255

253-
N/A
256+
Select your cluster from **Log Analytics dedicated clusters** menu in the Azure portal and then click **Linked workspaces** to view all workspaces currently linked to the dedicated cluster. Click **Link workspaces** to link additional workspaces.
257+
258+
:::image type="content" source="./media/logs-dedicated-cluster/linked-workspaces.png" alt-text="Screenshot for linking workspaces to a dedicated cluster in the Azure portal." lightbox="./media/logs-dedicated-cluster/linked-workspaces.png":::
259+
260+
254261

255262
#### [CLI](#tab/cli)
256263

@@ -317,13 +324,17 @@ Content-type: application/json
317324

318325

319326
### Check workspace link status
320-
321-
When a cluster is configured with customer-managed keys, data ingested to the workspaces after the link operation completion is stored encrypted with your managed key. The workspace link operation can take up to 90 minutes to complete and you can check the state by sending Get request to workspace and observe if *clusterResourceId* property is present in the response under *features*.
327+
The workspace link operation can take up to 90 minutes to complete. You can check the status on both the linked workspaces and the cluster. When completed, the workspace resources will include `clusterResourceId` property under `features`, and the cluster will include linked workspaces under `associatedWorkspaces` section.
328+
329+
When a cluster is configured with a customer managed key, data ingested to the workspaces after the link operation is complete will be stored encrypted with your key.
330+
322331

323332
#### [Portal](#tab/azure-portal)
324333

325-
1. Open the **Log Analytics workspaces** menu and then select your workspace.
326-
1. On the **Overview** page, select **JSON View**.
334+
On the **Overview** page for your dedicated cluster, select **JSON View**. The `associatedWorkspaces` section lists the workspaces linked to the cluster.
335+
336+
:::image type="content" source="./media/logs-dedicated-cluster/associated-workspaces.png" alt-text="Screenshot for viewing associated workspaces for a dedicated cluster in the Azure portal." lightbox="./media/logs-dedicated-cluster/associated-workspaces.png":::
337+
327338

328339
#### [CLI](#tab/cli)
329340

@@ -404,9 +415,12 @@ After you create your cluster resource and it's fully provisioned, you can edit
404415
405416
## Get all clusters in resource group
406417

418+
407419
#### [Portal](#tab/azure-portal)
408420

409-
N/A
421+
From the **Log Analytics dedicated clusters** menu in the Azure portal, select the **Resource group** filter.
422+
423+
:::image type="content" source="./media/logs-dedicated-cluster/resource-group-clusters.png" alt-text="Screenshot for viewing all dedicated clusters in a resource group in the Azure portal." lightbox="./media/logs-dedicated-cluster/resource-group-clusters.png":::
410424

411425
#### [CLI](#tab/cli)
412426

@@ -478,7 +492,11 @@ Authorization: Bearer <token>
478492

479493
#### [Portal](#tab/azure-portal)
480494

481-
N/A
495+
From the **Log Analytics dedicated clusters** menu in the Azure portal, select the **Subscription** filter.
496+
497+
:::image type="content" source="./media/logs-dedicated-cluster/subscription-clusters.png" alt-text="Screenshot for viewing all dedicated clusters in a subscription in the Azure portal." lightbox="./media/logs-dedicated-cluster/subscription-clusters.png":::
498+
499+
482500

483501
#### [CLI](#tab/cli)
484502

@@ -519,7 +537,9 @@ During the commitment period, you can change to a higher commitment tier, which
519537

520538
#### [Portal](#tab/azure-portal)
521539

522-
N/A
540+
Select your cluster from **Log Analytics dedicated clusters** menu in the Azure portal and then click **Change** next to **Commitment tier**
541+
542+
:::image type="content" source="./media/logs-dedicated-cluster/commitment-tier.png" alt-text="Screenshot for changing commitment tier for a dedicated cluster in the Azure portal." lightbox="./media/logs-dedicated-cluster/commitment-tier.png":::
523543

524544
#### [CLI](#tab/cli)
525545

@@ -619,7 +639,10 @@ Use the following commands to unlink a workspace from cluster:
619639

620640
#### [Portal](#tab/azure-portal)
621641

622-
N/A
642+
Select your cluster from **Log Analytics dedicated clusters** menu in the Azure portal and then click **Linked workspaces** to view all workspaces currently linked to the dedicated cluster. Select any workspaces you want to unlink and click **Unlink**.
643+
644+
:::image type="content" source="./media/logs-dedicated-cluster/unlink-workspace.png" alt-text="Screenshot for unlinking a workspace from a dedicated cluster in the Azure portal." lightbox="./media/logs-dedicated-cluster/unlink-workspace.png":::
645+
623646

624647
#### [CLI](#tab/cli)
625648

@@ -665,7 +688,9 @@ Use the following commands to delete a cluster:
665688

666689
#### [Portal](#tab/azure-portal)
667690

668-
N/A
691+
Select your cluster from **Log Analytics dedicated clusters** menu in the Azure portal and then click **Delete**.
692+
693+
:::image type="content" source="./media/logs-dedicated-cluster/delete-cluster.png" alt-text="Screenshot for deleting a dedicated cluster in the Azure portal." lightbox="./media/logs-dedicated-cluster/delete-cluster.png":::
669694

670695
#### [CLI](#tab/cli)
671696

83.3 KB
Loading
274 KB
Loading

0 commit comments

Comments
 (0)