From bf99dd28273b46b99d7338ec5539f7d4d5b1a203 Mon Sep 17 00:00:00 2001
From: "Karapetyan, Aram" <aram@dasmeta.com>
Date: Fri, 6 Oct 2023 12:44:55 +0400
Subject: [PATCH] fix: replicas and restarts

---
 .../widgets/container/replicas/README.md       |  1 +
 .../modules/widgets/container/replicas/base.tf |  8 ++++----
 .../widgets/container/replicas/variables.tf    |  6 ++++++
 .../tests/widgets-container/1-example.tf       | 18 +++++++++---------
 modules/dashboard/widgets-container.tf         |  2 ++
 5 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/modules/dashboard/modules/widgets/container/replicas/README.md b/modules/dashboard/modules/widgets/container/replicas/README.md
index f81cb7c..fa00014 100644
--- a/modules/dashboard/modules/widgets/container/replicas/README.md
+++ b/modules/dashboard/modules/widgets/container/replicas/README.md
@@ -23,6 +23,7 @@ No resources.
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
+| <a name="input_anomaly_detection"></a> [anomaly\_detection](#input\_anomaly\_detection) | Allow to enable anomaly detection on widget metrics | `bool` | `true` | no |
 | <a name="input_cluster"></a> [cluster](#input\_cluster) | n/a | `string` | n/a | yes |
 | <a name="input_container"></a> [container](#input\_container) | n/a | `string` | n/a | yes |
 | <a name="input_coordinates"></a> [coordinates](#input\_coordinates) | position | <pre>object({<br>    x : number<br>    y : number<br>    width : number<br>    height : number<br>  })</pre> | n/a | yes |
diff --git a/modules/dashboard/modules/widgets/container/replicas/base.tf b/modules/dashboard/modules/widgets/container/replicas/base.tf
index 9f81620..77339cb 100644
--- a/modules/dashboard/modules/widgets/container/replicas/base.tf
+++ b/modules/dashboard/modules/widgets/container/replicas/base.tf
@@ -3,19 +3,19 @@ module "base" {
 
   coordinates = var.coordinates
 
-  name = "Replicas / ${var.container}"
+  name = "Replicas"
 
   defaults = {
     MetricNamespace = "ContainerInsights"
     ClusterName     = var.cluster
     Namespace       = var.namespace
-    PodName         = var.container
   }
 
   period = var.period
 
   metrics = [
-    { MetricName = "kube_deployment_spec_replicas", label = "Deployment Spec" },
-    { MetricName = "kube_deployment_status_replicas_available", label = "Available" }
+    { MetricName = "kube_deployment_spec_replicas", PodName = var.container, label = "Deployment Spec", anomaly_detection = var.anomaly_detection },
+    { MetricName = "kube_deployment_status_replicas_available", PodName = var.container, label = "Available", anomaly_detection = var.anomaly_detection },
+    { MetricNamespace = "ContainerInsights", Service = var.container, MetricName = "service_number_of_running_pods", label = "Available", anomaly_detection = var.anomaly_detection }
   ]
 }
diff --git a/modules/dashboard/modules/widgets/container/replicas/variables.tf b/modules/dashboard/modules/widgets/container/replicas/variables.tf
index d01fab8..bbb87bb 100644
--- a/modules/dashboard/modules/widgets/container/replicas/variables.tf
+++ b/modules/dashboard/modules/widgets/container/replicas/variables.tf
@@ -26,3 +26,9 @@ variable "period" {
   type    = number
   default = 300
 }
+
+variable "anomaly_detection" {
+  type        = bool
+  default     = true
+  description = "Allow to enable anomaly detection on widget metrics"
+}
diff --git a/modules/dashboard/tests/widgets-container/1-example.tf b/modules/dashboard/tests/widgets-container/1-example.tf
index 8626235..8837dd6 100644
--- a/modules/dashboard/tests/widgets-container/1-example.tf
+++ b/modules/dashboard/tests/widgets-container/1-example.tf
@@ -8,7 +8,7 @@ module "dashboard-with-container-metrics" {
   name   = "dashboard-with-container-metrics-test"
   defaults = {
     cluster : local.cluster
-    anomaly_detection : false
+    anomaly_detection : true
   }
   rows = [
     [
@@ -32,14 +32,14 @@ module "dashboard-with-container-metrics" {
       type : "container/network-out",
       container : local.container
       },
-      # {
-      #   type : "container/restarts",
-      #   container : local.container,
-      # },
-      # {
-      #   type : "container/replicas",
-      #   container : local.container,
-      # },
+      {
+        type : "container/restarts",
+        container : local.container,
+      },
+      {
+        type : "container/replicas",
+        container : local.container,
+      },
     ]
   ]
 }
diff --git a/modules/dashboard/widgets-container.tf b/modules/dashboard/widgets-container.tf
index 843f6d6..a6a9275 100644
--- a/modules/dashboard/widgets-container.tf
+++ b/modules/dashboard/widgets-container.tf
@@ -134,6 +134,8 @@ module "container_replicas_widget" {
   container = local.container_replicas[count.index].container
   cluster   = local.container_replicas[count.index].cluster
   namespace = local.container_replicas[count.index].namespace
+
+  anomaly_detection = try(local.container_replicas[count.index].anomaly_detection, true)
 }
 
 module "container_restarts_widget" {