Аdd taxonomy filters to dashboard (#1180)

Author: iakov-gan

cfn-templates/cid-cfn.yml

@@ -1,6 +1,6 @@
 # https://github.com/aws-samples/aws-cudos-framework-deployment/blob/main/cfn-templates/cid-cfn.yml
 AWSTemplateFormatVersion: '2010-09-09'
-Description: Deployment of Cloud Intelligence Dashboards v4.1.5 - AWS Solution SO9011
+Description: Deployment of Cloud Intelligence Dashboards v4.2.0 - AWS Solution SO9011
 Metadata:
   AWS::CloudFormation::Interface:
     ParameterGroups:
@@ -2070,7 +2070,7 @@ Resources:
       SourceBucket: !Ref ReferenceAssetsBucket
       DestinationBucket: !Ref LocalAssetsBucket
       Keys:
-        - 'cid-resource-lambda-layer/cid-4.1.5.zip' #replace version here if needed
+        - 'cid-resource-lambda-layer/cid-4.2.0.zip' #replace version here if needed
 
   CidResourceLambdaLayer:
     Type: AWS::Lambda::LayerVersion
@@ -2085,7 +2085,7 @@ Resources:
             - LambdaLayerBucketPrefixIsManaged
             - !FindInMap [RegionMap, !Ref 'AWS::Region', BucketName]
             - !Sub '${LambdaLayerBucketPrefix}-${AWS::Region}' # Region added for backward compatibility
-        S3Key: 'cid-resource-lambda-layer/cid-4.1.5.zip' #replace version here if needed
+        S3Key: 'cid-resource-lambda-layer/cid-4.2.0.zip' #replace version here if needed
       CompatibleRuntimes:
         - python3.10
         - python3.11

changes/CHANGELOG-cudos.md

@@ -2,6 +2,17 @@
 
 # CUDOS v5
 
+# CUDOS - 5.6
+
+* **Executive: Trends**: Sheet 'MoM Trends' renamed to 'Trends'. Added control Trends Type which allows to switch between Monthly, Weekly and Daily Trends. Added control Trends Time Range which allows to adjust a time period when switching between Trend Types. Changed positioning of Product and Account Trends visuals to effectively present more than 3 trends periods. 
+* **Databases**: Added 'Amazon ElastiCache Redis Migration to Valkey - Adoption Tracking and Potential Savings' section with visuals 'ElastiCache Redis vs Valkey: Cost Breakdown', 'ElastiCache Valkey: Achieved Cost Efficiency Gains vs Redis', 'Monthly Cost Savings Opportunities with Migration to Valkey' and 'Redis Cache Instances and Serverlless Cache: Cost Savings Opportunities with migration to Valkey' to track migration progress to Valkey.
+* **Taxonomy Explorer**: 'TAGSplorer sheet complexly redesigned and renamed to Taxonomy Explorer. Now it allows to interactively explore cost and usage details across 2 Taxonomy Dimensions such as tags and account level mappings which added to the dashboard via new [Add Organizational Taxonomy](https://catalog.workshops.aws/awscid/en-US/dashboards/add-organizational-taxonomy) capability. 
+* **AI/ML**: Added 'Amazon Bedrock Model Unit Cost' and 'Amazon Bedrock Cost per Legal Entity' visuals . Updated Bedrock UsageType Group for more accurate usage type categorization. Added Model Name calculated field to group different model ids under the same name on 'Amazon Bedrock Daily Cost per Resource' visual.
+* **Amazon S3 Summary**: Added 'Group By' control which allows to switch between S3 Operation and S3 UsageType Group in 'Total Cost per Bucket by Operation', 'Daily Cost Bucket Explorer' and 'Daily Storage Bucket Explorer' visuals.
+* **Analytics**: Added new section AWS Glue with 'AWS Glue Spend per Account','AWS Glue Spend per UsageType Group', 'AWS Glue Spend per Usage Type' and 'AWS Glue Detailed Resource View'  visuals.
+* **Analytics**: Added new section Amazon Elastic MapReduce (EMR) with 'EMR Spend per Account', 'EMR Spend Per UsageType Group', 'EMR Spend Per UsageType Sub Group', 'EMR Spend Per Processor Type' 'EMR Daily Cost per Usage Type Sub Group' and 'EMR Detailed Resource View (Top 20)' visuals.
+* **Executive: RI/SP Summary**: Added Amazon ElastiCache, OpenSearch, Redshift, DynamoDB and MemoryDB services into 'Savings Option for Compute by Owner / Consumer' visual
+
 # CUDOS - 5.5
 
 * **DynamoDB**: Refactored visuals to improve user experience and simplify navigation. *'DynamoDB Accounts by Category'* visuals replaced with 'DynamoDB Cost per Account' and 'DynamoDB Cost per Usage Type Group'

changes/cloud-intelligence-dashboards.rss

@@ -5,8 +5,88 @@
     <link>https://catalog.workshops.aws/awscid/en-US</link>
     <atom:link href="https://cid.workshops.aws.dev/feed/cloud-intelligence-dashboards.rss" rel="self" type="application/rss+xml"/>
     <description>The Cloud Intelligence Dashboards is an open-source framework, lovingly cultivated and maintained by a group of customer-obsessed AWSers, that gives customers the power to get high-level and granular insight into their cost and usage data. Supported by the Well-Architected framework, the dashboards can be deployed by any customer using a CloudFormation template or a command-line tool in their environment in under 30 minutes. These dashboards help you to drive financial accountability, optimize cost, track usage goals, implement best-practices for governance, and achieve operational excellence across all your organization.</description>
-    <lastBuildDate>Mon, 21 Apr 2025 12:00:00 GMT</lastBuildDate>
+    <lastBuildDate>Mon, 2 Jun 2025 09:00:00 GMT</lastBuildDate>
     <language>en-us</language>
+
+   <item>
+      <title>[New significant feature] Add Organizational Taxonomy with cid-cmd without dashboard customization</title>
+      <link>
+        https://catalog.workshops.aws/awscid/en-US/dashboards/add-organizational-taxonomy
+      </link>
+      <pubDate>Mon, 2 Jun 2025 09:00:00 GMT</pubDate>
+      <category><![CDATA[Dashboard Update]]></category>
+      <guid isPermaLink="false">7d2f3c91-8c10-4265-94e7-7e0c8ef61b58</guid>
+      <description>Add Organizational Taxonomy with cid-cmd without dashboard customization</description>
+      <content:encoded><![CDATA[
+<div>
+  <p>Starting today, you can use <code>cid-cmd</code> to add organizational taxonomy—such as tags, cost categories, and account mappings to Cloud Intelligence Dashboards without needing to customize the dashboards, while retaining the ability to update to the latest versions.</p>
+  <p>Learn more in the new documentation guide: 
+    <a href="https://catalog.workshops.aws/awscid/en-US/dashboards/add-organizational-taxonomy">Add Organizational Taxonomy</a>
+  </p>
+</div>    
+    ]]></content:encoded>    
+    </item>
+    <item>
+      <title>[Update] CUDOS Dashboard v5.6.0</title>
+      <link>
+        https://github.com/aws-solutions-library-samples/cloud-intelligence-dashboards-framework/blob/main/changes/CHANGELOG-cudos.md#cudos---56
+      </link>
+      <pubDate>Mon, 2 Jun 2025 09:00:00 GMT</pubDate>
+      <category><![CDATA[Dashboard Update]]></category>
+      <guid isPermaLink="false">f3b5e9a2-1c4e-45fa-8c2a-9cf5a93e8e3a</guid>
+      <description>CUDOS Dashboard v5.6.0</description>
+      <content:encoded><![CDATA[
+<div>
+  <ul>
+    <li><strong>Executive: Trends</strong>: Sheet 'MoM Trends' renamed to 'Trends'. Added control <em>Trends Type</em> which allows switching between Monthly, Weekly and Daily Trends. Added control <em>Trends Time Range</em> to adjust the time period when switching between Trend Types. Changed positioning of Product and Account Trends visuals to effectively present more than 3 trends periods.</li>
+
+    <li><strong>Databases</strong>: Added '<em>Amazon ElastiCache Redis Migration to Valkey - Adoption Tracking and Potential Savings</em>' section with visuals:
+      <ul>
+        <li>'ElastiCache Redis vs Valkey: Cost Breakdown'</li>
+        <li>'ElastiCache Valkey: Achieved Cost Efficiency Gains vs Redis'</li>
+        <li>'Monthly Cost Savings Opportunities with Migration to Valkey'</li>
+        <li>'Redis Cache Instances and Serverless Cache: Cost Savings Opportunities with migration to Valkey'</li>
+      </ul>
+    </li>
+
+    <li><strong>Taxonomy Explorer</strong>: 'TAGSplorer' sheet completely redesigned and renamed to <em>Taxonomy Explorer</em>. Now allows interactive exploration of cost and usage across 2 Taxonomy Dimensions (e.g. tags and account-level mappings), added via the new 
+    <a href="https://catalog.workshops.aws/awscid/en-US/dashboards/add-organizational-taxonomy">Add Organizational Taxonomy</a> capability.</li>
+
+    <li><strong>AI/ML</strong>: Added 'Amazon Bedrock Model Unit Cost' and 'Amazon Bedrock Cost per Legal Entity' visuals. Updated <em>Bedrock UsageType Group</em> for more accurate categorization. Added <em>Model Name</em> calculated field to group different model IDs on 'Amazon Bedrock Daily Cost per Resource'.</li>
+
+    <li><strong>Amazon S3 Summary</strong>: Added <em>'Group By'</em> control to switch between S3 Operation and S3 UsageType Group in the following visuals:
+      <ul>
+        <li>'Total Cost per Bucket by Operation'</li>
+        <li>'Daily Cost Bucket Explorer'</li>
+        <li>'Daily Storage Bucket Explorer'</li>
+      </ul>
+    </li>
+
+    <li><strong>Analytics</strong>: Added new AWS Glue section with visuals:
+      <ul>
+        <li>'AWS Glue Spend per Account'</li>
+        <li>'AWS Glue Spend per UsageType Group'</li>
+        <li>'AWS Glue Spend per Usage Type'</li>
+        <li>'AWS Glue Detailed Resource View'</li>
+      </ul>
+    </li>
+
+    <li><strong>Analytics</strong>: Added new Amazon EMR section with visuals:
+      <ul>
+        <li>'EMR Spend per Account'</li>
+        <li>'EMR Spend Per UsageType Group'</li>
+        <li>'EMR Spend Per UsageType Sub Group'</li>
+        <li>'EMR Spend Per Processor Type'</li>
+        <li>'EMR Daily Cost per Usage Type Sub Group'</li>
+        <li>'EMR Detailed Resource View (Top 20)'</li>
+      </ul>
+    </li>
+
+    <li><strong>Executive: RI/SP Summary</strong>: Added Amazon ElastiCache, OpenSearch, Redshift, DynamoDB, and MemoryDB services to the 'Savings Option for Compute by Owner / Consumer' visual.</li>
+  </ul>
+</div>
+    ]]></content:encoded>    
+    </item>
     <item>
       <title>[Update] Sustainability Proxy and Carbon emissions data Dashboard v4.0.0</title>
       <link>

cid/_version.py

@@ -1,2 +1,2 @@
-__version__ = '4.1.5'
+__version__ = '4.2.0'
 

cid/builtin/core/data/datasets/kpi/kpi_ebs_snap.json

@@ -2,6 +2,24 @@
     "DataSetId": "0e7cd1a6-e38d-4ca8-af6f-9256577d651e",
     "Name": "kpi_ebs_snap",
     "PhysicalTableMap": {
+        "88cab3bf-bb23-4b37-9ff6-6f32e4c3d9d8": {
+            "RelationalTable": {
+                "DataSourceArn": "${athena_datasource_arn}",
+                "Catalog": "AwsDataCatalog",
+                "Schema": "${athena_database_name}",
+                "Name": "account_map",
+                "InputColumns": [
+                    {
+                        "Name": "account_id",
+                        "Type": "STRING"
+                    },
+                    {
+                        "Name": "account_name",
+                        "Type": "STRING"
+                    }
+                ]
+            }
+        },
         "f224e706-8cd3-4c2f-b4e8-d8470368782f": {
             "RelationalTable": {
                 "DataSourceArn": "${athena_datasource_arn}",
@@ -25,48 +43,45 @@
                         "Type": "STRING"
                     },
                     {
-                        "Name": "account_id",
-                        "Type": "STRING"
-                    },
-                    {
-                        "Name": "account_name",
+                        "Name": "snapshot_type",
                         "Type": "STRING"
                     },
                     {
                         "Name": "resource_id",
                         "Type": "STRING"
                     },
-                    {
-                        "Name": "snapshot_type",
-                        "Type": "STRING"
-                    },
                     {
                         "Name": "usage_quantity",
-                        "Type": "DECIMAL"
+                        "Type": "DECIMAL",
+                        "SubType": "FLOAT"
                     },
                     {
                         "Name": "ebs_snapshot_cost",
-                        "Type": "DECIMAL"
+                        "Type": "DECIMAL",
+                        "SubType": "FLOAT"
                     },
                     {
                         "Name": "public_cost",
-                        "Type": "DECIMAL"
+                        "Type": "DECIMAL",
+                        "SubType": "FLOAT"
                     },
                     {
                         "Name": "ebs_snapshots_under_1yr_cost",
-                        "Type": "DECIMAL"
+                        "Type": "DECIMAL",
+                        "SubType": "FLOAT"
                     },
                     {
                         "Name": "ebs_snapshots_over_1yr_cost",
-                        "Type": "DECIMAL"
+                        "Type": "DECIMAL",
+                        "SubType": "FLOAT"
                     }
                 ]
             }
         }
     },
     "LogicalTableMap": {
-        "f224e706-8cd3-4c2f-b4e8-d8470368782f": {
-            "Alias": "kpi_ebs_snap",
+        "9cd6e7ab-5a7a-40b8-8d3f-0061502aa428": {
+            "Alias": "Intermediate Table",
             "DataTransforms": [
                 {
                     "ProjectOperation": {
@@ -75,24 +90,41 @@
                             "start_date",
                             "payer_account_id",
                             "linked_account_id",
-                            "account_id",
-                            "account_name",
-                            "resource_id",
                             "snapshot_type",
+                            "resource_id",
                             "usage_quantity",
                             "ebs_snapshot_cost",
                             "public_cost",
                             "ebs_snapshots_under_1yr_cost",
-                            "ebs_snapshots_over_1yr_cost"
+                            "ebs_snapshots_over_1yr_cost",
+                            "account_id",
+                            "account_name"
                         ]
                     }
                 }
             ],
+            "Source": {
+                "JoinInstruction": {
+                    "LeftOperand": "f224e706-8cd3-4c2f-b4e8-d8470368782f",
+                    "RightOperand": "f0d714f0-5bdc-467d-a201-d15ec6f1bcbc",
+                    "Type": "LEFT",
+                    "OnClause": "{linked_account_id} = {account_id}"
+                }
+            }
+        },
+        "f0d714f0-5bdc-467d-a201-d15ec6f1bcbc": {
+            "Alias": "account_map",
+            "Source": {
+                "PhysicalTableId": "88cab3bf-bb23-4b37-9ff6-6f32e4c3d9d8"
+            }
+        },
+        "f224e706-8cd3-4c2f-b4e8-d8470368782f": {
+            "Alias": "kpi_ebs_snap",
             "Source": {
                 "PhysicalTableId": "f224e706-8cd3-4c2f-b4e8-d8470368782f"
             }
         }
     },
     "ImportMode": "SPICE",
     "Permissions": []
-}
+}