Merge pull request #346 from turbot/release/v0.20

Release/v0.20
turbot · Mar 27, 2024 · 60fb86f · 60fb86f
2 parents b64f851 + 41bdad3
commit 60fb86f
Show file tree

Hide file tree

Showing 2 changed files with 74 additions and 68 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,10 @@
-## v0.19 [2024-04-06]
+## v0.20 [2024-03-27]
+
+_Bug fixes_
+
+- Fixed the `ecs_cluster_active_service_count` query in the `AWS ECS Cluster Dashboard` to correctly return the count of `Cluster Active Services` instead of `ECS Clusters`. ([#341](https://github.com/turbot/steampipe-mod-aws-insights/pull/341)) (Thanks [@mupi2k](https://github.com/mupi2k) for the contribution!)
+
+## v0.19 [2024-03-06]
 
 _Powerpipe_
 

diff --git a/dashboards/ecs/ecs_cluster_dashboard.sp b/dashboards/ecs/ecs_cluster_dashboard.sp
@@ -11,98 +11,98 @@ dashboard "ecs_cluster_dashboard" {
 
     # Analysis
     card {
-      query = query.ecs_cluster_count
-      width = 3
-    }
-
-    card {
-      query = query.ecs_cluster_active_service_count
-      width = 3
-    }
+        query = query.ecs_cluster_count
+        width = 3
+      }
 
-    # Assessments
-    card {
-      query = query.ecs_cluster_container_insights_disabled
-      width = 3
-    }
+      card {
+        query = query.ecs_cluster_active_service_count
+        width = 3
+      }
 
+      # Assessments
+      card {
+        query = query.ecs_cluster_container_insights_disabled
+        width = 3
+      }
 
-  }
 
-  container {
+    }
 
-    title = "Assessments"
-    width = 6
+    container {
 
-    chart {
-      title = "Container Insights Status"
-      query = query.ecs_cluster_container_insights_status
-      type  = "donut"
-      width = 4
+      title = "Assessments"
+      width = 6
 
-      series "count" {
-        point "enabled" {
-          color = "ok"
-        }
-        point "disabled" {
-          color = "alert"
+      chart {
+        title = "Container Insights Status"
+        query = query.ecs_cluster_container_insights_status
+        type  = "donut"
+        width = 4
+
+        series "count" {
+          point "enabled" {
+            color = "ok"
+          }
+          point "disabled" {
+            color = "alert"
+          }
         }
       }
     }
-  }
-
-  container {
 
-    title = "Cost"
-    width = 6
+    container {
 
-    table {
+      title = "Cost"
       width = 6
-      title = "Forecast"
-      query = query.ecs_cluster_monthly_forecast_table
-    }
 
-    chart {
-      width = 6
-      type  = "column"
-      title = "Monthly Cost - 12 Months"
-      query = query.ecs_cluster_cost_per_month
+      table {
+        width = 6
+        title = "Forecast"
+        query = query.ecs_cluster_monthly_forecast_table
+      }
+
+      chart {
+        width = 6
+        type  = "column"
+        title = "Monthly Cost - 12 Months"
+        query = query.ecs_cluster_cost_per_month
+      }
+
     }
 
-  }
+    container {
 
-  container {
+      title = "Analysis"
 
-    title = "Analysis"
+      chart {
+        title = "Clusters by Account"
+        query = query.ecs_cluster_by_account
+        type  = "column"
+        width = 4
+      }
 
-    chart {
-      title = "Clusters by Account"
-      query = query.ecs_cluster_by_account
-      type  = "column"
-      width = 4
-    }
+      chart {
+        title = "Clusters by Region"
+        query = query.ecs_cluster_by_region
+        type  = "column"
+        width = 4
+      }
 
-    chart {
-      title = "Clusters by Region"
-      query = query.ecs_cluster_by_region
-      type  = "column"
-      width = 4
-    }
+      chart {
+        title = "Clusters by Status"
+        query = query.ecs_cluster_by_status
+        type  = "column"
+        width = 4
+      }
 
-    chart {
-      title = "Clusters by Status"
-      query = query.ecs_cluster_by_status
-      type  = "column"
-      width = 4
     }
 
   }
 
-}
-
-# Card Queries
+  # Card Queries
 
-query "ecs_cluster_count" {
+  query "ecs_cluster_count" {
   sql = <<-EOQ
     select
       count(*) as "Clusters"
@@ -114,7 +114,7 @@ query "ecs_cluster_count" {
 query "ecs_cluster_active_service_count" {
   sql = <<-EOQ
     select
-      count(*) as "Cluster Active Services"
+      sum(active_services_count) as "Cluster Active Services"
     from
       aws_ecs_cluster;
   EOQ