Skip to content

Commit 89e3417

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into provwork1
2 parents d475288 + d6b2d98 commit 89e3417

30 files changed

+688
-168
lines changed

.openpublishing.redirection.azure-monitor.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@
2525
"redirect_url": "/azure/azure-monitor/change/change-analysis",
2626
"redirect_document_id": false
2727
},
28+
{
29+
"source_path_from_root": "/articles/azure-monitor/app/java-in-process-agent-redirect.md",
30+
"redirect_url": "/azure/azure-monitor/app/opentelemetry-enable",
31+
"redirect_document_id": false
32+
},
2833
{
2934
"source_path_from_root": "/articles/azure-monitor/app/legacy-pricing.md",
3035
"redirect_url": "/azure/azure-monitor/best-practices-cost",

articles/active-directory-b2c/add-sign-up-and-sign-in-policy.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ title: Set up a sign-up and sign-in flow
33
titleSuffix: Azure AD B2C
44
description: Learn how to set up a sign-up and sign-in flow in Azure Active Directory B2C.
55
services: active-directory-b2c
6-
author: kengaderdus
6+
author: garrodonnell
77
manager: CelesteDG
88

99
ms.service: active-directory
1010
ms.workload: identity
1111
ms.topic: how-to
12-
ms.date: 10/21/2021
13-
ms.author: kengaderdus
12+
ms.date: 02/09/2023
13+
ms.author: godonnell
1414
ms.subservice: B2C
1515
ms.custom: "b2c-support"
1616
zone_pivot_groups: b2c-policy-type
@@ -37,7 +37,7 @@ Watch this video to learn how the user sign-up and sign-in policy works.
3737
3838
## Prerequisites
3939

40-
If you haven't already done so, [register a web application in Azure Active Directory B2C](tutorial-register-applications.md).
40+
[!INCLUDE [active-directory-b2c-customization-prerequisites](../../includes/active-directory-b2c-customization-prerequisites.md)]
4141

4242
::: zone pivot="b2c-user-flow"
4343

articles/active-directory/develop/tutorial-blazor-server.md

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.author: henrymbugua
66
ms.service: active-directory
77
ms.subservice: develop
88
ms.topic: tutorial
9-
ms.date: 12/13/2022
9+
ms.date: 02/09/2023
1010
ms.custom: "engagement-fy23"
1111
ms.reviewer: janicericketts
1212
#Customer intent: As a developer, I want to add authentication to a Blazor app.
@@ -52,13 +52,7 @@ Finally, because the app calls a protected API (in this case Microsoft Graph), i
5252

5353
## Create the app using the .NET CLI
5454

55-
Run the following command to download the templates for `Microsoft.Identity.Web`, which we'll make use of in this tutorial.
56-
57-
```dotnetcli
58-
dotnet new --install Microsoft.Identity.Web.ProjectTemplates
59-
```
60-
61-
Then, run the following command to create the application. Replace the placeholders in the command with the proper information from your app's overview page and execute the command in a command shell. The output location specified with the `-o|--output` option creates a project folder if it doesn't exist and becomes part of the app's name.
55+
To create the application, run the following command. Replace the placeholders in the command with the proper information from your app's overview page and execute the command in a command shell. The output location specified with the `-o|--output` option creates a project folder if it doesn't exist and becomes part of the app's name.
6256

6357
```dotnetcli
6458
dotnet new blazorserver --auth SingleOrg --calls-graph -o {APP NAME} --client-id "{CLIENT ID}" --tenant-id "{TENANT ID}" --domain "{DOMAIN}" -f net7.0
@@ -208,5 +202,5 @@ After granting consent, navigate to the "Fetch data" page to read some email.
208202

209203
Learn about calling building web apps that sign in users in our multi-part scenario series:
210204

211-
> [!div class="nextstepaction"]
205+
> [!div class="nextstepaction"]
212206
> [Scenario: Web app that signs in users](scenario-web-app-sign-user-overview.md)
Lines changed: 46 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
---
2-
title: Secure standalone managed service accounts | Azure Active Directory
3-
description: A guide to securing standalone managed service accounts.
2+
title: Secure standalone managed service accounts
3+
description: Learn when to use, how to assess, and to secure standalone managed service accounts (sMSAs)
44
services: active-directory
5-
author: janicericketts
5+
author: jricketts
66
manager: martinco
77
ms.service: active-directory
88
ms.workload: identity
99
ms.subservice: fundamentals
1010
ms.topic: conceptual
11-
ms.date: 08/20/2022
11+
ms.date: 02/08/2023
1212
ms.author: jricketts
1313
ms.reviewer: ajburnle
1414
ms.custom: "it-pro, seodec18"
@@ -17,78 +17,75 @@ ms.collection: M365-identity-device-management
1717

1818
# Secure standalone managed service accounts
1919

20-
Standalone managed service accounts (sMSAs) are managed domain accounts that you use to help secure one or more services that run on a server. They can't be reused across multiple servers. sMSAs provide automatic password management, simplified service principal name (SPN) management, and the ability to delegate management to other administrators.
20+
Standalone managed service accounts (sMSAs) are managed domain accounts that help secure services running on a server. They can't be reused across multiple servers. sMSAs have automatic password management, simplified service principal name (SPN) management, and delegated management to administrators.
2121

22-
In Active Directory, sMSAs are tied to a specific server that runs a service. You can find these accounts listed in the Active Directory Users and Computers snap-in of the Microsoft Management Console.
22+
In Active Directory (AD), sMSAs are tied to a server that runs a service. You can find accounts in the Active Directory Users and Computers snap-in in Microsoft Management Console.
2323

24-
![Screenshot of the Active Directory users and computers snap-in showing the managed service accounts OU.](./media/securing-service-accounts/secure-standalone-msa-image-1.png)
24+
![Screenshot of a service name and type under Active Directory Users and Computers.](./media/securing-service-accounts/secure-standalone-msa-image-1.png)
2525

26-
Managed service accounts were introduced with Windows Server 2008 R2 Active Directory Schema, and they require at least Windows Server 2008 R2​.
26+
> [!NOTE]
27+
> Managed service accounts were introduced in Windows Server 2008 R2 Active Directory Schema, and they require Windows Server 2008 R2, or a later version.
2728
28-
## Benefits of using sMSAs
29+
## sMSA benefits
2930

30-
sMSAs offer greater security than user accounts that are used as service accounts. At the same time, to help reduce administrative overhead, they:
31+
sMSAs have greater security than user accounts used as service accounts. They help reduce administrative overhead:
3132

32-
* **Set strong passwords**: sMSAs use 240-byte, randomly generated complex passwords. The complexity and length of sMSA passwords minimizes the likelihood of a service getting compromised by brute force or dictionary attacks.
33+
* Set strong passwords - sMSAs use 240 byte, randomly generated complex passwords
34+
* The complexity minimizes the likelihood of compromise by brute force or dictionary attacks
35+
* Cycle passwords regularly - Windows changes the sMSA password every 30 days.
36+
* Service and domain administrators don’t need to schedule password changes or manage the associated downtime
37+
* Simplify SPN management - SPNs are updated if the domain functional level is Windows Server 2008 R2. The SPN is updated when you:
38+
* Rename the host computer account
39+
* Change the host computer domain name server (DNS) name
40+
* Use PowerShell to add or remove other sam-accountname or dns-hostname parameters
41+
* See, [Set-ADServiceAccount](/powershell/module/activedirectory/set-adserviceaccount)
3342

34-
* **Cycle passwords regularly**: Windows automatically changes the sMSA password every 30 days. Service and domain administrators don’t need to schedule password changes or manage the associated downtime.
43+
## Using sMSAs
3544

36-
* **Simplify SPN management**: Service principal names are automatically updated if the domain functional level is Windows Server 2008 R2. For instance, the service principal name is automatically updated when you:
37-
* Rename the host computer account.
38-
* Change the domain name server (DNS) name of the host computer.
39-
* Add or remove other sam-accountname or dns-hostname parameters by using [PowerShell](/powershell/module/activedirectory/set-adserviceaccount).
40-
41-
## When to use sMSAs
42-
43-
sMSAs can simplify management and security tasks. Use sMSAs when you have one or more services deployed to a single server and you can't use a group managed service account (gMSA).
45+
Use sMSAs to simplify management and security tasks. sMSAs are useful when services are deployed to a server and you can't use a group managed service account (gMSA).
4446

4547
> [!NOTE]
46-
> Although you can use sMSAs for more than one service, we recommend that each service have its own identity for auditing purposes.
48+
> You can use sMSAs for more than one service, but it's recommended that each service has an identity for auditing.
4749
48-
If the creator of the software can’t tell you whether it can use an MSA, you must test your application. To do so, create a test environment and ensure that it can access all required resources. For more information, see [Create and install an sMSA](/archive/blogs/askds/managed-service-accounts-understanding-implementing-best-practices-and-troubleshooting).
50+
If the software creator can’t tell you if the application uses an MSA, test the application. Create a test environment and ensure it accesses required resources.
4951

50-
### Assess the security posture of sMSAs
52+
Learn more: [Managed Service Accounts: Understanding, Implementing, Best Practices, and Troubleshooting](/archive/blogs/askds/managed-service-accounts-understanding-implementing-best-practices-and-troubleshooting)
5153

52-
sMSAs are inherently more secure than standard user accounts, which require ongoing password management. However, it's important to consider sMSAs’ scope of access as part of their overall security posture.
54+
### Assess sMSA security posture
5355

54-
To see how to mitigate potential security issues posed by sMSAs, refer to the following table:
56+
Consider the sMSA scope of access as part of the security posture. To mitigate potential security issues, see the following table:
5557

5658
| Security issue| Mitigation |
5759
| - | - |
58-
| sMSA is a member of privileged groups. | <li>Remove the sMSA from elevated privileged groups, such as Domain Admins.<li>Use the *least privileged* model, and grant the sMSA only the rights and permissions it requires to run its services.<li>If you're unsure of the required permissions, consult the service creator. |
59-
| sMSA has read/write access to sensitive resources. | <li>Audit access to sensitive resources.<li>Archive audit logs to a Security Information and Event Management (SIEM) program, such as Azure Log Analytics or Microsoft Sentinel, for analysis.<li>Remediate resource permissions if an undesirable level of access is detected. |
60-
| By default, the sMSA password rollover frequency is 30 days. | You can use group policy to tune the duration, depending on enterprise security requirements. To set the password expiration duration, use the following path:<br>*Computer Configuration\Policies\Windows Settings\Security Settings\Security Options*. For domain member, use **Maximum machine account password age**. |
61-
| | |
62-
60+
| sMSA is a member of privileged groups | - Remove the sMSA from elevated privileged groups, such as Domain Admins</br> - Use the least-privileged model </br> - Grant the sMSA rights and permissions to run its services</br> - If you're unsure about permissions, consult the service creator|
61+
| sMSA has read/write access to sensitive resources | - Audit access to sensitive resources</br> - Archive audit logs to a security information and event management (SIEM) program, such as Azure Log Analytics or Microsoft Sentinel </br> - Remediate resource permissions if an undesirable access is detected |
62+
| By default, the sMSA password rollover frequency is 30 days | Use group policy to tune the duration, depending on enterprise security requirements. To set the password expiration duration, go to:<br>Computer Configuration>Policies>Windows Settings>Security Settings>Security Options. For domain member, use **Maximum machine account password age**. |
6363

64-
65-
### Challenges with sMSAs
66-
67-
The challenges associated with sMSAs are as follows:
64+
### sMSA challenges
65+
66+
Use the following table to associate challenges with mitigations.
6867

6968
| Challenge| Mitigation |
7069
| - | - |
71-
| sMSAs can be used on a single server only. | Use a gMSA if you need to use the account across servers. |
72-
| sMSAs can't be used across domains. | Use a gMSA if you need to use the account across domains. |
73-
| Not all applications support sMSAs. | Use a gMSA if possible. Otherwise, use a standard user account or a computer account, as recommended by the application creator. |
74-
| | |
75-
70+
| sMSAs are on a single server | Use a gMSA to use the account across servers |
71+
| sMSAs can't be used across domains | Use a gMSA to use the account across domains |
72+
| Not all applications support sMSAs| Use a gMSA, if possible. Otherwise, use a standard user account or a computer account, as recommended by the creator|
7673

7774
## Find sMSAs
7875

79-
On any domain controller, run DSA.msc, and then expand the managed service accounts container to view all sMSAs.
76+
On a domain controller, run DSA.msc, and then expand the managed service accounts container to view all sMSAs.
8077

8178
To return all sMSAs and gMSAs in the Active Directory domain, run the following PowerShell command:
8279

8380
`Get-ADServiceAccount -Filter *`
8481

85-
To return only sMSAs in the Active Directory domain, run the following command:
82+
To return sMSAs in the Active Directory domain, run the following command:
8683

8784
`Get-ADServiceAccount -Filter * | where { $_.objectClass -eq "msDS-ManagedServiceAccount" }`
8885

8986
## Manage sMSAs
9087

91-
To manage your sMSAs, you can use the following Active Directory PowerShell cmdlets:
88+
To manage your sMSAs, you can use the following AD PowerShell cmdlets:
9289

9390
`Get-ADServiceAccount`
9491
`Install-ADServiceAccount`
@@ -100,16 +97,17 @@ To manage your sMSAs, you can use the following Active Directory PowerShell cmdl
10097

10198
## Move to sMSAs
10299

103-
If an application service supports sMSAs but not gMSAs, and you're currently using a user account or computer account for the security context, [Create and install an sMSA](/archive/blogs/askds/managed-service-accounts-understanding-implementing-best-practices-and-troubleshooting) on the server.
100+
If an application service supports sMSAs, but not gMSAs, and you're using a user account or computer account for the security context, see</br>
101+
[Managed Service Accounts: Understanding, Implementing, Best Practices, and Troubleshooting](/archive/blogs/askds/managed-service-accounts-understanding-implementing-best-practices-and-troubleshooting).
104102

105-
Ideally, you would move resources to Azure and use Azure Managed Identities or service principals.
103+
If possible, move resources to Azure and use Azure managed identities, or service principals.
106104

107105
## Next steps
108106

109-
To learn more about securing service accounts, see the following articles:
107+
To learn more about securing service accounts, see:
110108

111-
* [Introduction to on-premises service accounts](service-accounts-on-premises.md)
109+
* [Securing on-premises service accounts](service-accounts-on-premises.md)
112110
* [Secure group managed service accounts](service-accounts-group-managed.md)
113-
* [Secure computer accounts](service-accounts-computer.md)
114-
* [Secure user accounts](service-accounts-user-on-premises.md)
111+
* [Secure on-premises computer accounts with AD](service-accounts-computer.md)
112+
* [Secure user-based service accounts in AD](service-accounts-user-on-premises.md)
115113
* [Govern on-premises service accounts](service-accounts-govern-on-premises.md)

articles/app-service/networking/private-endpoint.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Connect privately to an App Service apps using Azure private endpoi
44
author: madsd
55
ms.assetid: 2dceac28-1ba6-4904-a15d-9e91d5ee162c
66
ms.topic: article
7-
ms.date: 01/30/2023
7+
ms.date: 02/09/2023
88
ms.author: madsd
99
---
1010

@@ -27,7 +27,7 @@ A private endpoint is a special network interface (NIC) for your App Service app
2727
When you create a private endpoint for your app, it provides secure connectivity between clients on your private network and your app. The private endpoint is assigned an IP Address from the IP address range of your virtual network.
2828
The connection between the private endpoint and the app uses a secure [Private Link](../../private-link/private-link-overview.md). Private endpoint is only used for incoming traffic to your app. Outgoing traffic won't use this private endpoint. You can inject outgoing traffic to your network in a different subnet through the [virtual network integration feature](../overview-vnet-integration.md).
2929

30-
Each slot of an app is configured separately. You can plug up to 100 private endpoints per slot. You can't share a private endpoint between slots.
30+
Each slot of an app is configured separately. You can plug up to 100 private endpoints per slot. You can't share a private endpoint between slots. The sub-resource name of a slot will be `sites-<slot-name>`.
3131

3232
The subnet where you plug the private endpoint can have other resources in it, you don't need a dedicated empty subnet.
3333
You can also deploy the private endpoint in a different region than your app.

articles/azure-monitor/app/java-in-process-agent-redirect.md

Lines changed: 0 additions & 22 deletions
This file was deleted.

articles/azure-monitor/toc.yml

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -611,21 +611,17 @@ items:
611611
href: app/monitor-functions.md
612612
- name: Azure Kubernetes Service
613613
href: app/kubernetes-codeless.md
614-
- name: Any environment
614+
- name: ASP.NET on-premises
615615
items:
616-
- name: ASP.NET
617-
items:
618-
- name: Overview
619-
displayName: IIS monitoring, on premises monitoring, on prem
620-
href: app/status-monitor-v2-overview.md
621-
- name: Getting started
622-
href: app/status-monitor-v2-get-started.md
623-
- name: Detailed instructions
624-
href: app/status-monitor-v2-detailed-instructions.md
625-
- name: API reference
626-
href: app/status-monitor-v2-api-reference.md
627-
- name: Java (OpenTelemetry redirect)
628-
href: app/java-in-process-agent-redirect.md
616+
- name: Overview
617+
displayName: IIS monitoring, on premises monitoring, on prem
618+
href: app/status-monitor-v2-overview.md
619+
- name: Getting started
620+
href: app/status-monitor-v2-get-started.md
621+
- name: Detailed instructions
622+
href: app/status-monitor-v2-detailed-instructions.md
623+
- name: API reference
624+
href: app/status-monitor-v2-api-reference.md
629625
- name: Application Insights SDKs
630626
items:
631627
- name: .NET

articles/azure-vmware/includes/dhcp-dns-in-azure-vmware-solution-description.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: DHCP and DNS in Azure VMware Solution description
33
description: Azure VMware Solution DHCP and DNS description.
44
ms.topic: include
55
ms.service: azure-vmware
6-
ms.date: 05/28/2021
6+
ms.date: 2/9/2023
77
author: suzizuber
88
ms.author: v-szuber
99
---
@@ -13,3 +13,6 @@ ms.author: v-szuber
1313
Applications and workloads running in a private cloud environment require name resolution and DHCP services for lookup and IP address assignments. A proper DHCP and DNS infrastructure are required to provide these services. You can configure a virtual machine to provide these services in your private cloud environment.
1414

1515
Use the DHCP service built-in to NSX or use a local DHCP server in the private cloud instead of routing broadcast DHCP traffic over the WAN back to on-premises.
16+
17+
> [!IMPORTANT]
18+
> If you advertise a default route to the Azure VMware Solution, then you must allow the DNS forwarder to reach the configured DNS servers and they must support public name resolution.

0 commit comments

Comments
 (0)