Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

New Resource: azurerm_monitor_activitylog_alert #1989

Merged
merged 11 commits into from
Oct 15, 2018
Merged

New Resource: azurerm_monitor_activitylog_alert #1989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
489188f
Define the schema of activity log alert resource
Sep 21, 2018
05063dd
Implement delete operation of activity log alert
Sep 21, 2018
cadf3c0
Implement skeleton of create/update and read operations of activity l…
Sep 24, 2018
7c75a07
Implement expand and flatten of activity log alert
Sep 25, 2018
2bc812e
Adjust some schema definition according to Azure documentation.
Sep 26, 2018
d26ba2a
Add simple test cases to activity log alert.
Sep 27, 2018
3340f61
Add documentation of activity log alert.
Sep 27, 2018
8cf3bf4
Add update test case for activity log alert
Sep 27, 2018
ce620d0
Update code according to the feedback
Oct 11, 2018
3b87841
ignore the empty element in action set
Oct 12, 2018
b5205df
Merge one conflict in provider.go
Oct 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions azurerm/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,9 @@ type ArmClient struct {
managementGroupsSubscriptionClient managementgroups.SubscriptionsClient

// Monitor
monitorActionGroupsClient insights.ActionGroupsClient
monitorAlertRulesClient insights.AlertRulesClient
monitorActionGroupsClient insights.ActionGroupsClient
monitorActivityLogAlertsClient insights.ActivityLogAlertsClient
monitorAlertRulesClient insights.AlertRulesClient

// MSI
userAssignedIdentitiesClient msi.UserAssignedIdentitiesClient
Expand Down Expand Up @@ -846,6 +847,10 @@ func (c *ArmClient) registerMonitorClients(endpoint, subscriptionId string, auth
c.configureClient(&agc.Client, auth)
c.monitorActionGroupsClient = agc

alac := insights.NewActivityLogAlertsClientWithBaseURI(endpoint, subscriptionId)
c.configureClient(&alac.Client, auth)
c.monitorActivityLogAlertsClient = alac

arc := insights.NewAlertRulesClientWithBaseURI(endpoint, subscriptionId)
c.configureClient(&arc.Client, auth)
c.monitorAlertRulesClient = arc
Expand Down
1 change: 1 addition & 0 deletions azurerm/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@ func Provider() terraform.ResourceProvider {
"azurerm_management_group": resourceArmManagementGroup(),
"azurerm_metric_alertrule": resourceArmMetricAlertRule(),
"azurerm_monitor_action_group": resourceArmMonitorActionGroup(),
"azurerm_monitor_activity_log_alert": resourceArmMonitorActivityLogAlert(),
"azurerm_mysql_configuration": resourceArmMySQLConfiguration(),
"azurerm_mysql_database": resourceArmMySqlDatabase(),
"azurerm_mysql_firewall_rule": resourceArmMySqlFirewallRule(),
Expand Down
Loading