Skip to content

Commit a9e472a

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into nw-vnetflow
2 parents 010d565 + 300a6cd commit a9e472a

File tree

101 files changed

+143
-164
lines changed

Some content is hidden

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

101 files changed

+143
-164
lines changed

articles/ai-services/openai/concepts/use-your-data.md

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -349,18 +349,20 @@ You can deploy to a standalone Teams app directly from Azure OpenAI Studio. Foll
349349

350350
1. Provision your app: (detailed instructions in [Provision cloud resources](/microsoftteams/platform/toolkit/provision))
351351

352-
1. Assign the **Cognitive Service OpenAI User** role to your deployed App Service resource
353-
1. Go to the Azure portal and select the newly created Azure App Service resource
354-
1. Go to **settings** -> **identity** -> **enable system assigned identity**
355-
1. Select **Azure role assignments** and then **add role assignments**. Specify the following parameters:
356-
* Scope: resource group
357-
* Subscription: the subscription of your Azure OpenAI resource
358-
* Resource group of your Azure OpenAI resource
359-
* Role: **Cognitive Service OpenAI user**
352+
1. Assign the **Cognitive Service OpenAI User** role to your deployed **User Assigned Managed Identity** resource of your custom copilot.
353+
1. Go to the Azure portal and select the newly created **User Assigned Managed Identity** resource for your custom copilot.
354+
1. Go to **Azure Role Assignments**.
355+
1. Select **add role assignment**. Specify the following parameters:
356+
* Scope: resource group
357+
* Subscription: the subscription of your Azure OpenAI resource
358+
* Resource group of your Azure OpenAI resource
359+
* Role: **Cognitive Service OpenAI user**
360360

361361
1. Deploy your app to Azure by following the instructions in [Deploy to the cloud](/microsoftteams/platform/toolkit/deploy).
362362

363363
1. Publish your app to Teams by following the instructions in [Publish Teams app](/microsoftteams/platform/toolkit/publish).
364+
> [!IMPORTANT]
365+
> Your Teams app is intended for use within the same tenant of your Azure account used during setup, as it is securely configured by default for single-tenant usage. Using this app with a Teams account not associated with the Azure tenant used during setup will result in an error.
364366
365367
The README file in your Teams app has additional details and tips. Also, see [Tutorial - Build Custom Copilot using Teams](/microsoftteams/platform/teams-ai-library-tutorial) for guided steps.
366368

articles/azure-functions/durable/quickstart-mssql.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ $collation = "Latin1_General_100_BIN2_UTF8"
8181
docker pull mcr.microsoft.com/mssql/server:$tag
8282
8383
# run the image and provide some basic setup parameters
84-
docker run --name mssql-server -e 'ACCEPT_EULA=Y' -e "SA_PASSWORD=$pw" -e "MSSQL_PID=$edition" -p ${port}:1433 -d mcr.microsoft.com/mssql/server:$tag
84+
docker run --name mssql-server -e 'ACCEPT_EULA=Y' -e "MSSQL_SA_PASSWORD=$pw" -e "MSSQL_PID=$edition" -p ${port}:1433 -d mcr.microsoft.com/mssql/server:$tag
8585
8686
# wait a few seconds for the container to start...
8787

articles/azure-monitor/vm/vminsights-dependency-agent-maintenance.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ The Dependency Agent collects data about processes running on the virtual machin
2020
2121
## Dependency Agent requirements
2222

