AZ-97: Backport and bump to HCL2/tf0.12

This commit is contained in:
Jérôme Respaut 2019-07-19 11:02:36 +02:00
parent 2d0fff3567
commit f96b1d89dd
5 changed files with 819 additions and 779 deletions

View File

@ -1,7 +1,7 @@
# Global Terraform
variable "environment" {
description = "Architecture environment"
type = "string"
type = string
}
# Global DataDog
@ -42,37 +42,37 @@ variable "filter_tags_custom_excluded" {
# Azure Storage specific variables
variable "availability_silenced" {
description = "Groups to mute for Storage availability monitor"
type = "map"
type = map(string)
default = {}
}
variable "availability_enabled" {
description = "Flag to enable Storage availability monitor"
type = "string"
type = string
default = "true"
}
variable "availability_extra_tags" {
description = "Extra tags for Storage availability monitor"
type = "list"
type = list(string)
default = []
}
variable "availability_message" {
description = "Custom message for Storage availability monitor"
type = "string"
type = string
default = ""
}
variable "availability_time_aggregator" {
description = "Monitor aggregator for Storage availability [available values: min, max or avg]"
type = "string"
type = string
default = "max"
}
variable "availability_timeframe" {
description = "Monitor timeframe for Storage availability [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]"
type = "string"
type = string
default = "last_5m"
}
@ -88,37 +88,37 @@ variable "availability_threshold_warning" {
variable "successful_requests_silenced" {
description = "Groups to mute for Storage sucessful requests monitor"
type = "map"
type = map(string)
default = {}
}
variable "successful_requests_enabled" {
description = "Flag to enable Storage sucessful requests monitor"
type = "string"
type = string
default = "true"
}
variable "successful_requests_extra_tags" {
description = "Extra tags for Storage sucessful requests monitor"
type = "list"
type = list(string)
default = []
}
variable "successful_requests_message" {
description = "Custom message for Storage sucessful requests monitor"
type = "string"
type = string
default = ""
}
variable "successful_requests_time_aggregator" {
description = "Monitor aggregator for Storage sucessful requests [available values: min, max or avg]"
type = "string"
type = string
default = "max"
}
variable "successful_requests_timeframe" {
description = "Monitor timeframe for Storage sucessful requests [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]"
type = "string"
type = string
default = "last_5m"
}
@ -134,37 +134,37 @@ variable "successful_storage_requests_threshold_warning" {
variable "latency_silenced" {
description = "Groups to mute for Storage latency monitor"
type = "map"
type = map(string)
default = {}
}
variable "latency_enabled" {
description = "Flag to enable Storage latency monitor"
type = "string"
type = string
default = "true"
}
variable "latency_extra_tags" {
description = "Extra tags for Storage latency monitor"
type = "list"
type = list(string)
default = []
}
variable "latency_message" {
description = "Custom message for Storage latency monitor"
type = "string"
type = string
default = ""
}
variable "latency_time_aggregator" {
description = "Monitor aggregator for Storage latency [available values: min, max or avg]"
type = "string"
type = string
default = "min"
}
variable "latency_timeframe" {
description = "Monitor timeframe for Storage latency [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]"
type = "string"
type = string
default = "last_5m"
}
@ -180,37 +180,37 @@ variable "latency_threshold_warning" {
variable "timeout_error_requests_silenced" {
description = "Groups to mute for Storage timeout monitor"
type = "map"
type = map(string)
default = {}
}
variable "timeout_error_requests_enabled" {
description = "Flag to enable Storage timeout monitor"
type = "string"
type = string
default = "true"
}
variable "timeout_error_requests_extra_tags" {
description = "Extra tags for Storage timeout monitor"
type = "list"
type = list(string)
default = []
}
variable "timeout_error_requests_message" {
description = "Custom message for Storage timeout monitor"
type = "string"
type = string
default = ""
}
variable "timeout_error_requests_time_aggregator" {
description = "Monitor aggregator for Storage timeout [available values: min, max or avg]"
type = "string"
type = string
default = "min"
}
variable "timeout_error_requests_timeframe" {
description = "Monitor timeframe for Storage timeout [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]"
type = "string"
type = string
default = "last_5m"
}
@ -226,37 +226,37 @@ variable "timeout_error_requests_threshold_warning" {
variable "network_error_requests_silenced" {
description = "Groups to mute for Storage network errors monitor"
type = "map"
type = map(string)
default = {}
}
variable "network_error_requests_enabled" {
description = "Flag to enable Storage network errors monitor"
type = "string"
type = string
default = "true"
}
variable "network_error_requests_extra_tags" {
description = "Extra tags for Storage network errors monitor"
type = "list"
type = list(string)
default = []
}
variable "network_error_requests_message" {
description = "Custom message for Storage network errors monitor"
type = "string"
type = string
default = ""
}
variable "network_error_requests_time_aggregator" {
description = "Monitor aggregator for Storage network errors [available values: min, max or avg]"
type = "string"
type = string
default = "min"
}
variable "network_error_requests_timeframe" {
description = "Monitor timeframe for Storage network errors [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]"
type = "string"
type = string
default = "last_5m"
}
@ -272,37 +272,37 @@ variable "network_error_requests_threshold_warning" {
variable "throttling_error_requests_silenced" {
description = "Groups to mute for Storage throttling error monitor"
type = "map"
type = map(string)
default = {}
}
variable "throttling_error_requests_enabled" {
description = "Flag to enable Storage throttling error monitor"
type = "string"
type = string
default = "true"
}
variable "throttling_error_requests_extra_tags" {
description = "Extra tags for Storage throttling error monitor"
type = "list"
type = list(string)
default = []
}
variable "throttling_error_requests_message" {
description = "Custom message for Storage throttling error monitor"
type = "string"
type = string
default = ""
}
variable "throttling_error_requests_time_aggregator" {
description = "Monitor aggregator for Storage throttling errors [available values: min, max or avg]"
type = "string"
type = string
default = "min"
}
variable "throttling_error_requests_timeframe" {
description = "Monitor timeframe for Storage throttling errors [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]"
type = "string"
type = string
default = "last_5m"
}
@ -318,37 +318,37 @@ variable "throttling_error_requests_threshold_warning" {
variable "server_other_error_requests_silenced" {
description = "Groups to mute for Storage server other errors monitor"
type = "map"
type = map(string)
default = {}
}
variable "server_other_error_requests_enabled" {
description = "Flag to enable Storage server other errors monitor"
type = "string"
type = string
default = "true"
}
variable "server_other_error_requests_extra_tags" {
description = "Extra tags for Storage server other errors monitor"
type = "list"
type = list(string)
default = []
}
variable "server_other_error_requests_message" {
description = "Custom message for Storage server other errors monitor"
type = "string"
type = string
default = ""
}
variable "server_other_error_requests_time_aggregator" {
description = "Monitor aggregator for Storage other errors [available values: min, max or avg]"
type = "string"
type = string
default = "min"
}
variable "server_other_error_requests_timeframe" {
description = "Monitor timeframe for Storage server other errors [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]"
type = "string"
type = string
default = "last_5m"
}
@ -364,37 +364,37 @@ variable "server_other_error_requests_threshold_warning" {
variable "client_other_error_requests_silenced" {
description = "Groups to mute for Storage other errors monitor"
type = "map"
type = map(string)
default = {}
}
variable "client_other_error_requests_enabled" {
description = "Flag to enable Storage other errors monitor"
type = "string"
type = string
default = "true"
}
variable "client_other_error_requests_extra_tags" {
description = "Extra tags for Storage other errors monitor"
type = "list"
type = list(string)
default = []
}
variable "client_other_error_requests_message" {
description = "Custom message for Storage other errors monitor"
type = "string"
type = string
default = ""
}
variable "client_other_error_requests_time_aggregator" {
description = "Monitor aggregator for Storage other errors [available values: min, max or avg]"
type = "string"
type = string
default = "min"
}
variable "client_other_error_requests_timeframe" {
description = "Monitor timeframe for Storage other errors [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]"
type = "string"
type = string
default = "last_5m"
}
@ -410,37 +410,37 @@ variable "client_other_error_requests_threshold_warning" {
variable "authorization_error_requests_silenced" {
description = "Groups to mute for Storage authorization errors monitor"
type = "map"
type = map(string)
default = {}
}
variable "authorization_error_requests_enabled" {
description = "Flag to enable Storage authorization errors monitor"
type = "string"
type = string
default = "true"
}
variable "authorization_error_requests_extra_tags" {
description = "Extra tags for Storage authorization errors monitor"
type = "list"
type = list(string)
default = []
}
variable "authorization_error_requests_message" {
description = "Custom message for Storage authorization errors monitor"
type = "string"
type = string
default = ""
}
variable "authorization_error_requests_time_aggregator" {
description = "Monitor aggregator for Storage authorization errors [available values: min, max or avg]"
type = "string"
type = string
default = "min"
}
variable "authorization_error_requests_timeframe" {
description = "Monitor timeframe for Storage authorization errors [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]"
type = "string"
type = string
default = "last_5m"
}
@ -456,36 +456,37 @@ variable "authorization_error_requests_threshold_warning" {
variable "status_time_aggregator" {
description = "Monitor aggregator for Storage Services status [available values: min, max or avg]"
type = "string"
type = string
default = "max"
}
variable "status_timeframe" {
description = "Monitor timeframe for Storage Services status [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]"
type = "string"
type = string
default = "last_5m"
}
variable "status_enabled" {
description = "Flag to enable App Services status monitor"
type = "string"
type = string
default = "true"
}
variable "status_message" {
description = "Custom message for storage Services status monitor"
type = "string"
type = string
default = ""
}
variable "status_silenced" {
description = "Groups to mute for App Services status monitor"
type = "map"
type = map(string)
default = {}
}
variable "status_extra_tags" {
description = "Extra tags for App Services status monitor"
type = "list"
type = list(string)
default = []
}

View File

@ -1,87 +1,88 @@
module "filter-tags" {
source = "../../../common/filter-tags"
environment = "${var.environment}"
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}"
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 = ["transaction_type:all"]
}
module "filter-tags-success" {
source = "../../../common/filter-tags"
environment = "${var.environment}"
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}"
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 = ["transaction_type:all,responsetype:success"]
}
module "filter-tags-timeout-error" {
source = "../../../common/filter-tags"
environment = "${var.environment}"
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}"
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 = ["transaction_type:all,responsetype:ServerTimeoutError"]
}
module "filter-tags-network-error" {
source = "../../../common/filter-tags"
environment = "${var.environment}"
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}"
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 = ["transaction_type:all,responsetype:NetworkError"]
}
module "filter-tags-throttling-error" {
source = "../../../common/filter-tags"
environment = "${var.environment}"
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}"
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 = ["transaction_type:all,responsetype:ServerBusyError"]
}
module "filter-tags-server-other-error" {
source = "../../../common/filter-tags"
environment = "${var.environment}"
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}"
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 = ["transaction_type:all,responsetype:ServerOtherError"]
}
module "filter-tags-client-other-error" {
source = "../../../common/filter-tags"
environment = "${var.environment}"
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}"
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 = ["transaction_type:all,responsetype:ClientOtherError"]
}
module "filter-tags-authorization-error" {
source = "../../../common/filter-tags"
environment = "${var.environment}"
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}"
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 = ["transaction_type:all,responsetype:AuthorizationError"]
}

File diff suppressed because it is too large Load Diff

View File

@ -1,184 +1,185 @@
output "storage_status_id" {
description = "id for monitor storage_status"
value = "${datadog_monitor.storage_status.*.id}"
value = datadog_monitor.storage_status.*.id
}
output "blobservices_availability_id" {
description = "id for monitor blobservices_availability"
value = "${datadog_monitor.blobservices_availability.*.id}"
value = datadog_monitor.blobservices_availability.*.id
}
output "fileservices_availability_id" {
description = "id for monitor fileservices_availability"
value = "${datadog_monitor.fileservices_availability.*.id}"
value = datadog_monitor.fileservices_availability.*.id
}
output "queueservices_availability_id" {
description = "id for monitor queueservices_availability"
value = "${datadog_monitor.queueservices_availability.*.id}"
value = datadog_monitor.queueservices_availability.*.id
}
output "table_availability_id" {
description = "id for monitor table_availability"
value = "${datadog_monitor.table_availability.*.id}"
value = datadog_monitor.table_availability.*.id
}
output "blobservices_requests_error_id" {
description = "id for monitor blobservices_requests_error"
value = "${datadog_monitor.blobservices_requests_error.*.id}"
value = datadog_monitor.blobservices_requests_error.*.id
}
output "fileservices_requests_error_id" {
description = "id for monitor fileservices_requests_error"
value = "${datadog_monitor.fileservices_requests_error.*.id}"
value = datadog_monitor.fileservices_requests_error.*.id
}
output "queueservices_requests_error_id" {
description = "id for monitor queueservices_requests_error"
value = "${datadog_monitor.queueservices_requests_error.*.id}"
value = datadog_monitor.queueservices_requests_error.*.id
}
output "tableservices_requests_error_id" {
description = "id for monitor tableservices_requests_error"
value = "${datadog_monitor.tableservices_requests_error.*.id}"
value = datadog_monitor.tableservices_requests_error.*.id
}
output "blobservices_latency_id" {
description = "id for monitor blobservices_latency"
value = "${datadog_monitor.blobservices_latency.*.id}"
value = datadog_monitor.blobservices_latency.*.id
}
output "fileservices_latency_id" {
description = "id for monitor fileservices_latency"
value = "${datadog_monitor.fileservices_latency.*.id}"
value = datadog_monitor.fileservices_latency.*.id
}
output "queueservices_latency_id" {
description = "id for monitor queueservices_latency"
value = "${datadog_monitor.queueservices_latency.*.id}"
value = datadog_monitor.queueservices_latency.*.id
}
output "tableservices_latency_id" {
description = "id for monitor tableservices_latency"
value = "${datadog_monitor.tableservices_latency.*.id}"
value = datadog_monitor.tableservices_latency.*.id
}
output "blob_timeout_error_requests_id" {
description = "id for monitor blob_timeout_error_requests"
value = "${datadog_monitor.blob_timeout_error_requests.*.id}"
value = datadog_monitor.blob_timeout_error_requests.*.id
}
output "file_timeout_error_requests_id" {
description = "id for monitor file_timeout_error_requests"
value = "${datadog_monitor.file_timeout_error_requests.*.id}"
value = datadog_monitor.file_timeout_error_requests.*.id
}
output "queue_timeout_error_requests_id" {
description = "id for monitor queue_timeout_error_requests"
value = "${datadog_monitor.queue_timeout_error_requests.*.id}"
value = datadog_monitor.queue_timeout_error_requests.*.id
}
output "table_timeout_error_requests_id" {
description = "id for monitor table_timeout_error_requests"
value = "${datadog_monitor.table_timeout_error_requests.*.id}"
value = datadog_monitor.table_timeout_error_requests.*.id
}
output "blob_network_error_requests_id" {
description = "id for monitor blob_network_error_requests"
value = "${datadog_monitor.blob_network_error_requests.*.id}"
value = datadog_monitor.blob_network_error_requests.*.id
}
output "file_network_error_requests_id" {
description = "id for monitor file_network_error_requests"
value = "${datadog_monitor.file_network_error_requests.*.id}"
value = datadog_monitor.file_network_error_requests.*.id
}
output "queue_network_error_requests_id" {
description = "id for monitor queue_network_error_requests"
value = "${datadog_monitor.queue_network_error_requests.*.id}"
value = datadog_monitor.queue_network_error_requests.*.id
}
output "table_network_error_requests_id" {
description = "id for monitor table_network_error_requests"
value = "${datadog_monitor.table_network_error_requests.*.id}"
value = datadog_monitor.table_network_error_requests.*.id
}
output "blob_throttling_error_requests_id" {
description = "id for monitor blob_throttling_error_requests"
value = "${datadog_monitor.blob_throttling_error_requests.*.id}"
value = datadog_monitor.blob_throttling_error_requests.*.id
}
output "file_throttling_error_requests_id" {
description = "id for monitor file_throttling_error_requests"
value = "${datadog_monitor.file_throttling_error_requests.*.id}"
value = datadog_monitor.file_throttling_error_requests.*.id
}
output "queue_throttling_error_requests_id" {
description = "id for monitor queue_throttling_error_requests"
value = "${datadog_monitor.queue_throttling_error_requests.*.id}"
value = datadog_monitor.queue_throttling_error_requests.*.id
}
output "table_throttling_error_requests_id" {
description = "id for monitor table_throttling_error_requests"
value = "${datadog_monitor.table_throttling_error_requests.*.id}"
value = datadog_monitor.table_throttling_error_requests.*.id
}
output "blob_server_other_error_requests_id" {
description = "id for monitor blob_server_other_error_requests"
value = "${datadog_monitor.blob_server_other_error_requests.*.id}"
value = datadog_monitor.blob_server_other_error_requests.*.id
}
output "file_server_other_error_requests_id" {
description = "id for monitor file_server_other_error_requests"
value = "${datadog_monitor.file_server_other_error_requests.*.id}"
value = datadog_monitor.file_server_other_error_requests.*.id
}
output "queue_server_other_error_requests_id" {
description = "id for monitor queue_server_other_error_requests"
value = "${datadog_monitor.queue_server_other_error_requests.*.id}"
value = datadog_monitor.queue_server_other_error_requests.*.id
}
output "table_server_other_error_requests_id" {
description = "id for monitor table_server_other_error_requests"
value = "${datadog_monitor.table_server_other_error_requests.*.id}"
value = datadog_monitor.table_server_other_error_requests.*.id
}
output "blob_client_other_error_requests_id" {
description = "id for monitor blob_client_other_error_requests"
value = "${datadog_monitor.blob_client_other_error_requests.*.id}"
value = datadog_monitor.blob_client_other_error_requests.*.id
}
output "file_client_other_error_requests_id" {
description = "id for monitor file_client_other_error_requests"
value = "${datadog_monitor.file_client_other_error_requests.*.id}"
value = datadog_monitor.file_client_other_error_requests.*.id
}
output "queue_client_other_error_requests_id" {
description = "id for monitor queue_client_other_error_requests"
value = "${datadog_monitor.queue_client_other_error_requests.*.id}"
value = datadog_monitor.queue_client_other_error_requests.*.id
}
output "table_client_other_error_requests_id" {
description = "id for monitor table_client_other_error_requests"
value = "${datadog_monitor.table_client_other_error_requests.*.id}"
value = datadog_monitor.table_client_other_error_requests.*.id
}
output "blob_authorization_error_requests_id" {
description = "id for monitor blob_authorization_error_requests"
value = "${datadog_monitor.blob_authorization_error_requests.*.id}"
value = datadog_monitor.blob_authorization_error_requests.*.id
}
output "file_authorization_error_requests_id" {
description = "id for monitor file_authorization_error_requests"
value = "${datadog_monitor.file_authorization_error_requests.*.id}"
value = datadog_monitor.file_authorization_error_requests.*.id
}
output "queue_authorization_error_requests_id" {
description = "id for monitor queue_authorization_error_requests"
value = "${datadog_monitor.queue_authorization_error_requests.*.id}"
value = datadog_monitor.queue_authorization_error_requests.*.id
}
output "table_authorization_error_requests_id" {
description = "id for monitor table_authorization_error_requests"
value = "${datadog_monitor.table_authorization_error_requests.*.id}"
value = datadog_monitor.table_authorization_error_requests.*.id
}

View File

@ -0,0 +1,4 @@
terraform {
required_version = ">= 0.12"
}