Skip to content

Commit a3a0f42

Browse files
authored
Merge pull request #50680 from MicrosoftDocs/master
8/31 PM Publish
2 parents e45b2aa + 07638d3 commit a3a0f42

File tree

84 files changed

+439
-269
lines changed

Some content is hidden

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

84 files changed

+439
-269
lines changed

.openpublishing.redirection.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26094,7 +26094,12 @@
2609426094
},
2609526095
{
2609626096
"source_path": "articles/iot-suite/iot-suite-time-series-insights.md",
26097-
"redirect_url": "/azure/iot-accelerators/iot-accelerators-time-series-insights",
26097+
"redirect_url": "/azure/iot-accelerators/iot-accelerators-remote-monitoring-time-series-insights",
26098+
"redirect_document_id": false
26099+
},
26100+
{
26101+
"source_path": "articles/iot-suite/iot-accelerators-time-series-insights.md",
26102+
"redirect_url": "/azure/iot-accelerators/iot-accelerators-remote-monitoring-time-series-insights",
2609826103
"redirect_document_id": false
2609926104
},
2610026105
{

articles/active-directory/connect/active-directory-aadconnect-azure-adfs.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -182,18 +182,21 @@ Select the newly created ILB in the Load Balancers panel. It will open the setti
182182

183183
**6.3. Configuring probe**
184184

185-
In the ILB settings panel, select Probes.
185+
In the ILB settings panel, select Health probes.
186186

187187
1. Click on add
188188
2. Provide details for probe
189189
a. **Name**: Probe name
190-
b. **Protocol**: TCP
191-
c. **Port**: 443 (HTTPS)
192-
d. **Interval**: 5 (default value) – this is the interval at which ILB will probe the machines in the backend pool
193-
e. **Unhealthy threshold limit**: 2 (default value) – this is the threshold of consecutive probe failures after which ILB will declare a machine in the backend pool non-responsive and stop sending traffic to it.
190+
b. **Protocol**: HTTP
191+
c. **Port**: 80 (HTTP)
192+
d. **Path**: /adfs/probe
193+
e. **Interval**: 5 (default value) – this is the interval at which ILB will probe the machines in the backend pool
194+
f. **Unhealthy threshold limit**: 2 (default value) – this is the threshold of consecutive probe failures after which ILB will declare a machine in the backend pool non-responsive and stop sending traffic to it.
194195

195196
![Configure ILB probe](./media/active-directory-aadconnect-azure-adfs/ilbdeployment4.png)
196197

198+
We are using the /adfs/probe endpoint that was created explictly for health checks in an AD FS environment where a full HTTPS path check cannot happen. This is substantially better than a basic port 443 check, which does not accurately reflect the status of a modern AD FS deployment. More information on this can be found at https://blogs.technet.microsoft.com/applicationproxyblog/2014/10/17/hardware-load-balancer-health-checks-and-web-application-proxy-ad-fs-2012-r2/.
199+
197200
**6.4. Create load balancing rules**
198201

199202
In order to effectively balance the traffic, the ILB should be configured with load balancing rules. In order to create a load balancing rule,

articles/active-directory/reports-monitoring/tutorial-access-api-with-certificates.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ This involves the following steps:
3434

3535
1. First, make sure that you have completed the [prerequisites to access the Azure Active Directory reporting API](howto-configure-prerequisites-for-reporting-api.md).
3636

37-
2. Download and install Azure AD Powershell V2, following the instructions at [Azure Active Directory PowerShell](https://github.com/Azure/azure-docs-powershell-azuread/blob/master/Azure AD Cmdlets/AzureAD/index.md)
37+
2. Download and install Azure AD Powershell V2, following the instructions at [Azure Active Directory PowerShell(https://github.com/Azure/azure-docs-powershell-azuread/blob/master/docs-conceptual/azureadps-2.0/install-adv2.md)
3838

3939
3. Install the MSCloudIDUtils from the [PowerShellGallery - MSCloudIdUtils](https://www.powershellgallery.com/packages/MSCloudIdUtils/). This module provides several utility cmdlets including:
4040
- The ADAL libraries needed for authentication

articles/active-directory/saas-apps/pingboard-provisioning-tutorial.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ms.reviewer: asmalser
2323

2424
# Tutorial: Configure Pingboard for automatic user provisioning
2525

26-
The objective of this tutorial is to show you the steps you need to perform to enable automatic provisioning and de-provisioning of user accounts from Azure Active Directory (Azure AD) to Pingboard.
26+
The purpose of this tutorial is to show you the steps you need to follow to enable automatic provisioning and de-provisioning of user accounts from Azure Active Directory (Azure AD) to Pingboard.
2727

2828
## Prerequisites
2929

@@ -34,7 +34,7 @@ The scenario outlined in this tutorial assumes that you already have the followi
3434
* A user account in Pingboard with admin permissions
3535

3636
> [!NOTE]
37-
> Azure AD provisioning integration relies on the [Pingboard API](`https://your_domain.pingboard.com/scim/v2`), which is available to your account.
37+
> Azure AD provisioning integration relies on the [Pingboard API](https://pingboard.docs.apiary.io/#), which is available to your account.
3838
3939
## Assign users to Pingboard
4040

@@ -50,7 +50,7 @@ We recommend that you assign a single Azure AD user to Pingboard to test the pro
5050

5151
## Configure user provisioning to Pingboard
5252

53-
This section guides you through connecting your Azure AD to the Pingboard user account provisioning API. You also configure the provisioning service to create, update, and disable assigned user accounts in Pingboard based on user assignments in Azure AD.
53+
This section guides you through connecting your Azure AD to the Pingboard user account provisioning API. You also configure the provisioning service to create, update, and disable assigned user accounts in Pingboard that are based on user assignments in Azure AD.
5454

5555
> [!TIP]
5656
> To enable SAML-based single sign-on for Pingboard, follow the instructions provided in the [Azure portal](https://portal.azure.com). Single sign-on can be configured independently of automatic provisioning, although these two features complement each other.
@@ -67,7 +67,7 @@ This section guides you through connecting your Azure AD to the Pingboard user a
6767

6868
![Pingboard Provisioning](./media/pingboard-provisioning-tutorial/pingboardazureprovisioning.png)
6969

70-
1. Under the **Admin Credentials** section, perform the following steps:
70+
1. Under the **Admin Credentials** section, use the following steps:
7171

7272
a. In **Tenant URL**, enter `https://your_domain.pingboard.com/scim/v2`, and replace "your_domain" with your real domain.
7373

@@ -79,7 +79,7 @@ This section guides you through connecting your Azure AD to the Pingboard user a
7979

8080
e. Copy the token in **OAuth Bearer Token**, and enter it in **Secret Token**.
8181

82-
1. In the Azure portal, select **Test Connection** to ensure Azure AD can connect to your Pingboard app. If the connection fails, ensure that your Pingboard account has admin permissions, and try the **Test Connection** step again.
82+
1. In the Azure portal, select **Test Connection** to test Azure AD can connect to your Pingboard app. If the connection fails, test that your Pingboard account has admin permissions, and try the **Test Connection** step again.
8383

8484
1. Enter the email address of a person or group that you want to receive provisioning error notifications in **Notification Email**. Select the check box underneath.
8585

@@ -93,7 +93,7 @@ This section guides you through connecting your Azure AD to the Pingboard user a
9393

9494
1. Select **Save** to start the initial synchronization of users assigned to Pingboard.
9595

96-
The initial synchronization takes longer to perform than subsequent syncs, which occur approximately every 40 minutes as long as the service is running. Use the **Synchronization Details** section to monitor progress and follow links to provisioning activity logs. The logs describe all actions performed by the provisioning service on your Pingboard app.
96+
The initial synchronization takes longer to run than following syncs, which occur approximately every 40 minutes as long as the service is running. Use the **Synchronization Details** section to monitor progress and follow links to provisioning activity logs. The logs describe all actions taken by the provisioning service on your Pingboard app.
9797

9898
For more information on how to read the Azure AD provisioning logs, see [Report on automatic user account provisioning](../active-directory-saas-provisioning-reporting.md).
9999

articles/ansible/ansible-manage-azure-dynamic-inventories.md

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -131,20 +131,21 @@ The purpose of tags is to enable the ability to quickly and easily work with sub
131131

132132
1. Insert the following code into the newly created `nginx.yml` file:
133133

134-
```yml
135-
- name: Install and start Nginx on an Azure virtual machine
136-
hosts: azure
137-
become: yes
138-
tasks:
139-
- name: install nginx
140-
apt: pkg=nginx state=installed
141-
notify:
142-
- start nginx
143-
144-
handlers:
145-
- name: start nginx
146-
service: name=nginx state=started
147-
```
134+
```yml
135+
---
136+
- name: Install and start Nginx on an Azure virtual machine
137+
hosts: azure
138+
become: yes
139+
tasks:
140+
- name: install nginx
141+
apt: pkg=nginx state=installed
142+
notify:
143+
- start nginx
144+
145+
handlers:
146+
- name: start nginx
147+
service: name=nginx state=started
148+
```
148149
149150
1. Run the `nginx.yml` playbook:
150151

articles/app-service/app-service-security.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ The platform components of App Service, including Azure VMs, storage, network co
2525

2626
- Your app resources are [secured](https://github.com/projectkudu/kudu/wiki/Azure-Web-App-sandbox) from the other customers' Azure resources.
2727
- [VM instances and runtime software are regularly updated](app-service-patch-os-runtime.md) to address newly discovered vulnerabilities.
28-
- Communication of secrets (such as connection strings) between your app and other Azure resources (such as [SQL Database](/services/sql-database/)) stays within Azure and doesn't cross any network boundaries. Secrets are always encrypted when stored.
28+
- Communication of secrets (such as connection strings) between your app and other Azure resources (such as [SQL Database](https://azure.microsoft.com/services/sql-database/)) stays within Azure and doesn't cross any network boundaries. Secrets are always encrypted when stored.
2929
- All communication over the App Service connectivity features, such as [hybrid connection](app-service-hybrid-connections.md), is encrypted.
3030
- Connections with remote management tools like Azure PowerShell, Azure CLI, Azure SDKs, REST APIs, are all encrypted.
3131
- 24-hour threat management protects the infrastructure and platform against malware, distributed denial-of-service (DDoS), man-in-the-middle (MITM), and other threats.
@@ -80,7 +80,7 @@ In each of these cases, App Service provides a way for you to make secure connec
8080

8181
### Azure resources
8282

83-
When your app connects to Azure resources, such as [SQL Database](/services/sql-database/) and [Azure Storage](/azure/storage/), the connection stays within Azure and doesn't cross any network boundaries. However, the connection goes through the shared networking in Azure, so always make sure that your connection is encrypted.
83+
When your app connects to Azure resources, such as [SQL Database](https://azure.microsoft.com/services/sql-database/) and [Azure Storage](/azure/storage/), the connection stays within Azure and doesn't cross any network boundaries. However, the connection goes through the shared networking in Azure, so always make sure that your connection is encrypted.
8484

8585
If your app is hosted in an [App Service environment](environment/intro.md), you should [connect to supported Azure services using Virtual Network service endpoints](../virtual-network/virtual-network-service-endpoints-overview.md).
8686

@@ -113,4 +113,4 @@ Except for the **Isolated** pricing tier, all tiers run your apps on the shared
113113
- Serve internal application using an internal load balancer (ILB), which allows access only from inside your Azure Virtual Network. The ILB has an IP address from your private subnet, which provides total isolation of your apps from the internet.
114114
- [Use an ILB behind a web application firewall (WAF)](environment/integrate-with-application-gateway.md). The WAF offers enterprise-level protection to your public-facing applications, such as DDoS protection, URI filtering, and SQL injection prevention.
115115

116-
For more information, see [Introduction to Azure App Service Environments](environment/intro.md).
116+
For more information, see [Introduction to Azure App Service Environments](environment/intro.md).

articles/app-service/web-sites-scale.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ For a table of service limits, quotas, and constraints, and supported features i
108108
* [How Azure Websites Scale - with Stefan Schackow](https://azure.microsoft.com/resources/videos/how-azure-web-sites-scale/)
109109

110110
<!-- LINKS -->
111-
[vmsizes]:/pricing/details/app-service/
111+
[vmsizes]:https://azure.microsoft.com/pricing/details/app-service/
112112
[SQLaccountsbilling]:http://go.microsoft.com/fwlink/?LinkId=234930
113113
[azuresubscriptions]:https://account.windowsazure.com/subscriptions
114114
[portal]: https://portal.azure.com/

articles/automation/automation-schedules.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ The cmdlets in the following table are used to create and manage schedules with
2727
| [New-AzureRmAutomationSchedule](/powershell/module/azurerm.automation/new-azurermautomationschedule) |Creates a new schedule. |
2828
| [Remove-AzureRmAutomationSchedule](/powershell/module/azurerm.automation/remove-azurermautomationschedule) |Removes a schedule. |
2929
| [Set-AzureRmAutomationSchedule](/powershell/module/azurerm.automation/set-azurermautomationschedule) |Sets the properties for an existing schedule. |
30-
| [Get-AzureRmAutomationScheduledRunbook](/powershell/module/azurerm.automation/set-azurermautomationscheduledrunbook) |Retrieves scheduled runbooks. |
30+
| [Get-AzureRmAutomationScheduledRunbook](/powershell/module/azurerm.automation/get-azurermautomationscheduledrunbook) |Retrieves scheduled runbooks. |
3131
| [Register-AzureRmAutomationScheduledRunbook](/powershell/module/azurerm.automation/register-azurermautomationscheduledrunbook) |Associates a runbook with a schedule. |
3232
| [Unregister-AzureRmAutomationScheduledRunbook](/powershell/module/azurerm.automation/unregister-azurermautomationscheduledrunbook) |Dissociates a runbook from a schedule. |
3333

@@ -120,4 +120,4 @@ Set-AzureRmAutomationSchedule –AutomationAccountName $automationAccountName `
120120

121121
## Next steps
122122

123-
* To get started with runbooks in Azure Automation, see [Starting a Runbook in Azure Automation](automation-starting-a-runbook.md)
123+
* To get started with runbooks in Azure Automation, see [Starting a Runbook in Azure Automation](automation-starting-a-runbook.md)

articles/automation/automation-update-management.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ If your System Center Operations Manager management group is connected to a Log
113113
For more information about how solution management packs are updated, see [Connect Operations Manager to Log Analytics](../log-analytics/log-analytics-om-agents.md).
114114

115115
> [!NOTE]
116-
> For systems with the Operations Manger Agent, to be able to be fully managed by Update Management, the agent needs to be updated to the Microsoft Monitoring Agent. To learn how to update the agent, see [How to upgrade an Operations Manager agent](/system-center/scom/deploy-upgrade-agents.md).
116+
> For systems with the Operations Manger Agent, to be able to be fully managed by Update Management, the agent needs to be updated to the Microsoft Monitoring Agent. To learn how to update the agent, see [How to upgrade an Operations Manager agent](/system-center/scom/deploy-upgrade-agents).
117117
118118
### Confirm that non-Azure machines are onboarded
119119

0 commit comments

Comments
 (0)