From c6bffbe0a56822fb62c90a9b7dddadee60eb5e9b Mon Sep 17 00:00:00 2001
From: Sjuul Janssen <sjuul@outlook.com>
Date: Fri, 19 Aug 2022 14:49:12 +0200
Subject: [PATCH] .

---
 daemonset-incomplete.tf     | 4 ++--
 deploy-desired-vs-status.tf | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/daemonset-incomplete.tf b/daemonset-incomplete.tf
index ebe1748..27010fa 100644
--- a/daemonset-incomplete.tf
+++ b/daemonset-incomplete.tf
@@ -11,8 +11,8 @@ module "daemonset_incomplete" {
 
   name             = "Daemonset Incomplete"
   query            = "min(${var.daemonset_incomplete_evaluation_period}):max:kubernetes_state.daemonset.scheduled{${local.daemonset_incomplete_filter}} by {kube_daemon_set,kube_cluster_name} - min:kubernetes_state.daemonset.ready{${local.daemonset_incomplete_filter}} by {kube_daemon_set,kube_cluster_name} > 0"
-  alert_message    = "Kubernetes Daemonset {{daemonset}} is incomplete. Missing pod count:{{value}}"
-  recovery_message = "Kubernetes Daemonset {{daemonset}} has recovered"
+  alert_message    = "Kubernetes Daemonset {{kube_daemon_set}} is incomplete. Missing pod count:{{value}}"
+  recovery_message = "Kubernetes Daemonset {{kube_daemon_set}} has recovered"
 
   # monitor level vars
   enabled            = var.state_metrics_monitoring && var.daemonset_incomplete_enabled
diff --git a/deploy-desired-vs-status.tf b/deploy-desired-vs-status.tf
index b5d4f6f..c766893 100644
--- a/deploy-desired-vs-status.tf
+++ b/deploy-desired-vs-status.tf
@@ -13,6 +13,8 @@ module "deploy_desired_vs_status" {
   query            = "avg(${var.deploy_desired_vs_status_evaluation_period}):max:kubernetes_state.deployment.replicas_desired{${local.deploy_desired_vs_status_filter}} by {kube_cluster_name} - max:kubernetes_state.deployment.replicas_available{${local.deploy_desired_vs_status_filter}} by {kube_cluster_name} > ${var.deploy_desired_vs_status_critical}"
   alert_message    = "Kubernetes is having trouble getting all the pods to start. (Based on replicas number in all the deployments)"
   recovery_message = "All pods described in deployments have started"
+  notify_no_data   = true
+  no_data_message  = "Kubernetes State data missing for {{kube_cluster_name.name}}"
 
   # monitor level vars
   enabled            = var.state_metrics_monitoring && var.deploy_desired_vs_status_enabled