PyPI - cid-cmd - Versions diffs - 0.2.45__tar.gz → 4.0.8__tar.gz - Mend

cid-cmd 0.2.45tar.gz → 4.0.8tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (145) hide show

{cid-cmd-0.2.45/cid_cmd.egg-info → cid_cmd-4.0.8}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: cid-cmd
-Version: 0.2.45
+Version: 4.0.8
 Summary: Cloud Intelligence Dashboards deployment helper tool
 Home-page: https://github.com/aws-samples/aws-cudos-framework-deployment
 Author: AWS CUDOS Team
@@ -9,20 +9,21 @@ Keywords: aws,cmd,cli,cost intelligence dashboards
 Classifier: Development Status :: 4 - Beta
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: setuptools
-Requires-Dist: boto3>=1.29.5
+Requires-Dist: boto3>=1.35.86
 Requires-Dist: Click>=8.0
 Requires-Dist: PyYAML
 Requires-Dist: requests
 Requires-Dist: tzlocal>=4.0
 Requires-Dist: six>=1.15
 Requires-Dist: questionary>=1.10
+Requires-Dist: tqdm
 # Cloud Intelligence Dashboards (CUDOS Framework)
@@ -42,14 +43,15 @@ We recommend cid-cmd tool via [AWS CloudShell](https://console.aws.amazon.com/cl
 ---
 | Dashboard documentation | Demo URL | Prerequisites URL |
 | --- | --- | --- |
-| [CUDOS Dashboard](https://catalog.workshops.aws/awscid/en-US/dashboards/foundational/cudos-cid-kpi#cudos-dashboard) | [demo](https://cid.workshops.aws.dev/demo?dashboard=cudos) | [link](https://aws.amazon.com/aws-cost-management/aws-cost-and-usage-reporting) |
-| [Cost Intelligence Dashboard](https://catalog.workshops.aws/awscid/en-US/dashboards/foundational/cudos-cid-kpi#cost-intelligence-dashboard-(cid)) | [demo](https://cid.workshops.aws.dev/demo?dashboard=cost_intelligence_dashboard) | [link](https://aws.amazon.com/aws-cost-management/aws-cost-and-usage-reporting) |
+| [CUDOS Dashboard](https://catalog.workshops.aws/awscid/en-US/dashboards/foundational/cudos-cid-kpi#cudos-dashboard) | [demo](https://cid.workshops.aws.dev/demo?dashboard=cudos) | [link](https://catalog.workshops.aws/awscid/en-US/dashboards/foundational/cudos-cid-kpi/deploy) (Steps 1 and 2) |
+| [Cost Intelligence Dashboard](https://catalog.workshops.aws/awscid/en-US/dashboards/foundational/cudos-cid-kpi#cost-intelligence-dashboard-(cid)) | [demo](https://cid.workshops.aws.dev/demo?dashboard=cost_intelligence_dashboard) | [link](https://catalog.workshops.aws/awscid/en-US/dashboards/foundational/cudos-cid-kpi/deploy) (Steps 1 and 2) |
 | [Trusted Advisor Organisation (TAO) Dashboard](https://catalog.workshops.aws/awscid/en-US/dashboards/advanced/trusted-advisor) | [demo](https://cid.workshops.aws.dev/demo?dashboard=tao-dashboard) | [link](https://catalog.workshops.aws/awscid/en-US/dashboards/advanced/trusted-advisor/prerequisites) |
-| [Trends Dashboard](https://catalog.workshops.aws/awscid/en-US/dashboards/additional/trends) | [demo](https://cid.workshops.aws.dev/demo?dashboard=trends-dashboard) | [link](https://aws.amazon.com/aws-cost-management/aws-cost-and-usage-reporting) |
-| [KPI Dashboard](https://catalog.workshops.aws/awscid/en-US/dashboards/foundational/cudos-cid-kpi#kpi-dashboard) | [demo](https://cid.workshops.aws.dev/demo?dashboard=kpi) | [link](https://aws.amazon.com/aws-cost-management/aws-cost-and-usage-reporting) |
+| [Trends Dashboard](https://catalog.workshops.aws/awscid/en-US/dashboards/additional/trends) | [demo](https://cid.workshops.aws.dev/demo?dashboard=trends-dashboard) | [link](https://catalog.workshops.aws/awscid/en-US/dashboards/foundational/cudos-cid-kpi/deploy) (Steps 1 and 2) |
+| [KPI Dashboard](https://catalog.workshops.aws/awscid/en-US/dashboards/foundational/cudos-cid-kpi#kpi-dashboard) | [demo](https://cid.workshops.aws.dev/demo?dashboard=kpi) | [link](https://catalog.workshops.aws/awscid/en-US/dashboards/foundational/cudos-cid-kpi/deploy) (Steps 1 and 2) |
 | [Compute Optimizer Dashboard](https://catalog.workshops.aws/awscid/en-US/dashboards/advanced/compute-optimizer) | [demo](https://cid.workshops.aws.dev/demo?dashboard=compute-optimizer-dashboard) | [link](https://catalog.workshops.aws/awscid/en-US/dashboards/advanced/compute-optimizer/prerequisites) |
 | [Cost Anomaly Dashboard](https://catalog.workshops.aws/awscid/en-US/dashboards/advanced/cost-anomaly) | [demo](https://cid.workshops.aws.dev/demo?dashboard=aws-cost-anomalies) | [link](https://catalog.workshops.aws/awscid/en-US/dashboards/advanced/cost-anomaly/prerequisites) |
-| [Data Transfer Cost Dashboard](https://catalog.workshops.aws/awscid/en-US/dashboards/additional/data-transfer) | [demo](https://cid.workshops.aws.dev/demo?dashboard=datatransfer-cost-analysis-dashboard) | [link](https://catalog.workshops.aws/awscid/en-US/dashboards/foundational/cudos-cid-kpi) |
+| [Data Transfer Cost Dashboard](https://catalog.workshops.aws/awscid/en-US/dashboards/additional/data-transfer) | [demo](https://cid.workshops.aws.dev/demo?dashboard=datatransfer-cost-analysis-dashboard) | [link](https://catalog.workshops.aws/awscid/en-US/dashboards/foundational/cudos-cid-kpi/deploy) (Steps 1 and 2) |
+| [AWS Budgets Dashboard](https://catalog.workshops.aws/awscid/en-US/dashboards/advanced/aws-budgets) | [demo](https://cid.workshops.aws.dev/demo?dashboard=aws-budgets) | [link](https://catalog.workshops.aws/awscid/en-US/dashboards/advanced/aws-budgets#deploy-via-cid-tool) |
 See more dashboards on the [workshop page](https://catalog.workshops.aws/awscid/en-US/dashboards).
@@ -70,7 +72,7 @@ See more dashboards on the [workshop page](https://catalog.workshops.aws/awscid/
     Automation requires Python 3
-2. Make sure you have latest pip package installed
+2. Make sure you have the latest pip package installed
     ```bash
     python3 -m ensurepip --upgrade
     ```
@@ -80,7 +82,7 @@ See more dashboards on the [workshop page](https://catalog.workshops.aws/awscid/
     pip3 install --upgrade cid-cmd
     ```
-#### Dasbhoard Deployment
+#### Dashboard Deployment
 ```bash
 cid-cmd deploy
@@ -92,16 +94,19 @@ Update only Dashboard
 ```bash
 cid-cmd update
 ```
-Update dashboard and all dependenies (Datasets and Athena View). WARNING: this will overide any customization of SQL files and Datasets.
+Update dashboard and all dependencies (Datasets and Athena View). WARNING: this will override any customization of SQL files and Datasets.
 ```bash
 cid-cmd update --force --recursive
 ```
-#### Show Dashboard status
+#### Show Dashboard Status
 Show dashboards status
 ```bash
 cid-cmd status
 ```
+[<img width="558" alt="status" src="https://github.com/aws-samples/aws-cudos-framework-deployment/assets/82834333/cae2015f-0f81-4593-80b3-c67ec1200fcd">](https://www.youtube.com/watch?v=ivr1MoGaApM)
 ####  Share QuickSight resources
 ```bash
@@ -109,10 +114,40 @@ cid-cmd share
 ```
 #### Initialize Amazon QuickSight
-One time action to intialize Amazon QuickSight Enerprise Edition.
+One time action to initialize Amazon QuickSight Enterprise Edition.
 ```bash
-cid-cmd initqs
+cid-cmd init-qs
+```
+#### Initialize CUR
+One time action to initialize Athena table and Crawler from s3 with CUR data. Currently only CUR1 supported.
+```bash
+cid-cmd init-cur
+```
+#### Create CUR proxy
+There are 2 CUR formats that `cid-cmd` supports. CUR1 and CUR2 have slightly different fields structure. Each dashboard can be developed using CUR2 or CUR1, but on installation `cid-cmd` will deploy a special Athena View "CUR proxy". This View will play a role of compatibility layer between the CUR version used by Dashboard and available CUR. This View can be extended as new dashboard request CUR fields.
+Please note that Cost Allocation Tags and Cost Categories are not present in CUR Proxy by default. You will need to add these fields by modifying CUR Proxy in Athena or using `cid-cmd` tool:
+For CUR2 proxy (using CUR1 data as source)
+```bash
+cid-cmd create-cur-proxy -vv \
+   --cur-version '2' \
+   --cur-table-name 'mycur1' \
+   --athena-workgroup 'primary' \
+   --fields "resource_tags['user_cost_center'],resource_tags['user_owner']"
+```
+For CUR1 proxy (using CUR2 data as source)
+```bash
+cid-cmd create-cur-proxy -vv \
+   --cur-version '1' \
+   --cur-table-name 'mycur2' \
+   --athena-workgroup 'primary' \
+   --fields "resource_tags_user_cost_center,resource_tags_user_owner"
 ```
@@ -121,9 +156,11 @@ Delete Dashboards and all dependencies unused by other CID-managed dashboards.(i
 ```bash
 cid-cmd delete
 ```
 #### Delete Command Options:
 ```
- --dashboard-id TEXT QuickSight dashboard id
+ --dashboard-id TEXT QuickSight dashboard id
  --athena-database TEXT Athena database
  ```
@@ -155,15 +192,15 @@ This command generates a SQL file that you can execute. Please mind [Athena Serv
 ## Cloud Formation
-CID is also provided in a form of CloudFormation telmplates. See detailed instuctions in the [Well Architected Labs](https://wellarchitectedlabs.com/cost/200_labs/200_cloud_intelligence/cost-usage-report-dashboards/dashboards/deploy_dashboards/) site.
+CID is also provided in a form of CloudFormation templates. See detailed instructions in the [Well Architected Labs](https://wellarchitectedlabs.com/cost/200_labs/200_cloud_intelligence/cost-usage-report-dashboards/dashboards/deploy_dashboards/) site.
 ## Terraform
-CID offers a set of Terraform modules to deploy CUR replicaion and CID dashboards. These modules act as a wrapper around CloudFormation.
+CID offers a set of Terraform modules to deploy CUR replication and CID dashboards. Refer to these [deployment instructions](terraform-modules/README.md) for details of
+how to deploy CID dashboards with these modules.
   1. Create a bucket for consolidating CUR [terraform-modules/cur-setup-destination/](terraform-modules/cur-setup-destination/)
   2. Create a CUR in Payer Account(s) [terraform-modules/cur-setup-source/](terraform-modules/cur-setup-source/)
-  3. Create Dashboards [terraform-modules/cid-dashboards/](terraform-modules/cid-dashboards/)
+  3. Create Dashboards (wrapper around CloudFormation) [terraform-modules/cid-dashboards/](terraform-modules/cid-dashboards/)
 ## Rights Management
 The ownership of CID is usually with the FinOps team, who do not have administrative access. However, they require specific privileges to install and operate CID dashboards. To assist the Admin team in granting the necessary privileges to the CID owners, a CFN template is provided. This template, located at [CFN template](cfn-templates/cid-admin-policies.yaml), takes an IAM role name as a parameter and adds the required policies to the role.

{cid-cmd-0.2.45 → cid_cmd-4.0.8}/README.md RENAMED Viewed

@@ -16,14 +16,15 @@ We recommend cid-cmd tool via [AWS CloudShell](https://console.aws.amazon.com/cl
 ---
 | Dashboard documentation | Demo URL | Prerequisites URL |
 | --- | --- | --- |
-| [CUDOS Dashboard](https://catalog.workshops.aws/awscid/en-US/dashboards/foundational/cudos-cid-kpi#cudos-dashboard) | [demo](https://cid.workshops.aws.dev/demo?dashboard=cudos) | [link](https://aws.amazon.com/aws-cost-management/aws-cost-and-usage-reporting) |
-| [Cost Intelligence Dashboard](https://catalog.workshops.aws/awscid/en-US/dashboards/foundational/cudos-cid-kpi#cost-intelligence-dashboard-(cid)) | [demo](https://cid.workshops.aws.dev/demo?dashboard=cost_intelligence_dashboard) | [link](https://aws.amazon.com/aws-cost-management/aws-cost-and-usage-reporting) |
+| [CUDOS Dashboard](https://catalog.workshops.aws/awscid/en-US/dashboards/foundational/cudos-cid-kpi#cudos-dashboard) | [demo](https://cid.workshops.aws.dev/demo?dashboard=cudos) | [link](https://catalog.workshops.aws/awscid/en-US/dashboards/foundational/cudos-cid-kpi/deploy) (Steps 1 and 2) |
+| [Cost Intelligence Dashboard](https://catalog.workshops.aws/awscid/en-US/dashboards/foundational/cudos-cid-kpi#cost-intelligence-dashboard-(cid)) | [demo](https://cid.workshops.aws.dev/demo?dashboard=cost_intelligence_dashboard) | [link](https://catalog.workshops.aws/awscid/en-US/dashboards/foundational/cudos-cid-kpi/deploy) (Steps 1 and 2) |
 | [Trusted Advisor Organisation (TAO) Dashboard](https://catalog.workshops.aws/awscid/en-US/dashboards/advanced/trusted-advisor) | [demo](https://cid.workshops.aws.dev/demo?dashboard=tao-dashboard) | [link](https://catalog.workshops.aws/awscid/en-US/dashboards/advanced/trusted-advisor/prerequisites) |
-| [Trends Dashboard](https://catalog.workshops.aws/awscid/en-US/dashboards/additional/trends) | [demo](https://cid.workshops.aws.dev/demo?dashboard=trends-dashboard) | [link](https://aws.amazon.com/aws-cost-management/aws-cost-and-usage-reporting) |
-| [KPI Dashboard](https://catalog.workshops.aws/awscid/en-US/dashboards/foundational/cudos-cid-kpi#kpi-dashboard) | [demo](https://cid.workshops.aws.dev/demo?dashboard=kpi) | [link](https://aws.amazon.com/aws-cost-management/aws-cost-and-usage-reporting) |
+| [Trends Dashboard](https://catalog.workshops.aws/awscid/en-US/dashboards/additional/trends) | [demo](https://cid.workshops.aws.dev/demo?dashboard=trends-dashboard) | [link](https://catalog.workshops.aws/awscid/en-US/dashboards/foundational/cudos-cid-kpi/deploy) (Steps 1 and 2) |
+| [KPI Dashboard](https://catalog.workshops.aws/awscid/en-US/dashboards/foundational/cudos-cid-kpi#kpi-dashboard) | [demo](https://cid.workshops.aws.dev/demo?dashboard=kpi) | [link](https://catalog.workshops.aws/awscid/en-US/dashboards/foundational/cudos-cid-kpi/deploy) (Steps 1 and 2) |
 | [Compute Optimizer Dashboard](https://catalog.workshops.aws/awscid/en-US/dashboards/advanced/compute-optimizer) | [demo](https://cid.workshops.aws.dev/demo?dashboard=compute-optimizer-dashboard) | [link](https://catalog.workshops.aws/awscid/en-US/dashboards/advanced/compute-optimizer/prerequisites) |
 | [Cost Anomaly Dashboard](https://catalog.workshops.aws/awscid/en-US/dashboards/advanced/cost-anomaly) | [demo](https://cid.workshops.aws.dev/demo?dashboard=aws-cost-anomalies) | [link](https://catalog.workshops.aws/awscid/en-US/dashboards/advanced/cost-anomaly/prerequisites) |
-| [Data Transfer Cost Dashboard](https://catalog.workshops.aws/awscid/en-US/dashboards/additional/data-transfer) | [demo](https://cid.workshops.aws.dev/demo?dashboard=datatransfer-cost-analysis-dashboard) | [link](https://catalog.workshops.aws/awscid/en-US/dashboards/foundational/cudos-cid-kpi) |
+| [Data Transfer Cost Dashboard](https://catalog.workshops.aws/awscid/en-US/dashboards/additional/data-transfer) | [demo](https://cid.workshops.aws.dev/demo?dashboard=datatransfer-cost-analysis-dashboard) | [link](https://catalog.workshops.aws/awscid/en-US/dashboards/foundational/cudos-cid-kpi/deploy) (Steps 1 and 2) |
+| [AWS Budgets Dashboard](https://catalog.workshops.aws/awscid/en-US/dashboards/advanced/aws-budgets) | [demo](https://cid.workshops.aws.dev/demo?dashboard=aws-budgets) | [link](https://catalog.workshops.aws/awscid/en-US/dashboards/advanced/aws-budgets#deploy-via-cid-tool) |
 See more dashboards on the [workshop page](https://catalog.workshops.aws/awscid/en-US/dashboards).
@@ -44,7 +45,7 @@ See more dashboards on the [workshop page](https://catalog.workshops.aws/awscid/
     Automation requires Python 3
-2. Make sure you have latest pip package installed
+2. Make sure you have the latest pip package installed
     ```bash
     python3 -m ensurepip --upgrade
     ```
@@ -54,7 +55,7 @@ See more dashboards on the [workshop page](https://catalog.workshops.aws/awscid/
     pip3 install --upgrade cid-cmd
     ```
-#### Dasbhoard Deployment
+#### Dashboard Deployment
 ```bash
 cid-cmd deploy
@@ -66,16 +67,19 @@ Update only Dashboard
 ```bash
 cid-cmd update
 ```
-Update dashboard and all dependenies (Datasets and Athena View). WARNING: this will overide any customization of SQL files and Datasets.
+Update dashboard and all dependencies (Datasets and Athena View). WARNING: this will override any customization of SQL files and Datasets.
 ```bash
 cid-cmd update --force --recursive
 ```
-#### Show Dashboard status
+#### Show Dashboard Status
 Show dashboards status
 ```bash
 cid-cmd status
 ```
+[<img width="558" alt="status" src="https://github.com/aws-samples/aws-cudos-framework-deployment/assets/82834333/cae2015f-0f81-4593-80b3-c67ec1200fcd">](https://www.youtube.com/watch?v=ivr1MoGaApM)
 ####  Share QuickSight resources
 ```bash
@@ -83,10 +87,40 @@ cid-cmd share
 ```
 #### Initialize Amazon QuickSight
-One time action to intialize Amazon QuickSight Enerprise Edition.
+One time action to initialize Amazon QuickSight Enterprise Edition.
 ```bash
-cid-cmd initqs
+cid-cmd init-qs
+```
+#### Initialize CUR
+One time action to initialize Athena table and Crawler from s3 with CUR data. Currently only CUR1 supported.
+```bash
+cid-cmd init-cur
+```
+#### Create CUR proxy
+There are 2 CUR formats that `cid-cmd` supports. CUR1 and CUR2 have slightly different fields structure. Each dashboard can be developed using CUR2 or CUR1, but on installation `cid-cmd` will deploy a special Athena View "CUR proxy". This View will play a role of compatibility layer between the CUR version used by Dashboard and available CUR. This View can be extended as new dashboard request CUR fields.
+Please note that Cost Allocation Tags and Cost Categories are not present in CUR Proxy by default. You will need to add these fields by modifying CUR Proxy in Athena or using `cid-cmd` tool:
+For CUR2 proxy (using CUR1 data as source)
+```bash
+cid-cmd create-cur-proxy -vv \
+   --cur-version '2' \
+   --cur-table-name 'mycur1' \
+   --athena-workgroup 'primary' \
+   --fields "resource_tags['user_cost_center'],resource_tags['user_owner']"
+```
+For CUR1 proxy (using CUR2 data as source)
+```bash
+cid-cmd create-cur-proxy -vv \
+   --cur-version '1' \
+   --cur-table-name 'mycur2' \
+   --athena-workgroup 'primary' \
+   --fields "resource_tags_user_cost_center,resource_tags_user_owner"
 ```
@@ -95,9 +129,11 @@ Delete Dashboards and all dependencies unused by other CID-managed dashboards.(i
 ```bash
 cid-cmd delete
 ```
 #### Delete Command Options:
 ```
- --dashboard-id TEXT QuickSight dashboard id
+ --dashboard-id TEXT QuickSight dashboard id
  --athena-database TEXT Athena database
  ```
@@ -129,15 +165,15 @@ This command generates a SQL file that you can execute. Please mind [Athena Serv
 ## Cloud Formation
-CID is also provided in a form of CloudFormation telmplates. See detailed instuctions in the [Well Architected Labs](https://wellarchitectedlabs.com/cost/200_labs/200_cloud_intelligence/cost-usage-report-dashboards/dashboards/deploy_dashboards/) site.
+CID is also provided in a form of CloudFormation templates. See detailed instructions in the [Well Architected Labs](https://wellarchitectedlabs.com/cost/200_labs/200_cloud_intelligence/cost-usage-report-dashboards/dashboards/deploy_dashboards/) site.
 ## Terraform
-CID offers a set of Terraform modules to deploy CUR replicaion and CID dashboards. These modules act as a wrapper around CloudFormation.
+CID offers a set of Terraform modules to deploy CUR replication and CID dashboards. Refer to these [deployment instructions](terraform-modules/README.md) for details of
+how to deploy CID dashboards with these modules.
   1. Create a bucket for consolidating CUR [terraform-modules/cur-setup-destination/](terraform-modules/cur-setup-destination/)
   2. Create a CUR in Payer Account(s) [terraform-modules/cur-setup-source/](terraform-modules/cur-setup-source/)
-  3. Create Dashboards [terraform-modules/cid-dashboards/](terraform-modules/cid-dashboards/)
+  3. Create Dashboards (wrapper around CloudFormation) [terraform-modules/cid-dashboards/](terraform-modules/cid-dashboards/)
 ## Rights Management
 The ownership of CID is usually with the FinOps team, who do not have administrative access. However, they require specific privileges to install and operate CID dashboards. To assist the Admin team in granting the necessary privileges to the CID owners, a CFN template is provided. This template, located at [CFN template](cfn-templates/cid-admin-policies.yaml), takes an IAM role name as a parameter and adds the required policies to the role.

cid_cmd-4.0.8/cid/_version.py ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ __version__ = '4.0.8'
2	+

{cid-cmd-0.2.45 → cid_cmd-4.0.8}/cid/base.py RENAMED Viewed

@@ -21,6 +21,14 @@ class CidBase():
     def account_id(self) -> str:
         return self.awsIdentity.get('Account')
+    @property
+    def domain(self) -> str:
+        if self.partition == 'aws-us-gov':
+            return 'amazonaws-us-gov.com'
+        if self.partition == 'aws-cn':
+            return 'amazonaws.cn'
+        return 'aws.amazon.com'
     @property
     def awsIdentity(self) -> dict:
         if not self._awsIdentity:

{cid-cmd-0.2.45 → cid_cmd-4.0.8}/cid/builtin/core/data/datasets/shared/customer_all.json RENAMED Viewed

@@ -22,8 +22,8 @@
     "b163ad4b-f459-4b01-b2f3-54a168088640": {
       "RelationalTable": {
         "DataSourceArn": "${athena_datasource_arn}",
-        "Schema": "${athena_database_name}",
-        "Name": "${cur_table_name}",
+        "Schema": "${cur1_database}",
+        "Name": "${cur1_table_name}",
         "InputColumns": [
           {
             "Name": "product_updates",
@@ -837,7 +837,7 @@
       }
     },
     "2f69dc70-9487-4f34-9120-e5f40660b257": {
-      "Alias": "${cur_table_name}",
+      "Alias": "${cur1_table_name}",
       "Source": {
         "PhysicalTableId": "b163ad4b-f459-4b01-b2f3-54a168088640"
       }

{cid-cmd-0.2.45 → cid_cmd-4.0.8}/cid/builtin/core/data/datasets/tao/dataset.json RENAMED Viewed

@@ -1382,6 +1382,17 @@
                         ]
                     }
                 },
+                {
+                    "CreateColumnsOperation": {
+                        "Columns": [
+                            {
+                                "ColumnName": "account_id",
+                                "ColumnId": "2f67fc2d-9c64-4f14-9d28-f962cad070d9",
+                                "Expression": "accountid"
+                            }
+                        ]
+                    }
+                },
                 {
                     "ProjectOperation": {
                         "ProjectedColumns": [
@@ -1389,6 +1400,7 @@
                             "checkname",
                             "accountparentname",
                             "accountid",
+                            "account_id",
                             "category",
                             "checkid",
                             "issuppressed",

{cid-cmd-0.2.45 → cid_cmd-4.0.8}/cid/builtin/core/data/queries/cid/compute_savings_plan_eligible_spend.sql RENAMED Viewed

@@ -1,7 +1,7 @@
  CREATE OR REPLACE VIEW "compute_savings_plan_eligible_spend" AS
  SELECT DISTINCT
- "year"
- , "month"
+   split_part("billing_period", '-', 1) "year"
+ , split_part("billing_period", '-', 2) "month"
  , "bill_payer_account_id" "payer_account_id"
  , "line_item_usage_account_id" "linked_account_id"
  , "bill_billing_period_start_date" "billing_period"
@@ -16,9 +16,9 @@
              WHEN ("line_item_usage_type" LIKE '%Fargate%') THEN "line_item_unblended_cost"
              ELSE 0
          END
-     ELSE 0
+     ELSE 0
      END) "unblended_cost"
  FROM
-    "${cur_table_name}"
+    "${cur2_database}"."${cur2_table_name}"
  WHERE (("bill_billing_period_start_date" >= ("date_trunc"('month', current_timestamp) - INTERVAL  '1' MONTH)) AND ("line_item_usage_start_date" < ("date_trunc"('day', current_timestamp) - INTERVAL  '1' DAY)) AND ((("line_item_product_code" = 'AmazonEC2') AND ("line_item_operation" LIKE '%RunInstances%')) OR (("line_item_product_code" = 'AWSLambda') AND ("line_item_usage_type" LIKE '%Lambda-Provisioned-GB-Second%')) OR (("line_item_product_code" = 'AWSLambda') AND ("line_item_usage_type" LIKE '%Lambda-GB-Second%')) OR (("line_item_product_code" = 'AWSLambda') AND ("line_item_usage_type" LIKE '%Lambda-Provisioned-Concurrency%')) OR ("line_item_usage_type" LIKE '%Fargate%')) AND ("line_item_line_item_type" = 'Usage') AND ("line_item_usage_type" NOT LIKE '%Spot%') AND ("product_servicecode" <> 'AWSDataTransfer') AND ("line_item_usage_type" NOT LIKE '%DataXfer%'))
  GROUP BY 1, 2, 3, 4,5,6

cid-cmd-0.2.45/cid/builtin/core/data/queries/cid/ec2_running_cost_sp_ri.sql → cid_cmd-4.0.8/cid/builtin/core/data/queries/cid/ec2_running_cost.sql RENAMED Viewed

@@ -1,12 +1,17 @@
- CREATE OR REPLACE VIEW "ec2_running_cost" AS
+ CREATE OR REPLACE VIEW "ec2_running_cost" AS
  SELECT DISTINCT
- "year"
- , "month"
+    split_part("billing_period", '-', 1) "year"
+ ,  split_part("billing_period", '-', 2) "month"
  , "bill_billing_period_start_date" "billing_period"
  ,  "date_trunc"('hour', "line_item_usage_start_date") "usage_date"
  , "bill_payer_account_id" "payer_account_id"
  , "line_item_usage_account_id" "linked_account_id"
- , (CASE WHEN ("savings_plan_savings_plan_a_r_n" <> '') THEN 'SavingsPlan' WHEN ("reservation_reservation_a_r_n" <> '') THEN 'Reserved' WHEN ("line_item_usage_type" LIKE '%Spot%') THEN 'Spot' ELSE 'OnDemand' END) "purchase_option"
+ , (CASE
+     WHEN ("savings_plan_savings_plan_a_r_n" <> '') THEN 'SavingsPlan'
+     WHEN ("reservation_reservation_a_r_n" <> '') THEN 'Reserved'
+     WHEN ("line_item_usage_type" LIKE '%Spot%') THEN 'Spot'
+     ELSE 'OnDemand'
+    END) "purchase_option"
  , "sum"(CASE
      WHEN "line_item_line_item_type" = 'SavingsPlanCoveredUsage' THEN "savings_plan_savings_plan_effective_cost"
      WHEN "line_item_line_item_type" = 'DiscountedUsage' THEN "reservation_effective_cost"
@@ -14,6 +19,6 @@
      ELSE 0 END) "amortized_cost"
  , "round"("sum"("line_item_usage_amount"), 2) "usage_quantity"
  FROM
-    "${cur_table_name}"
+    "${cur2_database}"."${cur2_table_name}"
  WHERE (((((("bill_billing_period_start_date" >= ("date_trunc"('month', current_timestamp) - INTERVAL  '1' MONTH)) AND ("line_item_product_code" = 'AmazonEC2')) AND ("product_servicecode" <> 'AWSDataTransfer')) AND ("line_item_operation" LIKE '%RunInstances%')) AND ("line_item_usage_type" NOT LIKE '%DataXfer%')) AND ((("line_item_line_item_type" = 'Usage') OR ("line_item_line_item_type" = 'SavingsPlanCoveredUsage')) OR ("line_item_line_item_type" = 'DiscountedUsage')))
  GROUP BY 1, 2, 3, 4,5,6,7

cid-cmd-0.2.45/cid/builtin/core/data/queries/cid/ri_sp_mapping_sp_ri.sql → cid_cmd-4.0.8/cid/builtin/core/data/queries/cid/ri_sp_mapping.sql RENAMED Viewed

@@ -1,4 +1,4 @@
-CREATE OR REPLACE VIEW "ri_sp_mapping" AS
+CREATE OR REPLACE VIEW "ri_sp_mapping" AS
 SELECT DISTINCT
   "a"."billing_period_mapping"
 , "a"."payer_account_id_mapping"
@@ -12,13 +12,13 @@ FROM
    SELECT DISTINCT
      "bill_billing_period_start_date" "billing_period_mapping"
    , "bill_payer_account_id" "payer_account_id_mapping"
-   , (CASE WHEN ("savings_plan_savings_plan_a_r_n" <> '') THEN "savings_plan_savings_plan_a_r_n" WHEN ("reservation_reservation_a_r_n" <> '') THEN "reservation_reservation_a_r_n" ELSE '' END) "ri_sp_arn_mapping"
+   , (CASE WHEN ("savings_plan_savings_plan_a_r_n" <> '') THEN "savings_plan_savings_plan_a_r_n" WHEN ("reservation_reservation_a_r_n" <> '') THEN "reservation_reservation_a_r_n" ELSE ''   END) "ri_sp_arn_mapping"
    , (CASE WHEN ("savings_plan_savings_plan_a_r_n" <> '') THEN CAST(CAST("from_iso8601_timestamp"("savings_plan_end_time") AS date) AS timestamp) WHEN (("reservation_reservation_a_r_n" <> '') AND ("reservation_end_time" <> '')) THEN CAST(CAST("from_iso8601_timestamp"("reservation_end_time") AS date) AS timestamp) ELSE null END) "ri_sp_end_date"
-   , (CASE WHEN ("savings_plan_savings_plan_a_r_n" <> '') THEN "savings_plan_purchase_term" WHEN ("reservation_reservation_a_r_n" <> '') THEN "pricing_lease_contract_length" ELSE '' END) "ri_sp_term"
-   , (CASE WHEN ("savings_plan_savings_plan_a_r_n" <> '') THEN "savings_plan_offering_type" WHEN ("reservation_reservation_a_r_n" <> '') THEN "pricing_offering_class" ELSE '' END) "ri_sp_offering"
-   , (CASE WHEN ("savings_plan_savings_plan_a_r_n" <> '') THEN "savings_plan_payment_option" WHEN ("reservation_reservation_a_r_n" <> '') THEN "pricing_purchase_option" ELSE '' END) "ri_sp_Payment"
+   , (CASE WHEN ("savings_plan_savings_plan_a_r_n" <> '') THEN "savings_plan_purchase_term"      WHEN ("reservation_reservation_a_r_n" <> '') THEN "pricing_lease_contract_length" ELSE ''   END) "ri_sp_term"
+   , (CASE WHEN ("savings_plan_savings_plan_a_r_n" <> '') THEN "savings_plan_offering_type"      WHEN ("reservation_reservation_a_r_n" <> '') THEN "pricing_offering_class"        ELSE ''   END) "ri_sp_offering"
+   , (CASE WHEN ("savings_plan_savings_plan_a_r_n" <> '') THEN "savings_plan_payment_option"     WHEN ("reservation_reservation_a_r_n" <> '') THEN "pricing_purchase_option"       ELSE ''   END) "ri_sp_payment"
    FROM
-     "${cur_table_name}"
+     "${cur2_database}"."${cur2_table_name}"
    WHERE (("line_item_line_item_type" = 'RIFee') OR ("line_item_line_item_type" = 'SavingsPlanRecurringFee'))
 )  a
 LEFT JOIN (
@@ -26,10 +26,10 @@ LEFT JOIN (
      "bill_billing_period_start_date" "billing_period_mapping"
    , "bill_payer_account_id" "payer_account_id_mapping"
    , (CASE WHEN ("savings_plan_savings_plan_a_r_n" <> '') THEN "savings_plan_savings_plan_a_r_n" WHEN ("reservation_reservation_a_r_n" <> '') THEN "reservation_reservation_a_r_n" ELSE '' END) "ri_sp_arn_mapping"
-   , (CASE WHEN ("savings_plan_savings_plan_a_r_n" <> '') THEN "savings_plan_purchase_term" WHEN ("reservation_reservation_a_r_n" <> '') THEN "pricing_lease_contract_length" ELSE '' END) "ri_sp_term"
-   , (CASE WHEN ("savings_plan_savings_plan_a_r_n" <> '') THEN "savings_plan_offering_type" WHEN ("reservation_reservation_a_r_n" <> '') THEN "pricing_offering_class" ELSE '' END) "ri_sp_offering"
-   , (CASE WHEN ("savings_plan_savings_plan_a_r_n" <> '') THEN "savings_plan_payment_option" WHEN ("reservation_reservation_a_r_n" <> '') THEN "pricing_purchase_option" ELSE '' END) "ri_sp_Payment"
+   , (CASE WHEN ("savings_plan_savings_plan_a_r_n" <> '') THEN "savings_plan_purchase_term"      WHEN ("reservation_reservation_a_r_n" <> '') THEN "pricing_lease_contract_length" ELSE '' END) "ri_sp_term"
+   , (CASE WHEN ("savings_plan_savings_plan_a_r_n" <> '') THEN "savings_plan_offering_type"      WHEN ("reservation_reservation_a_r_n" <> '') THEN "pricing_offering_class"        ELSE '' END) "ri_sp_offering"
+   , (CASE WHEN ("savings_plan_savings_plan_a_r_n" <> '') THEN "savings_plan_payment_option"     WHEN ("reservation_reservation_a_r_n" <> '') THEN "pricing_purchase_option"       ELSE '' END) "ri_sp_payment"
    FROM
-     "${cur_table_name}"
+     "${cur2_database}"."${cur2_table_name}"
    WHERE (("line_item_line_item_type" = 'DiscountedUsage') OR ("line_item_line_item_type" = 'SavingsPlanCoveredUsage'))
 )  b ON ((("a"."ri_sp_arn_mapping" = "b"."ri_sp_arn_mapping") AND ("a"."billing_period_mapping" = "b"."billing_period_mapping")) AND ("a"."payer_account_id_mapping" = "b"."payer_account_id_mapping")))

{cid-cmd-0.2.45 → cid_cmd-4.0.8}/cid/builtin/core/data/queries/cid/s3.sql RENAMED Viewed

@@ -1,6 +1,7 @@
 CREATE OR REPLACE VIEW "s3_view" AS
-SELECT DISTINCT "year",
-    "month",
+SELECT DISTINCT
+    split_part("billing_period", '-', 1) "year",
+    split_part("billing_period", '-', 2) "month",
     "bill_billing_period_start_date" "billing_period",
     "date_trunc"('day', "line_item_usage_start_date") "usage_date",
     "bill_payer_account_id" "payer_account_id",
@@ -8,7 +9,7 @@ SELECT DISTINCT "year",
     "line_item_resource_id" "resource_id",
     "line_item_product_code" "product_code",
     "line_item_operation" "operation",
-    "product_region" "region",
+    product['region'] "region",
     "line_item_line_item_type" "charge_type",
     "pricing_unit" "pricing_unit",
     "sum"(
@@ -19,7 +20,7 @@ SELECT DISTINCT "year",
     ) "usage_quantity",
     "sum"("line_item_unblended_cost") "unblended_cost",
     "sum"("pricing_public_on_demand_cost") "public_cost"
-FROM "${cur_table_name}"
+FROM "${cur2_database}"."${cur2_table_name}"
 WHERE (
         (
             (

cid-cmd 0.2.45__tar.gz → 4.0.8__tar.gz

cid-cmd 0.2.45tar.gz → 4.0.8tar.gz