From 60b51adaea4943eac6eab68d1fc973007de404eb Mon Sep 17 00:00:00 2001
From: Quentin Manfroi <quentin.manfroi@fr.clara.net>
Date: Thu, 28 Jun 2018 10:09:11 +0200
Subject: [PATCH] MON-191 make the elasticsearch status aggregator hardcoded

---
 cloud/aws/elasticsearch/README.md             | Bin 3484 -> 3346 bytes
 cloud/aws/elasticsearch/inputs.tf             |   6 ------
 .../elasticsearch/monitors-elasticsearch.tf   |   2 +-
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/cloud/aws/elasticsearch/README.md b/cloud/aws/elasticsearch/README.md
index e0582596616d0e414e71e97635bf1a365e09e210..44fb59687d48a0e8b393a10dc8b1f39c2e0c7486 100644
GIT binary patch
delta 14
VcmbOuJxOXqJm=<DoST>#xd18E1mXYy

delta 31
ncmbOvHAi|wJm+LFc7w?WIM^rma|%z6W|3n`tk`VFd6^jiplS)X

diff --git a/cloud/aws/elasticsearch/inputs.tf b/cloud/aws/elasticsearch/inputs.tf
index 499b0c6..6f56332 100644
--- a/cloud/aws/elasticsearch/inputs.tf
+++ b/cloud/aws/elasticsearch/inputs.tf
@@ -38,12 +38,6 @@ variable "es_cluster_status_message" {
   default     = ""
 }
 
-variable "es_cluster_status_time_aggregator" {
-  description = "Monitor aggregator for ES cluster status [available values: min, max or avg]"
-  type        = "string"
-  default     = "max"
-}
-
 variable "es_cluster_status_timeframe" {
   description = "Monitor timeframe for ES cluster status [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`]"
   type        = "string"
diff --git a/cloud/aws/elasticsearch/monitors-elasticsearch.tf b/cloud/aws/elasticsearch/monitors-elasticsearch.tf
index 3f51e75..b46b5e1 100644
--- a/cloud/aws/elasticsearch/monitors-elasticsearch.tf
+++ b/cloud/aws/elasticsearch/monitors-elasticsearch.tf
@@ -18,7 +18,7 @@ resource "datadog_monitor" "es_cluster_status" {
   type = "metric alert"
 
   query = <<EOF
-  ${var.es_cluster_status_time_aggregator}(${var.es_cluster_status_timeframe}): (
+  max(${var.es_cluster_status_timeframe}): (
     avg:aws.es.cluster_statusred{${data.template_file.filter.rendered}} by {region,name} * 2 +
     (avg:aws.es.cluster_statusyellow{${data.template_file.filter.rendered}} by {region,name} + 0.1)
   ) >= 2