Skip to content

Commit f1083e1

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into devops3b
2 parents 32dbf25 + fd75d24 commit f1083e1

File tree

4 files changed

+41
-25
lines changed

4 files changed

+41
-25
lines changed

articles/asc-for-iot/concept-baseline.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ms.devlang: na
1515
ms.topic: conceptual
1616
ms.tgt_pltfrm: na
1717
ms.workload: na
18-
ms.date: 10/03/2019
18+
ms.date: 10/07/2019
1919
ms.author: mlottner
2020

2121
---
@@ -52,7 +52,7 @@ To configure baseline custom checks:
5252
"baselineCustomChecksFilePath": {
5353
"value" : "/home/user/full_path.xml"
5454
},
55-
"baselineCustomChecksFilePath": {
55+
"baselineCustomChecksFileHash": {
5656
"value" : "#hashexample!"
5757
}
5858
}

articles/asc-for-iot/how-to-deploy-edge.md

Lines changed: 35 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.devlang: na
1414
ms.topic: conceptual
1515
ms.tgt_pltfrm: na
1616
ms.workload: na
17-
ms.date: 07/23/2019
17+
ms.date: 10/08/2019
1818
ms.author: mlottner
1919

2020
---
@@ -67,7 +67,7 @@ There are three steps to create an IoT Edge deployment for Azure Security Center
6767

6868
#### Step 1: Add modules
6969

70-
1. From the **Add Modules** tab, **Deployment Modules** area, click **AzureSecurityCenterforIoT**.
70+
1. From the **Add Modules** tab, **Deployment Modules** area, click the **configure** option for **AzureSecurityCenterforIoT**.
7171

7272
1. Change the **name** to **azureiotsecurity**.
7373
1. Change the **Image URI** to **mcr.microsoft.com/ascforiot/azureiotsecurity:1.0.0**.
@@ -92,10 +92,13 @@ There are three steps to create an IoT Edge deployment for Azure Security Center
9292
1. Verify that **Set module twin's desired properties** is selected, and change the configuration object to:
9393

9494
``` json
95-
"desired": {
96-
"ms_iotn:urn_azureiot_Security_SecurityAgentConfiguration": {
97-
}
98-
}
95+
{
96+
"properties.desired":{
97+
"ms_iotn:urn_azureiot_Security_SecurityAgentConfiguration":{
98+
99+
}
100+
}
101+
}
99102
```
100103

101104
1. Click **Save**.
@@ -107,13 +110,25 @@ There are three steps to create an IoT Edge deployment for Azure Security Center
107110

108111
``` json
109112
{
110-
"HostConfig":{
111-
"PortBindings":{
112-
"8883/tcp": [{"HostPort": "8883"}],
113-
"443/tcp": [{"HostPort": "443"}],
114-
"5671/tcp": [{"HostPort": "5671"}]
115-
}
116-
}
113+
"HostConfig":{
114+
"PortBindings":{
115+
"8883/tcp":[
116+
{
117+
"HostPort":"8883"
118+
}
119+
],
120+
"443/tcp":[
121+
{
122+
"HostPort":"443"
123+
}
124+
],
125+
"5671/tcp":[
126+
{
127+
"HostPort":"5671"
128+
}
129+
]
130+
}
131+
}
117132
}
118133
```
119134
1. Click **Save**.
@@ -122,16 +137,15 @@ There are three steps to create an IoT Edge deployment for Azure Security Center
122137

123138
#### Step 2: Specify routes
124139

125-
1. In the **Specify Routes** tab, make sure you have a route (explicit or implicit) that will forward messages from the **azureiotsecurity** module to **$upstream**.
126-
1. Click **Next**.
140+
1. In the **Specify Routes** tab, make sure you have a route (explicit or implicit) that will forward messages from the **azureiotsecurity** module to **$upstream** according to the following examples, only then click **Next**.
127141

128-
~~~Default implicit route
129-
"route": "FROM /messages/* INTO $upstream"
130-
~~~
142+
~~~Default implicit route
143+
"route": "FROM /messages/* INTO $upstream"
144+
~~~
131145

132-
~~~Explicit route
133-
"ASCForIoTRoute": "FROM /messages/modules/azureiotsecurity/* INTO $upstream"
134-
~~~
146+
~~~Explicit route
147+
"ASCForIoTRoute": "FROM /messages/modules/azureiotsecurity/* INTO $upstream"
148+
~~~
135149

136150
#### Step 3: Review deployment
137151

articles/asc-for-iot/overview.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ ms.date: 09/26/2019
1818
ms.author: mlottner
1919

2020
---
21+
22+
2123
# Introducing Azure Security Center for IoT
2224

2325
Unify security management and enable end-to-end threat detection and analysis across hybrid cloud workloads and your Azure IoT solution.

articles/virtual-network/virtual-network-ipv4-ipv6-dual-stack-standard-load-balancer-powershell.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ $nsg = New-AzNetworkSecurityGroup `
235235
```
236236
### Create a virtual network
237237

238-
Create a virtual network with [New-AzVirtualNetwork](/powershell/module/az.network/new-azvirtualnetwork). The following example creates a virtual network named *myVnet* with *mySubnet*:
238+
Create a virtual network with [New-AzVirtualNetwork](/powershell/module/az.network/new-azvirtualnetwork). The following example creates a virtual network named *dsVnet* with *mySubnet*:
239239

240240
```azurepowershell-interactive
241241
# Create dual stack subnet
@@ -360,7 +360,7 @@ The following figure shows a sample output that lists the private IPv4 and IPv6
360360
## View IPv6 dual stack virtual network in Azure portal
361361
You can view the IPv6 dual stack virtual network in Azure portal as follows:
362362
1. In the portal's search bar, enter *dsVnet*.
363-
2. When **myVirtualNetwork** appears in the search results, select it. This launches the **Overview** page of the dual stack virtual network named *dsVnet*. The dual stack virtual network shows the two NICs with both IPv4 and IPv6 configurations located in the dual stack subnet named *dsSubnet*.
363+
2. When **dsVnet** appears in the search results, select it. This launches the **Overview** page of the dual stack virtual network named *dsVnet*. The dual stack virtual network shows the two NICs with both IPv4 and IPv6 configurations located in the dual stack subnet named *dsSubnet*.
364364

365365
![IPv6 dual stack virtual network in Azure](./media/virtual-network-ipv4-ipv6-dual-stack-powershell/dual-stack-vnet.png)
366366

0 commit comments

Comments
 (0)