Skip to content

Commit 45e21ff

Browse files
authored
Merge pull request #206597 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 075851b + 9205ecb commit 45e21ff

File tree

10 files changed

+52
-22
lines changed

10 files changed

+52
-22
lines changed

articles/active-directory/devices/concept-azure-ad-join-hybrid.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ Hybrid Azure AD joined devices require network line of sight to your on-premises
2727
| **Primary audience** | Suitable for hybrid organizations with existing on-premises AD infrastructure |
2828
| | Applicable to all users in an organization |
2929
| **Device ownership** | Organization |
30-
| **Operating Systems** | Windows 10 or newer, 8.1 and 7 |
31-
| | Windows Server 2008/R2, 2012/R2, 2016 and 2019 |
32-
| **Provisioning** | Windows 10 or newer, Windows Server 2016/2019 |
30+
| **Operating Systems** | Windows 11, Windows 10 or 8.1 |
31+
| | Windows Server 2008/R2, 2012/R2, 2016, 2019 and 2022 |
32+
| **Provisioning** | Windows 11, Windows 10, Windows Server 2016/2019/2022 |
3333
| | Domain join by IT and autojoin via Azure AD Connect or ADFS config |
3434
| | Domain join by Windows Autopilot and autojoin via Azure AD Connect or ADFS config |
35-
| | Windows 8.1, Windows 7, Windows Server 2012 R2, Windows Server 2012, and Windows Server 2008 R2 - Require MSI |
35+
| | Windows 8.1, Windows Server 2012 R2, Windows Server 2012, and Windows Server 2008 R2 - Require MSI |
3636
| **Device sign in options** | Organizational accounts using: |
3737
| | Password |
3838
| | Windows Hello for Business for Win10 and above |
@@ -48,7 +48,7 @@ Hybrid Azure AD joined devices require network line of sight to your on-premises
4848

4949
Use Azure AD hybrid joined devices if:
5050

