Skip to content

Commit f8ad4ca

Browse files
committed
updated change log
1 parent b92d70b commit f8ad4ca

File tree

4 files changed

+102
-83
lines changed

4 files changed

+102
-83
lines changed

src/Monitor/Monitor.Test/ScenarioTests/ActionGroupsTests.ps1

Lines changed: 84 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -65,119 +65,123 @@ function Test-AddGetListSetRemoveActionGroup
6565
Assert-AreEqual $emptyString $webhook1.TenantId
6666

6767
Write-Verbose " ****** Creating a new webhook receiver with UseCommonAlertSchema explicitly set and use aad auth set"
68-
$webhook1 = New-AzActionGroupReceiver -WebhookReceiver -Name 'webhookreceiver' -ServiceUri 'http://test.com' -UseCommonAlertSchema $t -UseAadAuth $t -ObjectId 'someObjectId' -IdentifierUri 'someIdentifierUri' -TenantId 'someTenantId'
68+
$webhook2 = New-AzActionGroupReceiver -WebhookReceiver -Name 'webhookreceiver' -ServiceUri 'http://test.com' -UseCommonAlertSchema $t -UseAadAuth $t -ObjectId 'someObjectId' -IdentifierUri 'someIdentifierUri' -TenantId 'someTenantId'
6969
Assert-NotNull $webhook1
70-
Assert-AreEqual 'webhookreceiver' $webhook1.Name
71-
Assert-AreEqual 'http://test.com' $webhook1.ServiceUri
72-
Assert-AreEqual true $webhook1.UseCommonAlertSchema
73-
Assert-AreEqual true $webhook1.UseAadAuth
74-
Assert-AreEqual 'someObjectId' $webhook1.ObjectId
75-
Assert-AreEqual 'someIdentifierUri' $webhook1.IdentifierUri
76-
Assert-AreEqual 'someTenantId' $webhook1.TenantId
70+
Assert-AreEqual 'webhookreceiver' $webhook2.Name
71+
Assert-AreEqual 'http://test.com' $webhook2.ServiceUri
72+
Assert-AreEqual true $webhook2.UseCommonAlertSchema
73+
Assert-AreEqual true $webhook2.UseAadAuth
74+
Assert-AreEqual 'someObjectId' $webhook2.ObjectId
75+
Assert-AreEqual 'someIdentifierUri' $webhook2.IdentifierUri
76+
Assert-AreEqual 'someTenantId' $webhook2.TenantId
7777

7878
Write-Verbose " ****** Creating a new itsm receiver "
79-
$itsm = New-AzActionGroupReceiver -ItsmReceiver -Name 'itsmReceiver' -WorkspaceId 'someworkspaceId' -ConnectionId 'connectionId' -TicketConfiguration 'ticketConfiguration' -Region 'someRegion'
80-
Assert-NotNull $itsm
81-
Assert-AreEqual 'itsmReceiver' $itsm.Name
82-
Assert-AreEqual 'someworkspaceId' $itsm.WorkspaceId
83-
Assert-AreEqual 'connectionId' $itsm.ConnectionId
84-
Assert-AreEqual 'ticketConfiguration' $itsm.TicketConfiguration
85-
Assert-AreEqual 'someRegion' $itsm.Region
79+
$itsm1 = New-AzActionGroupReceiver -ItsmReceiver -Name 'itsmReceiver' -WorkspaceId 'someworkspaceId' -ConnectionId 'connectionId' -TicketConfiguration 'ticketConfiguration' -Region 'someRegion'
80+
Assert-NotNull $itsm1
81+
Assert-AreEqual 'itsmReceiver' $itsm1.Name
82+
Assert-AreEqual 'someworkspaceId' $itsm1.WorkspaceId
83+
Assert-AreEqual 'connectionId' $itsm1.ConnectionId
84+
Assert-AreEqual 'ticketConfiguration' $itsm1.TicketConfiguration
85+
Assert-AreEqual 'someRegion' $itsm1.Region
8686

