Skip to content

Commit 9d9bd7b

Browse files
author
Mahak Jain
committed
Determine Scope Type programatically
1 parent 35ef33c commit 9d9bd7b

File tree

8 files changed

+144
-147
lines changed

8 files changed

+144
-147
lines changed

‎src/AlertsManagement/AlertsManagement.Test/ScenarioTests/ActionRuleTests.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ function Test-CreateUpdateAndDeleteSuppressionRule
3030
$resourceGroupName = "ActionRules-Powershell-Test"
3131
$actionRuleName = "ScenarioTest-Suppression-ActionRule"
3232

33-
$createdActionRule = Set-AzActionRule -ResourceGroupName $resourceGroupName -Name $actionRuleName -ScopeType "ResourceGroup" -Scope "/subscriptions/dd91de05-d791-4ceb-b6dc-988682dc7d72/resourceGroups/alertslab","/subscriptions/dd91de05-d791-4ceb-b6dc-988682dc7d72/resourceGroups/Test-VMs" -SeverityCondition "Equals:Sev0,Sev1" -MonitorCondition "NotEquals:Resolved" -Description "Test description" -Status "Enabled" -ActionRuleType "Suppression" -ReccurenceType "Weekly" -SuppressionStartTime "06/26/2018 06:00:00" -SuppressionEndTime "07/27/2018 06:00:00" -ReccurentValue 1,4,6
33+
$createdActionRule = Set-AzActionRule -ResourceGroupName $resourceGroupName -Name $actionRuleName -Scope "/subscriptions/dd91de05-d791-4ceb-b6dc-988682dc7d72/resourceGroups/alertslab","/subscriptions/dd91de05-d791-4ceb-b6dc-988682dc7d72/resourceGroups/Test-VMs" -SeverityCondition "Equals:Sev0,Sev1" -MonitorCondition "NotEquals:Resolved" -Description "Test description" -Status "Enabled" -ActionRuleType "Suppression" -ReccurenceType "Weekly" -SuppressionStartTime "06/26/2018 06:00:00" -SuppressionEndTime "07/27/2018 06:00:00" -ReccurentValue 1,4,6
3434

3535
Assert-NotNull $createdActionRule
3636

@@ -48,7 +48,7 @@ function Test-CreateUpdateAndDeleteActionGroupRule
4848
$resourceGroupName = "ActionRules-Powershell-Test"
4949
$actionRuleName = "ScenarioTest-ActionGroup-ActionRule"
5050

51-
$createdActionRule = Set-AzActionRule -ResourceGroupName $resourceGroupName -Name $actionRuleName -ScopeType "ResourceGroup" -Scope "/subscriptions/dd91de05-d791-4ceb-b6dc-988682dc7d72/resourceGroups/alertslab","/subscriptions/dd91de05-d791-4ceb-b6dc-988682dc7d72/resourceGroups/Test-VMs" -SeverityCondition "Equals:Sev0,Sev1" -MonitorCondition "NotEquals:Resolved" -Description "Test description" -Status "Enabled" -ActionRuleType "ActionGroup" -ActionGroupId "/subscriptions/1e3ff1c0-771a-4119-a03b-be82a51e232d/resourceGroups/alertscorrelationrg/providers/Microsoft.insights/actiongroups/testAG"
51+
$createdActionRule = Set-AzActionRule -ResourceGroupName $resourceGroupName -Name $actionRuleName -Scope "/subscriptions/dd91de05-d791-4ceb-b6dc-988682dc7d72/resourceGroups/alertslab","/subscriptions/dd91de05-d791-4ceb-b6dc-988682dc7d72/resourceGroups/Test-VMs" -SeverityCondition "Equals:Sev0,Sev1" -MonitorCondition "NotEquals:Resolved" -Description "Test description" -Status "Enabled" -ActionRuleType "ActionGroup" -ActionGroupId "/subscriptions/1e3ff1c0-771a-4119-a03b-be82a51e232d/resourceGroups/alertscorrelationrg/providers/Microsoft.insights/actiongroups/testAG"
5252

5353
Assert-NotNull $createdActionRule
5454

