fix(DMVP-1232): Changed metrics in cpu,memory,network widgets

modules/dashboard/README.md

@@ -66,17 +66,13 @@
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_cloudfront_combined"></a> [cloudfront\_combined](#module\_cloudfront\_combined) | ./modules/widgets/cloudfront/combined | n/a |
-| <a name="module_cloudfront_error_rate"></a> [cloudfront\_error\_rate](#module\_cloudfront\_error\_rate) | ./modules/widgets/cloudfront/error-rate | n/a |
-| <a name="module_cloudfront_errors"></a> [cloudfront\_errors](#module\_cloudfront\_errors) | ./modules/widgets/cloudfront/errors | n/a |
-| <a name="module_cloudfront_requests"></a> [cloudfront\_requests](#module\_cloudfront\_requests) | ./modules/widgets/cloudfront/requests | n/a |
-| <a name="module_cloudfront_traffic_bytes"></a> [cloudfront\_traffic\_bytes](#module\_cloudfront\_traffic\_bytes) | ./modules/widgets/cloudfront/traffic-bytes | n/a |
 | <a name="module_container_balancer_2xx_widget"></a> [container\_balancer\_2xx\_widget](#module\_container\_balancer\_2xx\_widget) | ./modules/widgets/balancer/2xx | n/a |
 | <a name="module_container_balancer_4xx_widget"></a> [container\_balancer\_4xx\_widget](#module\_container\_balancer\_4xx\_widget) | ./modules/widgets/balancer/4xx | n/a |
 | <a name="module_container_balancer_5xx_widget"></a> [container\_balancer\_5xx\_widget](#module\_container\_balancer\_5xx\_widget) | ./modules/widgets/balancer/5xx | n/a |
 | <a name="module_container_cpu_widget"></a> [container\_cpu\_widget](#module\_container\_cpu\_widget) | ./modules/widgets/container/cpu | n/a |
 | <a name="module_container_memory_widget"></a> [container\_memory\_widget](#module\_container\_memory\_widget) | ./modules/widgets/container/memory | n/a |
 | <a name="module_container_network_widget"></a> [container\_network\_widget](#module\_container\_network\_widget) | ./modules/widgets/container/network | n/a |
+| <a name="module_container_replicas_widget"></a> [container\_replicas\_widget](#module\_container\_replicas\_widget) | ./modules/widgets/container/replicas | n/a |
 | <a name="module_container_restarts_widget"></a> [container\_restarts\_widget](#module\_container\_restarts\_widget) | ./modules/widgets/container/restarts | n/a |
 | <a name="module_text_title"></a> [text\_title](#module\_text\_title) | ./modules/widgets/text/title | n/a |
 | <a name="module_widget_alarm_metric"></a> [widget\_alarm\_metric](#module\_widget\_alarm\_metric) | ./modules/widgets/alarm/metric | n/a |

modules/dashboard/locals.tf

@@ -57,6 +57,7 @@ locals {
  "container/memory" = []
  "container/network" = []
  "container/restarts" = []
+ "container/replicas" = []
  "balancer/2xx" = []
  "balancer/4xx" = []
  "balancer/5xx" = []
@@ -80,6 +81,7 @@ locals {
  container_memory = local.widget_config["container/memory"]
  container_network = local.widget_config["container/network"]
  container_restarts = local.widget_config["container/restarts"]
+ container_replicas = local.widget_config["container/replicas"]
 
  balancer_2xx = local.widget_config["balancer/2xx"]
  balancer_4xx = local.widget_config["balancer/4xx"]
@@ -111,6 +113,7 @@ locals {
  module.container_memory_widget[*].data,
  module.container_network_widget[*].data,
  module.container_restarts_widget[*].data,
+ module.container_replicas_widget[*].data,
 
  // Widget/Traffic
  module.container_balancer_2xx_widget[*].data,
@@ -121,7 +124,7 @@ locals {
  module.text_title[*].data,
 
  # log based metrics
- module.widget_log_based[*].data,
+ # module.widget_log_based[*].data,
 
  # custom metrics
  module.widget_custom[*].data,

modules/dashboard/modules/widgets/container/cpu/base.tf

@@ -14,7 +14,7 @@ module "base" {
 
  coordinates = var.coordinates
 
- name = "Container CPU / ${var.container}"
+ name = "CPU / ${var.container}"
 
  defaults = {
  MetricNamespace = "ContainerInsights"
@@ -28,8 +28,7 @@ module "base" {
  period = var.period
 
  metrics = [
- { MetricName = "pod_cpu_limit" },
- { MetricName = "pod_cpu_utilization" },
- { MetricName = "pod_cpu_reserved_capacity", color = "#d62728" }
+ { MetricName = "pod_cpu_usage_total", label = "Current" },
+ { MetricName = "pod_cpu_limit", color = "#d62728", label = "Limit" }
  ]
 }

modules/dashboard/modules/widgets/container/memory/base.tf

@@ -6,7 +6,7 @@ module "base" {
 
  coordinates = var.coordinates
 
- name = "Container Memory / ${var.container}"
+ name = "Memory / ${var.container}"
 
  defaults = {
  MetricNamespace = "ContainerInsights"
@@ -20,8 +20,7 @@ module "base" {
  period = var.period
 
  metrics = [
- { MetricName = "pod_memory_limit" },
- { MetricName = "pod_memory_utilization", },
- { MetricName = "pod_memory_reserved_capacity", color : "#d62728" }
+ { MetricName = "pod_memory_working_set", label = "Current" },
+ { MetricName = "pod_memory_limit", color = "#d62728", label = "Limit" }
  ]
 }

modules/dashboard/modules/widgets/container/network/base.tf

@@ -6,7 +6,7 @@ module "base" {
 
  coordinates = var.coordinates
 
- name = "Container Network / ${var.container}"
+ name = "Network / ${var.container}"
 
  defaults = {
  MetricNamespace = "ContainerInsights"
@@ -20,7 +20,7 @@ module "base" {
  period = var.period
 
  metrics = [
- { MetricName = "pod_network_rx_bytes", color = "#17becf" },
- { MetricName = "pod_network_tx_bytes", color = "#e377c2" }
+ { MetricName = "pod_network_rx_bytes", color = "#17becf", label = "In" },
+ { MetricName = "pod_network_tx_bytes", color = "#e377c2", label = "Out" }
  ]
 }

modules/dashboard/modules/widgets/container/replicas/base.tf

@@ -6,15 +6,16 @@ module "base" {
  name = "Replicas / ${var.container}"
 
  defaults = {
- "ClusterName" : var.cluster,
- "Namespace" : var.namespace
- "PodName" : var.container
+ MetricNamespace = "ContainerInsights"
+ ClusterName = var.cluster
+ Namespace = var.namespace
+ PodName = var.container
  }
 
  period = var.period
 
  metrics = [
- { "ContainerInsights" : "kube_deployment_spec_replicas", "Style" : { "label" : "Deployment Spec" } },
- { "ContainerInsights" : "kube_deployment_status_replicas_available", "Style" : { "label" : "Available" } }
+ { MetricName = "kube_deployment_spec_replicas", label = "Deployment Spec" },
+ { MetricName = "kube_deployment_status_replicas_available", label = "Available" }
  ]
 }

modules/dashboard/modules/widgets/container/restarts/base.tf

@@ -6,7 +6,7 @@ module "base" {
 
  coordinates = var.coordinates
 
- name = "Container Restarts / ${var.container}"
+ name = "Restarts / ${var.container}"
 
  stat = "Maximum"
 

modules/dashboard/tests/dashboard-layout/0-setup.tf

@@ -12,7 +12,3 @@ terraform {
  }
  }
 }
-
-provider "aws" {
- # Configuration options
-}

modules/dashboard/tests/dashboard-layout/1-example.tf

@@ -7,41 +7,41 @@ module "dashboard-to-test-layout" {
  [
  {
  type : "text/title"
- text : "App 1 (block 1)"
+ text : "smm (block 1)"
  }
  ],
  [
  {
  type : "container/cpu",
  period : 300,
- container : "App 1",
- cluster : "test-cluster"
+ container : "smm",
+ cluster : "dev"
  },
  {
  type : "container/memory",
  period : 300,
- container : "App 1",
- cluster : "test-cluster"
+ container : "smm",
+ cluster : "dev"
  },
  ],
  [
  {
  type : "text/title"
- text : "App 2 (block 2)"
+ text : "smm 2 (block 2)"
  }
  ],
  [
  {
  type : "container/cpu",
  period : 300,
- container : "App 2",
- cluster : "test-cluster"
+ container : "smm",
+ cluster : "dev"
  },
  {
  type : "container/memory",
  period : 300,
- container : "App 2",
- cluster : "test-cluster"
+ container : "smm",
+ cluster : "dev"
  }
  ]
  ]

modules/dashboard/tests/widgets-container/1-example.tf

@@ -1,36 +1,39 @@
 module "dashboard-with-container-metrics" {
  source = "../../"
- name = "dashboard-with-container-metrics"
-
- defaults = {
- cluster = "test-cluster"
- # accountId = "12345435435"
- }
+ name = "dashboard-with-container-metrics-test"
  rows = [
  [
  {
  type : "container/cpu",
  period : 300,
- container : "App 1",
- cluster : "test-cluster"
+ container : "smm",
+ cluster : "dev"
  },
  {
  type : "container/memory",
  period : 300,
- container : "App 1",
- cluster : "test-cluster"
+ container : "smm",
+ cluster : "dev"
  },
  {
  type : "container/network",
  period : 300,
- container : "App 1",
- cluster : "test-cluster"
+ container : "smm",
+ cluster : "dev",
  },
  {
  type : "container/restarts",
  period : 300,
- container : "App 1"
- accountId : "232323232323223232"
+ container : "smm",
+ cluster : "dev",
+ },
+ {
+ type : "container/replicas",
+ period : 300,
+ container : "smm",
+ cluster : "dev",
+ x : 20,
+ y : 20
  },
  ]
  ]