8787
Write-Verbose " ****** Creating a new voice receiver"
88-
$voice = New-AzActionGroupReceiver -VoiceReceiver -Name 'VoiceReceiver' -VoiceCountryCode '1' -VoicePhoneNumber '4254251234'
89-
Assert-NotNull $voice
90-
Assert-AreEqual 'VoiceReceiver' $voice.Name
91-
Assert-AreEqual '1' $voice.CountryCode
92-
Assert-AreEqual '4254251234' $voice.PhoneNumber
88+
$voice1 = New-AzActionGroupReceiver -VoiceReceiver -Name 'VoiceReceiver' -VoiceCountryCode '1' -VoicePhoneNumber '4254251234'
89+
Assert-NotNull $voice1
90+
Assert-AreEqual 'VoiceReceiver' $voice1.Name
91+
Assert-AreEqual '1' $voice1.CountryCode
92+
Assert-AreEqual '4254251234' $voice1.PhoneNumber
9393

9494
Write-Verbose " ****** Creating a new armrole receiver with default use common alert schema"
95-
$armrole = New-AzActionGroupReceiver -ArmRoleReceiver -Name 'armroleReceiver' -RoleId 'someRoleId'
96-
Assert-NotNull $armrole
97-
Assert-AreEqual 'armroleReceiver' $armrole.Name
98-
Assert-AreEqual 'someRoleId' $armrole.RoleId
99-
Assert-AreEqual false $armrole.UseCommonAlertSchema
95+
$armrole1 = New-AzActionGroupReceiver -ArmRoleReceiver -Name 'armroleReceiver' -RoleId 'someRoleId'
96+
Assert-NotNull $armrole1
97+
Assert-AreEqual 'armroleReceiver' $armrole1.Name
98+
Assert-AreEqual 'someRoleId' $armrole1.RoleId
99+
Assert-AreEqual false $armrole1.UseCommonAlertSchema
100100

101101
Write-Verbose " ****** Creating a new armrole receiver with use common alert schema explicitly se"
102-
$armrole = New-AzActionGroupReceiver -ArmRoleReceiver -Name 'armroleReceiver' -RoleId 'someRoleId' -UseCommonAlertSchema $t
103-
Assert-NotNull $armrole
104-
Assert-AreEqual 'armroleReceiver' $armrole.Name
105-
Assert-AreEqual 'someRoleId' $armrole.RoleId
106-
Assert-AreEqual true $armrole.UseCommonAlertSchema
102+
$armrole2 = New-AzActionGroupReceiver -ArmRoleReceiver -Name 'armroleReceiver' -RoleId 'someRoleId' -UseCommonAlertSchema $t
103+
Assert-NotNull $armrole2
104+
Assert-AreEqual 'armroleReceiver' $armrole2.Name
105+
Assert-AreEqual 'someRoleId' $armrole2.RoleId
106+
Assert-AreEqual true $armrole2.UseCommonAlertSchema
107107

108108
Write-Verbose " ****** Creating a new azure function receiver with default use common alert schema"
109-
$azureFunc = New-AzActionGroupReceiver -AzureFunctionReceiver -Name 'azfunreceiver' -FunctionAppResourceId 'somereosurceid' -FunctionName 'somefunc' -HttpTriggerUrl 'someHttpTrigUrl'
110-
Assert-NotNull $azureFunc
111-
Assert-AreEqual 'azfunreceiver' $azureFunc.Name
112-
Assert-AreEqual 'somereosurceid' $azureFunc.FunctionAppResourceId
113-
Assert-AreEqual 'somefunc' $azureFunc.FunctionName
114-
Assert-AreEqual 'someHttpTrigUrl' $azureFunc.HttpTriggerUrl
115-
Assert-AreEqual false $azureFunc.UseCommonAlertSchema
109+
$azureFunc1 = New-AzActionGroupReceiver -AzureFunctionReceiver -Name 'azfunreceiver' -FunctionAppResourceId 'somereosurceid' -FunctionName 'somefunc' -HttpTriggerUrl 'someHttpTrigUrl'
110+
Assert-NotNull $azureFunc1
111+
Assert-AreEqual 'azfunreceiver' $azureFunc1.Name
112+
Assert-AreEqual 'somereosurceid' $azureFunc1.FunctionAppResourceId
113+
Assert-AreEqual 'somefunc' $azureFunc1.FunctionName
114+
Assert-AreEqual 'someHttpTrigUrl' $azureFunc1.HttpTriggerUrl
115+
Assert-AreEqual false $azureFunc1.UseCommonAlertSchema
116116