@@ -66,7 +66,7 @@ function Test-CreateUpdateAndDeleteDiagnosticsRule
6666
$resourceGroupName = "ActionRules-Powershell-Test"
6767
$actionRuleName = "ScenarioTest-Diagnostics-ActionRule"
6868

69-
$createdActionRule = Set-AzActionRule -ResourceGroupName $resourceGroupName -Name $actionRuleName -ScopeType "ResourceGroup" -Scope "/subscriptions/dd91de05-d791-4ceb-b6dc-988682dc7d72/resourceGroups/alertslab","/subscriptions/dd91de05-d791-4ceb-b6dc-988682dc7d72/resourceGroups/Test-VMs" -SeverityCondition "Equals:Sev0,Sev1" -MonitorCondition "NotEquals:Resolved" -Description "Test description" -Status "Enabled" -ActionRuleType "Diagnostics"
69+
$createdActionRule = Set-AzActionRule -ResourceGroupName $resourceGroupName -Name $actionRuleName -Scope "/subscriptions/dd91de05-d791-4ceb-b6dc-988682dc7d72/resourceGroups/alertslab","/subscriptions/dd91de05-d791-4ceb-b6dc-988682dc7d72/resourceGroups/Test-VMs" -SeverityCondition "Equals:Sev0,Sev1" -MonitorCondition "NotEquals:Resolved" -Description "Test description" -Status "Enabled" -ActionRuleType "Diagnostics"
7070

7171
Assert-NotNull $createdActionRule
7272

