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

Monitor Activity Log Alert: add missing criteria fields #2150

Merged
merged 1 commit into from
Oct 25, 2018
Merged

Monitor Activity Log Alert: add missing criteria fields #2150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 38 additions & 3 deletions azurerm/resource_arm_monitor_activity_log_alert.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,8 @@ func resourceArmMonitorActivityLogAlert() *schema.Resource {
}, false),
},
"operation_name": {
Type: schema.TypeString,
Required: true,
ValidateFunc: validation.NoZeroValues,
Type: schema.TypeString,
Optional: true,
},
"caller": {
Type: schema.TypeString,
Expand All @@ -85,6 +84,18 @@ func resourceArmMonitorActivityLogAlert() *schema.Resource {
"Critical",
}, false),
},
"resource_provider": {
Type: schema.TypeString,
Optional: true,
},
"resource_type": {
Type: schema.TypeString,
Optional: true,
},
"resource_group": {
Type: schema.TypeString,
Optional: true,
},
"resource_id": {
Type: schema.TypeString,
Optional: true,
Expand Down Expand Up @@ -273,6 +284,24 @@ func expandMonitorActivityLogAlertCriteria(input []interface{}) *insights.Activi
Equals: utils.String(level),
})
}
if resourceProvider := v["resource_provider"].(string); resourceProvider != "" {
conditions = append(conditions, insights.ActivityLogAlertLeafCondition{
Field: utils.String("resourceProvider"),
Equals: utils.String(resourceProvider),
})
}
if resourceType := v["resource_type"].(string); resourceType != "" {
conditions = append(conditions, insights.ActivityLogAlertLeafCondition{
Field: utils.String("resourceType"),
Equals: utils.String(resourceType),
})
}
if resourceGroup := v["resource_group"].(string); resourceGroup != "" {
conditions = append(conditions, insights.ActivityLogAlertLeafCondition{
Field: utils.String("resourceGroup"),
Equals: utils.String(resourceGroup),
})
}
if id := v["resource_id"].(string); id != "" {
conditions = append(conditions, insights.ActivityLogAlertLeafCondition{
Field: utils.String("resourceId"),
Expand Down Expand Up @@ -330,6 +359,12 @@ func flattenMonitorActivityLogAlertCriteria(input *insights.ActivityLogAlertAllO
switch strings.ToLower(*condition.Field) {
case "operationname":
result["operation_name"] = *condition.Equals
case "resourceprovider":
result["resource_provider"] = *condition.Equals
case "resourcetype":
result["resource_type"] = *condition.Equals
case "resourcegroup":
result["resource_group"] = *condition.Equals
case "resourceid":
result["resource_id"] = *condition.Equals
case "substatus":
Expand Down
23 changes: 14 additions & 9 deletions azurerm/resource_arm_monitor_activity_log_alert_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ func TestAccAzureRMMonitorActivityLogAlert_basic(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "enabled", "true"),
resource.TestCheckResourceAttr(resourceName, "scopes.#", "1"),
resource.TestCheckResourceAttr(resourceName, "criteria.#", "1"),
resource.TestCheckResourceAttr(resourceName, "criteria.0.operation_name", "Microsoft.Storage/storageAccounts/write"),
resource.TestCheckResourceAttr(resourceName, "criteria.0.category", "Recommendation"),
resource.TestCheckResourceAttr(resourceName, "action.#", "0"),
),
Expand Down Expand Up @@ -96,6 +95,9 @@ func TestAccAzureRMMonitorActivityLogAlert_complete(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "criteria.#", "1"),
resource.TestCheckResourceAttr(resourceName, "criteria.0.operation_name", "Microsoft.Storage/storageAccounts/write"),
resource.TestCheckResourceAttr(resourceName, "criteria.0.category", "Recommendation"),
resource.TestCheckResourceAttr(resourceName, "criteria.0.resource_provider", "Microsoft.Storage"),
resource.TestCheckResourceAttr(resourceName, "criteria.0.resource_type", "Microsoft.Storage/storageAccounts"),
resource.TestCheckResourceAttrSet(resourceName, "criteria.0.resource_group"),
resource.TestCheckResourceAttrSet(resourceName, "criteria.0.resource_id"),
resource.TestCheckResourceAttr(resourceName, "criteria.0.caller", "user@example.com"),
resource.TestCheckResourceAttr(resourceName, "criteria.0.level", "Error"),
Expand Down Expand Up @@ -133,7 +135,6 @@ func TestAccAzureRMMonitorActivityLogAlert_basicAndCompleteUpdate(t *testing.T)
resource.TestCheckResourceAttr(resourceName, "description", ""),
resource.TestCheckResourceAttr(resourceName, "scopes.#", "1"),
resource.TestCheckResourceAttr(resourceName, "criteria.#", "1"),
resource.TestCheckResourceAttr(resourceName, "criteria.0.operation_name", "Microsoft.Storage/storageAccounts/write"),
resource.TestCheckResourceAttr(resourceName, "criteria.0.category", "Recommendation"),
resource.TestCheckResourceAttr(resourceName, "criteria.0.resource_id", ""),
resource.TestCheckResourceAttr(resourceName, "criteria.0.caller", ""),
Expand All @@ -152,6 +153,9 @@ func TestAccAzureRMMonitorActivityLogAlert_basicAndCompleteUpdate(t *testing.T)
resource.TestCheckResourceAttr(resourceName, "criteria.#", "1"),
resource.TestCheckResourceAttr(resourceName, "criteria.0.operation_name", "Microsoft.Storage/storageAccounts/write"),
resource.TestCheckResourceAttr(resourceName, "criteria.0.category", "Recommendation"),
resource.TestCheckResourceAttr(resourceName, "criteria.0.resource_provider", "Microsoft.Storage"),
resource.TestCheckResourceAttr(resourceName, "criteria.0.resource_type", "Microsoft.Storage/storageAccounts"),
resource.TestCheckResourceAttrSet(resourceName, "criteria.0.resource_group"),
resource.TestCheckResourceAttrSet(resourceName, "criteria.0.resource_id"),
resource.TestCheckResourceAttr(resourceName, "criteria.0.caller", "user@example.com"),
resource.TestCheckResourceAttr(resourceName, "criteria.0.level", "Error"),
Expand All @@ -167,7 +171,6 @@ func TestAccAzureRMMonitorActivityLogAlert_basicAndCompleteUpdate(t *testing.T)
resource.TestCheckResourceAttr(resourceName, "description", ""),
resource.TestCheckResourceAttr(resourceName, "scopes.#", "1"),
resource.TestCheckResourceAttr(resourceName, "criteria.#", "1"),
resource.TestCheckResourceAttr(resourceName, "criteria.0.operation_name", "Microsoft.Storage/storageAccounts/write"),
resource.TestCheckResourceAttr(resourceName, "criteria.0.category", "Recommendation"),
resource.TestCheckResourceAttr(resourceName, "criteria.0.resource_id", ""),
resource.TestCheckResourceAttr(resourceName, "criteria.0.caller", ""),
Expand All @@ -193,7 +196,6 @@ resource "azurerm_monitor_activity_log_alert" "test" {
scopes = ["${azurerm_resource_group.test.id}"]

criteria {
operation_name = "Microsoft.Storage/storageAccounts/write"
category = "Recommendation"
}
}
Expand Down Expand Up @@ -278,11 +280,14 @@ resource "azurerm_monitor_activity_log_alert" "test" {

criteria {
operation_name = "Microsoft.Storage/storageAccounts/write"
category = "Recommendation"
resource_id = "${azurerm_storage_account.test.id}"
caller = "user@example.com"
level = "Error"
status = "Failed"
category = "Recommendation"
resource_provider = "Microsoft.Storage"
resource_type = "Microsoft.Storage/storageAccounts"
resource_group = "${azurerm_resource_group.test.name}"
resource_id = "${azurerm_storage_account.test.id}"
caller = "user@example.com"
level = "Error"
status = "Failed"
}

action {
Expand Down
7 changes: 5 additions & 2 deletions website/docs/r/monitor_activity_log_alert.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,14 @@ An `action` block supports the following:
A `criteria` block supports the following:

* `category` - (Required) The category of the operation. Possible values are `Administrative`, `Autoscale`, `Policy`, `Recommendation`, `Security` and `Service Health`.
* `operation_name` - (Required) The Resource Manager Role-Based Access Control operation name. Supported operation should be of the form: `<resourceProvider>/<resourceType>/<operation>`.
* `operation_name` - (Optional) The Resource Manager Role-Based Access Control operation name. Supported operation should be of the form: `<resourceProvider>/<resourceType>/<operation>`.
* `resource_provider` - (Optional) The name of the resource provider monitored by the activity log alert.
* `resource_type` - (Optional) The resource type monitored by the activity log alert.
* `resource_group` - (Optional) The name of resource group monitored by the activity log alert.
* `resource_id` - (Optional) The specific resource monitored by the activity log alert. It should be within one of the `scopes`.
* `caller` - (Optional) The email address or Azure Active Directory identifier of the user who performed the operation.
* `level` - (Optional) The severity level of the event. Possible values are `Verbose`, `Informational`, `Warning`, `Error`, and `Critical`.
* `status` - (Optional) The status of the event. for example, `Started`, `Failed`, or `Succeeded`.
* `status` - (Optional) The status of the event. For example, `Started`, `Failed`, or `Succeeded`.
* `sub_status` - (Optional) The sub status of the event.

## Attributes Reference
Expand Down