117117
Write-Verbose " ****** Creating a new azure function receiver with use common alert schema explicitly set"
118-
$azureFunc = New-AzActionGroupReceiver -AzureFunctionReceiver -Name 'azfunreceiver' -FunctionAppResourceId 'somereosurceid' -UseCommonAlertSchema $t -FunctionName 'somefunc' -HttpTriggerUrl 'someHttpTrigUrl'
119-
Assert-NotNull $azureFunc
120-
Assert-AreEqual 'azfunreceiver' $azureFunc.Name
121-
Assert-AreEqual 'somereosurceid' $azureFunc.FunctionAppResourceId
122-
Assert-AreEqual 'somefunc' $azureFunc.FunctionName
123-
Assert-AreEqual 'someHttpTrigUrl' $azureFunc.HttpTriggerUrl
124-
Assert-AreEqual true $azureFunc.UseCommonAlertSchema
118+
$azureFunc2 = New-AzActionGroupReceiver -AzureFunctionReceiver -Name 'azfunreceiver' -FunctionAppResourceId 'somereosurceid' -UseCommonAlertSchema $t -FunctionName 'somefunc' -HttpTriggerUrl 'someHttpTrigUrl'
119+
Assert-NotNull $azureFunc2
120+
Assert-AreEqual 'azfunreceiver' $azureFunc2.Name
121+
Assert-AreEqual 'somereosurceid' $azureFunc2.FunctionAppResourceId
122+
Assert-AreEqual 'somefunc' $azureFunc2.FunctionName
123+
Assert-AreEqual 'someHttpTrigUrl' $azureFunc2.HttpTriggerUrl
124+
Assert-AreEqual true $azureFunc2.UseCommonAlertSchema
125125

126126
Write-Verbose " ****** Creating a new logic app receiver with default use common alert schema"
127-
$logicapp = New-AzActionGroupReceiver -LogicAppReceiver -Name 'logicapp' -ResourceId 'somereosurceid' -CallbackUrl 'somecallback'
128-
Assert-NotNull $logicapp
129-
Assert-AreEqual 'logicapp' $logicapp.Name
130-
Assert-AreEqual 'somereosurceid' $logicapp.ResourceId
131-
Assert-AreEqual 'somecallback' $logicapp.CallbackUrl
132-
Assert-AreEqual false $logicapp.UseCommonAlertSchema
127+
$logicapp1 = New-AzActionGroupReceiver -LogicAppReceiver -Name 'logicapp' -ResourceId 'somereosurceid' -CallbackUrl 'somecallback'
128+
Assert-NotNull $logicapp1
129+
Assert-AreEqual 'logicapp' $logicapp1.Name
130+
Assert-AreEqual 'somereosurceid' $logicapp1.ResourceId
131+
Assert-AreEqual 'somecallback' $logicapp1.CallbackUrl
132+
Assert-AreEqual false $logicapp1.UseCommonAlertSchema
133133

134134
Write-Verbose " ****** Creating a new logic app receiver with use common alert schema explicitly set"
135-
$logicapp = New-AzActionGroupReceiver -LogicAppReceiver -Name 'logicapp' -ResourceId 'somereosurceid' -CallbackUrl 'somecallback' -UseCommonAlertSchema $t
136-
Assert-NotNull $logicapp
137-
Assert-AreEqual 'logicapp' $logicapp.Name
138-
Assert-AreEqual 'somereosurceid' $logicapp.ResourceId
139-
Assert-AreEqual 'somecallback' $logicapp.CallbackUrl
140-
Assert-AreEqual true $logicapp.UseCommonAlertSchema
135+
$logicapp2 = New-AzActionGroupReceiver -LogicAppReceiver -Name 'logicapp' -ResourceId 'somereosurceid' -CallbackUrl 'somecallback' -UseCommonAlertSchema $t
136+
Assert-NotNull $logicapp2
137+
Assert-AreEqual 'logicapp' $logicapp2.Name
138+
Assert-AreEqual 'somereosurceid' $logicapp2.ResourceId
139+
Assert-AreEqual 'somecallback' $logicapp2.CallbackUrl
140+
Assert-AreEqual true $logicapp2.UseCommonAlertSchema
141141

