replace default apiserver by heartbeat

claranet · Jan 22, 2025 · ad919ca · ad919ca
1 parent de6a98e
commit ad919ca
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/caas/kubernetes/cluster/README.md b/caas/kubernetes/cluster/README.md
@@ -17,7 +17,7 @@ module "datadog-monitors-caas-kubernetes-cluster" {
 
 Creates DataDog monitors with the following checks:
 
-- Kubernetes API server does not respond
+- Kubernetes API server does not respond on {{kube_cluster_name}} (disabled by default)
 - Kubernetes cluster heartbeat alert on {{kube_cluster_name}}
 
 <!-- BEGIN_TF_DOCS -->
@@ -51,7 +51,7 @@ Creates DataDog monitors with the following checks:
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| <a name="input_apiserver_enabled"></a> [apiserver\_enabled](#input\_apiserver\_enabled) | Flag to enable API server monitor | `string` | `"true"` | no |
+| <a name="input_apiserver_enabled"></a> [apiserver\_enabled](#input\_apiserver\_enabled) | Flag to enable API server monitor | `string` | `"false"` | no |
 | <a name="input_apiserver_extra_tags"></a> [apiserver\_extra\_tags](#input\_apiserver\_extra\_tags) | Extra tags for API server monitor | `list(string)` | `[]` | no |
 | <a name="input_apiserver_message"></a> [apiserver\_message](#input\_apiserver\_message) | Custom message for API server monitor | `string` | `""` | no |
 | <a name="input_apiserver_no_data_timeframe"></a> [apiserver\_no\_data\_timeframe](#input\_apiserver\_no\_data\_timeframe) | Number of minutes before reporting no data | `string` | `10` | no |

diff --git a/caas/kubernetes/cluster/inputs.tf b/caas/kubernetes/cluster/inputs.tf
@@ -70,7 +70,7 @@ variable "apiserver_no_data_timeframe" {
 variable "apiserver_enabled" {
   description = "Flag to enable API server monitor"
   type        = string
-  default     = "true"
+  default     = "false"
 }
 
 variable "apiserver_extra_tags" {

diff --git a/caas/kubernetes/cluster/monitors-k8s-cluster.tf b/caas/kubernetes/cluster/monitors-k8s-cluster.tf
@@ -1,12 +1,12 @@
 resource "datadog_monitor" "apiserver" {
   count   = var.apiserver_enabled == "true" ? 1 : 0
-  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Kubernetes API server does not respond"
+  name    = "${var.prefix_slug == "" ? "" : "[${var.prefix_slug}]"}[${var.environment}] Kubernetes API server does not respond on {{kube_cluster_name}}"
   message = coalesce(var.apiserver_message, var.message)
 
   type = "service check"
 
   query = <<EOQ
-    "kube_apiserver_controlplane.up"${module.filter-tags.service_check}.last(6).count_by_status()
+    "kube_apiserver_controlplane.up"${module.filter-tags.service_check}.by("kube_cluster_name").last(6).count_by_status()
 EOQ
 
   monitor_thresholds {
@@ -16,7 +16,7 @@ EOQ
 
   new_host_delay      = var.new_host_delay
   new_group_delay     = var.new_group_delay
-  notify_no_data      = var.notify_no_data
+  notify_no_data      = false
   no_data_timeframe   = var.apiserver_no_data_timeframe
   renotify_interval   = 0
   notify_audit        = false