‎src/AlertsManagement/AlertsManagement.Test/SessionRecords/Microsoft.Azure.Commands.AlertsManagement.Test.ScenarioTests.ActionRuleTests/TestCreateUpdateAndDeleteActionGroupRule.json

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"RequestBody": "{\r\n \"properties\": {\r\n \"type\": \"ActionGroup\",\r\n \"actionGroupId\": \"/subscriptions/1e3ff1c0-771a-4119-a03b-be82a51e232d/resourceGroups/alertscorrelationrg/providers/Microsoft.insights/actiongroups/testAG\",\r\n \"scope\": {\r\n \"scopeType\": \"ResourceGroup\",\r\n \"values\": [\r\n \"/subscriptions/dd91de05-d791-4ceb-b6dc-988682dc7d72/resourceGroups/alertslab\",\r\n \"/subscriptions/dd91de05-d791-4ceb-b6dc-988682dc7d72/resourceGroups/Test-VMs\"\r\n ]\r\n },\r\n \"conditions\": {\r\n \"severity\": {\r\n \"operator\": \"Equals\",\r\n \"values\": [\r\n \"Sev0\",\r\n \"Sev1\"\r\n ]\r\n },\r\n \"monitorCondition\": {\r\n \"operator\": \"NotEquals\",\r\n \"values\": [\r\n \"Resolved\"\r\n ]\r\n }\r\n },\r\n \"description\": \"Test description\",\r\n \"status\": \"Enabled\"\r\n },\r\n \"location\": \"Global\",\r\n \"tags\": {}\r\n}",
88
"RequestHeaders": {
99
"x-ms-client-request-id": [
10-
"c1f61fac-f687-4be4-9590-0a973e5bd0c3"
10+
"66a08945-edf4-4100-b5a1-8387c51c931e"
1111
],
1212
"Accept-Language": [
1313
"en-US"
@@ -33,7 +33,7 @@
3333
"no-cache"
3434
],
3535
"x-ms-request-id": [
36-
"5cffd53d-b856-4554-ad4a-79114e890c92"
36+
"4a42003d-0347-4a2b-8cd2-bea17baac513"
3737
],
3838
"X-Content-Type-Options": [
3939
"nosniff"
@@ -42,19 +42,19 @@
4242
"max-age=31536000; includeSubDomains"
4343
],
4444
"x-ms-ratelimit-remaining-subscription-writes": [
45-
"1197"
45+
"1199"
4646
],
4747
"x-ms-correlation-request-id": [
48-
"aa204e2c-e187-402c-8f33-57ca83a31af2"
48+
"8279b287-c58a-4fcb-a332-4ca1d83bdbb2"
4949
],
5050
"x-ms-routing-request-id": [
51-
"SOUTHINDIA:20190712T142019Z:aa204e2c-e187-402c-8f33-57ca83a31af2"
51+
"SOUTHINDIA:20190716T145352Z:8279b287-c58a-4fcb-a332-4ca1d83bdbb2"
5252
],
5353
"Date": [
54-
"Fri, 12 Jul 2019 14:20:19 GMT"
54+
"Tue, 16 Jul 2019 14:53:52 GMT"
5555
],
5656
"Content-Length": [
57-
"1022"
57+
"1020"
5858
],
5959
"Content-Type": [
6060
"application/json; charset=utf-8"
@@ -63,7 +63,7 @@
6363
"-1"
6464
]
6565
},
66-
"ResponseBody": "{\r\n \"properties\": {\r\n \"conditions\": {\r\n \"severity\": {\r\n \"operator\": \"Equals\",\r\n \"values\": [\r\n \"Sev0\",\r\n \"Sev1\"\r\n ]\r\n },\r\n \"monitorCondition\": {\r\n \"operator\": \"NotEquals\",\r\n \"values\": [\r\n \"Resolved\"\r\n ]\r\n }\r\n },\r\n \"status\": \"Enabled\",\r\n \"type\": \"ActionGroup\",\r\n \"scope\": {\r\n \"scopeType\": \"ResourceGroup\",\r\n \"values\": [\r\n \"/subscriptions/dd91de05-d791-4ceb-b6dc-988682dc7d72/resourceGroups/alertslab\",\r\n \"/subscriptions/dd91de05-d791-4ceb-b6dc-988682dc7d72/resourceGroups/Test-VMs\"\r\n ]\r\n },\r\n \"description\": \"Test description\",\r\n \"createdAt\": \"2019-07-12T14:20:18.3542901Z\",\r\n \"createdBy\": \"User\",\r\n \"lastModifiedAt\": \"2019-07-12T14:20:18.3542901Z\",\r\n \"lastModifiedBy\": \"User\",\r\n \"actionGroupId\": \"/subscriptions/1e3ff1c0-771a-4119-a03b-be82a51e232d/resourceGroups/alertscorrelationrg/providers/Microsoft.insights/actiongroups/testAG\"\r\n },\r\n \"location\": \"Global\",\r\n \"id\": \"/subscriptions/dd91de05-d791-4ceb-b6dc-988682dc7d72/resourceGroups/ActionRules-Powershell-Test/providers/Microsoft.AlertsManagement/actionRules/ScenarioTest-ActionGroup-ActionRule\",\r\n \"type\": \"Microsoft.AlertsManagement/actionRules\",\r\n \"name\": \"ScenarioTest-ActionGroup-ActionRule\"\r\n}",
66+
"ResponseBody": "{\r\n \"properties\": {\r\n \"conditions\": {\r\n \"severity\": {\r\n \"operator\": \"Equals\",\r\n \"values\": [\r\n \"Sev0\",\r\n \"Sev1\"\r\n ]\r\n },\r\n \"monitorCondition\": {\r\n \"operator\": \"NotEquals\",\r\n \"values\": [\r\n \"Resolved\"\r\n ]\r\n }\r\n },\r\n \"status\": \"Enabled\",\r\n \"type\": \"ActionGroup\",\r\n \"scope\": {\r\n \"scopeType\": \"ResourceGroup\",\r\n \"values\": [\r\n \"/subscriptions/dd91de05-d791-4ceb-b6dc-988682dc7d72/resourceGroups/alertslab\",\r\n \"/subscriptions/dd91de05-d791-4ceb-b6dc-988682dc7d72/resourceGroups/Test-VMs\"\r\n ]\r\n },\r\n \"description\": \"Test description\",\r\n \"createdAt\": \"2019-07-16T14:53:51.647592Z\",\r\n \"createdBy\": \"User\",\r\n \"lastModifiedAt\": \"2019-07-16T14:53:51.647592Z\",\r\n \"lastModifiedBy\": \"User\",\r\n \"actionGroupId\": \"/subscriptions/1e3ff1c0-771a-4119-a03b-be82a51e232d/resourceGroups/alertscorrelationrg/providers/Microsoft.insights/actiongroups/testAG\"\r\n },\r\n \"location\": \"Global\",\r\n \"id\": \"/subscriptions/dd91de05-d791-4ceb-b6dc-988682dc7d72/resourceGroups/ActionRules-Powershell-Test/providers/Microsoft.AlertsManagement/actionRules/ScenarioTest-ActionGroup-ActionRule\",\r\n \"type\": \"Microsoft.AlertsManagement/actionRules\",\r\n \"name\": \"ScenarioTest-ActionGroup-ActionRule\"\r\n}",
6767
"StatusCode": 200
6868
},
6969
{
@@ -73,7 +73,7 @@
7373
"RequestBody": "{\r\n \"properties\": {\r\n \"status\": \"Disabled\"\r\n }\r\n}",
7474
"RequestHeaders": {
7575
"x-ms-client-request-id": [
76-
"b8541352-0728-4c01-949e-fac2e881dcc2"
76+
"22ac38c2-faf5-4365-8651-c85604fd61d0"
7777
],
7878
"Accept-Language": [
7979
"en-US"
@@ -99,7 +99,7 @@
9999
"no-cache"
100100
],
101101
"x-ms-request-id": [
102-
"8e12e6fc-3407-4407-9067-dc882c206894"
102+
"d0286239-af93-4adb-a918-5495932d003b"
103103
],
104104
"X-Content-Type-Options": [
105105
"nosniff"
@@ -108,19 +108,19 @@
108108
"max-age=31536000; includeSubDomains"
109109
],
110110
"x-ms-ratelimit-remaining-subscription-writes": [
111-
"1196"
111+
"1198"
112112
],
113113
"x-ms-correlation-request-id": [
114-
"776429fd-b741-499a-aa86-23d61607e4e1"
114+
"2b3faa99-7012-4b57-9818-c3c8d4d390c3"
115115
],
116116
"x-ms-routing-request-id": [
117-
"SOUTHINDIA:20190712T142020Z:776429fd-b741-499a-aa86-23d61607e4e1"
117+
"SOUTHINDIA:20190716T145353Z:2b3faa99-7012-4b57-9818-c3c8d4d390c3"
118118
],
119119
"Date": [
120-
"Fri, 12 Jul 2019 14:20:20 GMT"
120+
"Tue, 16 Jul 2019 14:53:53 GMT"
121121
],
122122
"Content-Length": [
123-
"1023"
123+
"1022"
124124
],
125125
"Content-Type": [
126126
"application/json; charset=utf-8"
@@ -129,7 +129,7 @@
129129
"-1"
130130
]
131131
},
132-
"ResponseBody": "{\r\n \"properties\": {\r\n \"conditions\": {\r\n \"severity\": {\r\n \"operator\": \"Equals\",\r\n \"values\": [\r\n \"Sev0\",\r\n \"Sev1\"\r\n ]\r\n },\r\n \"monitorCondition\": {\r\n \"operator\": \"NotEquals\",\r\n \"values\": [\r\n \"Resolved\"\r\n ]\r\n }\r\n },\r\n \"status\": \"Disabled\",\r\n \"type\": \"ActionGroup\",\r\n \"scope\": {\r\n \"scopeType\": \"ResourceGroup\",\r\n \"values\": [\r\n \"/subscriptions/dd91de05-d791-4ceb-b6dc-988682dc7d72/resourceGroups/alertslab\",\r\n \"/subscriptions/dd91de05-d791-4ceb-b6dc-988682dc7d72/resourceGroups/Test-VMs\"\r\n ]\r\n },\r\n \"description\": \"Test description\",\r\n \"createdAt\": \"2019-07-12T14:20:18.3542901Z\",\r\n \"createdBy\": \"User\",\r\n \"lastModifiedAt\": \"2019-07-12T14:20:20.4987724Z\",\r\n \"lastModifiedBy\": \"User\",\r\n \"actionGroupId\": \"/subscriptions/1e3ff1c0-771a-4119-a03b-be82a51e232d/resourceGroups/alertscorrelationrg/providers/Microsoft.insights/actiongroups/testAG\"\r\n },\r\n \"location\": \"Global\",\r\n \"id\": \"/subscriptions/dd91de05-d791-4ceb-b6dc-988682dc7d72/resourceGroups/ActionRules-Powershell-Test/providers/Microsoft.AlertsManagement/actionRules/ScenarioTest-ActionGroup-ActionRule\",\r\n \"type\": \"Microsoft.AlertsManagement/actionRules\",\r\n \"name\": \"ScenarioTest-ActionGroup-ActionRule\"\r\n}",
132+
"ResponseBody": "{\r\n \"properties\": {\r\n \"conditions\": {\r\n \"severity\": {\r\n \"operator\": \"Equals\",\r\n \"values\": [\r\n \"Sev0\",\r\n \"Sev1\"\r\n ]\r\n },\r\n \"monitorCondition\": {\r\n \"operator\": \"NotEquals\",\r\n \"values\": [\r\n \"Resolved\"\r\n ]\r\n }\r\n },\r\n \"status\": \"Disabled\",\r\n \"type\": \"ActionGroup\",\r\n \"scope\": {\r\n \"scopeType\": \"ResourceGroup\",\r\n \"values\": [\r\n \"/subscriptions/dd91de05-d791-4ceb-b6dc-988682dc7d72/resourceGroups/alertslab\",\r\n \"/subscriptions/dd91de05-d791-4ceb-b6dc-988682dc7d72/resourceGroups/Test-VMs\"\r\n ]\r\n },\r\n \"description\": \"Test description\",\r\n \"createdAt\": \"2019-07-16T14:53:51.647592Z\",\r\n \"createdBy\": \"User\",\r\n \"lastModifiedAt\": \"2019-07-16T14:53:53.3507691Z\",\r\n \"lastModifiedBy\": \"User\",\r\n \"actionGroupId\": \"/subscriptions/1e3ff1c0-771a-4119-a03b-be82a51e232d/resourceGroups/alertscorrelationrg/providers/Microsoft.insights/actiongroups/testAG\"\r\n },\r\n \"location\": \"Global\",\r\n \"id\": \"/subscriptions/dd91de05-d791-4ceb-b6dc-988682dc7d72/resourceGroups/ActionRules-Powershell-Test/providers/Microsoft.AlertsManagement/actionRules/ScenarioTest-ActionGroup-ActionRule\",\r\n \"type\": \"Microsoft.AlertsManagement/actionRules\",\r\n \"name\": \"ScenarioTest-ActionGroup-ActionRule\"\r\n}",
133133
"StatusCode": 200
134134
},
135135
{
@@ -139,7 +139,7 @@
139139
"RequestBody": "",
140140
"RequestHeaders": {
141141
"x-ms-client-request-id": [
142-
"a01e84c6-dd74-4c47-8ce5-834daaf20a8a"
142+
"f18def5a-0fad-424a-b401-b2e17fbb85b3"
143143
],
144144
"Accept-Language": [
145145
"en-US"
@@ -159,7 +159,7 @@
159159
"no-cache"
160160
],
161161
"x-ms-request-id": [
162-
"1a774daa-cfe7-4d1e-97f8-4f3a34f1f3e8"
162+
"0e513443-a54d-4886-a473-17446be90e4b"
163163
],
164164
"X-Content-Type-Options": [
165165
"nosniff"
@@ -168,16 +168,16 @@
168168
"max-age=31536000; includeSubDomains"
169169
],
170170
"x-ms-ratelimit-remaining-subscription-deletes": [
171-
"14998"
171+
"14999"
172172
],
173173
"x-ms-correlation-request-id": [
174-
"e9066bb3-172e-4d7b-b858-4c09c167d391"
174+
"5e1c9813-b2f0-4039-96cb-45fdd197e22e"
175175
],
176176
"x-ms-routing-request-id": [
177-
"SOUTHINDIA:20190712T142023Z:e9066bb3-172e-4d7b-b858-4c09c167d391"
177+
"SOUTHINDIA:20190716T145356Z:5e1c9813-b2f0-4039-96cb-45fdd197e22e"
178178
],
179179
"Date": [
180-
"Fri, 12 Jul 2019 14:20:23 GMT"
180+
"Tue, 16 Jul 2019 14:53:56 GMT"
181181
],
182182
"Content-Length": [
183183
"4"

0 commit comments

Comments
 (0)