Skip to content

Commit 36945bc

Browse files
JamesJBarnettJamesJBarnett
authored
Merge pull request #289694 from halkazwini/nw-sfi-guid
[BULK] Network Watcher SFI GUID
2 parents 8fe7454 + f47a2c9 commit 36945bc

12 files changed

+138
-140
lines changed

‎articles/network-watcher/connection-troubleshoot-cli.md

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

‎articles/network-watcher/connection-troubleshoot-powershell.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ Hops : [
7676
"Type": "Source",
7777
"Id": "c5222ea0-3213-4f85-a642-cee63217c2f3",
7878
"Address": "10.1.1.4",
79-
"ResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGrou
79+
"ResourceId": "/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGrou
8080
ps/ContosoRG/providers/Microsoft.Network/networkInterfaces/appNic0/ipConfigurat
8181
ions/ipconfig1",
8282
"NextHopIds": [
@@ -88,7 +88,7 @@ Hops : [
8888
"Type": "VirtualAppliance",
8989
"Id": "9283a9f0-cc5e-4239-8f5e-ae0f3c19fbaa",
9090
"Address": "10.1.2.4",
91-
"ResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGrou
91+
"ResourceId": "/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGrou
9292
ps/ContosoRG/providers/Microsoft.Network/networkInterfaces/fwNic/ipConfiguratio
9393
ns/ipconfig1",
9494
"NextHopIds": [
@@ -100,7 +100,7 @@ Hops : [
100100
"Type": "VirtualAppliance",
101101
"Id": "0f1500cd-c512-4d43-b431-7267e4e67017",
102102
"Address": "10.1.3.4",
103-
"ResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGrou
103+
"ResourceId": "/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGrou
104104
ps/ContosoRG/providers/Microsoft.Network/networkInterfaces/auNic/ipConfiguratio
105105
ns/ipconfig1",
106106
"NextHopIds": [
@@ -124,7 +124,7 @@ Hops : [
124124
"Type": "VnetLocal",
125125
"Id": "a88940f8-5fbe-40da-8d99-1dee89240f64",
126126
"Address": "10.1.4.4",
127-
"ResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGrou
127+
"ResourceId": "/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGrou
128128
ps/ContosoRG/providers/Microsoft.Network/networkInterfaces/dbNic0/ipConfigurati
129129
ons/ipconfig1",
130130
"NextHopIds": [],
@@ -167,7 +167,7 @@ Hops : [
167167
"Type": "Source",
168168
"Id": "b4f7bceb-07a3-44ca-8bae-adec6628225f",
169169
"Address": "10.1.1.4",
170-
"ResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ContosoRG/providers/Microsoft.Network/networkInterfaces/appNic0/ipConfigurations/ipconfig1",
170+
"ResourceId": "/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/ContosoRG/providers/Microsoft.Network/networkInterfaces/appNic0/ipConfigurations/ipconfig1",
171171
"NextHopIds": [
172172
"3fee8adf-692f-4523-b742-f6fdf6da6584"
173173
],
@@ -231,7 +231,7 @@ Hops : [
231231
"Type": "Source",
232232
"Id": "1f0e3415-27b0-4bf7-a59d-3e19fb854e3e",
233233
"Address": "10.1.1.4",
234-
"ResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ContosoRG/providers/Microsoft.Network/networkInterfaces/appNic0/ipConfigurations/ipconfig1",
234+
"ResourceId": "/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/ContosoRG/providers/Microsoft.Network/networkInterfaces/appNic0/ipConfigurations/ipconfig1",
235235
"NextHopIds": [
236236
"f99f2bd1-42e8-4bbf-85b6-5d21d00c84e0"
237237
],
@@ -283,7 +283,7 @@ Hops : [
283283
"Type": "Source",
284284
"Id": "9e7f61d9-fb45-41db-83e2-c815a919b8ed",
285285
"Address": "10.1.1.4",
286-
"ResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ContosoRG/providers/Microsoft.Network/networkInterfaces/appNic0/ipConfigurations/ipconfig1",
286+
"ResourceId": "/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/ContosoRG/providers/Microsoft.Network/networkInterfaces/appNic0/ipConfigurations/ipconfig1",
287287
"NextHopIds": [
288288
"1e6d4b3c-7964-4afd-b959-aaa746ee0f15"
289289
],

‎articles/network-watcher/diagnose-network-security-rules.md

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ ResultsText : [
398398
"SecurityRuleAccessResult": "Deny",
399399
"EvaluatedNetworkSecurityGroups": [
400400
{
401-
"NetworkSecurityGroupId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/NetworkAdmin/providers/Microsoft.Network/networkManagers/GlobalRules",
401+
"NetworkSecurityGroupId": "/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/NetworkAdmin/providers/Microsoft.Network/networkManagers/GlobalRules",
402402
"MatchedRule": {
403403
"RuleName": "VirtualNetwork",
404404
"Action": "Allow"
@@ -415,7 +415,7 @@ ResultsText : [
415415
]
416416
},
417417
{
418-
"NetworkSecurityGroupId": "/subscriptions/abcdef01-2345-6789-0abc-def012345678/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/mySubnet-nsg",
418+
"NetworkSecurityGroupId": "/subscriptions/bbbb1b1b-cc2c-dd3d-ee4e-ffffff5f5f5f/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/mySubnet-nsg",
419419
"MatchedRule": {
420420
"RuleName": "DefaultRule_AllowVnetInBound",
421421
"Action": "Allow"
@@ -432,7 +432,7 @@ ResultsText : [
432432
]
433433
},
434434
{
435-
"NetworkSecurityGroupId": "/subscriptions/abcdef01-2345-6789-0abc-def012345678/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/myVM-nsg",
435+
"NetworkSecurityGroupId": "/subscriptions/bbbb1b1b-cc2c-dd3d-ee4e-ffffff5f5f5f/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/myVM-nsg",
436436
"MatchedRule": {
437437
"RuleName": "UserRule_DenyVnetInBound",
438438
"Action": "Deny"
@@ -479,12 +479,12 @@ Output similar to the following example output is returned:
479479
"networkSecurityGroupResult": {
480480
"evaluatedNetworkSecurityGroups": [
481481
{
482-
"appliedTo": "/subscriptions/abcdef01-2345-6789-0abc-def012345678/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVNet",
482+
"appliedTo": "/subscriptions/bbbb1b1b-cc2c-dd3d-ee4e-ffffff5f5f5f/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVNet",
483483
"matchedRule": {
484484
"action": "Allow",
485485
"ruleName": "VirtualNetwork"
486486
},
487-
"networkSecurityGroupId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/NetworkAdmin/providers/Microsoft.Network/networkManagers/GlobalRules",
487+
"networkSecurityGroupId": "/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/NetworkAdmin/providers/Microsoft.Network/networkManagers/GlobalRules",
488488
"rulesEvaluationResult": [
489489
{
490490
"destinationMatched": true,
@@ -497,12 +497,12 @@ Output similar to the following example output is returned:
497497
]
498498
},
499499
{
500-
"appliedTo": "/subscriptions/abcdef01-2345-6789-0abc-def012345678/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVNet/subnets/mySubnet",
500+
"appliedTo": "/subscriptions/bbbb1b1b-cc2c-dd3d-ee4e-ffffff5f5f5f/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVNet/subnets/mySubnet",
501501
"matchedRule": {
502502
"action": "Allow",
503503
"ruleName": "DefaultRule_AllowVnetInBound"
504504
},
505-
"networkSecurityGroupId": "/subscriptions/abcdef01-2345-6789-0abc-def012345678/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/mySubnet-nsg",
505+
"networkSecurityGroupId": "/subscriptions/bbbb1b1b-cc2c-dd3d-ee4e-ffffff5f5f5f/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/mySubnet-nsg",
506506
"rulesEvaluationResult": [
507507
{
508508
"destinationMatched": true,
@@ -515,12 +515,12 @@ Output similar to the following example output is returned:
515515
]
516516
},
517517
{
518-
"appliedTo": "/subscriptions/abcdef01-2345-6789-0abc-def012345678/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkInterfaces/myvm36",
518+
"appliedTo": "/subscriptions/bbbb1b1b-cc2c-dd3d-ee4e-ffffff5f5f5f/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkInterfaces/myvm36",
519519
"matchedRule": {
520520
"action": "Deny",
521521
"ruleName": "UserRule_DenyVnetInBound"
522522
},
523-
"networkSecurityGroupId": "/subscriptions/abcdef01-2345-6789-0abc-def012345678/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/myVM-nsg",
523+
"networkSecurityGroupId": "/subscriptions/bbbb1b1b-cc2c-dd3d-ee4e-ffffff5f5f5f/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/myVM-nsg",
524524
"rulesEvaluationResult": [
525525
{
526526
"destinationMatched": true,
@@ -629,7 +629,7 @@ You can add the security rule to the network security group from the Network Wat
629629
"SecurityRuleAccessResult": "Allow",
630630
"EvaluatedNetworkSecurityGroups": [
631631
{
632-
"NetworkSecurityGroupId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/NetworkAdmin/providers/Microsoft.Network/networkManagers/GlobalRules",
632+
"NetworkSecurityGroupId": "/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/NetworkAdmin/providers/Microsoft.Network/networkManagers/GlobalRules",
633633
"MatchedRule": {
634634
"RuleName": "VirtualNetwork",
635635
"Action": "Allow"
@@ -646,7 +646,7 @@ You can add the security rule to the network security group from the Network Wat
646646
]
647647
},
648648
{
649-
"NetworkSecurityGroupId": "/subscriptions/abcdef01-2345-6789-0abc-def012345678/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/mySubnet-nsg",
649+
"NetworkSecurityGroupId": "/subscriptions/bbbb1b1b-cc2c-dd3d-ee4e-ffffff5f5f5f/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/mySubnet-nsg",
650650
"MatchedRule": {
651651
"RuleName": "DefaultRule_AllowVnetInBound",
652652
"Action": "Allow"
@@ -663,7 +663,7 @@ You can add the security rule to the network security group from the Network Wat
663663
]
664664
},
665665
{
666-
"NetworkSecurityGroupId": "/subscriptions/abcdef01-2345-6789-0abc-def012345678/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/myVM-nsg",
666+
"NetworkSecurityGroupId": "/subscriptions/bbbb1b1b-cc2c-dd3d-ee4e-ffffff5f5f5f/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/myVM-nsg",
667667
"MatchedRule": {
668668
"RuleName": "UserRule_AllowBastionConnections",
669669
"Action": "Allow"
@@ -714,12 +714,12 @@ You can add the security rule to the network security group from the Network Wat
714714
"networkSecurityGroupResult": {
715715
"evaluatedNetworkSecurityGroups": [
716716
{
717-
"appliedTo": "/subscriptions/abcdef01-2345-6789-0abc-def012345678/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVNet",
717+
"appliedTo": "/subscriptions/bbbb1b1b-cc2c-dd3d-ee4e-ffffff5f5f5f/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVNet",
718718
"matchedRule": {
719719
"action": "Allow",
720720
"ruleName": "VirtualNetwork"
721721
},
722-
"networkSecurityGroupId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/NetworkAdmin/providers/Microsoft.Network/networkManagers/GlobalRules",
722+
"networkSecurityGroupId": "/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/NetworkAdmin/providers/Microsoft.Network/networkManagers/GlobalRules",
723723
"rulesEvaluationResult": [
724724
{
725725
"destinationMatched": true,
@@ -732,12 +732,12 @@ You can add the security rule to the network security group from the Network Wat
732732
]
733733
},
734734
{
735-
"appliedTo": "/subscriptions/abcdef01-2345-6789-0abc-def012345678/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVNet/subnets/mySubnet",
735+
"appliedTo": "/subscriptions/bbbb1b1b-cc2c-dd3d-ee4e-ffffff5f5f5f/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVNet/subnets/mySubnet",
736736
"matchedRule": {
737737
"action": "Allow",
738738
"ruleName": "DefaultRule_AllowVnetInBound"
739739
},
740-
"networkSecurityGroupId": "/subscriptions/abcdef01-2345-6789-0abc-def012345678/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/mySubnet-nsg",
740+
"networkSecurityGroupId": "/subscriptions/bbbb1b1b-cc2c-dd3d-ee4e-ffffff5f5f5f/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/mySubnet-nsg",
741741
"rulesEvaluationResult": [
742742
{
743743
"destinationMatched": true,
@@ -750,12 +750,12 @@ You can add the security rule to the network security group from the Network Wat
750750
]
751751
},
752752
{
753-
"appliedTo": "/subscriptions/abcdef01-2345-6789-0abc-def012345678/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkInterfaces/myvm36",
753+
"appliedTo": "/subscriptions/bbbb1b1b-cc2c-dd3d-ee4e-ffffff5f5f5f/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkInterfaces/myvm36",
754754
"matchedRule": {
755755
"action": "Allow",
756756
"ruleName": "UserRule_AllowBastionConnections"
757757
},
758-
"networkSecurityGroupId": "/subscriptions/abcdef01-2345-6789-0abc-def012345678/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/myVM-nsg",
758+
"networkSecurityGroupId": "/subscriptions/bbbb1b1b-cc2c-dd3d-ee4e-ffffff5f5f5f/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/myVM-nsg",
759759
"rulesEvaluationResult": [
760760
{
761761
"destinationMatched": true,

‎articles/network-watcher/flow-logs-read.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ The results of this value are shown in the following example:
283283
"time": "2017-06-16T20:59:43.7340000Z",
284284
"systemId": "abcdef01-2345-6789-0abc-def012345678",
285285
"category": "NetworkSecurityGroupFlowEvent",
286-
"resourceId": "/SUBSCRIPTIONS/00000000-0000-0000-0000-000000000000/RESOURCEGROUPS/MYRESOURCEGROUP/PROVIDERS/MICROSOFT.NETWORK/NETWORKSECURITYGROUPS/MYNSG",
286+
"resourceId": "/SUBSCRIPTIONS/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/RESOURCEGROUPS/MYRESOURCEGROUP/PROVIDERS/MICROSOFT.NETWORK/NETWORKSECURITYGROUPS/MYNSG",
287287
"operationName": "NetworkSecurityGroupFlowEvents",
288288
"properties": {
289289
"Version": 1,
@@ -344,8 +344,8 @@ The results of this value are shown in the following example:
344344
"flowLogGUID": "abcdef01-2345-6789-0abc-def012345678",
345345
"macAddress": "0022485D8CF8",
346346
"category": "FlowLogFlowEvent",
347-
"flowLogResourceID": "/SUBSCRIPTIONS/00000000-0000-0000-0000-000000000000/RESOURCEGROUPS/NETWORKWATCHERRG/PROVIDERS/MICROSOFT.NETWORK/NETWORKWATCHERS/NETWORKWATCHER_EASTUS/FLOWLOGS/MYVNET-MYRESOURCEGROUP-FLOWLOG",
348-
"targetResourceID": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVNet",
347+
"flowLogResourceID": "/SUBSCRIPTIONS/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/RESOURCEGROUPS/NETWORKWATCHERRG/PROVIDERS/MICROSOFT.NETWORK/NETWORKWATCHERS/NETWORKWATCHER_EASTUS/FLOWLOGS/MYVNET-MYRESOURCEGROUP-FLOWLOG",
348+
"targetResourceID": "/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVNet",
349349
"operationName": "FlowLogFlowEvent",
350350
"flowRecords": {
351351
"flows": [

‎articles/network-watcher/network-watcher-nsg-auditing-powershell.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ The first step in this example is to work with an existing baseline. The followi
5454
"ProvisioningState": "Succeeded",
5555
"Name": "default-allow-rdp",
5656
"Etag": "W/\"d8859256-1c4c-4b93-ba7d-73d9bf67c4f1\"",
57-
"Id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testrg/providers/Microsoft.Network/networkSecurityGroups/testvm1-nsg/securityRules/default-allow-rdp"
57+
"Id": "/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/testrg/providers/Microsoft.Network/networkSecurityGroups/testvm1-nsg/securityRules/default-allow-rdp"
5858
},
5959
{
6060
"Description": null,
@@ -69,7 +69,7 @@ The first step in this example is to work with an existing baseline. The followi
6969
"ProvisioningState": "Succeeded",
7070
"Name": "MyRuleDoNotDelete",
7171
"Etag": "W/\"d8859256-1c4c-4b93-ba7d-73d9bf67c4f1\"",
72-
"Id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testrg/providers/Microsoft.Network/networkSecurityGroups/testvm1-nsg/securityRules/MyRuleDoNotDelete"
72+
"Id": "/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/testrg/providers/Microsoft.Network/networkSecurityGroups/testvm1-nsg/securityRules/MyRuleDoNotDelete"
7373
},
7474
{
7575
"Description": null,
@@ -84,7 +84,7 @@ The first step in this example is to work with an existing baseline. The followi
8484
"ProvisioningState": "Succeeded",
8585
"Name": "My2ndRuleDoNotDelete",
8686
"Etag": "W/\"d8859256-1c4c-4b93-ba7d-73d9bf67c4f1\"",
87-
"Id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testrg/providers/Microsoft.Network/networkSecurityGroups/testvm1-nsg/securityRules/My2ndRuleDoNotDelete"
87+
"Id": "/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/testrg/providers/Microsoft.Network/networkSecurityGroups/testvm1-nsg/securityRules/My2ndRuleDoNotDelete"
8888
},
8989
{
9090
"Description": null,
@@ -99,7 +99,7 @@ The first step in this example is to work with an existing baseline. The followi
9999
"ProvisioningState": "Succeeded",
100100
"Name": "ThisRuleNeedsToStay",
101101
"Etag": "W/\"d8859256-1c4c-4b93-ba7d-73d9bf67c4f1\"",
102-
"Id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testrg/providers/Microsoft.Network/networkSecurityGroups/testvm1-nsg/securityRules/ThisRuleNeedsToStay"
102+
"Id": "/subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/resourceGroups/testrg/providers/Microsoft.Network/networkSecurityGroups/testvm1-nsg/securityRules/ThisRuleNeedsToStay"
103103
}
104104
]
105105
```

0 commit comments

Comments
 (0)