Skip to content

Commit 48135b5

Browse files
authored
Merge pull request #5196 from MicrosoftDocs/FromPrivateRepo
From private repo
2 parents fe9f2e2 + 329b7b9 commit 48135b5

File tree

120 files changed

+1902
-1720
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+1902
-1720
lines changed

.openpublishing.redirection.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1718,6 +1718,11 @@
17181718
"redirect_url": "/azure/automation",
17191719
"redirect_document_id": false
17201720
},
1721+
{
1722+
"source_path": "articles/automation/automation-vm-change-tracking.md",
1723+
"redirect_url": "/azure/automation/automation-change-tracking",
1724+
"redirect_document_id": false
1725+
},
17211726
{
17221727
"source_path": "articles/automation/automation-azure-vm-alert-integration.md",
17231728
"redirect_url": "/azure/automation/automation-create-alert-triggered-runbook",
@@ -4818,6 +4823,11 @@
48184823
"redirect_url": "/azure/log-analytics/log-analytics-data-security",
48194824
"redirect_document_id": false
48204825
},
4826+
{
4827+
"source_path": "articles/log-analytics/log-analytics-change-tracking.md",
4828+
"redirect_url": "/azure/automation/automation-change-tracking",
4829+
"redirect_document_id": false
4830+
},
48214831
{
48224832
"source_path": "articles/log-analytics/log-analytics-configuration-assessment.md",
48234833
"redirect_url": "/azure/log-analytics/log-analytics-add-solutions",

articles/active-directory-b2c/active-directory-b2c-reference-language-customization.md

Lines changed: 68 additions & 54 deletions
Large diffs are not rendered by default.

articles/active-directory-domain-services/TOC.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
## [Check a managed domain's health](active-directory-ds-check-health.md)
2323
## [Use Azure AD Domain Services in Azure CSP subscriptions](active-directory-ds-csp.md)
2424
## [Enable Azure AD Domain Services using PowerShell](active-directory-ds-enable-using-powershell.md)
25+
## [Check your domain's health](active-directory-ds-check-health.md)
2526
## Join a managed domain
2627
### [Windows Server VM](active-directory-ds-admin-guide-join-windows-vm-portal.md)
2728
### [Windows Server VM from template](active-directory-ds-join-windows-vm-template.md)
@@ -32,7 +33,6 @@
3233
## Administer a managed domain
3334
### [Administer a managed domain](active-directory-ds-admin-guide-administer-domain.md)
3435
### [Administer DNS on a managed domain](active-directory-ds-admin-guide-administer-dns.md)
35-
3636
### Configure secure LDAP for a managed domain
3737
#### [Task 1: obtain a certificate for secure LDAP](active-directory-ds-admin-guide-configure-secure-ldap.md)
3838
#### [Task 2: export the secure LDAP certificate](active-directory-ds-admin-guide-configure-secure-ldap-export-pfx.md)

articles/active-directory-domain-services/active-directory-ds-troubleshoot-alerts.md

Lines changed: 50 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.workload: identity
1313
ms.tgt_pltfrm: na
1414
ms.devlang: na
1515
ms.topic: article
16-
ms.date: 02/05/2018
16+
ms.date: 02/28/2018
1717
ms.author: ergreenl
1818

1919
---
@@ -31,6 +31,13 @@ Pick the troubleshooting steps that correspond to or alert ID or message you enc
3131
| AADDS102 | *A Service Principal required for Azure AD Domain Services to function properly has been deleted from your Azure AD directory. This configuration impacts Microsoft's ability to monitor, manage, patch, and synchronize your managed domain.* | [Missing Service Principal](active-directory-ds-troubleshoot-service-principals.md) |
3232
| AADDS103 | *The IP address range for the virtual network in which you have enabled Azure AD Domain Services is in a public IP range. Azure AD Domain Services must be enabled in a virtual network with a private IP address range. This configuration impacts Microsoft's ability to monitor, manage, patch and synchronize your managed domain.* | [Address is in a public IP range](#aadds103-address-is-in-a-public-ip-range) |
3333
| AADDS104 | *Microsoft is unable to reach the domain controllers for this managed domain. This may happen if a network security group (NSG) configured on your virtual network blocks access to the managed domain. Another possible reason is if there is a user defined route that blocks incoming traffic from the internet.* | [Network Error](active-directory-ds-troubleshoot-nsg.md) |
34+
| AADDS500 | *The managed domain was last synchronized with Azure AD on {0}. Users may be unable to sign-in on the managed domain or group memberships may not be in sync with Azure AD.* | [Synchronization hasn't happened in a while](#aadds500-synchronization-has-not-completed-in-a-while) |
35+
| AADDS501 | *The managed domain was last backed up on XX.* | [A backup hasn't been taken in a while](#aadds501-a-backup-has-not-been-taken-in-a-while) |
36+
| AADDS502 | *The secure LDAP certificate for the managed domain will expire on XX.* | [Expiring secure LDAP certificate](active-directory-ds-troubleshoot-ldaps.md#aadds502-secure-ldap-certificate-expiring) |
37+
| AADDS503 | *The managed domain is suspended because the Azure subscription associated with the domain is not active.* | [Suspension due to disabled subscription](#aadds503-suspension-due-to-disabled-subscription) |
38+
| AADDS504 | *The managed domain is suspended due to an invalid configuration. The service has been unable to manage, patch, or update the domain controllers for your managed domain for a long time.* | [Suspension due to an invalid configuration](#aadds504-suspension-due-to-an-invalid-configuration) |
39+
40+
3441

3542
## AADDS100: Missing directory
3643
**Alert message:**
@@ -72,7 +79,7 @@ To restore your service, follow these steps:
7279
7380
Before you begin, read the **private IP v4 address space** section in [this article](https://en.wikipedia.org/wiki/Private_network#Private_IPv4_address_spaces).
7481

75-
Inside the virtual network, machines may make requests to Azure resources that are in the same IP address range as those configured for the subnet. However, since the virtual network is configured for this range, those requests will be routed within the virtual network and will not reach the intended web resources. This can lead to unpredictable errors with Azure AD Domain Services.
82+
Inside the virtual network, machines may make requests to Azure resources that are in the same IP address range as those configured for the subnet. However, since the virtual network is configured for this range, those requests will be routed within the virtual network and will not reach the intended web resources. This configuration can lead to unpredictable errors with Azure AD Domain Services.
7683

7784
**If you own the IP address range in the internet that is configured in your virtual network, this alert can be ignored. However, Azure AD Domain Services cannot commit to the [SLA](https://azure.microsoft.com/support/legal/sla/active-directory-ds/v1_0/)] with this configuration since it can lead to unpredictable errors.**
7885

@@ -90,6 +97,47 @@ Inside the virtual network, machines may make requests to Azure resources that a
9097
4. To domain-join your virtual machines to your new domain, follow [this guide](active-directory-ds-admin-guide-join-windows-vm-portal.md).
9198
8. To ensure the alert is resolved, check your domain's health in two hours.
9299

100+
## AADDS500: Synchronization has not completed in a while
101+
102+
**Alert message:**
103+
104+
*The managed domain was last synchronized with Azure AD on {0}. Users may be unable to sign-in on the managed domain or group memberships may not be in sync with Azure AD.*
105+
106+
**Remediation:**
107+
108+
[Check your domain's health](active-directory-ds-check-health.md) for any alerts that might indicate problems in your configuration of your managed domain. Sometimes, problems with your configuration can block Microsoft's ability to synchronize your managed domain. If you are able to resolve any alerts, wait two hours and check back to see if the synchronization has completed.
109+
110+
111+
## AADDS501: A backup has not been taken in a while
112+
113+
**Alert message:**
114+
115+
*The managed domain was last backed up on XX.*
116+
117+
**Remediation:**
118+
119+
[Check your domain's health](active-directory-ds-check-health.md) for any alerts that might indicate problems in your configuration of your managed domain. Sometimes, problems with your configuration can block Microsoft's ability to synchronize your managed domain. If you are able to resolve any alerts, wait two hours and check back to see if the synchronization has completed.
120+
121+
122+
## AADDS503: Suspension due to disabled subscription
123+
124+
**Alert message:**
125+
126+
*The managed domain is suspended because the Azure subscription associated with the domain is not active.*
127+
128+
**Remediation:**
129+
130+
To restore your service, [renew your Azure subscription](https://docs.microsoft.com/en-us/azure/billing/billing-subscription-become-disable) associated with your managed domain.
131+
132+
## AADDS504: Suspension due to an invalid configuration
133+
134+
**Alert message:**
135+
136+
*The managed domain is suspended due to an invalid configuration. The service has been unable to manage, patch, or update the domain controllers for your managed domain for a long time.*
137+
138+
**Remediation:**
139+
140+
[Check your domain's health](active-directory-ds-check-health.md) for any alerts that might indicate problems in your configuration of your managed domain. If you can resolve any of these alerts, do so. After, contact support to re-enable your subscription.
93141

94142
## Contact us
95143
Contact the Azure Active Directory Domain Services product team to [share feedback or for support](active-directory-ds-contact-us.md).

articles/active-directory-domain-services/active-directory-ds-troubleshoot-ldaps.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.workload: identity
1313
ms.tgt_pltfrm: na
1414
ms.devlang: na
1515
ms.topic: article
16-
ms.date: 02/02/2018
16+
ms.date: 02/21/2018
1717
ms.author: ergreenl
1818

1919
---
@@ -49,5 +49,15 @@ When secure LDAP is enabled, we recommend creating additional rules to allow inb
4949
> Port 636 is not the only rule needed for Azure AD Domain Services to run smoothly. To learn more, visit the [Networking guidelines](active-directory-ds-networking.md) or [Troubleshoot NSG configuration](active-directory-ds-troubleshoot-nsg.md) articles.
5050
>
5151
52+
## AADDS502: Secure LDAP certificate expiring
53+
54+
**Alert message:**
55+
56+
*The secure LDAP certificate for the managed domain will expire on XX.*
57+
58+
**Remediation:**
59+
60+
Create a new secure LDAP certificate by following the steps outlined in the [Configure secure LDAP](active-directory-ds-admin-guide-configure-secure-ldap.md) article.
61+
5262
## Contact us
5363
Contact the Azure Active Directory Domain Services product team to [share feedback or for support](active-directory-ds-contact-us.md).

articles/active-directory-domain-services/active-directory-ds-troubleshoot-nsg.md

Lines changed: 34 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.workload: identity
1313
ms.tgt_pltfrm: na
1414
ms.devlang: na
1515
ms.topic: article
16-
ms.date: 02/12/2018
16+
ms.date: 03/01/2018
1717
ms.author: ergreenl
1818

1919
---
@@ -55,7 +55,7 @@ Follow the instructions to [install the Azure PowerShell module and connect to y
5555
> We recommend using the latest version of the Azure PowerShell module. If you already have an older version of the Azure PowerShell module installed, update to the latest version.
5656
>
5757
58-
Use the following steps to create a new NSG using PowerShell.
58+
Use the following steps to create a new NSG using PowerShell.
5959
1. Log in to your Azure subscription.
6060

6161
```PowerShell
@@ -67,33 +67,34 @@ Use the following steps to create a new NSG using PowerShell.
6767

6868
```PowerShell
6969
# Allow inbound HTTPS traffic to enable synchronization to your managed domain.
70-
$SyncRule = New-AzureRmNetworkSecurityRuleConfig -Name AllowSyncWithAzureAD `
71-
-Description "Allow synchronization with Azure AD" `
70+
$SyncRule = New-AzureRmNetworkSecurityRuleConfig -Name AllowSyncWithAzureAD -Description "Allow synchronization with Azure AD" `
7271
-Access Allow -Protocol Tcp -Direction Inbound -Priority 101 `
7372
-SourceAddressPrefix * -SourcePortRange * -DestinationAddressPrefix * `
7473
-DestinationPortRange 443
7574
7675
# Allow management of your domain over port 5986 (PowerShell Remoting)
77-
$PSRemotingRule = New-AzureRmNetworkSecurityRuleConfig -Name AllowPSRemoting `
78-
-Description "Allow management of domain through port 5986" `
76+
$PSRemotingRule = New-AzureRmNetworkSecurityRuleConfig -Name AllowPSRemoting -Description "Allow management of domain through port 5986" `
7977
-Access Allow -Protocol Tcp -Direction Inbound -Priority 102 `
80-
-SourceAddressPrefix 52.180.183.8, 23.101.0.70, 52.225.184.198, 52.179.126.223, `
81-
13.74.249.156, 52.187.117.83, 52.161.13.95, 104.40.156.18, 104.40.87.209, `
82-
52.180.179.108, 52.175.18.134, 52.138.68.41, 104.41.159.212, 52.169.218.0, `
83-
52.187.120.237, 52.161.110.169, 52.174.189.149, 13.64.151.161 `
84-
-SourcePortRange * -DestinationAddressPrefix * `
78+
-SourceAddressPrefix 52.180.183.8, 23.101.0.70, 52.225.184.198, 52.179.126.223, 13.74.249.156, 52.187.117.83, 52.161.13.95, 104.40.156.18, 104.40.87.209, 52.180.179.108, 52.175.18.134, 52.138.68.41, 104.41.159.212, 52.169.218.0, 52.187.120.237, 52.161.110.169, 52.174.189.149, 13.64.151.161 -SourcePortRange * -DestinationAddressPrefix * `
8579
-DestinationPortRange 5986
8680
81+
#The following two rules are optional and needed only in certain situations.
82+
8783
# Allow management of your domain over port 3389 (remote desktop).
88-
$RemoteDesktopRule = New-AzureRmNetworkSecurityRuleConfig -Name AllowRD `
89-
-Description "Allow management of domain through port 3389" `
84+
$RemoteDesktopRule = New-AzureRmNetworkSecurityRuleConfig -Name AllowRD -Description "Allow management of domain through port 3389" `
9085
-Access Allow -Protocol Tcp -Direction Inbound -Priority 103 `
91-
-SourceAddressPrefix * -SourcePortRange * -DestinationAddressPrefix * `
86+
-SourceAddressPrefix 207.68.190.32/27, 13.106.78.32/27, 10.254.32.0/20, 10.97.136.0/22, 13.106.174.32/27, 13.106.4.96/27 -SourcePortRange * -DestinationAddressPrefix * `
9287
-DestinationPortRange 3389
9388
94-
# Create the NSG with the 3 rules above
95-
$Nsg = New-AzureRmNetworkSecurityGroup -ResourceGroupName $ResourceGroup -Location $Location `
96-
-Name "AAD-DomainServices-NSG" -SecurityRules $SyncRule,$PSRemotingRule,$RemoteDesktopRule
89+
# Secure LDAP rule, it is recommended to change the source address prefix to include only the IP addresses
90+
$SecureLDAPRule = New-AzureRmNetworkSecurityRuleConfig -Name SecureLDAP -Description "Allow access through secure LDAP port" `
91+
-Access Allow -Protocol Tcp -Direction Inbound -Priority 104 `
92+
-SourceAddressPrefix * -SourcePortRange * -DestinationAddressPrefix * `
93+
-DestinationPortRange 636
94+
95+
# Create the NSG with the rules above (if you need the remote desktop rule and secure ldap rule, add it below)
96+
$nsg = New-AzureRmNetworkSecurityGroup -ResourceGroupName $resourceGroup -Location westus `
97+
-Name "AADDomainServices-NSG" -SecurityRules $SyncRule, $PSRemotingRule
9798
```
9899

99100
3. Lastly, associate the NSG with the vnet and subnet of choice.
@@ -124,33 +125,34 @@ $SubnetName = "exampleSubnet"
124125
Login-AzureRmAccount
125126
126127
# Allow inbound HTTPS traffic to enable synchronization to your managed domain.
127-
$SyncRule = New-AzureRmNetworkSecurityRuleConfig -Name AllowSyncWithAzureAD `
128-
-Description "Allow synchronization with Azure AD" `
128+
$SyncRule = New-AzureRmNetworkSecurityRuleConfig -Name AllowSyncWithAzureAD -Description "Allow synchronization with Azure AD" `
129129
-Access Allow -Protocol Tcp -Direction Inbound -Priority 101 `
130130
-SourceAddressPrefix * -SourcePortRange * -DestinationAddressPrefix * `
131131
-DestinationPortRange 443
132132
133133
# Allow management of your domain over port 5986 (PowerShell Remoting)
134-
$PSRemotingRule = New-AzureRmNetworkSecurityRuleConfig -Name AllowPSRemoting `
135-
-Description "Allow management of domain through port 5986" `
134+
$PSRemotingRule = New-AzureRmNetworkSecurityRuleConfig -Name AllowPSRemoting -Description "Allow management of domain through port 5986" `
136135
-Access Allow -Protocol Tcp -Direction Inbound -Priority 102 `
137-
-SourceAddressPrefix 52.180.183.8, 23.101.0.70, 52.225.184.198, 52.179.126.223, `
138-
13.74.249.156, 52.187.117.83, 52.161.13.95, 104.40.156.18, 104.40.87.209, `
139-
52.180.179.108, 52.175.18.134, 52.138.68.41, 104.41.159.212, 52.169.218.0, `
140-
52.187.120.237, 52.161.110.169, 52.174.189.149, 13.64.151.161 `
141-
-SourcePortRange * -DestinationAddressPrefix * `
136+
-SourceAddressPrefix 52.180.183.8, 23.101.0.70, 52.225.184.198, 52.179.126.223, 13.74.249.156, 52.187.117.83, 52.161.13.95, 104.40.156.18, 104.40.87.209, 52.180.179.108, 52.175.18.134, 52.138.68.41, 104.41.159.212, 52.169.218.0, 52.187.120.237, 52.161.110.169, 52.174.189.149, 13.64.151.161 -SourcePortRange * -DestinationAddressPrefix * `
142137
-DestinationPortRange 5986
143138
139+
#The following two rules are optional and needed only in certain situations.
140+
144141
# Allow management of your domain over port 3389 (remote desktop).
145-
$RemoteDesktopRule = New-AzureRmNetworkSecurityRuleConfig -Name AllowRD `
146-
-Description "Allow management of domain through port 3389" `
142+
$RemoteDesktopRule = New-AzureRmNetworkSecurityRuleConfig -Name AllowRD -Description "Allow management of domain through port 3389" `
147143
-Access Allow -Protocol Tcp -Direction Inbound -Priority 103 `
148-
-SourceAddressPrefix * -SourcePortRange * -DestinationAddressPrefix * `
144+
-SourceAddressPrefix 207.68.190.32/27, 13.106.78.32/27, 10.254.32.0/20, 10.97.136.0/22, 13.106.174.32/27, 13.106.4.96/27 -SourcePortRange * -DestinationAddressPrefix * `
149145
-DestinationPortRange 3389
150146
151-
# Create the NSG with the 3 rules above
152-
$Nsg = New-AzureRmNetworkSecurityGroup -ResourceGroupName $ResourceGroup -Location $Location `
153-
-Name "AAD-DomainServices-NSG" -SecurityRules $SyncRule,$PSRemotingRule,$RemoteDesktopRule
147+
# Secure LDAP rule, it is recommended to change the source address prefix to include only the IP addresses
148+
$SecureLDAPRule = New-AzureRmNetworkSecurityRuleConfig -Name SecureLDAP -Description "Allow access through secure LDAP port" `
149+
-Access Allow -Protocol Tcp -Direction Inbound -Priority 104 `
150+
-SourceAddressPrefix * -SourcePortRange * -DestinationAddressPrefix * `
151+
-DestinationPortRange 636
152+
153+
# Create the NSG with the rules above (if you need the remote desktop rule and secure ldap rule, add it below)
154+
$nsg = New-AzureRmNetworkSecurityGroup -ResourceGroupName $resourceGroup -Location westus `
155+
-Name "AADDomainServices-NSG" -SecurityRules $SyncRule, $PSRemotingRule
154156
155157
# Find vnet and subnet
156158
$Vnet = Get-AzureRmVirtualNetwork -ResourceGroupName $ResourceGroup -Name $VnetName
@@ -161,9 +163,6 @@ $Subnet.NetworkSecurityGroup = $Nsg
161163
Set-AzureRmVirtualNetwork -VirtualNetwork $Vnet
162164
```
163165

164-
> [!NOTE]
165-
> This default NSG does not lock down access to the port used for Secure LDAP. To lock down Secure LDAP access over the internet, see [this article](active-directory-ds-troubleshoot-ldaps.md).
166-
>
167166

168167
## Need help?
169168
Contact the Azure Active Directory Domain Services product team to [share feedback or for support](active-directory-ds-contact-us.md).
4.07 KB
Loading

articles/active-directory/TOC.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,23 @@
5151
- name: Using Azure Resource Manager template
5252
href: msi-qs-configure-template-windows-vm.md
5353
- name: Using Azure SDK
54-
href: msi-qs-configure-sdk-windows-vm.md
55-
- name: Grant a VM MSI access to Resource Manager
54+
href: msi-qs-configure-sdk-windows-vm.md
55+
- name: Configure MSI for Azure VMSS
56+
items:
57+
- name: Using the Azure Portal
58+
href: msi-qs-configure-portal-windows-vmss.md
59+
- name: Using Azure CLI
60+
href: msi-qs-configure-cli-windows-vmss.md
61+
- name: Using Azure Resource Manager template
62+
href: msi-qs-configure-template-windows-vmss.md
63+
- name: Grant a VM or VMSS MSI access to Resource Manager
5664
items:
5765
- name: Using Azure portal
5866
href: msi-howto-assign-access-portal.md
5967
- name: Using PowerShell
6068
href: msi-howto-assign-access-powershell.md
6169
- name: Using Azure CLI
62-
href: msi-howto-assign-access-cli.md
70+
href: msi-howto-assign-access-cli.md
6371
- name: How to use a VM MSI
6472
items:
6573
- name: Acquire an access token
25.1 KB
Loading
42.4 KB
Loading

0 commit comments

Comments
 (0)