MON-191 - Update on firehorse reverted

This commit is contained in:
Alexandre Gaillet 2018-05-18 17:05:38 +02:00
parent 4183b1eeea
commit 7597b3fec2
3 changed files with 2 additions and 9 deletions

View File

@ -29,7 +29,6 @@ Inputs
| environment | Environment | string | - | yes | | environment | Environment | string | - | yes |
| filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no | | filter_tags_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `*` | no |
| filter_tags_use_defaults | Use default filter tags convention | string | `true` | no | | filter_tags_use_defaults | Use default filter tags convention | string | `true` | no |
| incoming_records_aggregator | Monitor aggregator for Kinesis Firehorse incoming records [available values: min, max, sum or avg] | string | `sum` | no |
| incoming_records_message | Custom message for Kinesis Firehorse incoming records monitor | string | `` | no | | incoming_records_message | Custom message for Kinesis Firehorse incoming records monitor | string | `` | no |
| incoming_records_silenced | Groups to mute for Kinesis Firehorse incoming records monitor | map | `<map>` | no | | incoming_records_silenced | Groups to mute for Kinesis Firehorse incoming records monitor | map | `<map>` | no |
| incoming_records_timeframe | Monitor timeframe for incoming records metrics evaluation [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_15m` | no | | incoming_records_timeframe | Monitor timeframe for incoming records metrics evaluation [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `last_15m` | no |

View File

@ -38,12 +38,6 @@ variable "incoming_records_message" {
default = "" default = ""
} }
variable "incoming_records_aggregator" {
description = "Monitor aggregator for Kinesis Firehorse incoming records [available values: min, max, sum or avg]"
type = "string"
default = "sum"
}
variable "incoming_records_timeframe" { variable "incoming_records_timeframe" {
description = "Monitor timeframe for incoming records metrics evaluation [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]" description = "Monitor timeframe for incoming records metrics evaluation [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]"
default = "last_15m" default = "last_15m"

View File

@ -14,8 +14,8 @@ resource "datadog_monitor" "firehose_incoming_records" {
type = "metric alert" type = "metric alert"
query = <<EOF query = <<EOF
${var.incoming_records_aggregator}(${var.incoming_records_timeframe}): ( sum(${var.incoming_records_timeframe}): (
${var.incoming_records_aggregator}:aws.firehose.incoming_records{${data.template_file.filter.rendered}} by {region,deliverystreamname} avg:aws.firehose.incoming_records{${data.template_file.filter.rendered}} by {region,deliverystreamname}
) <= 0 ) <= 0
EOF EOF