From 7af01c5bb102713311a1b0b8a5207638eacec4fa Mon Sep 17 00:00:00 2001
From: Quentin Manfroi <quentin.manfroi@fr.clara.net>
Date: Wed, 26 Sep 2018 11:39:39 +0200
Subject: [PATCH 1/2] MON-306 use normalized metric for load and replace
 percentage by ratio

---
 system/generic/monitors-system.tf | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/system/generic/monitors-system.tf b/system/generic/monitors-system.tf
index ac84c0f..98a4904 100644
--- a/system/generic/monitors-system.tf
+++ b/system/generic/monitors-system.tf
@@ -32,13 +32,12 @@ resource "datadog_monitor" "datadog_cpu_too_high" {
 
 resource "datadog_monitor" "datadog_load_too_high" {
   count   = "${var.cpu_load_enabled ? 1 : 0}"
-  name    = "[${var.environment}] CPU load 5 {{#is_alert}}{{{comparator}}} {{threshold}}% ({{value}}%){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}}% ({{value}}%){{/is_warning}}"
+  name    = "[${var.environment}] CPU load 5 ratio {{#is_alert}}{{{comparator}}} {{threshold}} ({{value}}){{/is_alert}}{{#is_warning}}{{{comparator}}} {{warn_threshold}} ({{value}}){{/is_warning}}"
   message = "${coalesce(var.cpu_load_message, var.message)}"
 
   query = <<EOF
     ${var.cpu_load_time_aggregator}(${var.cpu_load_timeframe}): (
-      avg:system.load.5${module.filter-tags.query_alert} by {region,host} /
-      avg:system.core.count${module.filter-tags.query_alert} by {region,host}
+      avg:system.load.norm.5${module.filter-tags.query_alert} by {region,host}
     ) > ${var.cpu_load_threshold_critical}
   EOF
 

From ade3d577e4f391eb1bca39cea06f30be7644587b Mon Sep 17 00:00:00 2001
From: Quentin Manfroi <quentin.manfroi@fr.clara.net>
Date: Wed, 26 Sep 2018 11:40:49 +0200
Subject: [PATCH 2/2] MON-306 auto update

---
 system/generic/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/generic/README.md b/system/generic/README.md
index 8f288e8..b1462e3 100644
--- a/system/generic/README.md
+++ b/system/generic/README.md
@@ -16,7 +16,7 @@ module "datadog-monitors-system-generic" {
 
 Creates DataDog monitors with the following checks:
 
-- CPU load 5
+- CPU load 5 ratio
 - CPU usage
 - Disk Space forecast
 - Free disk inodes