Skip to content

Commit 7367fff

Browse files
authored
Merge pull request #204942 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 e16fe18 + d9a2211 commit 7367fff

File tree

6 files changed

+13
-35
lines changed

6 files changed

+13
-35
lines changed

articles/active-directory/devices/howto-vm-sign-in-azure-ad-windows.md

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -230,9 +230,6 @@ You can enforce Conditional Access policies, such as multifactor authentication
230230
>
231231
> Remote desktop using Windows Hello for Business authentication is available only for deployments that use a certificate trust model. It's currently not available for a key trust model.
232232
233-
> [!WARNING]
234-
> The per-user **Enabled/Enforced Azure AD Multi-Factor Authentication** setting is not supported for the Azure Windows VM Sign-In app.
235-
236233
## Log in by using Azure AD credentials to a Windows VM
237234

238235
> [!IMPORTANT]
@@ -396,31 +393,12 @@ You might see the following error message when you initiate a remote desktop con
396393

397394
![Screenshot of the message that says the sign-in method you're trying to use isn't allowed.](./media/howto-vm-sign-in-azure-ad-windows/mfa-sign-in-method-required.png)
398395

399-
If you've configured a Conditional Access policy that requires MFA before you can access the resource, you need to ensure that the Windows 10 or later PC that's initiating the remote desktop connection to your VM signs in by using a strong authentication method such as Windows Hello. If you don't use a strong authentication method for your remote desktop connection, you'll see the error.
396+
If you've configured a Conditional Access policy that requires MFA or legacy per-user Enabled/Enforced Azure AD MFA before you can access the resource, you need to ensure that the Windows 10 or later PC that's initiating the remote desktop connection to your VM signs in by using a strong authentication method such as Windows Hello. If you don't use a strong authentication method for your remote desktop connection, you'll see the error.
400397

401398
Another MFA-related error message is the one described previously: "Your credentials did not work."
402399