142142
Write-Verbose " ****** Creating a new automation run book receiver with default use common alert schema"
143-
$runbook = New-AzActionGroupReceiver -AutomationRunbookReceiver -Name 'runbook' -AutomationAccountId 'accoutId' -RunbookName 'runbook' -WebhookResourceId 'webhookresourceid' -IsGlobalRunbook $t -AutomationRunbookServiceUri 'someserviceUrl'
144-
Assert-NotNull $runbook
145-
Assert-AreEqual 'runbook' $runbook.Name
146-
Assert-AreEqual 'accoutId' $runbook.AutomationAccountId
147-
Assert-AreEqual 'runbook' $runbook.RunbookName
148-
Assert-AreEqual 'webhookresourceid' $runbook.WebhookResourceId
149-
Assert-AreEqual true $runbook.IsGlobalRunbook
150-
Assert-AreEqual false $runbook.UseCommonAlertSchema
151-
Assert-AreEqual 'someserviceUrl' $runbook.ServiceUri
143+
$runbook1 = New-AzActionGroupReceiver -AutomationRunbookReceiver -Name 'runbook' -AutomationAccountId 'accoutId' -RunbookName 'runbook' -WebhookResourceId 'webhookresourceid' -IsGlobalRunbook $t -AutomationRunbookServiceUri 'someserviceUrl'
144+
Assert-NotNull $runbook1
145+
Assert-AreEqual 'runbook' $runbook1.Name
146+
Assert-AreEqual 'accoutId' $runbook1.AutomationAccountId
147+
Assert-AreEqual 'runbook' $runbook1.RunbookName
148+
Assert-AreEqual 'webhookresourceid' $runbook1.WebhookResourceId
149+
Assert-AreEqual true $runbook1.IsGlobalRunbook
150+
Assert-AreEqual false $runbook1.UseCommonAlertSchema
151+
Assert-AreEqual 'someserviceUrl' $runbook1.ServiceUri
152152

153153
Write-Verbose " ****** Creating a new automation run book receiver with use common alert schema set explicitly"
154-
$runbook = New-AzActionGroupReceiver -AutomationRunbookReceiver -Name 'runbook' -AutomationAccountId 'accoutId' -RunbookName 'runbook' -WebhookResourceId 'webhookresourceid' -IsGlobalRunbook $t -AutomationRunbookServiceUri 'someserviceUrl' -UseCommonAlertSchema $t
155-
Assert-NotNull $runbook
156-
Assert-AreEqual 'runbook' $runbook.Name
157-
Assert-AreEqual 'accoutId' $runbook.AutomationAccountId
158-
Assert-AreEqual 'runbook' $runbook.RunbookName
159-
Assert-AreEqual 'webhookresourceid' $runbook.WebhookResourceId
160-
Assert-AreEqual true $runbook.IsGlobalRunbook
161-
Assert-AreEqual true $runbook.UseCommonAlertSchema
162-
Assert-AreEqual 'someserviceUrl' $runbook.ServiceUri
154+
$runbook2 = New-AzActionGroupReceiver -AutomationRunbookReceiver -Name 'runbook' -AutomationAccountId 'accoutId' -RunbookName 'runbook' -WebhookResourceId 'webhookresourceid' -IsGlobalRunbook $t -AutomationRunbookServiceUri 'someserviceUrl' -UseCommonAlertSchema $t
155+
Assert-NotNull $runbook2
156+
Assert-AreEqual 'runbook' $runbook2.Name
157+
Assert-AreEqual 'accoutId' $runbook2.AutomationAccountId
158+
Assert-AreEqual 'runbook' $runbook2.RunbookName
159+
Assert-AreEqual 'webhookresourceid' $runbook2.WebhookResourceId
160+
Assert-AreEqual true $runbook2.IsGlobalRunbook
161+
Assert-AreEqual true $runbook2.UseCommonAlertSchema
162+
Assert-AreEqual 'someserviceUrl' $runbook2.ServiceUri
163163

