Skip to content

Commit 86065a5

Browse files
authored
Merge pull request #295305 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents f5434a7 + 95d1699 commit 86065a5

File tree

5 files changed

+21
-8
lines changed

5 files changed

+21
-8
lines changed

articles/azure-maps/power-bi-visual-get-started.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ titleSuffix: Microsoft Azure Maps
44
description: This article discusses how to use Azure Maps Power BI visual.
55
author: deniseatmicrosoft
66
ms.author: limingchen
7-
ms.date: 01/27/2025
7+
ms.date: 02/25/2025
88
ms.topic: how-to
99
ms.service: azure-maps
1010
ms.subservice: power-bi-visual
@@ -153,7 +153,7 @@ The Azure Maps Power BI visual is available in the following services and applic
153153
| Power BI Desktop | Yes |
154154
| Power BI service (app.powerbi.com) | Yes |
155155
| Power BI mobile applications | Yes |
156-
| Power BI publish to web | No |
156+
| Power BI publish to web | Yes |
157157
| Power BI Embedded | Yes |
158158
| Power BI service embedding (PowerBI.com) | Yes |
159159

articles/communication-services/quickstarts/advanced-messaging/whatsapp/download-media.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ An example of an `AdvancedMessageReceived` event with media content:
5555
::: zone-end
5656

5757
::: zone pivot="programming-language-javascript"
58-
[!INCLUDE [Download WhatsApp media messages with Javascript SDK](./includes/download-media/download-media-javascript.md)]
58+
[!INCLUDE [Download WhatsApp media messages with JavaScript SDK](./includes/download-media/download-media-javascript.md)]
5959
::: zone-end
6060

6161
::: zone pivot="programming-language-python"

