fix(k8s): phase tag (#64)

* fix(k8s): phase tag

* chore: add pod_name

* chore: add pod_name

Author: Aohzan

caas/kubernetes/pod/README.md

@@ -17,10 +17,10 @@ module "datadog-monitors-caas-kubernetes-pod" {
 
 Creates DataDog monitors with the following checks:
 
-- Kubernetes Pod phase status failed
 - Kubernetes Pod {{pod_name}} container {{kube_container_name}} killed by OOM on {{kube_cluster_name}}
-- Kubernetes Pod terminated abnormally
-- Kubernetes Pod waiting errors
+- Kubernetes Pod {{pod_name}} phase status failed
+- Kubernetes Pod {{pod_name}} terminated abnormally
+- Kubernetes Pod {{pod_name}} waiting errors
 - Kubernetes Pods in {{kube_replica_set}} frequently restarted on {{kube_cluster_name}}
 
 <!-- BEGIN_TF_DOCS -->
@@ -96,7 +96,7 @@ Creates DataDog monitors with the following checks:
 | <a name="input_pod_phase_status_message"></a> [pod\_phase\_status\_message](#input\_pod\_phase\_status\_message) | Custom message for Pod phase status monitor | `string` | `""` | no |
 | <a name="input_pod_phase_status_time_aggregator"></a> [pod\_phase\_status\_time\_aggregator](#input\_pod\_phase\_status\_time\_aggregator) | Monitor aggregator for Pod phase status [available values: min, max or avg] | `string` | `"max"` | no |
 | <a name="input_pod_phase_status_timeframe"></a> [pod\_phase\_status\_timeframe](#input\_pod\_phase\_status\_timeframe) | Monitor timeframe for Pod phase status [available values: `last_#m` (1, 5, 10, 15, or 30), `last_#h` (1, 2, or 4), or `last_1d`] | `string` | `"last_5m"` | no |
-| <a name="input_pod_status_group_by"></a> [pod\_status\_group\_by](#input\_pod\_status\_group\_by) | Select group by element on monitors (phase status) | `list` | <pre>[<br>  "kube_namespace",<br>  "kube_cluster_name"<br>]</pre> | no |
+| <a name="input_pod_status_group_by"></a> [pod\_status\_group\_by](#input\_pod\_status\_group\_by) | Select group by element on monitors (phase status) | `list` | <pre>[<br>  "pod_name",<br>  "kube_namespace",<br>  "kube_cluster_name"<br>]</pre> | no |
 | <a name="input_prefix_slug"></a> [prefix\_slug](#input\_prefix\_slug) | Prefix string to prepend between brackets on every monitors names | `string` | `""` | no |
 | <a name="input_tags"></a> [tags](#input\_tags) | Global variables | `list(string)` | <pre>[<br>  "type:caas",<br>  "provider:kubernetes",<br>  "resource:kubernetes-pod"<br>]</pre> | no |
 | <a name="input_team"></a> [team](#input\_team) | n/a | `string` | `"claranet"` | no |

caas/kubernetes/pod/inputs.tf

@@ -264,6 +264,6 @@ variable "pod_group_by" {
 }
 
 variable "pod_status_group_by" {
-  default     = ["kube_namespace", "kube_cluster_name"]
+  default     = ["pod_name", "kube_namespace", "kube_cluster_name"]
   description = "Select group by element on monitors (phase status)"
 }

caas/kubernetes/pod/modules.tf

@@ -18,7 +18,7 @@ module "filter-tags-phase" {
   filter_tags_custom          = var.filter_tags_custom
   filter_tags_custom_excluded = var.filter_tags_custom_excluded
   filter_tags_separator       = var.filter_tags_separator
-  extra_tags_excluded         = ["phase:pending", "phase:running", "phase:succeeded", "phase:unknown"]
+  extra_tags_excluded         = ["pod_phase:pending", "pod_phase:running", "pod_phase:succeeded", "pod_phase:unknown"]
 }
 
 module "filter-tags-nocontainercreating" {

caas/kubernetes/pod/monitors-k8s-pod.tf

@@ -1,6 +1,6 @@
 resource "datadog_monitor" "pod_phase_status" {
   count   = var.pod_phase_status_enabled == "true" ? 1 : 0
-  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Kubernetes Pod phase status failed"
+  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Kubernetes Pod {{pod_name}} phase status failed"
   message = coalesce(var.pod_phase_status_message, var.message)
   type    = "metric alert"
 
@@ -29,7 +29,7 @@ EOQ
 
 resource "datadog_monitor" "error" {
   count   = var.error_enabled == "true" ? 1 : 0
-  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Kubernetes Pod waiting errors"
+  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Kubernetes Pod {{pod_name}} waiting errors"
   message = coalesce(var.error_message, var.message)
   type    = "query alert"
 
@@ -59,7 +59,7 @@ EOQ
 
 resource "datadog_monitor" "terminated" {
   count   = var.terminated_enabled == "true" ? 1 : 0
-  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Kubernetes Pod terminated abnormally"
+  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Kubernetes Pod {{pod_name}} terminated abnormally"
   message = coalesce(var.terminated_message, var.message)
   type    = "query alert"