164164
Write-Verbose " ****** Creating a new app push receiver"
165-
$apppush = New-AzActionGroupReceiver -AzureAppPushReceiver -Name 'apppsuh' -AzureAppPushEmailAddress 'someemaild'
166-
Assert-NotNull $apppush
167-
Assert-AreEqual 'apppsuh' $apppush.Name
168-
Assert-AreEqual 'someemaild' $apppush.EmailAddress
165+
$apppush1 = New-AzActionGroupReceiver -AzureAppPushReceiver -Name 'apppsuh' -AzureAppPushEmailAddress 'someemaild'
166+
Assert-NotNull $apppush1
167+
Assert-AreEqual 'apppsuh' $apppush1.Name
168+
Assert-AreEqual 'someemaild' $apppush1.EmailAddress
169169

170170
Write-Verbose " ****** Creating a new action group"
171-
$actual = Set-AzActionGroup -Name $actionGroupName -ResourceGroup $resourceGroupName -ShortName $shortName -Receiver $email1,$email2,$sms1,$webhook1
171+
$actual = Set-AzActionGroup -Name $actionGroupName -ResourceGroup $resourceGroupName -ShortName $shortName -Receiver $email1,$email2,$sms1,$webhook1,$webhook2,$itsm1,$voice1,$armrole1,$armrole2,$azureFunc1,$azureFunc2,$logicapp1,$logicapp2,$runbook1,$runbook2,$apppush1
172172
Assert-NotNull $actual
173173
Assert-AreEqual $actionGroupName $actual.Name
174+
175+
$json = $actual | ConvertTo-Json
176+
177+
Write-Verbose $json
174178

175179
Write-Verbose " ****** Getting the action group by name"
176180
$retrieved = Get-AzActionGroup -ResourceGroup $resourceGroupName -Name $actionGroupName
177181
Assert-NotNull $retrieved
178182
Assert-AreEqual 1 $retrieved.Length
179183
Assert-AreEqual $actionGroupName $retrieved[0].Name
180-
184+
181185
Write-Verbose " ****** Getting the action group by subscriptionId"
182186
$retrieved = Get-AzActionGroup
183187
Assert-NotNull $retrieved

src/Monitor/Monitor/Az.Monitor.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# RootModule = ''
1313

1414
# Version number of this module.
15-
ModuleVersion = '1.2.1'
15+
ModuleVersion = '1.2.2'
1616

1717
# Supported PSEditions
1818
CompatiblePSEditions = 'Core', 'Desktop'

src/Monitor/Monitor/ChangeLog.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,21 @@
2121
* Fixed miscellaneous typos across module
2222
* Fixed incorrect parameter name in help documentation
2323

24+
25+
## Version 1.2.2
26+
27+
* New action group receivers added for action group
28+
-ItsmReceiver
29+
-VoiceReceiver
30+
-ArmRoleReceiver
31+
-AzureFunctionReceiver
32+
-LogicAppReceiver
33+
-AutomationRunbookReceiver
34+
-AzureAppPushReceiver
35+
36+
* Use common alert schema enabled for the receivers. This is not applicable for SMS, Azure App push , ITSM and Voice recievers
37+
* Webhooks now supports Azure active directory authentication .
38+
2439
## Version 1.2.1
2540
* Fixed incorrect parameter names in help examples
2641

src/Monitor/Monitor/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@
2424
[assembly: ComVisible(false)]
2525
[assembly: CLSCompliant(false)]
2626
[assembly: Guid("ed102280-3577-49bf-93dd-11b6e3a44a57")]
27-
[assembly: AssemblyVersion("1.2.1")]
28-
[assembly: AssemblyFileVersion("1.2.1")]
27+
[assembly: AssemblyVersion("1.2.2")]
28+
[assembly: AssemblyFileVersion("1.2.2")]

0 commit comments

Comments
 (0)