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

Support for auto-mitigate for Monitor scheduled query rules alerts #13036 #13213

Merged
merged 18 commits into from
Sep 15, 2021
Merged

Support for auto-mitigate for Monitor scheduled query rules alerts #13036 #13213

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
c5aeb94
Support for auto-mitigate for Azure scheduled_query #13036
cloutier Sep 1, 2021
47864d5
fix lint
cloutier Sep 1, 2021
64f5c73
change tests
cloutier Sep 2, 2021
f55890c
add auto_mitigate and throttle exclusion
cloutier Sep 2, 2021
25b7636
fix lint
cloutier Sep 2, 2021
b931924
fixes
cloutier Sep 2, 2021
eb2c5e8
fix validation
cloutier Sep 2, 2021
83e3c04
changes from feedback
cloutier Sep 7, 2021
bf33fce
fix test
cloutier Sep 7, 2021
a904a90
changes from feedback
cloutier Sep 8, 2021
a631c54
fix doc
cloutier Sep 8, 2021
9bf7c46
changed test
cloutier Sep 8, 2021
3c973c6
fix lint
cloutier Sep 8, 2021
9557bb6
don't send throttling if not set
cloutier Sep 8, 2021
aabf47b
Apply suggestions from code review
cloutier Sep 15, 2021
ad0c15e
fix bad github apply
cloutier Sep 15, 2021
1fe0da2
fix tf linting
cloutier Sep 15, 2021
77c7897
fix note in docs
stephybun Sep 15, 2021
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
16 changes: 10 additions & 6 deletions internal/services/monitor/monitor_scheduled_query_rules_alert_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ func resourceMonitorScheduledQueryRulesAlert() *pluginsdk.Resource {
"throttling": {
Type: pluginsdk.TypeInt,
Optional: true,
Default: nil,
cloutier marked this conversation as resolved.
Show resolved Hide resolved
ValidateFunc: validation.IntBetween(0, 10000),
ConflictsWith: []string{"auto_mitigation_enabled"},
},
Expand Down Expand Up @@ -395,17 +396,20 @@ func expandMonitorScheduledQueryRulesAlertingAction(d *pluginsdk.ResourceData) *
alertAction := expandMonitorScheduledQueryRulesAlertAction(alertActionRaw)
severityRaw := d.Get("severity").(int)
severity := strconv.Itoa(severityRaw)
throttling := d.Get("throttling").(int)
throttling, throttlingOk := d.GetOk("throttling")
cloutier marked this conversation as resolved.
Show resolved Hide resolved

triggerRaw := d.Get("trigger").([]interface{})
trigger := expandMonitorScheduledQueryRulesAlertTrigger(triggerRaw)

action := insights.AlertingAction{
AznsAction: alertAction,
Severity: insights.AlertSeverity(severity),
ThrottlingInMin: utils.Int32(int32(throttling)),
Trigger: trigger,
OdataType: insights.OdataTypeBasicActionOdataTypeMicrosoftWindowsAzureManagementMonitoringAlertsModelsMicrosoftAppInsightsNexusDataContractsResourcesScheduledQueryRulesAlertingAction,
AznsAction: alertAction,
Severity: insights.AlertSeverity(severity),
Trigger: trigger,
OdataType: insights.OdataTypeBasicActionOdataTypeMicrosoftWindowsAzureManagementMonitoringAlertsModelsMicrosoftAppInsightsNexusDataContractsResourcesScheduledQueryRulesAlertingAction,
}

if throttlingOk {
cloutier marked this conversation as resolved.
Show resolved Hide resolved
action.ThrottlingInMin = utils.Int32(int32(throttling.(int)))
}

return &action
Expand Down