23-
- The Dependency Agent requires the Azure Monitor Agent to be installed on the same machine.
24-
- On both the Windows and Linux versions, the Dependency Agent collects data using a user-space service and a kernel driver.
25-
- Dependency Agent supports the same [Windows versions that Azure Monitor Agent supports](../agents/agents-overview.md#supported-operating-systems), except Windows Server 2008 SP2, Windows Server 2022, and Azure Stack HCI.
26-
- For Linux, see [Dependency Agent Linux support](#dependency-agent-linux-support).
23+
* The Dependency Agent requires the Azure Monitor Agent to be installed on the same machine.
24+
* On both the Windows and Linux versions, the Dependency Agent collects data using a user-space service and a kernel driver.
25+
* Dependency Agent supports the same [Windows versions that Azure Monitor Agent supports](../agents/agents-overview.md#supported-operating-systems), except Windows Server 2008 SP2 and Azure Stack HCI.
26+
* For Linux, see [Dependency Agent Linux support](#dependency-agent-linux-support).
2727

2828
## Install or upgrade Dependency Agent
2929

articles/azure-netapp-files/backup-requirements-considerations.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ Azure NetApp Files backup in a region can only protect an Azure NetApp Files vol
4444

4545
* If you need to delete a parent resource group or subscription that contains backups, you should delete any backups first. Deleting the resource group or subscription won't delete the backups.
4646

47-
* If you use the standard storage with cool access, see [Manage Azure NetApp Files standard storage with cool access](manage-cool-access.md#considerations) for more considerations.
48-
4947
## Next steps
5048

5149
* [Understand Azure NetApp Files backup](backup-introduction.md)

articles/azure-netapp-files/cool-access-introduction.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ The following diagram illustrates an application with a volume enabled for cool
2424

2525
In the initial write, data blocks are assigned a "warm" temperature value (in the diagram, red data blocks) and exist on the "hot" tier. As the data resides on the volume, a temperature scan monitors the activity of each block. When a data block is inactive, the temperature scan decreases the value of the block until it has been inactive for the number of days specified in the cooling period. The cooling period can be between 2 and 183 days; it has a default value of 31 days. Once marked "cold," the tiering scan collects blocks and packages them into 4-MB objects, which are moved to Azure storage fully transparently. To the application and users, those cool blocks still appear online. Tiered data appears to be online and continues to be available to users and applications by transparent and automated retrieval from the cool tier.
2626

27-
By `Default` (unless cool access retrieval policy is configured otherwise), data blocks on the cool tier that are read randomly again become "warm" and are moved back to the hot tier. Once marked as _warm_, the data blocks are again subjected to the temperature scan. However, large sequential reads (such as index and antivirus scans) on inactive data in the cool tier don't "warm" the data nor do they trigger inactive data to be moved back to the hot tier. Additionally, sequential reads for Azure NetApp Files, cross-region replication, or cross-zone replication do ***not*** "warm" the data.
27+
By `Default` (unless cool access retrieval policy is configured otherwise), data blocks on the cool tier that are read randomly again become "warm" and are moved back to the hot tier. Once marked as _warm_, the data blocks are again subjected to the temperature scan. However, large sequential reads (such as index and antivirus scans) on inactive data in the cool tier don't "warm" the data nor do they trigger inactive data to be moved back to the hot tier.
2828

2929
>[!IMPORTANT]
3030
>If you're using a third-party backup service, configure it to use NDMP instead of the CIFS or NFS protocols. NDMP reads do not affect the temperature of the data.

articles/azure-netapp-files/manage-cool-access.md

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,11 @@ The standard storage with cool access feature provides options for the “coolne
2525
* You can convert an existing Standard service-level capacity pool into a cool-access capacity pool to create cool access volumes. However, once the capacity pool is enabled for cool access, you can't convert it back to a non-cool-access capacity pool.
2626
* A cool-access capacity pool can contain both volumes with cool access enabled and volumes with cool access disabled.
2727
* To prevent data retrieval from the cool tier to the hot tier during sequential read operations (for example, antivirus or other file scanning operations), set the cool access retrieval policy to "Default" or "Never." For more information, see [Enable cool access on a new volume](#enable-cool-access-on-a-new-volume).
28-
* Sequential reads from Azure NetApp Files backup, cross-zone replication, and cross-zone replication do not impact the temperature of the data.
29-
* If you're using a third-party backup service, configure it to use NDMP instead of the CIFS or NFS protocols. NDMP reads do not affect the temperature of the data.
3028
* After the capacity pool is configured with the option to support cool access volumes, the setting can't be disabled at the _capacity pool_ level. However, you can turn on or turn off the cool access setting at the volume level anytime. Turning off the cool access setting at the _volume_ level stops further tiering of data. 
3129
* You can't use [large volume](large-volumes-requirements-considerations.md) with Standard storage with cool access.
3230
* See [Resource limits for Azure NetApp Files](azure-netapp-files-resource-limits.md#resource-limits) for maximum number of volumes supported for cool access per subscription per region.
33-
* Considerations for using cool access with [cross-region replication](cross-region-replication-requirements-considerations.md) (CRR) and [cross-zone replication](cross-zone-replication-introduction.md):
34-
* If the volume is in a CRR relationship as a source volume, you can enable cool access on it only if the [mirror state](cross-region-replication-display-health-status.md#display-replication-status) is `Mirrored`. Enabling cool access on the source volume automatically enables cool access on the destination volume.
35-
* If the volume is in a CRR relationship as a destination volume (data protection volume), enabling cool access isn't supported for the volume.
36-
* The cool access setting is updated automatically on the destination volume to be the same as the source volume. When you update the cool access setting on the source volume, the same setting is applied at the destination volume.
37-
* Considerations for using cool access with [Azure NetApp Files backup](backup-requirements-considerations.md):
38-
* When a backup is in progress for a volume, you can’t enable cool access on the volume.
39-
* If a volume already contains cool-tiered data, you can’t enable backup for the volume.
40-
* If backup is already enabled on a volume, you can enable cool access only if the baseline backup is complete.
31+
* Considerations for using cool access with [cross-region replication](cross-region-replication-requirements-considerations.md) and [cross-zone replication](cross-zone-replication-introduction.md):
32+
* The cool access setting on the destination is updated automatically to match the source volume whenever the setting is changed on the source volume or during authorizing or performing a reverse resync of the replication. Changes to the cool access setting on the destination volume don't affect the setting on the source volume.
4133
* Considerations for using cool access with [snapshot restore](snapshots-restore-new-volume.md):
4234
* When restoring a snapshot of a cool access enabled volume to a new volume, the new volume inherits the cool access configuration from the parent volume. Once the new volume is created, the cool access settings can be modified.
4335
* You can't restore from a snapshot of a non-cool-access volume to a cool access volume. Likewise, you can't restore from a snapshot of a cool access volume to a non-cool-access volume.

articles/azure-sql-edge/deploy-kubernetes.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ Create an SA password in the Kubernetes cluster. Kubernetes can manage sensitive
6969
The following command creates a password for the SA account:
7070

7171
```azurecli
72-
kubectl create secret generic mssql --from-literal=SA_PASSWORD="MyC0m9l&xP@ssw0rd" -n <namespace name>
72+
kubectl create secret generic mssql --from-literal=MSQL_SA_PASSWORD="MyC0m9l&xP@ssw0rd" -n <namespace name>
7373
```
7474

7575
Replace `MyC0m9l&xP@ssw0rd` with a complex password.
@@ -186,11 +186,11 @@ In this step, create a manifest to describe the container based on the Azure SQL
186186
value: "Developer"
187187
- name: ACCEPT_EULA
188188
value: "Y"
189-
- name: SA_PASSWORD
189+
- name: MSSQL_SA_PASSWORD
190190
valueFrom:
191191
secretKeyRef:
192192
name: mssql
193-
key: SA_PASSWORD
193+
key: MSSQL_SA_PASSWORD
194194
- name: MSSQL_AGENT_ENABLED
195195
value: "TRUE"
196196
- name: MSSQL_COLLATION
@@ -225,13 +225,13 @@ In this step, create a manifest to describe the container based on the Azure SQL
225225

226226
* `persistentVolumeClaim`: This value requires an entry for `claimName:` that maps to the name used for the persistent volume claim. This tutorial uses `mssql-data`.
227227

228-
* `name: SA_PASSWORD`: Configures the container image to set the SA password, as defined in this section.
228+
* `name: MSSQL_SA_PASSWORD`: Configures the container image to set the SA password, as defined in this section.
229229

230230
```yaml
231231
valueFrom:
232232
secretKeyRef:
233233
name: mssql
234-
key: SA_PASSWORD
234+
key: MSSQL_SA_PASSWORD
235235
```
236236

237237
When Kubernetes deploys the container, it refers to the secret named `mssql` to get the value for the password.

articles/network-watcher/azure-monitor-agent-with-connection-monitor.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ titleSuffix: Azure Network Watcher
44
description: Learn how to use Azure Monitor agent to monitor network connectivity with Network Watcher connection monitor.
55
author: halkazwini
66
ms.author: halkazwini
7-
ms.service: network-watcher
7+
ms.service: azure-network-watcher
88
ms.topic: how-to
99
ms.date: 03/12/2024
1010

articles/network-watcher/connection-monitor-connected-machine-agent.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ titleSuffix: Azure Network Watcher
44
description: Learn how to install the Azure Connected Machine agent using an installation script to use the Azure Network Watcher connection monitor.
55
ms.author: halkazwini
66
author: halkazwini
7-
ms.service: network-watcher
7+
ms.service: azure-network-watcher
88
ms.topic: how-to
99
ms.date: 11/15/2023
1010

articles/network-watcher/connection-monitor-create-using-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ titleSuffix: Azure Network Watcher
44
description: Learn how to create a monitor in Azure Network Watcher connection monitor using the Azure portal.
55
author: halkazwini
66
ms.author: halkazwini
7-
ms.service: network-watcher
7+
ms.service: azure-network-watcher
88
ms.topic: how-to
99
ms.date: 11/30/2023
1010

0 commit comments

Comments
 (0)