Skip to content

Commit 2f5bf7d

Browse files
authored
Merge pull request #252455 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 ee6250b + 311e264 commit 2f5bf7d

File tree

7 files changed

+100
-19
lines changed

7 files changed

+100
-19
lines changed

articles/active-directory-b2c/troubleshoot.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ This error occurs when the [self-service password reset experience](add-password
2929

3030
There are 2 solutions to this problem:
3131
- Respond back with a new authentication request using Azure AD B2C password reset user flow.
32-
- Use recommended [self service password resect (SSPR) experience](add-password-reset-policy.md#self-service-password-reset-recommended).
32+
- Use recommended [self service password reset (SSPR) experience](add-password-reset-policy.md#self-service-password-reset-recommended).
3333

3434

3535
## User canceled the operation
3636
Azure AD B2C service can also return an error to your application when a user cancels an operation. The following are examples of scenarios where a user performs a cancel operation:
37-
- A user policy uses the recommended [self service password resect (SSPR) experience](add-password-reset-policy.md#self-service-password-reset-recommended) with a consumer local account. The user selects the **Forgot your password?** link , and then selects **Cancel** button before the user flow experience completes. In this case, Azure AD B2C service returns error code `AADB2C90091` to your application.
37+
- A user policy uses the recommended [self service password reset (SSPR) experience](add-password-reset-policy.md#self-service-password-reset-recommended) with a consumer local account. The user selects the **Forgot your password?** link , and then selects **Cancel** button before the user flow experience completes. In this case, Azure AD B2C service returns error code `AADB2C90091` to your application.
3838
- A user chooses to authenticate with an external identity provider such as [LinkedIn](identity-provider-linkedin.md). The user select **Cancel** button before authenticating to the identity provider itself. In this case, Azure AD B2C service returns error code `AADB2C90273` to your application. Learn more about [error codes Azure Active Directory B2C service return](error-codes.md).
3939

4040
To handle this error, fetch the **error description** for the user and respond back with a new authentication request using the same user flow.

articles/active-directory/develop/custom-extension-get-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ The following JSON snippet demonstrates how to configure these properties.
408408

409409
## Step 4: Assign a custom claims provider to your app
410410

411-
For tokens to be issued with claims incoming from the custom authentication extension, you must assign a custom claims provider to your application. The custom claims provider relies on the custom authentication extension configured with the **token issuance start** event listener. You can choose whether all, or a subset of claims, from the custom claims provider are mapped into the token.
411+
For tokens to be issued with claims incoming from the custom authentication extension, you must assign a custom claims provider to your application. This is based on the token audience, so the provider must be assgined to the client application to receive claims in an ID token, and to the resource application to receive claims in an access token. The custom claims provider relies on the custom authentication extension configured with the **token issuance start** event listener. You can choose whether all, or a subset of claims, from the custom claims provider are mapped into the token.
412412

413413
Follow these steps to connect the *My Test application* with your custom authentication extension:
414414

articles/active-directory/workload-identities/workload-identity-federation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Watch this video to learn why you would use workload identity federation.
2828
2929
Typically, a software workload (such as an application, service, script, or container-based application) needs an identity in order to authenticate and access resources or communicate with other services. When these workloads run on Azure, you can use [managed identities](../managed-identities-azure-resources/overview.md) and the Azure platform manages the credentials for you. You can only use managed identities, however, for software workloads running in Azure. For a software workload running outside of Azure, you need to use application credentials (a secret or certificate) to access Microsoft Entra ID protected resources (such as Azure, Microsoft Graph, Microsoft 365, or third-party resources). These credentials pose a security risk and have to be stored securely and rotated regularly. You also run the risk of service downtime if the credentials expire.
3030

31-
You use workload identity federation to configure an [user-assigned managed identity](../managed-identities-azure-resources/how-manage-user-assigned-managed-identities.md) or [app registration](../develop/app-objects-and-service-principals.md) in Microsoft Entra ID to trust tokens from an external identity provider (IdP), such as GitHub or Google. The user-assigned managed identity or app registration in Microsoft Entra ID becomes an identity for software workloads running, for example, in on-premises Kubernetes or GitHub Actions workflows. Once that trust relationship is created, your external software workload exchanges trusted tokens from the external IdP for access tokens from Microsoft identity platform. Your software workload uses that access token to access the Microsoft Entra ID protected resources to which the workload has been granted access. You eliminate the maintenance burden of manually managing credentials and eliminates the risk of leaking secrets or having certificates expire.
31+
You use workload identity federation to configure a [user-assigned managed identity](../managed-identities-azure-resources/how-manage-user-assigned-managed-identities.md) or [app registration](../develop/app-objects-and-service-principals.md) in Microsoft Entra ID to trust tokens from an external identity provider (IdP), such as GitHub or Google. The user-assigned managed identity or app registration in Microsoft Entra ID becomes an identity for software workloads running, for example, in on-premises Kubernetes or GitHub Actions workflows. Once that trust relationship is created, your external software workload exchanges trusted tokens from the external IdP for access tokens from Microsoft identity platform. Your software workload uses that access token to access the Microsoft Entra ID protected resources to which the workload has been granted access. You eliminate the maintenance burden of manually managing credentials and eliminates the risk of leaking secrets or having certificates expire.
3232

3333
## Supported scenarios
3434

articles/ai-services/computer-vision/whats-new.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,15 @@ ms.author: pafarley
1717

1818
Learn what's new in the service. These items may be release notes, videos, blog posts, and other types of information. Bookmark this page to stay up to date with new features, enhancements, fixes, and documentation updates.
1919

20+
## September 2023
21+
22+
### Deprecation of outdated Computer Vision API versions
23+
24+
Computer Vision API versions 1.0, 2.0, 3.0, and 3.1 will be retired on September 13, 2026. Developers won’t be able to make API calls to these APIs after that date.
25+
We recommend that all affected customers migrate their workloads to the generally available Computer Vision 3.2 API by following this [QuickStart](/azure/ai-services/computer-vision/quickstarts-sdk/image-analysis-client-library?tabs=linux%2Cvisual-studio&pivots=programming-language-rest-api) at their earliest convenience. Customers should also consider migrating to [Image Analysis 4.0 API (preview)](/azure/ai-services/computer-vision/quickstarts-sdk/image-analysis-client-library-40?tabs=visual-studio%2Clinux&pivots=programming-language-python), which has our latest and greatest Image Analysis capabilities.
26+
27+
Visit our [Q&A](/answers/tags/127/azure-computer-vision) for any questions.
28+
2029
## May 2023
2130

2231
### Image Analysis 4.0 Product Recognition (public preview)

articles/azure-vmware/migrate-sql-server-standalone-cluster.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.custom: engagement-fy23
1111

1212
# Migrate a SQL Server standalone instance to Azure VMware Solution
1313

14-
In this article, you learn how to migrate a SQL Server Standalone to Azure VMware Solution.
14+
In this article, you learn how to migrate a SQL Server standalone instance to Azure VMware Solution.
1515

1616
When migrating a SQL Server standalone instance to Azure VMware Solution, VMware HCX offers two migration profiles:
1717

@@ -39,7 +39,7 @@ This scenario was validated using the following editions and configurations:
3939
- Remove all cluster node VMs from any Distributed Resource Scheduler (DRS) groups and rules.
4040

4141
- Configure VMware HCX between your on-premises datacenter and the Azure VMware Solution private cloud that runs the migrated workloads. For more information about configuring VMware HCX, see [Azure VMware Solution documentation](install-vmware-hcx.md).
42-
- Ensure that all the network segments in use by the SQL Server are extended into your Azure VMware Solution private cloud. To verify this step in the procedure, see [Configure VMware HCX network extension](configure-hcx-network-extension.md).
42+
- Ensure that all the network segments in use by the SQL Server and workloads using it are extended into your Azure VMware Solution private cloud. To verify this step in the process, see [Configure VMware HCX network extension](configure-hcx-network-extension.md).
4343

4444
Either VMware HCX over VPN or ExpressRoute connectivity can be used as the networking configuration for the migration.
4545

@@ -52,7 +52,7 @@ Further downtime considerations are discussed in the next section.
5252
## Downtime considerations
5353

5454
Downtime during a migration depends on the size of the database to be migrated and the speed of the private network connection to Azure cloud.
55-
Migration of the Microsoft SQL Server Standalone instance using the VMware HCX vMotion mechanism is intended to minimize the solution downtime, however we still recommend the migration take place during off-peak hours with a pre-approved change window.
55+
Migration of a SQL Server standalone instance using the VMware HCX vMotion mechanism is intended to minimize the solution downtime, however we still recommend the migration take place during off-peak hours within an pre-approved change window.
5656

5757
This table indicates the estimated downtime for migration of each SQL Server topology.
5858

articles/azure-vmware/toc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,11 +191,11 @@ items:
191191
href: deploy-vsan-stretched-clusters.md
192192
- name: Migrate Microsoft SQL Server workloads
193193
items:
194-
- name: Migrate Microsoft SQL Server Standalone to Azure VMware Solution
194+
- name: Migrate a SQL Server standalone instance to Azure VMware Solution
195195
href: migrate-sql-server-standalone-cluster.md
196196
- name: Migrate SQL Server failover cluster to Azure VMware Solution
197197
href: migrate-sql-server-failover-cluster.md
198-
- name: Migrate Microsoft SQL Server Always-On cluster to Azure VMware Solution
198+
- name: Migrate Microsoft SQL Server Always-On Availability Group to Azure VMware Solution
199199
href: migrate-sql-server-always-on-availability-group.md
200200
- name: Move resources
201201
items:

articles/service-fabric/how-to-managed-cluster-vmss-extension.md

Lines changed: 82 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ ms.date: 07/11/2022
1414
Each node type in a Service Fabric managed cluster is backed by a virtual machine scale set. This enables you to add [virtual machine scale set extensions](../virtual-machines/extensions/overview.md) to your Service Fabric managed cluster node types. Extensions are small applications that provide post-deployment configuration and automation on Azure VMs. The Azure platform hosts many extensions covering VM configuration, monitoring, security, and utility applications. Publishers take an application, wrap it into an extension, and simplify the installation. All you need to do is provide mandatory parameters.
1515

1616
## Add a virtual machine scale set extension
17+
1718
You can add a virtual machine scale set extension to a Service Fabric managed cluster node type using the [Add-AzServiceFabricManagedNodeTypeVMExtension](/powershell/module/az.servicefabric/add-azservicefabricmanagednodetypevmextension) PowerShell command.
1819

1920
Alternately, you can add a virtual machine scale set extension on a Service Fabric managed cluster node type in your Azure Resource Manager template, for example:
@@ -29,22 +30,21 @@ Alternately, you can add a virtual machine scale set extension on a Service Fabr
2930
"location": "[resourceGroup().location]",
3031
"properties": {
3132
"isPrimary": true,
32-
"vmInstanceCount": 3,
33-
"dataDiskSizeGB": 100,
34-
"vmSize": "Standard_D2",
35-
"vmImagePublisher": "MicrosoftWindowsServer",
36-
"vmImageOffer": "WindowsServer",
37-
"vmImageSku": "2019-Datacenter",
38-
"vmImageVersion": "latest",
33+
...
3934
"vmExtensions": [
4035
{
41-
"name": "ExtensionA",
36+
"name": "KvExtension",
4237
"properties": {
43-
"publisher": "ExtensionA.Publisher",
38+
"publisher": "Microsoft.Azure.KeyVault",
4439
"type": "KeyVaultForWindows",
45-
"typeHandlerVersion": "1.0",
40+
"typeHandlerVersion": "3.0",
4641
"autoUpgradeMinorVersion": true,
4742
"settings": {
43+
"secretsManagementSettings": {
44+
"observedCertificates": [
45+
...
46+
]
47+
}
4848
}
4949
}
5050
}
@@ -55,6 +55,78 @@ Alternately, you can add a virtual machine scale set extension on a Service Fabr
5555

5656
For more information on configuring Service Fabric managed cluster node types, see [managed cluster node type](/azure/templates/microsoft.servicefabric/2022-01-01/managedclusters/nodetypes).
5757

58+
## How to provision before Service Fabric runtime
59+
To provision extensions before the Service Fabric runtime starts, you can use the `setupOrder` parameter with the value `BeforeSFRuntime` in the extension properties for each extension as needed. This allows you to set up the environment and dependencies before the runtime and applications begin running on the node. See the example below for clarification:
60+
61+
>[!NOTE]
62+
> It's essential to note that if an extension marked with `BeforeSFRuntime` fails, it will prevent the Service Fabric runtime from starting. Consequently, the node will be down from the Service Fabric perspective. Therefore, it is crucial to maintain these extensions with correct configurations and promptly address any issues that may arise to ensure the health of nodes within the cluster.
63+
64+
### Requirements
65+
Use Service Fabric API version `2023-09-01-preview` or later.
66+
67+
### ARM Template example:
68+
```json
69+
{
70+
"type": "Microsoft.ServiceFabric/managedclusters/nodetypes",
71+
"apiVersion": "2023-09-01-preview",
72+
"name": "[concat(parameters('clusterName'), '/', parameters('nodeTypeName'))]",
73+
"properties": {
74+
"isPrimary": true,
75+
...
76+
"vmExtensions": [
77+
{
78+
"name": "KvExtension",
79+
"properties": {
80+
"setupOrder": [
81+
"BeforeSFRuntime"
82+
],
83+
"provisionAfterExtensions" [ "GenevaMonitoringExtension" ],
84+
"publisher": "Microsoft.Azure.KeyVault",
85+
"type": "KeyVaultForWindows",
86+
"typeHandlerVersion": "3.0",
87+
"autoUpgradeMinorVersion": true,
88+
"settings": {
89+
"secretsManagementSettings": {
90+
"observedCertificates": [
91+
...
92+
]
93+
}
94+
}
95+
}
96+
},
97+
{
98+
"name": "GenevaMonitoringExtension",
99+
"properties": {
100+
"setupOrder": [
101+
"BeforeSFRuntime"
102+
],
103+
"autoUpgradeMinorVersion": true,
104+
"enableAutomaticUpgrade": true,
105+
"publisher": "Microsoft.Azure.Geneva",
106+
"type": "GenevaMonitoring",
107+
"typeHandlerVersion": "2.40",
108+
"settings": {
109+
"configurations": [
110+
{
111+
"ServiceArguments": {
112+
...
113+
},
114+
"UserArguments": {
115+
...
116+
}
117+
}
118+
]
119+
}
120+
}
121+
}
122+
]
123+
}
124+
}
125+
```
126+
127+
>[!NOTE]
128+
> Special handling for AzureDiskEncryption (ADE) extension: ADE needs to run before the Service Fabric runtime to ensures that the disk is decrypted after a reimage operations, allowing the Service Fabric runtime to start using it. Even if the extension is not explicitly marked with `BeforeSFRuntime`, it will run before the runtime. But note that enabling encryption at host is recommended over using ADE extension. For detailed instructions, refer to [Enable encryption at host](how-to-managed-cluster-enable-disk-encryption.md#enable-encryption-at-host).
129+
58130
## Next steps
59131

60132
To learn more about Service Fabric managed clusters, see:

0 commit comments

Comments
 (0)