articles/container-apps/storage-mounts.md

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: craigshoemaker
66
ms.service: azure-container-apps
77
ms.custom: devx-track-azurecli
88
ms.topic: conceptual
9-
ms.date: 01/31/2025
9+
ms.date: 02/25/2025
1010
ms.author: cshoe
1111
zone_pivot_groups: arm-azure-cli-portal
1212
---
@@ -321,9 +321,12 @@ For a step-by-step tutorial on mounting an SMB file share, refer to [Create an A
321321
- The `name` is an identifier for the volume.
322322
- For `storageType`, use `AzureFile` for SMB, or `NfsAzureFile` for NFS. This value must match the storage type you defined in the environment.
323323
- For `storageName`, use the name of the storage you defined in the environment.
324+
- The `mountOptions` is a comma-separated string of mount options. For more information see [Use mountOptions settings in Azure Files](/troubleshoot/azure/azure-kubernetes/storage/mountoptions-settings-azure-files).
325+
- The `secrets` list is a list of secrets to mount in the volume. For more information see [Mounting secrets in a volume](./manage-secrets.md#secrets-volume-mounts).
324326
- For each container in the template that you want to mount Azure Files storage, define a volume mount in the `volumeMounts` array of the container definition.
325327
- The `volumeName` is the name defined in the `volumes` array.
326328
- The `mountPath` is the path in the container to mount the volume.
329+
- The `subPath` (optional) is the path in the volume to mount. If not specified, the volume root is mounted. For more information see [using subPath](https://kubernetes.io/docs/concepts/storage/volumes/#using-subpath).
327330
328331
# [SMB](#tab/smb)
329332
@@ -338,6 +341,7 @@ For a step-by-step tutorial on mounting an SMB file share, refer to [Create an A
338341
volumeMounts:
339342
- volumeName: azure-files-volume
340343
mountPath: /my-files
344+
subPath: my-sub-path
341345
volumes:
342346
- name: azure-files-volume
343347
storageType: AzureFile
@@ -357,6 +361,7 @@ For a step-by-step tutorial on mounting an SMB file share, refer to [Create an A
357361
volumeMounts:
358362
- volumeName: azure-files-volume
359363
mountPath: /my-files
364+
subPath: my-sub-path
360365
volumes:
361366
- name: azure-files-volume
362367
storageType: NfsAzureFile
@@ -501,7 +506,8 @@ The following ARM template snippets demonstrate how to add an Azure Files share
501506
"volumeMounts": [
502507
{
503508
"mountPath": "/myfiles",
504-
"volumeName": "azure-files-volume"
509+
"volumeName": "azure-files-volume",
510+
"subPath": "my-sub-path"
505511
}
506512
]
507513
}
@@ -547,7 +553,8 @@ The following ARM template snippets demonstrate how to add an Azure Files share
547553
"volumeMounts": [
548554
{
549555
"mountPath": "/myfiles",
550-
"volumeName": "azure-files-volume"
556+
"volumeName": "azure-files-volume",
557+
"subPath": "my-sub-path"
551558
}
552559
]
553560
}
@@ -574,9 +581,12 @@ The following ARM template snippets demonstrate how to add an Azure Files share
574581
- The `name` is an identifier for the volume.
575582
- For `storageType`, use `AzureFile` for SMB, or `NfsAzureFile` for NFS. This value must match the storage type you defined in the environment.
576583
- For `storageName`, use the name of the storage you defined in the environment.
584+
- The `mountOptions` is a comma-separated string of mount options. For more information see [Use mountOptions settings in Azure Files](/troubleshoot/azure/azure-kubernetes/storage/mountoptions-settings-azure-files).
585+
- The `secrets` list is a list of secrets to mount in the volume. For more information see [Mounting secrets in a volume](./manage-secrets.md#secrets-volume-mounts).
577586
- For each container in the template that you want to mount Azure Files storage, define a volume mount in the `volumeMounts` array of the container definition.
578587
- The `volumeName` is the name defined in the `volumes` array.
579588
- The `mountPath` is the path in the container to mount the volume.
589+
- The `subPath` (optional) is the path in the volume to mount. If not specified, the volume root is mounted. For more information see [using subPath](https://kubernetes.io/docs/concepts/storage/volumes/#using-subpath).
580590
581591
See the [ARM template API specification](azure-resource-manager-api-spec.md) for a full example.
582592
@@ -632,6 +642,7 @@ To configure a volume mount for Azure Files storage in the Azure portal, add a f
632642
- **Volume type**: **Azure file volume**.
633643
- **Name**: Enter a volume name.
634644
- **File share name**: Select the file share you created previously.
645+
- **Mount options**: Optionally, enter a comma-separated string of mount options. For more information see [Use mountOptions settings in Azure Files](/troubleshoot/azure/azure-kubernetes/storage/mountoptions-settings-azure-files).
635646
636647
1. Select **Add** to exit the context pane.
637648
@@ -645,6 +656,8 @@ To configure a volume mount for Azure Files storage in the Azure portal, add a f
645656
646657
1. In **Mount path**, enter the absolute path in the container to mount the volume.
647658
659+
1. In **Sub path (optional)**, enter the path in the volume to mount. If not specified, the volume root is mounted. For more information see [using subPath](https://kubernetes.io/docs/concepts/storage/volumes/#using-subpath).
660+
648661
1. Select **Save** to save changes and exit the context pane.
649662
650663
1. Select **Create** to create the new revision.

articles/governance/machine-configuration/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ such as:
2424

2525
Configurations are distinct from policy definitions. Machine configuration uses Azure Policy to
2626
dynamically assign configurations to machines. You can also assign configurations to machines
27-
[manually][03], or by using other Azure services such as [Automanage][04].
27+
[manually][03].
2828

2929
Examples of each scenario are provided in the following table.
3030

articles/managed-grafana/encryption.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ For more information, go to [Encryption at rest in Azure Cosmos DB](/azure/cosmo
3232

3333
The encryption model used by Azure Managed Grafana is the server-side encryption model with Service-Managed keys.
3434

35-
In this model, all key management aspects such as key issuance, rotation, and backup are managed by Microsoft. The Azure resource providers create the keys, place them in secure storage, and retrieve them when needed. For more information, go to [Server-side encryption using service-managed keys](../security/fundamentals/encryption-models.md#server-side-encryption-using-service-managed-keys).
35+
In this model, all key management aspects, such as key issuance, rotation, and backup, are managed by Microsoft. The Azure resource providers create the keys, place them in secure storage, and retrieve them when needed. For more information, go to [Server-side encryption using service-managed keys](../security/fundamentals/encryption-models.md#server-side-encryption-using-service-managed-keys).
3636

3737
## Next steps
3838

0 commit comments

Comments
 (0)