Skip to content

Commit 4eae2c8

Browse files
authored
Merge pull request #298406 from MicrosoftDocs/main
Merge main to live, 4 AM
2 parents 9a17b0f + 022ad1a commit 4eae2c8

13 files changed

+266
-26
lines changed

articles/active-directory-b2c/user-profile-attributes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Azure AD B2C directory user profile supports the [user resource type](/graph/api
3939
- Whether the attribute can be used in a user flow
4040
- Whether the attribute can be used in a custom policy [Microsoft Entra ID technical profile](active-directory-technical-profile.md) and in which section (<InputClaims>, <OutputClaims>, or <PersistedClaims>)
4141

42-
|Name |Date type |Description|Available in Azure portal|Used in user flows|Used in custom policy|
42+
|Name |Data type |Description|Available in Azure portal|Used in user flows|Used in custom policy|
4343
|---------|---------|----------|------------|----------|-------------|
4444
|accountEnabled |Boolean|Whether the user account is enabled or disabled: **true** if the account is enabled, otherwise **false**.|Yes|No|Persisted, Output|
4545
|ageGroup |String|The user's age group. Possible values: null, Undefined, Minor, Adult, NotAdult.|Yes|No|Persisted, Output|

articles/azure-vmware/native-create-azure-vmware-virtual-network-private-cloud.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Before you begin, these items are required to create an Azure VMware Solution Ge
2323
- Enable the Azure VMware Solution Fleet Rp Service Principal as described in the [enable Azure VMware Solution Fleet Rp service Principal](native-first-party-principle-security.md).
2424
- Ensure you have appropriate administrative rights and permission to create a private cloud. You must be at minimum Owner or User Access Administrator on the subscription.
2525
- Hosts provisioned and the "Microsoft.AVS" resource provider is registered.
26-
- Deploy or us an existing Azure Virtual Network with a minimum network address space of a /22 or four /24s.
26+
- Deploy or use an existing Azure Virtual Network with a minimum network address space of a /22 or four /24s.
2727
- The newly created Azure Virtual Network and your Azure VMware Solution Gen 2 private cloud must be in the same Resource Group.
2828
- Ensure you have sufficient AV64 quota allocated to your subscription in the desired region before your deployment.
2929
- The following Preview feature flags need to be registered under the subscription where your private cloud will reside. This commands can be run using Azure Cloud Shell.

articles/backup/aks-backup-faq.yml

Lines changed: 242 additions & 0 deletions
Large diffs are not rendered by default.

articles/backup/toc.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,10 @@
218218
href: backup-azure-file-folder-backup-faq.yml
219219
- name: FAQ-Back up Azure Files
220220
href: backup-azure-files-faq.yml
221-
- name: FAQ- Azure Disk Backup
221+
- name: FAQ-Azure Disk Backup
222222
href: disk-backup-faq.yml
223+
- name: FAQ-Azure Backup for AKS
224+
href: aks-backup-faq.yml
223225
- name: FAQ-Back up SQL Server databases on Azure VMs
224226
href: faq-backup-sql-server.yml
225227
- name: FAQ-Back up SAP HANA databases on Azure VMs

articles/synapse-analytics/spark/azure-synapse-diagnostic-emitters-azure-eventhub.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,3 +92,8 @@ Here's a sample log record in JSON format:
9292
## Synapse workspace with data exfiltration protection enabled
9393

9494
Azure Synapse Analytics workspaces support enabling data exfiltration protection for workspaces. With exfiltration protection, the logs and metrics can't be sent out to the destination endpoints directly. You can create corresponding [managed private endpoints](../../synapse-analytics/security/synapse-workspace-managed-private-endpoints.md) for different destination endpoints or [create IP firewall rules](../../synapse-analytics/security/synapse-workspace-ip-firewall.md) in this scenario.
95+
96+
## Collect Apache Spark applications logs and metrics by certificate and service principal
97+
98+
The Apache Spark diagnostic emitter extension now supports accessing Azure Event Hub by obtaining a token through service principal authentication with certificate credentials. For more information, see [Collect Apache Spark Application Logs and Metrics to Azure Event Hubs Using Certificate-Based Service Principal Authentication](./how-to-use-certificate-with-service-principalp-emit-log-event-hubs.md) article.
99+

articles/synapse-analytics/spark/how-to-use-certificate-with-service-principalp-emit-log-event-hubs.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: How to use certificate and Service Principal emit log to Azure Event Hubs
2+
title: Collect Apache Spark Application Logs and Metrics to Azure Event Hubs Using Certificate-Based Service Principal Authentication
33
description: Learn to setting up Azure services, particularly focusing on integrating Azure Synapse with Azure Event Hubs and Key Vault.
44
author: jejiang
55
ms.author: jejiang
@@ -8,7 +8,7 @@ ms.topic: tutorial
88
ms.date: 03/24/2025
99
---
1010

11-
# How to use certificate and service principal emit log to Azure Event Hubs
11+
# Collect Apache Spark Application Logs and Metrics to Azure Event Hubs Using Certificate-Based Service Principal Authentication
1212

1313
The Apache Spark diagnostic emitter extension is a library that allows Spark applications to send logs, event logs, and metrics to destinations like Azure Event Hubs, Azure Log Analytics, and Azure Storage.
1414

articles/synapse-analytics/toc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -816,7 +816,7 @@ items:
816816
href: ./spark/azure-synapse-diagnostic-emitters-azure-storage.md
817817
- name: Collect Apache Spark applications logs and metrics with Azure Event Hubs
818818
href: ./spark/azure-synapse-diagnostic-emitters-azure-eventhub.md
819-
- name: Collect Apache Spark applications logs and metrics by certificate and service principal
819+
- name: Collect Apache Spark Application Logs and Metrics to Azure Event Hubs Using Certificate-Based Service Principal Authentication
820820
href: ./spark/how-to-use-certificate-with-service-principalp-emit-log-event-hubs.md
821821
- name: Manage Apache Spark configuration
822822
href: ./spark/apache-spark-azure-create-spark-configuration.md

articles/virtual-desktop/app-attach-create-msix-image.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ Here are example commands to create a CIM disk image from an MSIX package. You'l
4242

4343
You should create a new folder for the destination because a CIM disk image is made up of multiple files and this helps differentiate between the images.
4444

45+
> [!CAUTION]
46+
> An issue currently impacts CimFS images with Windows 11, version 24H2, which prevents the images from being mounted. We are actively working on a fix that is estimated to be available in June 2025. Workarounds are use VHDX images instead or use a version of Windows 11 prior to 24H2.
47+
4548
> [!IMPORTANT]
4649
> To guarantee compatibility, make sure the CIM files storing your MSIX images are generated on a version of Windows that is lower than or equal to the version of Windows where you are planning to run the MSIX packages. For example, CIM files generated on Windows 11 may not work on Windows 10.
4750

articles/virtual-desktop/app-attach-overview.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ Before you can use MSIX application packages with Azure Virtual Desktop, you nee
8181

8282
### Disk image types
8383

84-
For MSIX and Appx disk images, you can use *Composite Image File System (CimFS)*, *VHDX*, or *VHD*, but we don't recommend using VHD. Mounting and unmounting CimFS images is faster than VHD and VHDX files and also consumes less CPU and memory. We only recommend using CimFS for your application images if your session hosts are running Windows 11.
84+
For MSIX and Appx disk images, you can use *Composite Image File System (CimFS)*, *VHDX*, or *VHD*, but we don't recommend using VHD. Mounting and unmounting CimFS images is faster than VHD and VHDX images and also consumes less CPU and memory. We only recommend using CimFS for your application images if your session hosts are running Windows 11.
8585

8686
A CimFS image is a combination of several files: one file has the `.cim` file extension and contains metadata, together with at least two other files, one starting with `objectid_` and the other starting with `region_` that contain the actual application data. The files accompanying the `.cim` file don't have a file extension. The following table is a list of example files you'd find for a CimFS image:
8787

@@ -104,6 +104,9 @@ The following table is a performance comparison between VHDX and CimFS. These nu
104104
| Memory consumption | 6% (of 8 GB) | 2% (of 8 GB) |
105105
| CPU (count spike) | Maxed out multiple times | No effect |
106106

107+
> [!CAUTION]
108+
> An issue currently impacts CimFS images with Windows 11, version 24H2, which prevents the images from being mounted. We are actively working on a fix that is estimated to be available in June 2025. Workarounds are use VHDX images instead or use a version of Windows 11 prior to 24H2.
109+
107110
## Application registration
108111

109112
::: zone pivot="app-attach"

articles/virtual-desktop/app-attach-setup.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,10 @@ In order to use MSIX app attach in Azure Virtual Desktop, you need to meet the p
9797
> - All MSIX and Appx application packages include a certificate. You're responsible for making sure the certificates are trusted in your environment. Self-signed certificates are supported with the appropriate chain of trust.
9898
>
9999
> - You have to choose whether you want to use app attach or MSIX app attach with a host pool. You can't use both versions with the same package in the same host pool.
100+
101+
> [!CAUTION]
102+
> An issue currently impacts CimFS images with Windows 11, version 24H2, which prevents the images from being mounted. We are actively working on a fix that is estimated to be available in June 2025. Workarounds are use VHDX images instead or use a version of Windows 11 prior to 24H2.
103+
100104
::: zone-end
101105

102106
::: zone pivot="msix-app-attach"

0 commit comments

Comments
 (0)