From 048bd802e771f5a306f770f12062306e90fc61c5 Mon Sep 17 00:00:00 2001
From: Matthieu Bourgain <matthieu.bourgain@fr.clara.net>
Date: Thu, 18 Feb 2021 16:34:45 +0100
Subject: [PATCH] MN-589 "Add_K8S cluster name pod monitors"

---
 caas/kubernetes/pod/README.md           | 2 +-
 caas/kubernetes/pod/monitors-k8s-pod.tf | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/caas/kubernetes/pod/README.md b/caas/kubernetes/pod/README.md
index a2d4ab9..ef45d10 100644
--- a/caas/kubernetes/pod/README.md
+++ b/caas/kubernetes/pod/README.md
@@ -76,4 +76,4 @@ Creates DataDog monitors with the following checks:
 
 ## Requirements
 
-* Datadog Agent > v6.6
+* Datadog Agent > v7.2
diff --git a/caas/kubernetes/pod/monitors-k8s-pod.tf b/caas/kubernetes/pod/monitors-k8s-pod.tf
index d5f6e93..d286e6c 100644
--- a/caas/kubernetes/pod/monitors-k8s-pod.tf
+++ b/caas/kubernetes/pod/monitors-k8s-pod.tf
@@ -6,7 +6,7 @@ resource "datadog_monitor" "pod_phase_status" {
 
   query = <<EOQ
     ${var.pod_phase_status_time_aggregator}(${var.pod_phase_status_timeframe}):
-      default(sum:kubernetes_state.pod.status_phase${module.filter-tags-phase.query_alert} by {namespace}, 0) > 0
+      default(sum:kubernetes_state.pod.status_phase${module.filter-tags-phase.query_alert} by {namespace,kube_cluster_name}, 0) > 0
 EOQ
 
   thresholds = {
@@ -39,7 +39,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}
+      sum:kubernetes_state.container.status_report.count.waiting${module.filter-tags-nocontainercreating.query_alert} by {namespace,pod,reason,kube_cluster_name}
     > ${var.error_threshold_critical}
 EOQ
 
@@ -73,7 +73,7 @@ resource "datadog_monitor" "terminated" {
 
   query = <<EOQ
     ${var.terminated_time_aggregator}(${var.terminated_timeframe}):
-      sum:kubernetes_state.container.status_report.count.terminated${module.filter-tags-nocontainercreating.query_alert} by {namespace,pod,reason}
+      sum:kubernetes_state.container.status_report.count.terminated${module.filter-tags-nocontainercreating.query_alert} by {namespace,pod,reason,kube_cluster_name}
     > ${var.terminated_threshold_critical}
 EOQ