Merge branch 'MON-456_status_report_count_waiting' into 'master'

MON-456 remove as_count() for a gauge and change time aggregator for more tolerant

Closes MON-456

See merge request claranet/pt-monitoring/projects/datadog/terraform/monitors!75
This commit is contained in:
Quentin Manfroi 2019-07-15 14:45:43 +02:00
commit 52a5fb6a09
3 changed files with 3 additions and 3 deletions

View File

@ -29,7 +29,7 @@ Creates DataDog monitors with the following checks:
| error\_message | Custom message for Pod errors monitor | string | `""` | no |
| error\_threshold\_critical | error critical threshold | string | `"0.5"` | no |
| error\_threshold\_warning | error warning threshold | string | `"0"` | no |
| error\_time\_aggregator | Monitor aggregator for Pod errors [available values: min, max or avg] | string | `"sum"` | no |
| error\_time\_aggregator | Monitor aggregator for Pod errors [available values: min, max or avg] | string | `"min"` | no |
| error\_timeframe | Monitor timeframe for Pod errors [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | string | `"last_15m"` | no |
| evaluation\_delay | Delay in seconds for the metric evaluation | string | `"15"` | no |
| filter\_tags\_custom | Tags used for custom filtering when filter_tags_use_defaults is false | string | `"*"` | no |

View File

@ -91,7 +91,7 @@ variable "error_message" {
variable "error_time_aggregator" {
description = "Monitor aggregator for Pod errors [available values: min, max or avg]"
type = string
default = "sum"
default = "min"
}
variable "error_timeframe" {

View File

@ -35,7 +35,7 @@ resource "datadog_monitor" "error" {
query = <<EOQ
${var.error_time_aggregator}(${var.error_timeframe}):
sum:kubernetes_state.container.status_report.count.waiting${module.filter-tags-nocontainercreating.query_alert} by {namespace,pod,reason}.as_count()
sum:kubernetes_state.container.status_report.count.waiting${module.filter-tags-nocontainercreating.query_alert} by {namespace,pod,reason}
> ${var.error_threshold_critical}
EOQ