wbyc/terraform-datadog-old-monitors
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MON-513-fix-azure-storage' into 'master'

Browse Source 
MON-513 Fix Azure Storage Account false alarms by filtering api operations

Closes MON-513

See merge request claranet/pt-monitoring/projects/datadog/terraform/monitors!124
This commit is contained in:
Quentin Manfroi 2019-10-18 13:33:57 +02:00
commit d8e686a291
2 changed files with 40 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
cloud/azure/storage/modules.tf
View File

@ -9,6 +9,18 @@ module "filter-tags" {
extra_tags = []
}
module "filter-tags-blob" {
source = "../../../common/filter-tags"
environment = var.environment
resource = "azure_storage"
filter_tags_use_defaults = var.filter_tags_use_defaults
filter_tags_custom = var.filter_tags_custom
filter_tags_custom_excluded = var.filter_tags_custom_excluded
extra_tags = []
extra_tags_excluded = ["apiname:getblobproperties", "apiname:createcontainer"]
}
module "filter-tags-success" {
source = "../../../common/filter-tags"
@ -20,6 +32,18 @@ module "filter-tags-success" {
extra_tags = ["responsetype:success"]
}
module "filter-tags-success-blob" {
source = "../../../common/filter-tags"
environment = var.environment
resource = "azure_storage"
filter_tags_use_defaults = var.filter_tags_use_defaults
filter_tags_custom = var.filter_tags_custom
filter_tags_custom_excluded = var.filter_tags_custom_excluded
extra_tags = ["responsetype:success"]
extra_tags_excluded = ["apiname:getblobproperties", "apiname:createcontainer"]
}
module "filter-tags-timeout-error" {
source = "../../../common/filter-tags"
@ -75,6 +99,18 @@ module "filter-tags-client-other-error" {
extra_tags = ["responsetype:clientothererror"]
}
module "filter-tags-client-other-error-blob" {
source = "../../../common/filter-tags"
environment = var.environment
resource = "azure_storage"
filter_tags_use_defaults = var.filter_tags_use_defaults
filter_tags_custom = var.filter_tags_custom
filter_tags_custom_excluded = var.filter_tags_custom_excluded
extra_tags = ["responsetype:clientothererror"]
extra_tags_excluded = ["apiname:getblobproperties", "apiname:createcontainer"]
}
module "filter-tags-authorization-error" {
source = "../../../common/filter-tags"

8
cloud/azure/storage/monitors-azure-storage.tf
View File

@ -39,8 +39,8 @@ resource "datadog_monitor" "blobservices_requests_error" {
query = <<EOQ
${var.successful_requests_time_aggregator}(${var.successful_requests_timeframe}):
default(100-(default(sum:azure.storage_storageaccounts_blobservices.transactions${module.filter-tags-success.query_alert} by {resource_group,name}.as_rate(),0) /
default(sum:azure.storage_storageaccounts_blobservices.transactions${module.filter-tags.query_alert} by {resource_group,name}.as_rate(),0)
default(100-(default(sum:azure.storage_storageaccounts_blobservices.transactions${module.filter-tags-success-blob.query_alert} by {resource_group,name}.as_rate(),0) /
default(sum:azure.storage_storageaccounts_blobservices.transactions${module.filter-tags-blob.query_alert} by {resource_group,name}.as_rate(),0)
* 100),0) > ${var.successful_storage_requests_threshold_critical}
EOQ
@ -941,8 +941,8 @@ resource "datadog_monitor" "blob_client_other_error_requests" {
message = coalesce(var.client_other_error_requests_message, var.message)
query = <<EOQ
${var.client_other_error_requests_time_aggregator}(${var.client_other_error_requests_timeframe}):
default((default(sum:azure.storage_storageaccounts_blobservices.transactions${module.filter-tags-client-other-error.query_alert} by {resource_group,name}.as_rate(),0) /
default(sum:azure.storage_storageaccounts_blobservices.transactions${module.filter-tags.query_alert} by {resource_group,name}.as_rate(),0)
default((default(sum:azure.storage_storageaccounts_blobservices.transactions${module.filter-tags-client-other-error-blob.query_alert} by {resource_group,name}.as_rate(),0) /
default(sum:azure.storage_storageaccounts_blobservices.transactions${module.filter-tags-blob.query_alert} by {resource_group,name}.as_rate(),0)
* 100),0) > ${var.client_other_error_requests_threshold_critical}
EOQ