Skip to content

Commit d844048

Browse files
authored
Merge pull request #79405 from MicrosoftDocs/master
6/12 AM Publish
2 parents ce6eb24 + bbff8e1 commit d844048

File tree

47 files changed

+346
-233
lines changed

Some content is hidden

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

47 files changed

+346
-233
lines changed

articles/active-directory/saas-apps/cisco-spark-provisioning-tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.subservice: saas-app-tutorial
1313
ms.workload: identity
1414
ms.tgt_pltfrm: na
1515
ms.devlang: na
16-
ms.topic: article
16+
ms.topic: tutorial
1717
ms.date: 03/27/2019
1818
ms.author: v-wingf
1919
ms.collection: M365-identity-device-management

articles/active-directory/saas-apps/pluralsight-tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ To configure Azure AD single sign-on with Pluralsight, perform the following ste
114114
> [!NOTE]
115115
> These values are not real. Update these values with the actual Sign-On URL and Reply URL. Contact [Pluralsight Client support team](mailto:[email protected]) to get these values. You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.
116116

117-
5. Pluralsight application expects the SAML assertions in a specific format, which requires you to add custom attribute mappings to your SAML token attributes configuration. The following screenshot shows the list of default attributes. Click **Edit** icon to open **User Attributes** dialog.
117+
5. Pluralsight application expects the SAML assertions in a specific format, which requires you to add custom attribute mappings to your SAML token attributes configuration. The following screenshot shows the list of default attributes. Click **Edit** icon to open **User Attributes** dialog.
118118
![image](common/edit-attribute.png)
119119

120120
>[!NOTE]

articles/active-directory/saas-apps/smartdraw-tutorial.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ To configure Azure AD single sign-on with SmartDraw, perform the following steps
113113
> [!NOTE]
114114
> The Sign-on URL value is not real. You will update the Sign-on URL value with the actual Sign-on URL, which is explained later in the tutorial. You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.
115115

116-
6. SmartDraw application expects the SAML assertions in a specific format, which requires you to add custom attribute mappings to your SAML token attributes configuration. The following screenshot shows the list of default attributes. Click **Edit** icon to open **User Attributes** dialog.
116+
6. SmartDraw application expects the SAML assertions in a specific format, which requires you to add custom attribute mappings to your SAML token attributes configuration. The following screenshot shows the list of default attributes. Click **Edit** icon to open **User Attributes** dialog.
117117

118118
![image](common/edit-attribute.png)
119119

@@ -172,13 +172,13 @@ To configure Azure AD single sign-on with SmartDraw, perform the following steps
172172

173173
a. In the **Your Domain (like acme.com)** textbox, type your domain.
174174

175-
b. Copy the **Your SP Initiated Login Url will be** for your instance and paste it in Sign-on URL textbox in **Basic SAML Configuration** on Azure portal.
175+
b. Copy the **Your SP Initiated Login Url will be** for your instance and paste it in Sign-on URL textbox in **Basic SAML Configuration** on Azure portal.
176176

177177
c. In the **Security Groups to Allow SmartDraw Access** textbox, type **Everyone**.
178178

179179
d. In the **Your SAML Issuer Url** textbox, paste the value of **Azure AD Identifier** which you have copied from the Azure portal.
180180

181-
e. In Notepad, open the Metadata XML file that you downloaded from the Azure portal, copy its content, and then paste it into the **Your SAML MetaData** box.
181+
e. In Notepad, open the Metadata XML file that you downloaded from the Azure portal, copy its content, and then paste it into the **Your SAML MetaData** box.
182182

183183
f. Click **Save Configuration**
184184

articles/active-directory/saas-apps/tinfoil-security-tutorial.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,9 @@ To configure Azure AD single sign-on with TINFOIL SECURITY, perform the followin
101101

102102
![TINFOIL SECURITY Domain and URLs single sign-on information](common/preintegrated.png)
103103

104-
5. Your TINFOIL SECURITY application expects the SAML assertions in a specific format, which requires you to add custom attribute mappings to your SAML token attributes configuration. The following screenshot shows the list of default attributes. Click **Edit** icon to open **User Attributes** dialog.
104+
5. Your TINFOIL SECURITY application expects the SAML assertions in a specific format, which requires you to add custom attribute mappings to your SAML token attributes configuration. The following screenshot shows the list of default attributes. Click **Edit** icon to open **User Attributes** dialog.
105105

