Skip to content

Commit f9e50f4

Browse files
authored
Added Subscription Scope Type for Set-AzActionRule (Azure#12062)
* Added Subscription Scope Type for Set-AzActionRule * Updated ChangeLog.Md
1 parent 9406411 commit f9e50f4

File tree

7 files changed

+19
-13
lines changed

7 files changed

+19
-13
lines changed

src/AlertsManagement/AlertsManagement.Test/AlertsManagement.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.Azure.Management.AlertsManagement" Version="0.9.1-preview" />
14+
<PackageReference Include="Microsoft.Azure.Management.AlertsManagement" Version="0.9.2-preview" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

src/AlertsManagement/AlertsManagement/ActionRuleCommands/SetAzureActionRule.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -554,8 +554,11 @@ private string DetermineScopeType(List<string> scopeValues)
554554
private string DetermineScopeType(string value)
555555
{
556556
string[] tokens = value.Split('/');
557-
558-
if (tokens.Length == 5)
557+
if (tokens.Length == 3)
558+
{
559+
return ScopeType.Subscription;
560+
}
561+
else if (tokens.Length == 5)
559562
{
560563
return ScopeType.ResourceGroup;
561564
}

src/AlertsManagement/AlertsManagement/AlertsManagement.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<Import Project="$(MSBuildThisFileDirectory)..\..\Az.props" />
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.Azure.Management.AlertsManagement" Version="0.9.1-preview" />
10+
<PackageReference Include="Microsoft.Azure.Management.AlertsManagement" Version="0.9.2-preview" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

src/AlertsManagement/AlertsManagement/ChangeLog.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
- Additional information about change #1
1919
-->
2020
## Upcoming Release
21+
* Updated AlertsManagement SDK version to 0.9.2-preview.
22+
* Added Subscription Scope Type for Set-AzActionRule.
23+
* Updated Examples for Set-AzActionRule, to show scope types as well.
2124

2225
## Version 0.1.2
2326
* Updated help messages and document for `Get-AzActionRule`

src/AlertsManagement/AlertsManagement/Properties/Resources.Designer.cs

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/AlertsManagement/AlertsManagement/Properties/Resources.resx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,10 @@
133133
<value>'{0}' is not a valid ResourceId.</value>
134134
</data>
135135
<data name="InvalidScopeType_Exception" xml:space="preserve">
136-
<value>Scope is neither Resource or ResourceGroup type.</value>
136+
<value>Scope is neither Subscription, ResourceGroup or Resource type.</value>
137137
</data>
138138
<data name="MixedScopeType_Exception" xml:space="preserve">
139-
<value>Scope can either be list of Resource or ResourceGroup exclusively.</value>
139+
<value>Scope can either be list of Resources, ResourceGroups or Subscriptions exclusively.</value>
140140
</data>
141141
<data name="RemoveActionRule_Action" xml:space="preserve">
142142
<value>Remove action rule</value>

src/AlertsManagement/AlertsManagement/help/Set-AzActionRule.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,24 +55,24 @@ Set-AzActionRule -ResourceGroupName <String> -Name <String> [-Description <Strin
5555

5656
### Example 1
5757
```powershell
58-
PS C:\> Set-AzActionRule -ResourceGroupName "test-rg" -Name "Test-AR" -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
58+
PS C:\> Set-AzActionRule -ResourceGroupName "test-rg" -Name "Test-AR" -Scope "/subscriptions/dd91de05-d791-4ceb-b6dc-988682dc7d72" -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
5959
```
6060

61-
This cmdlet creates an action rule for supression.
61+
This cmdlet creates an action rule for supression, with a subscription scope.
6262

6363
### Example 2
6464
```powershell
6565
PS C:\> Set-AzActionRule -ResourceGroupName "test-rg" -Name "Test-AR" -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"
6666
```
6767

68-
This cmdlet creates an action rule for action group.
68+
This cmdlet creates an action rule for action group, with a list of resource groups scope.
6969

7070
### Example 3
7171
```powershell
72-
PS C:\> Set-AzActionRule -ResourceGroupName "test-rg" -Name "Test-AR" -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"
72+
PS C:\> Set-AzActionRule -ResourceGroupName "test-rg" -Name "Test-AR" -Scope "/subscriptions/dd91de05-d791-4ceb-b6dc-988682dc7d72/resourceGroups/alertslab/providers/microsoft.insights/metricAlerts/Total Requests Exceeded" -SeverityCondition "Equals:Sev0,Sev1" -MonitorCondition "NotEquals:Resolved" -Description "Test description" -Status "Enabled" -ActionRuleType "Diagnostics"
7373
```
7474

75-
This cmdlet creates an action rule for diagnostics settings.
75+
This cmdlet creates an action rule for diagnostics settings, with a resource scope.
7676

7777
## PARAMETERS
7878

0 commit comments

Comments
 (0)