403400
![Screenshot of the message that says your credentials didn't work.](./media/howto-vm-sign-in-azure-ad-windows/your-credentials-did-not-work.png)
404401

405-
> [!WARNING]
406-
> The legacy per-user **Enabled/Enforced Azure AD Multi-Factor Authentication** setting is not supported for the Azure Windows VM Sign-In app. This setting causes sign-in to fail with the "Your credentials did not work" error message.
407-
408-
You can resolve the problem by removing the per-user MFA setting through these commands:
409-
410-
```
411-
412-
# Get StrongAuthenticationRequirements configure on a user
413-
(Get-MsolUser -UserPrincipalName [email protected]).StrongAuthenticationRequirements
414-
415-
# Clear StrongAuthenticationRequirements from a user
416-
$mfa = @()
417-
Set-MsolUser -UserPrincipalName [email protected] -StrongAuthenticationRequirements $mfa
418-
419-
# Verify StrongAuthenticationRequirements are cleared from the user
420-
(Get-MsolUser -UserPrincipalName [email protected]).StrongAuthenticationRequirements
421-
422-
```
423-
424402
If you haven't deployed Windows Hello for Business and if that isn't an option for now, you can configure a Conditional Access policy that excludes the Azure Windows VM Sign-In app from the list of cloud apps that require MFA. To learn more about Windows Hello for Business, see [Windows Hello for Business overview](/windows/security/identity-protection/hello-for-business/hello-identity-verification).
425403

426404
> [!NOTE]

articles/azure-arc/kubernetes/tutorial-gitops-flux2-ci-cd.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ In this tutorial, you'll set up a CI/CD solution using GitOps with Flux v2 and A
1515

1616
> [!div class="checklist"]
1717
> * Create an Azure Arc-enabled Kubernetes or AKS cluster.
18-
> * Connect your application and GitOps repositories to Azure Repos or Git Hub.
18+
> * Connect your application and GitOps repositories to Azure Repos or GitHub.
1919
> * Implement CI/CD flow with either Azure Pipelines or GitHub.
2020
> * Connect your Azure Container Registry to Azure DevOps and Kubernetes.
2121
> * Create environment variable groups or secrets.

articles/defender-for-cloud/includes/defender-for-containers-enable-plan-aks.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,12 +161,12 @@ Request body parameters:
161161
162162
| Property | Description |
163163
|----------|-------------|
164-
| logAnalyticsWorkspaceResourceID | **Optional**. Full resource ID of your own Log Analytics workspace.<br>When not provided, the default workspace of the region will be used.<br><br>To get the full resource ID, run the following command to display the list of workspaces in your subscriptions in the default JSON format:<br>```az resource list --resource-type Microsoft.OperationalInsights/workspaces -o json```<br><br>The Log Analytics workspace resource ID has the following syntax:<br>/subscriptions/{your-subscription-id}/resourceGroups/{your-resource-group}/providers/Microsoft.OperationalInsights/workspaces/{your-workspace-name}. <br>Learn more in [Log Analytics workspaces](../../azure-monitor/logs/log-analytics-workspace-overview.md) |
164+
| logAnalyticsWorkspaceResourceId | **Optional**. Full resource ID of your own Log Analytics workspace.<br>When not provided, the default workspace of the region will be used.<br><br>To get the full resource ID, run the following command to display the list of workspaces in your subscriptions in the default JSON format:<br>```az resource list --resource-type Microsoft.OperationalInsights/workspaces -o json```<br><br>The Log Analytics workspace resource ID has the following syntax:<br>/subscriptions/{your-subscription-id}/resourceGroups/{your-resource-group}/providers/Microsoft.OperationalInsights/workspaces/{your-workspace-name}. <br>Learn more in [Log Analytics workspaces](../../azure-monitor/logs/log-analytics-workspace-overview.md) |
165165
166166
You can include these settings in a JSON file and specify the JSON file in the `az aks create` and `az aks update` commands with this parameter: `--defender-config <path-to-JSON-file>`. The format of the JSON file must be:
167167
168168
```json
169-
{"logAnalyticsWorkspaceResourceID": "<workspace-id>"}
169+
{"logAnalyticsWorkspaceResourceId": "<workspace-id>"}
170170
```
171171
172172
Learn more about AKS CLI commands in [az aks](/cli/azure/aks).

articles/iot-central/core/howto-faq.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ sections:
3939
- question: |
4040
How many IoT Central applications can I deploy in my subscription?
4141
answer: |
42-
Each Azure subscription has default quotas that could impact the scope of your IoT solution. Currently, IoT Central limits the number of applications you can deploy in a subscription to 10. If you need to increase this limit, contact [Microsoft support](https://azure.microsoft.com/support/options/).
42+
Each Azure subscription has default quotas that could impact the scope of your IoT solution. Currently, IoT Central limits the number of applications you can deploy in a subscription to 100. If you need to increase this limit, contact [Microsoft support](https://azure.microsoft.com/support/options/).
4343
4444
- question: |
4545
How do I file a ticket with customer support?

articles/iot-central/core/howto-integrate-with-devops.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ You need the following prerequisites to complete the steps in this guide:
5252

5353
To get started, fork the IoT Central CI/CD GitHub repository and then clone your fork to your local machine:
5454

55-
1. To fork the Git Hub repository, open the [IoT Central CI/CD GitHub repository](https://github.com/Azure/iot-central-CICD-sample) and select **Fork**.
55+
1. To fork the GitHub repository, open the [IoT Central CI/CD GitHub repository](https://github.com/Azure/iot-central-CICD-sample) and select **Fork**.
5656

5757
1. Clone your fork of the repository to your local machine by opening a console or bash window and running the following command.
5858

@@ -338,7 +338,7 @@ Now configure the pipeline to push configuration changes to your IoT Central app
338338
```
339339
340340
1. Select **Save and run**.
341-
1. The YAML file is saved to your Git Hub repository, so you need to provide a commit message and then select **Save and run** again.
341+
1. The YAML file is saved to your GitHub repository, so you need to provide a commit message and then select **Save and run** again.
342342
343343
Your pipeline is queued. It may take a few minutes before it runs.
344344

articles/service-fabric/service-fabric-containers-overview.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,13 @@ Compared to virtual machines, containers have the following advantages:
4141
* **Portability**: A containerized application image can be ported to run in the cloud, on premises, inside virtual machines, or directly on physical machines.
4242
* **Resource governance**: A container can limit the physical resources that it can consume on its host.
4343

44-
### Container types and supported environments
44+
## Service Fabric support for containers
45+
46+
Service Fabric supports the deployment of Docker containers on Linux, and Windows Server containers on Windows Server 2016 and later, along with support for Hyper-V isolation mode.
4547

46-
Service Fabric supports containers on both Linux and Windows, and supports Hyper-V isolation mode on Windows.
48+
Container runtimes compatible with ServiceFabric:
49+
- Mirantis Container Runtime
50+
- Moby
4751

4852
#### Docker containers on Linux
4953

@@ -70,10 +74,6 @@ Here are typical examples where a container is a good choice:
7074

7175
* **Reduce impact of "noisy neighbors" services**: You can use the resource governance ability of containers to restrict the resources that a service uses on a host. If services might consume many resources and affect the performance of others (such as a long-running, query-like operation), consider putting these services into containers that have resource governance.
7276

73-
## Service Fabric support for containers
74-
75-
Service Fabric supports the deployment of Docker containers on Linux, and Windows Server containers on Windows Server 2016 and later, along with support for Hyper-V isolation mode.
76-
7777
> [!NOTE]
7878
> A Service Fabric cluster is single tenant by design and hosted applications are considered **trusted**. If you are considering hosting **untrusted applications**, please see [Hosting untrusted applications in a Service Fabric cluster](service-fabric-best-practices-security.md#hosting-untrusted-applications-in-a-service-fabric-cluster).
7979

0 commit comments

Comments
 (0)