106-
    ![image](common/edit-attribute.png)
106+
![image](common/edit-attribute.png)
107107

108108
6. In addition to above, TINFOIL SECURITY application expects few more attributes to be passed back in SAML response. In the **User Claims** section on the **User Attributes** dialog, perform the following steps to add SAML token attribute as shown in the below table:
109109

articles/active-directory/saas-apps/zoom-tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ To configure Azure AD single sign-on with Zoom, perform the following steps:
110110
> [!NOTE]
111111
> These values are not real. Update these values with the actual Sign on URL and Identifier. Contact [Zoom Client support team](https://support.zoom.us/hc/en-us) to get these values. You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.
112112

113-
5. Zoom application expects the SAML assertions in a specific format, which requires you to add custom attribute mappings to your SAML token attributes configuration. The following screenshot shows the list of default attributes. Click **Edit** icon to open **User Attributes** dialog.
113+
5. Zoom application expects the SAML assertions in a specific format, which requires you to add custom attribute mappings to your SAML token attributes configuration. The following screenshot shows the list of default attributes. Click **Edit** icon to open **User Attributes** dialog.
114114

115115
![image](common/edit-attribute.png)
116116

articles/aks/gpu-cluster.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ spec:
9494
operator: Exists
9595
effect: NoSchedule
9696
containers:
97-
- image: nvidia/k8s-device-plugin:1.0.0-beta
97+
- image: nvidia/k8s-device-plugin:1.11
9898
name: nvidia-device-plugin-ctr
9999
securityContext:
100100
allowPrivilegeEscalation: false

articles/application-gateway/application-gateway-autoscaling-zone-redundant.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
---
2-
title: Autoscaling and Zone-redundant Application Gateway in Azure
2+
title: Autoscaling and Zone-redundant Application Gateway v2
33
description: This article introduces the Azure Application Standard_v2 and WAF_v2 SKU, which includes Autoscaling and Zone-redundant features.
44
services: application-gateway
55
author: vhorne
66
ms.service: application-gateway
77
ms.topic: article
8-
ms.date: 6/1/2019
8+
ms.date: 6/13/2019
99
ms.author: victorh
1010
---
1111

12-
# Autoscaling and Zone-redundant Application Gateway
12+
# Autoscaling and Zone-redundant Application Gateway v2
1313

1414
Application Gateway and Web Application Firewall (WAF) are also available under a Standard_v2 and WAF_v2 SKU. The v2 SKU offers performance enhancements and adds support for critical new features like autoscaling, zone redundancy, and support for static VIPs. Existing features under the Standard and WAF SKU continue to be supported in the new v2 SKU, with a few exceptions listed in [comparison](#differences-with-v1-sku) section.
1515

@@ -100,7 +100,7 @@ Total price = $267.84 + $85.71 = $353.55
100100

101101
Application Gateway and WAF can be configured to scale in two modes:
102102

103-
- **Autoscaling** - With autoscaling enabled, the Application Gateway and WAF v2 SKUs scale up or down based on application traffic requirements. This mode offers better elasticity to your application and eliminates the need to guess the application gateway size or instance count. This mode also allows you to save cost by not requiring to run gateways at peak provisioned capacity for anticipated maximum traffic load. Customers must specify a minimum and optionally maximum instance count. Minimum capacity ensures that Application Gateway and WAF v2 do not fall below the minimum instance count specified, even in the absence of traffic. You'll be billed for this minimum capacity even in the absence of any traffic. You can also optionally specify a maximum instance count, which ensures that the Application Gateway doesn't scale beyond the specified number of instances. You'll continue to be billed for the amount of traffic served by the Gateway. The instance counts can range from 0 to 125. The default value for maximum instance count is 20 if not specified.
103+
- **Autoscaling** - With autoscaling enabled, the Application Gateway and WAF v2 SKUs scale up or down based on application traffic requirements. This mode offers better elasticity to your application and eliminates the need to guess the application gateway size or instance count. This mode also allows you to save cost by not requiring to run gateways at peak provisioned capacity for anticipated maximum traffic load. Customers must specify a minimum and optionally maximum instance count. Minimum capacity ensures that Application Gateway and WAF v2 don't fall below the minimum instance count specified, even in the absence of traffic. You'll be billed for this minimum capacity even in the absence of any traffic. You can also optionally specify a maximum instance count, which ensures that the Application Gateway doesn't scale beyond the specified number of instances. You'll continue to be billed for the amount of traffic served by the Gateway. The instance counts can range from 0 to 125. The default value for maximum instance count is 20 if not specified.
104104
- **Manual** - You can alternatively choose Manual mode where the gateway won't autoscale. In this mode, if there is more traffic than what Application Gateway or WAF can handle, it could result in traffic loss. With manual mode, specifying instance count is mandatory. Instance count can vary from 1 to 125 instances.
105105

106106
## Feature comparison between v1 SKU and v2 SKU
@@ -143,11 +143,12 @@ The following table compares the features available with each SKU.
143143
|FIPS mode|These are currently not supported.|
144144
|ILB only mode|This is currently not supported. Public and ILB mode together is supported.|
145145
|Netwatcher integration|Not supported.|
146-
|Azure Support Center integration|Not yet available.
146+
|Azure Security Center integration|Not yet available.
147147

148148
## Migrate from v1 to v2
149149

150-
An Azure PowerShell script is available in the PowerShell gallery to help you migrate from your v1 Application Gateway/WAF to the v2 Autoscaling SKU. This script helps you copy the configuration from your v1 gateway. Traffic migration is still your responsibility. For more details, see [Migrate Azure Application Gateway from v1 to v2](migrate-v1-v2.md).
150+
An Azure PowerShell script is available in the PowerShell gallery to help you migrate from your v1 Application Gateway/WAF to the v2 Autoscaling SKU. This script helps you copy the configuration from your v1 gateway. Traffic migration is still your responsibility. For more information, see [Migrate Azure Application Gateway from v1 to v2](migrate-v1-v2.md).
151+
151152
## Next steps
152153

153154
- [Quickstart: Direct web traffic with Azure Application Gateway - Azure portal](quick-create-portal.md)

articles/automation/automation-update-management.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ After a computer completes a scan for update compliance, the agent forwards the
3939

4040
In addition to the scan schedule, the scan for update compliance is initiated within 15 minutes of the MMA being restarted, before update installation, and after update installation.
4141

42-
For a Linux computer, the compliance scan is performed every 3 hours by default. If the MMA agent is restarted, a compliance scan is initiated within 15 minutes.
42+
For a Linux computer, the compliance scan is performed every hour by default. If the MMA agent is restarted, a compliance scan is initiated within 15 minutes.
4343

4444
The solution reports how up-to-date the computer is based on what source you're configured to sync with. If the Windows computer is configured to report to WSUS, depending on when WSUS last synced with Microsoft Update, the results might differ from what Microsoft Updates shows. This behavior is the same for Linux computers that are configured to report to a local repo instead of to a public repo.
4545

articles/automation/manage-update-multi.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ Computers that have recently been enabled for Update Management might not have b
7979

8080
- **Non-compliant**: Computers that are missing at least one critical or security update.
8181

82-
- **Not assessed**: The update assessment data hasn't been received from the computer within the expected timeframe. For Linux computers, the expect timeframe is in the last 3 hours. For Windows computers, the expected timeframe is in the last 12 hours.
82+
- **Not assessed**: The update assessment data hasn't been received from the computer within the expected timeframe. For Linux computers, the expect timeframe is in the last hour. For Windows computers, the expected timeframe is in the last 12 hours.
8383

8484
To view the status of the agent, select the link in the **UPDATE AGENT READINESS** column. Selecting this option opens the **Hybrid Worker** pane, and shows the status of the Hybrid Worker. The following image shows an example of an agent that hasn't been connected to Update Management for an extended period of time:
8585

@@ -110,7 +110,7 @@ After a computer completes a scan for update compliance, the agent forwards the
110110

111111
In addition to the scan schedule, the scan for update compliance is initiated within 15 minutes of the MMA being restarted, before update installation, and after update installation.
112112

113-
For a Linux computer, the compliance scan is performed every 3 hours by default. If the MMA agent is restarted, a compliance scan is initiated within 15 minutes.
113+
For a Linux computer, the compliance scan is performed every hour by default. If the MMA agent is restarted, a compliance scan is initiated within 15 minutes.
114114

115115
It can take between 30 minutes and 6 hours for the dashboard to display updated data from managed computers.
116116

articles/automation/pre-post-scripts.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@ When you configure pre and post scripts, you can pass in parameters just like sc
5858

5959
If you need another object type, you can cast it to another type with your own logic in the runbook.
6060

61-
In addition to your standard runbook parameters, an additional parameter is provided. This parameter is **SoftwareUpdateConfigurationRunContext**. This parameter is a JSON string, and if you define the parameter in your pre or post script, it is automatically passed in by the update deployment. The parameter contains information about the update deployment, which is a subset of information returned by the [SoftwareUpdateconfigurations API](/rest/api/automation/softwareupdateconfigurations/getbyname#updateconfiguration) The following table shows you the properties that are provided in the variable:
61+
In addition to your standard runbook parameters, an additional parameter is provided. This parameter is **SoftwareUpdateConfigurationRunContext**. This parameter is a JSON string, and if you define the parameter in your pre or post script, it's automatically passed in by the update deployment. The parameter contains information about the update deployment, which is a subset of information returned by the [SoftwareUpdateconfigurations API](/rest/api/automation/softwareupdateconfigurations/getbyname#updateconfiguration) The following table shows you the properties that are provided in the variable:
6262

6363
## Stopping a deployment
6464

65-
If you want to stop a deployment based on a Pre script you must [throw](automation-runbook-execution.md#throw) an exception. If you do not throw an exception, the deployment and Post script will still run. The [example runbook](https://gallery.technet.microsoft.com/Update-Management-Run-6949cc44?redir=0) in the gallery shows how you can do this. The following is a snippet from that runbook.
65+
If you want to stop a deployment based on a Pre script, you must [throw](automation-runbook-execution.md#throw) an exception. If you don't throw an exception, the deployment and Post script will still run. The [example runbook](https://gallery.technet.microsoft.com/Update-Management-Run-6949cc44?redir=0) in the gallery shows how you can do this. The following is a snippet from that runbook.
6666

6767
```powershell
6868
#In this case, we want to terminate the patch job if any run fails.
@@ -200,11 +200,11 @@ $variable = Get-AutomationVariable -Name $runId
200200

201201
## Interacting with machines
202202

203-
Pre and post tasks run as a runbook in your Automation Account and not directly on the machines in your deployment. Pre and post tasks also run in the Azure context and don't have access to Non-Azure machines. The following sections show how you can interact with the machines directly whether they are an Azure VM or a Non-Azure machine:
203+
Pre and post tasks run as a runbook in your Automation Account and not directly on the machines in your deployment. Pre and post tasks also run in the Azure context and don't have access to Non-Azure machines. The following sections show how you can interact with the machines directly whether they're an Azure VM or a Non-Azure machine:
204204

205205
### Interacting with Azure machines
206206

207-
Pre and post tasks are ran as runbooks and do not natively run on your Azure VMs in your deployment. To interact with your Azure VMs, you must have the following items:
207+
Pre and post tasks are run as runbooks and don't natively run on your Azure VMs in your deployment. To interact with your Azure VMs, you must have the following items:
208208

209209
* A Run As account
210210
* A runbook you want to run
@@ -233,9 +233,10 @@ if (<My custom error logic>)
233233
throw "There was an error, abort deployment"
234234
}
235235
```
236+
236237
## Known issues
237238

238-
* You can't pass objects or arrays to parameters when using pre and post scripts. The runbook will fail.
239+
* You can't pass a boolean, objects, or arrays to parameters when using pre and post scripts. The runbook will fail. For a complete list of supported types, see [parameters](#passing-parameters).
239240

240241
## Next steps
241242

0 commit comments

Comments
 (0)