51-
- You support down-level devices running Windows 7 and 8.1.
51+
- You support down-level devices running 8.1.
5252
- You want to continue to use [Group Policy](/mem/configmgr/comanage/faq#my-environment-has-too-many-group-policy-objects-and-legacy-authenticated-apps--do-i-have-to-use-hybrid-azure-ad-) to manage device configuration.
5353
- You want to continue to use existing imaging solutions to deploy and configure devices.
5454
- You have Win32 apps deployed to these devices that rely on Active Directory machine authentication.

articles/active-directory/identity-protection/concept-workload-identity-risk.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,3 +113,4 @@ The [Azure AD Toolkit](https://github.com/microsoft/AzureADToolkit) is a PowerSh
113113
- [Microsoft Graph API](/graph/use-the-api)
114114
- [Azure AD audit logs](../reports-monitoring/concept-audit-logs.md)
115115
- [Azure AD sign-in logs](../reports-monitoring/concept-sign-ins.md)
116+
- [Simulate risk detections](howto-identity-protection-simulate-risk.md)

articles/active-directory/identity-protection/howto-identity-protection-simulate-risk.md

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,11 @@ This article provides you with steps for simulating the following risk detection
2727
- Anonymous IP address (easy)
2828
- Unfamiliar sign-in properties (moderate)
2929
- Atypical travel (difficult)
30+
- Leaked credentials in GitHub for workload identities (moderate)
3031

3132
Other risk detections cannot be simulated in a secure manner.
3233

33-
More information about each risk detection can be found in the article, [What is risk](concept-identity-protection-risks.md).
34+
More information about each risk detection can be found in the article, What is risk for [user](concept-identity-protection-risks.md) and [workload identity](concept-workload-identity-risk.md).
3435

3536
## Anonymous IP address
3637

@@ -81,6 +82,30 @@ Simulating the atypical travel condition is difficult because the algorithm uses
8182

8283
The sign-in shows up in the Identity Protection dashboard within 2-4 hours.
8384

85+
## Leaked Credentials for Workload Identities
86+
87+
This risk detection indicates that the application's valid credentials have been leaked. This leak can occur when someone checks in the credentials in a public code artifact on GitHub. Therefore, to simulate this detection, you need a GitHub account and can [sign up a GitHub account](https://docs.github.com/get-started/signing-up-for-github) if you don't have one already.
88+
89+
**To simulate Leaked Credentials in GitHub for Workload Identities, perform the following steps**:
90+
1. Navigate to the [Azure portal](https://portal.azure.com).
91+
2. Browse to **Azure Active Directory** > **App registrations**.
92+
3. Select **New registration** to register a new application or reuse an exsiting stale application.
93+
4. Select **Certificates & Secrets** > **New client Secret** , add a description of your client secret and set an expiration for the secret or specify a custom lifetime and click **Add**. Record the secret's value for later use for your GitHub Commit.
94+
95+
> [!Note]
96+
> **You can not retrieve the secret again after you leave this page**.
97+
98+
5. Get the TenantID and Application(Client)ID in the **Overview** page.
99+
6. Ensure you disable the application via **Azure Active Directory** > **Enterprise Application** > **Properties** > Set **Enabled for users to sign-in** to **No**.
100+
7. Create a **public** GitHub Repository, add the following config and commit the change.
101+
```GitHub file
102+
"AadClientId": "XXXX-2dd4-4645-98c2-960cf76a4357",
103+
"AadSecret": "p3n7Q~XXXX",
104+
"AadTenantDomain": "XXXX.onmicrosoft.com",
105+
"AadTenantId": "99d4947b-XXX-XXXX-9ace-abceab54bcd4",
106+
```
107+
7. In about 8 hours, you will be able to view a leaked credentail detection under **Azure Active Directory** > **Security** > **Risk Detection** > **Workload identity detections** where the additional info will contain your the URL of your GitHub commit.
108+
84109
## Testing risk policies
85110

86111
This section provides you with steps for testing the user and the sign-in risk policies created in the article, [How To: Configure and enable risk policies](howto-identity-protection-configure-risk-policies.md).
@@ -126,6 +151,8 @@ To test a sign in risk policy, perform the following steps:
126151

127152
- [What is risk?](concept-identity-protection-risks.md)
128153

154+
- [Securing workload identities with Identity](concept-workload-identity-risk.md)
155+
129156
- [How To: Configure and enable risk policies](howto-identity-protection-configure-risk-policies.md)
130157

131158
- [Azure Active Directory Identity Protection](overview-identity-protection.md)

articles/application-gateway/application-gateway-components.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ Application Gateway backend pool members aren't tied to an availability set. An
136136

137137
If you use internal IPs as backend pool members, you must use [virtual network peering](../virtual-network/virtual-network-peering-overview.md) or a [VPN gateway](../vpn-gateway/vpn-gateway-about-vpngateways.md). Virtual network peering is supported and beneficial for load-balancing traffic in other virtual networks.
138138

139-
An application gateway can also communicate with to on-premises servers when they're connected by Azure ExpressRoute or VPN tunnels if traffic is allowed.
139+
An application gateway can also communicate with on-premises servers when they're connected by Azure ExpressRoute or VPN tunnels if traffic is allowed.
140140

141141
You can create different backend pools for different types of requests. For example, create one backend pool for general requests, and then another backend pool for requests to the microservices for your application.
142142

articles/azure-monitor/logs/logs-export-logic-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ This procedure uses the [Azure Monitor Logs connector](/connectors/azuremonitorl
2626

2727
When you export data from a Log Analytics workspace, you should filter and aggregate your log data and optimize query and limit the amount of data processed by your Logic App workflow, to the required data. For example, if you need to archive sign-in events, you should filter for required events and project only the required fields. For example:
2828

29-
```json
29+
```Kusto
3030
SecurityEvent
3131
| where EventID == 4624 or EventID == 4625
3232
| project TimeGenerated , Account , AccountType , Computer

articles/azure-vmware/enable-public-ip-nsx-edge.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ A Sourced Network Translation Service (SNAT) with Port Address Translation (PAT)
7878
1. Enter a name.
7979
1. Select **SNAT**.
8080
1. Optionally, enter a source such as a subnet to SNAT or destination.
81-
1. Enter the translated IP. This IP is from the range of Public IPs you reserved from the Azure VMware Solution Portal.
81+
1. Enter the translated IP. This IP is from the range of Public IPs you reserved from the Azure VMware Solution Portal.
8282
1. Optionally, give the rule a higher priority number. This prioritization will move the rule further down the rule list to ensure more specific rules are matched first.
8383
1. Click **SAVE**.
8484

@@ -106,8 +106,8 @@ A Destination Network Translation Service (DNAT) is used to expose a VM on a spe
106106
**Configure the DNAT rule**
107107
1. Name the rule.
108108
1. Select **DNAT** as the action.
109-
1. Enter the reserved Public IP in the destination match.
110-
1. Enter the VM Private IP in the translated IP. This IP is from the range of Public IPs reserved from the Azure VMware Solution Portal.
109+
1. Enter the reserved Public IP in the destination match. This IP is from the range of Public IPs reserved from the Azure VMware Solution Portal.
110+
1. Enter the VM Private IP in the translated IP.
111111
1. Select **SAVE**.
112112
1. Optionally, configure the Translated Port or source IP for more specific matches.
113113

articles/defender-for-cloud/integration-defender-for-endpoint.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,7 @@ To remove the Defender for Endpoint solution from your machines:
315315
316316
- [What's this "MDE.Windows" / "MDE.Linux" extension running on my machine?](#whats-this-mdewindows--mdelinux-extension-running-on-my-machine)
317317
- [What are the licensing requirements for Microsoft Defender for Endpoint?](#what-are-the-licensing-requirements-for-microsoft-defender-for-endpoint)
318+
- [Do I need to buy a separate anti-malware solution to protect my machines?](#do-i-need-to-buy-a-separate-anti-malware-solution-to-protect-my-machines)
318319
- [If I already have a license for Microsoft Defender for Endpoint, can I get a discount for Microsoft Defender for Servers?](#if-i-already-have-a-license-for-microsoft-defender-for-endpoint-can-i-get-a-discount-for-microsoft-defender-for-servers)
319320
- [How do I switch from a third-party EDR tool?](#how-do-i-switch-from-a-third-party-edr-tool)
320321
@@ -324,7 +325,8 @@ In the past, Microsoft Defender for Endpoint was provisioned by the Log Analytic
324325
325326
Defender for Cloud automatically deploys the extension to machines running:
326327
327-
- Windows Server 2019 and Windows Server 2022.
328+
- Windows Server 2019 and Windows Server 2022
329+
- Windows Server 2012 R2 and 2016 if [MDE Unified Solution integration](#enable-the-integration) is enabled
328330
- Windows 10 on Azure Virtual Desktop.
329331
- Other versions of Windows Server if Defender for Cloud doesn't recognize the OS version (for example, when a custom VM image is used). In this case, Microsoft Defender for Endpoint is still provisioned by the Log Analytics agent.
330332
- Linux.

articles/purview/tutorial-using-python-sdk.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ In this section, you'll register your Blob Storage.
254254
body_input = {
255255
"kind": "AzureStorage",
256256
"properties": {
257-
"endpoint": "endpoint": f"https://{storage_name}.blob.core.windows.net/",
257+
"endpoint": f"https://{storage_name}.blob.core.windows.net/",
258258
"resourceGroup": rg_name,
259259
"location": rg_location,
260260
"resourceName": storage_name,

articles/virtual-machines/workloads/sap/automation-configure-devops.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ Push the changes back to the repository by selecting the source control icon and
8282
Azure Pipelines are implemented as YAML files and they're stored in the 'deploy/pipelines' folder in the repository.
8383
## Control plane deployment pipeline
8484

85-
Create the control plane deployment pipeline by choosing _New Pipeline_ from the Pipelines section, select 'Azure Repos Git' as the source for your code. Configure your Pipeline to use an existing Azure Pipeline YAML File. Specify the pipeline with the following settings:
85+
Create the control plane deployment pipeline by choosing _New Pipeline_ from the Pipelines section, select 'Azure Repos Git' as the source for your code. Configure your Pipeline to use an existing Azure Pipelines YAML File. Specify the pipeline with the following settings:
8686

8787
| Setting | Value |
8888
| ------- | ----------------------------------------------- |
@@ -94,7 +94,7 @@ Save the Pipeline, to see the Save option select the chevron next to the Run but
9494

9595
## SAP workload zone deployment pipeline
9696

97-
Create the SAP workload zone pipeline by choosing _New Pipeline_ from the Pipelines section, select 'Azure Repos Git' as the source for your code. Configure your Pipeline to use an existing Azure Pipeline YAML File. Specify the pipeline with the following settings:
97+
Create the SAP workload zone pipeline by choosing _New Pipeline_ from the Pipelines section, select 'Azure Repos Git' as the source for your code. Configure your Pipeline to use an existing Azure Pipelines YAML File. Specify the pipeline with the following settings:
9898

9999
| Setting | Value |
100100
| ------- | -------------------------------------------- |
@@ -106,7 +106,7 @@ Save the Pipeline, to see the Save option select the chevron next to the Run but
106106

107107
## SAP system deployment pipeline
108108

109-
Create the SAP system deployment pipeline by choosing _New Pipeline_ from the Pipelines section, select 'Azure Repos Git' as the source for your code. Configure your Pipeline to use an existing Azure Pipeline YAML File. Specify the pipeline with the following settings:
109+
Create the SAP system deployment pipeline by choosing _New Pipeline_ from the Pipelines section, select 'Azure Repos Git' as the source for your code. Configure your Pipeline to use an existing Azure Pipelines YAML File. Specify the pipeline with the following settings:
110110

111111
| Setting | Value |
112112
| ------- | ------------------------------------------------ |
@@ -118,7 +118,7 @@ Save the Pipeline, to see the Save option select the chevron next to the Run but
118118

119119
## SAP software acquisition pipeline
120120

121-
Create the SAP software acquisition pipeline by choosing _New Pipeline_ from the Pipelines section, select 'Azure Repos Git' as the source for your code. Configure your Pipeline to use an existing Azure Pipeline YAML File. Specify the pipeline with the following settings:
121+
Create the SAP software acquisition pipeline by choosing _New Pipeline_ from the Pipelines section, select 'Azure Repos Git' as the source for your code. Configure your Pipeline to use an existing Azure Pipelines YAML File. Specify the pipeline with the following settings:
122122

123123
| Setting | Value |
124124
| ------- | ------------------------------------------------ |
@@ -130,7 +130,7 @@ Save the Pipeline, to see the Save option select the chevron next to the Run but
130130

131131
## SAP configuration and software installation pipeline
132132

133-
Create the SAP configuration and software installation pipeline by choosing _New Pipeline_ from the Pipelines section, select 'Azure Repos Git' as the source for your code. Configure your Pipeline to use an existing Azure Pipeline YAML File. Specify the pipeline with the following settings:
133+
Create the SAP configuration and software installation pipeline by choosing _New Pipeline_ from the Pipelines section, select 'Azure Repos Git' as the source for your code. Configure your Pipeline to use an existing Azure Pipelines YAML File. Specify the pipeline with the following settings:
134134

135135
| Setting | Value |
136136
| ------- | -------------------------------------------------- |
@@ -142,7 +142,7 @@ Save the Pipeline, to see the Save option select the chevron next to the Run but
142142

143143
## Deployment removal pipeline
144144

145-
Create the deployment removal pipeline by choosing _New Pipeline_ from the Pipelines section, select 'Azure Repos Git' as the source for your code. Configure your Pipeline to use an existing Azure Pipeline YAML File. Specify the pipeline with the following settings:
145+
Create the deployment removal pipeline by choosing _New Pipeline_ from the Pipelines section, select 'Azure Repos Git' as the source for your code. Configure your Pipeline to use an existing Azure Pipelines YAML File. Specify the pipeline with the following settings:
146146

147147
| Setting | Value |
148148
| ------- | -------------------------------------------- |
@@ -154,7 +154,7 @@ Save the Pipeline, to see the Save option select the chevron next to the Run but
154154

155155
## Deployment removal pipeline using Azure Resource Manager
156156

157-
Create the deployment removal ARM pipeline by choosing _New Pipeline_ from the Pipelines section, select 'Azure Repos Git' as the source for your code. Configure your Pipeline to use an existing Azure Pipeline YAML File. Specify the pipeline with the following settings:
157+
Create the deployment removal ARM pipeline by choosing _New Pipeline_ from the Pipelines section, select 'Azure Repos Git' as the source for your code. Configure your Pipeline to use an existing Azure Pipelines YAML File. Specify the pipeline with the following settings:
158158

159159
| Setting | Value |
160160
| ------- | ----------------------------------------------- |
@@ -169,7 +169,7 @@ Save the Pipeline, to see the Save option select the chevron next to the Run but
169169
170170
## Repository updater pipeline
171171

172-
Create the Repository updater pipeline by choosing _New Pipeline_ from the Pipelines section, select 'Azure Repos Git' as the source for your code. Configure your Pipeline to use an existing Azure Pipeline YAML File. Specify the pipeline with the following settings:
172+
Create the Repository updater pipeline by choosing _New Pipeline_ from the Pipelines section, select 'Azure Repos Git' as the source for your code. Configure your Pipeline to use an existing Azure Pipelines YAML File. Specify the pipeline with the following settings:
173173

174174
| Setting | Value |
175175
| ------- | ----------------------------------------------- |

includes/iot-central-limits.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ ms.topic: include
66
ms.date: 11/21/2019
77
---
88

9-
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/).
9+
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/).

0 commit comments

Comments
 (0)