cid-cmd 4.2.0__tar.gz → 4.2.2__tar.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 (126) hide show
  1. {cid_cmd-4.2.0/cid_cmd.egg-info → cid_cmd-4.2.2}/PKG-INFO +1 -1
  2. cid_cmd-4.2.2/cid/_version.py +2 -0
  3. cid_cmd-4.2.2/cid/builtin/core/data/queries/kpi/first_kpi_instance_mapping_view.sql +244 -0
  4. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/resources.yaml +4 -2
  5. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/helpers/quicksight/dashboard_patching.py +8 -3
  6. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/helpers/quicksight/dataset.py +3 -2
  7. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/utils.py +1 -1
  8. {cid_cmd-4.2.0 → cid_cmd-4.2.2/cid_cmd.egg-info}/PKG-INFO +1 -1
  9. cid_cmd-4.2.0/cid/_version.py +0 -2
  10. cid_cmd-4.2.0/cid/builtin/core/data/queries/kpi/first_kpi_instance_mapping_view.sql +0 -168
  11. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/LICENSE +0 -0
  12. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/MANIFEST.in +0 -0
  13. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/README.md +0 -0
  14. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/__init__.py +0 -0
  15. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/base.py +0 -0
  16. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/__init__.py +0 -0
  17. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/__init__.py +0 -0
  18. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/datasets/cid/compute.json +0 -0
  19. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/datasets/cid/ec2_running_cost.json +0 -0
  20. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/datasets/cid/s3_view.json +0 -0
  21. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/datasets/cid/summary_view.json +0 -0
  22. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/datasets/co/dataset.json +0 -0
  23. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/datasets/cudos/hourly_view.json +0 -0
  24. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/datasets/cudos/resource_view.json +0 -0
  25. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/datasets/kpi/kpi_ebs_snap.json +0 -0
  26. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/datasets/kpi/kpi_ebs_storage_all.json +0 -0
  27. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/datasets/kpi/kpi_instance_all.json +0 -0
  28. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/datasets/kpi/kpi_s3_storage_all.json +0 -0
  29. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/datasets/kpi/kpi_tracker.json +0 -0
  30. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/datasets/shared/customer_all.json +0 -0
  31. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/datasets/tao/dataset.json +0 -0
  32. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/datasets/trends/daily_anomaly_detection.json +0 -0
  33. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/datasets/trends/monthly_anomaly_detection.json +0 -0
  34. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/datasets/trends/monthly_bill_by_account.json +0 -0
  35. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/permissions/dashboard_permissions.json +0 -0
  36. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/permissions/dashboard_permissions_namespace.json +0 -0
  37. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/permissions/data_set_permissions.json +0 -0
  38. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/permissions/data_source_permissions.json +0 -0
  39. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/permissions/folder_permissions.json +0 -0
  40. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/queries/cid/compute_savings_plan_eligible_spend.sql +0 -0
  41. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/queries/cid/ec2_running_cost.sql +0 -0
  42. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/queries/cid/ri_sp_mapping.sql +0 -0
  43. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/queries/cid/s3.sql +0 -0
  44. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/queries/cid/summary_view.sql +0 -0
  45. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/queries/co/all_options.sql +0 -0
  46. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/queries/co/auto_scale.json +0 -0
  47. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/queries/co/auto_scale_options.sql +0 -0
  48. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/queries/co/ebs_volume.json +0 -0
  49. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/queries/co/ebs_volume_options.sql +0 -0
  50. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/queries/co/ec2_instance.json +0 -0
  51. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/queries/co/ec2_instance_options.sql +0 -0
  52. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/queries/co/ecs_service.json +0 -0
  53. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/queries/co/ecs_service_options.sql +0 -0
  54. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/queries/co/idle.json +0 -0
  55. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/queries/co/idle_options.sql +0 -0
  56. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/queries/co/lambda.json +0 -0
  57. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/queries/co/lambda_options.sql +0 -0
  58. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/queries/co/license.json +0 -0
  59. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/queries/co/license_options.sql +0 -0
  60. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/queries/co/rds_database.json +0 -0
  61. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/queries/co/rds_instance_options.sql +0 -0
  62. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/queries/co/rds_storage_options.sql +0 -0
  63. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/queries/cudos/hourly_view.sql +0 -0
  64. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/queries/cudos/resource_view.sql +0 -0
  65. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/queries/kpi/kpi_ebs_snap_view.sql +0 -0
  66. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/queries/kpi/kpi_ebs_storage_view.sql +0 -0
  67. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/queries/kpi/kpi_instance_all_view.sql +0 -0
  68. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/queries/kpi/kpi_s3_storage_view.sql +0 -0
  69. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/queries/kpi/last_kpi_tracker_view.sql +0 -0
  70. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/queries/shared/account_map.sql +0 -0
  71. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/queries/shared/account_map_cur2.sql +0 -0
  72. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/queries/shared/account_map_dummy.sql +0 -0
  73. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/queries/shared/aws_accounts.sql +0 -0
  74. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/queries/shared/aws_regions.sql +0 -0
  75. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/queries/shared/aws_service_category_map.sql +0 -0
  76. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/queries/shared/business_units_map.sql +0 -0
  77. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/queries/shared/cur.yaml +0 -0
  78. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/queries/shared/customer_all_unlimited.sql +0 -0
  79. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/queries/shared/payer_account_name_map.sql +0 -0
  80. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/queries/shared/ta_descriptions.sql +0 -0
  81. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/queries/tao/glue_table.json +0 -0
  82. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/queries/tao/ta_org_view.sql +0 -0
  83. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/queries/trends/daily_anomaly_detection.sql +0 -0
  84. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/queries/trends/monthly_anomaly_detection.sql +0 -0
  85. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/builtin/core/data/queries/trends/monthly_bill_by_account.sql +0 -0
  86. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/cli.py +0 -0
  87. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/commands/__init__.py +0 -0
  88. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/commands/command_base.py +0 -0
  89. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/commands/init_qs.py +0 -0
  90. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/common.py +0 -0
  91. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/exceptions.py +0 -0
  92. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/export.py +0 -0
  93. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/helpers/__init__.py +0 -0
  94. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/helpers/account_map.py +0 -0
  95. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/helpers/athena.py +0 -0
  96. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/helpers/cloudformation.py +0 -0
  97. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/helpers/csv2view.py +0 -0
  98. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/helpers/cur.py +0 -0
  99. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/helpers/cur_proxy.py +0 -0
  100. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/helpers/diff.py +0 -0
  101. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/helpers/glue.py +0 -0
  102. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/helpers/iam.py +0 -0
  103. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/helpers/organizations.py +0 -0
  104. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/helpers/parameter_store.py +0 -0
  105. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/helpers/quicksight/__init__.py +0 -0
  106. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/helpers/quicksight/dashboard.py +0 -0
  107. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/helpers/quicksight/datasource.py +0 -0
  108. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/helpers/quicksight/definition.py +0 -0
  109. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/helpers/quicksight/resource.py +0 -0
  110. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/helpers/quicksight/template.py +0 -0
  111. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/helpers/quicksight/version.py +0 -0
  112. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/helpers/randtime.py +0 -0
  113. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/helpers/s3.py +0 -0
  114. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/helpers/timezone.py +0 -0
  115. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/logger.py +0 -0
  116. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/plugin.py +0 -0
  117. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/test/python/test_csv2view.py +0 -0
  118. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/test/python/test_isolated_parameters.py +0 -0
  119. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid/test/python/test_merge.py +0 -0
  120. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid_cmd.egg-info/SOURCES.txt +0 -0
  121. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid_cmd.egg-info/dependency_links.txt +0 -0
  122. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid_cmd.egg-info/entry_points.txt +0 -0
  123. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid_cmd.egg-info/requires.txt +0 -0
  124. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/cid_cmd.egg-info/top_level.txt +0 -0
  125. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/pyproject.toml +0 -0
  126. {cid_cmd-4.2.0 → cid_cmd-4.2.2}/setup.cfg +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: cid-cmd
3
- Version: 4.2.0
3
+ Version: 4.2.2
4
4
  Summary: Cloud Intelligence Dashboards deployment helper tool
5
5
  Home-page: https://github.com/aws-samples/aws-cudos-framework-deployment
6
6
  Author: AWS CUDOS Team
@@ -0,0 +1,2 @@
1
+ __version__ = '4.2.2'
2
+
@@ -0,0 +1,244 @@
1
+ CREATE OR REPLACE VIEW kpi_instance_mapping AS
2
+ SELECT *
3
+ FROM
4
+ (
5
+ VALUES
6
+ ROW ('a1', 'AmazonEC2', 'Previous', 'Graviton', '', '', '', '')
7
+ , ROW ('c1', 'AmazonEC2', 'Previous', 'Intel', 'c7i', 'c7a', 'c8g', '')
8
+ , ROW ('c3', 'AmazonEC2', 'Previous', 'Intel', 'c7i', 'c7a', 'c8g', 'c1')
9
+ , ROW ('c4', 'AmazonEC2', 'Previous', 'Intel', 'c7i', 'c7a', 'c8g', 'c3')
10
+ , ROW ('c5', 'AmazonEC2', 'Previous', 'Intel', 'c7i', 'c7a', 'c8g', 'c4')
11
+ , ROW ('c5a', 'AmazonEC2', 'Previous', 'AMD', 'c7i', 'c7a', 'c8g', 'c4')
12
+ , ROW ('c5ad', 'AmazonEC2', 'Current', 'AMD', 'c6id', '', 'c8gd', '')
13
+ , ROW ('c5d', 'AmazonEC2', 'Previous', 'Intel', 'c6id', '', 'c8gd', '')
14
+ , ROW ('c5n', 'AmazonEC2', 'Previous', 'Intel', 'c6in', '', 'c7gn', '')
15
+ , ROW ('c6a', 'AmazonEC2', 'Previous', 'AMD', 'c7i', 'c7a', 'c8g', 'c5')
16
+ , ROW ('c6g', 'AmazonEC2', 'Previous', 'Graviton', 'c7i', 'c7a', 'c8g', 'c5')
17
+ , ROW ('c6gd', 'AmazonEC2', 'Previous', 'Graviton', '', '', 'c8gd', 'c5d')
18
+ , ROW ('c6gn', 'AmazonEC2', 'Previous', 'Graviton', '', '', 'c7gn', 'c5n')
19
+ , ROW ('c6i', 'AmazonEC2', 'Previous', 'Intel', 'c7i', 'c7a', 'c8g', 'c5')
20
+ , ROW ('c6id', 'AmazonEC2', 'Current', 'Intel', '', '', 'c8gd', 'c5d')
21
+ , ROW ('c6in', 'AmazonEC2', 'Current', 'Intel', '', '', 'c7gn', 'c5n')
22
+ , ROW ('c7a', 'AmazonEC2', 'Current', 'AMD', '', '', 'c8g', 'c6i')
23
+ , ROW ('c7g', 'AmazonEC2', 'Previous', 'Graviton', '', '', 'c8g', 'c6i')
24
+ , ROW ('c7gd', 'AmazonEC2', 'Previous', 'Graviton', '', '', 'c8gd', 'c6id')
25
+ , ROW ('c7gn', 'AmazonEC2', 'Current', 'Graviton', '', '', '', 'c6in')
26
+ , ROW ('c7i', 'AmazonEC2', 'Current', 'Intel', '', '', 'c8g', 'c6i')
27
+ , ROW ('c7i-flex', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
28
+ , ROW ('c8g', 'AmazonEC2', 'Current', 'Graviton', '', '', '', 'c7i')
29
+ , ROW ('c8gd', 'AmazonEC2', 'Current', 'Graviton', '', '', '', 'c6id')
30
+ , ROW ('cc2', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
31
+ , ROW ('cr1', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
32
+ , ROW ('d2', 'AmazonEC2', 'Previous', 'Intel', 'd3', '', '', '')
33
+ , ROW ('d3', 'AmazonEC2', 'Current', 'Intel', '', '', '', 'd2')
34
+ , ROW ('d3en', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
35
+ , ROW ('dl1', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
36
+ , ROW ('f1', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
37
+ , ROW ('f2', 'AmazonEC2', 'Current', 'AMD', '', '', '', '')
38
+ , ROW ('g2', 'AmazonEC2', 'Previous', 'Intel', 'g3', 'g6', 'g5g', '')
39
+ , ROW ('g3', 'AmazonEC2', 'Current', 'Intel', '', 'g6', 'g5g', 'g2')
40
+ , ROW ('g3s', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
41
+ , ROW ('g4ad', 'AmazonEC2', 'Current', 'AMD', '', '', '', '')
42
+ , ROW ('g4dn', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
43
+ , ROW ('g5', 'AmazonEC2', 'Previous', 'AMD', '', 'g6', '', 'g3')
44
+ , ROW ('g5g', 'AmazonEC2', 'Current', 'Graviton', '', 'g6', '', 'g3')
45
+ , ROW ('g6', 'AmazonEC2', 'Current', 'AMD', '', '', '', 'g3')
46
+ , ROW ('g6e', 'AmazonEC2', 'Current', 'AMD', '', '', '', '')
47
+ , ROW ('gr6', 'AmazonEC2', 'Current', 'AMD', '', '', '', '')
48
+ , ROW ('h1', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
49
+ , ROW ('hpc7g', 'AmazonEC2', 'Current', 'Graviton', '', '', '', '')
50
+ , ROW ('hs1', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
51
+ , ROW ('i2', 'AmazonEC2', 'Previous', 'Intel', 'i7i', '', 'i8g', '')
52
+ , ROW ('i3', 'AmazonEC2', 'Previous', 'Intel', 'i7i', '', 'i8g', 'i2')
53
+ , ROW ('i3en', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
54
+ , ROW ('i3p', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
55
+ , ROW ('i4g', 'AmazonEC2', 'Previous', 'Graviton', 'i7i', '', 'i8g', 'i3')
56
+ , ROW ('i4i', 'AmazonEC2', 'Previous', 'Intel', 'i7i', '', 'i8g', 'i3')
57
+ , ROW ('i7i', 'AmazonEC2', 'Current', 'Intel', '', '', 'i8g', 'i4i')
58
+ , ROW ('i7ie', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
59
+ , ROW ('i8g', 'AmazonEC2', 'Current', 'Graviton', '', '', '', 'i7i')
60
+ , ROW ('im4gn', 'AmazonEC2', 'Current', 'Graviton', '', '', '', '')
61
+ , ROW ('inf1', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
62
+ , ROW ('inf2', 'AmazonEC2', 'Current', 'AMD', '', '', '', '')
63
+ , ROW ('is4gen', 'AmazonEC2', 'Current', 'Graviton', '', '', '', '')
64
+ , ROW ('m1', 'AmazonEC2', 'Previous', 'Intel', 'm7i', 'm7a', 'm8g', '')
65
+ , ROW ('m2', 'AmazonEC2', 'Previous', 'Intel', 'm7i', 'm7a', 'm8g', 'm1')
66
+ , ROW ('m3', 'AmazonEC2', 'Previous', 'Intel', 'm7i', 'm7a', 'm8g', 'm2')
67
+ , ROW ('m4', 'AmazonEC2', 'Previous', 'Intel', 'm7i', 'm7a', 'm8g', 'm3')
68
+ , ROW ('m5', 'AmazonEC2', 'Previous', 'Intel', 'm7i', 'm7a', 'm8g', 'm4')
69
+ , ROW ('m5a', 'AmazonEC2', 'Previous', 'AMD', 'm7i', 'm7a', 'm8g', 'm4')
70
+ , ROW ('m5ad', 'AmazonEC2', 'Current', 'AMD', 'm6id', '', 'm8gd', '')
71
+ , ROW ('m5d', 'AmazonEC2', 'Previous', 'Intel', 'm6id', '', 'm8gd', '')
72
+ , ROW ('m5dn', 'AmazonEC2', 'Previous', 'Intel', 'm6idn', '', '', '')
73
+ , ROW ('m5n', 'AmazonEC2', 'Previous', 'Intel', 'm6in', '', '', '')
74
+ , ROW ('m5zn', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
75
+ , ROW ('m6a', 'AmazonEC2', 'Previous', 'AMD', 'm7i', 'm7a', 'm8g', 'm5')
76
+ , ROW ('m6g', 'AmazonEC2', 'Previous', 'Graviton', 'm7i', 'm7a', 'm8g', 'm5')
77
+ , ROW ('m6gd', 'AmazonEC2', 'Previous', 'Graviton', '', '', 'm8gd', 'm5d')
78
+ , ROW ('m6i', 'AmazonEC2', 'Previous', 'Intel', 'm7i', 'm7a', 'm8g', 'm5')
79
+ , ROW ('m6id', 'AmazonEC2', 'Current', 'Intel', '', '', 'm8gd', 'm5d')
80
+ , ROW ('m6idn', 'AmazonEC2', 'Current', 'Intel', '', '', '', 'm5dn')
81
+ , ROW ('m6in', 'AmazonEC2', 'Current', 'Intel', '', '', '', 'm5n')
82
+ , ROW ('m7a', 'AmazonEC2', 'Current', 'AMD', '', '', 'm8g', 'm6i')
83
+ , ROW ('m7g', 'AmazonEC2', 'Previous', 'Graviton', '', '', 'm8g', 'm6i')
84
+ , ROW ('m7gd', 'AmazonEC2', 'Previous', 'Graviton', '', '', 'm8gd', 'm6id')
85
+ , ROW ('m7i', 'AmazonEC2', 'Current', 'Intel', '', '', 'm8g', 'm6i')
86
+ , ROW ('m7i-flex', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
87
+ , ROW ('m8g', 'AmazonEC2', 'Current', 'Graviton', '', '', '', 'm7i')
88
+ , ROW ('m8gd', 'AmazonEC2', 'Current', 'Graviton', '', '', '', 'm6id')
89
+ , ROW ('mac1', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
90
+ , ROW ('mac2', 'AmazonEC2', 'Current', 'Unknown', '', '', '', '')
91
+ , ROW ('mac2-m1ultra', 'AmazonEC2', 'Current', 'Unknown', '', '', '', '')
92
+ , ROW ('mac2-m2', 'AmazonEC2', 'Current', 'Unknown', '', '', '', '')
93
+ , ROW ('mac2-m2pro', 'AmazonEC2', 'Current', 'Unknown', '', '', '', '')
94
+ , ROW ('p2', 'AmazonEC2', 'Previous', 'Intel', 'p3', 'p5', '', '')
95
+ , ROW ('p3', 'AmazonEC2', 'Current', 'Intel', '', 'p5', '', 'p2')
96
+ , ROW ('p3dn', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
97
+ , ROW ('p4d', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
98
+ , ROW ('p4de', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
99
+ , ROW ('p5', 'AmazonEC2', 'Current', 'AMD', '', '', '', 'p3')
100
+ , ROW ('p5en', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
101
+ , ROW ('r3', 'AmazonEC2', 'Previous', 'Intel', 'r7i', 'r7a', 'r8g', '')
102
+ , ROW ('r4', 'AmazonEC2', 'Previous', 'Intel', 'r7i', 'r7a', 'r8g', 'r3')
103
+ , ROW ('r5', 'AmazonEC2', 'Previous', 'Intel', 'r7i', 'r7a', 'r8g', 'r4')
104
+ , ROW ('r5a', 'AmazonEC2', 'Previous', 'AMD', 'r7i', 'r7a', 'r8g', 'r4')
105
+ , ROW ('r5ad', 'AmazonEC2', 'Current', 'AMD', 'r6id', '', 'r8gd', '')
106
+ , ROW ('r5b', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
107
+ , ROW ('r5d', 'AmazonEC2', 'Previous', 'Intel', 'r6id', '', 'r8gd', '')
108
+ , ROW ('r5dn', 'AmazonEC2', 'Previous', 'Intel', 'r6idn', '', '', '')
109
+ , ROW ('r5n', 'AmazonEC2', 'Previous', 'Intel', 'r6in', '', '', '')
110
+ , ROW ('r6a', 'AmazonEC2', 'Previous', 'AMD', 'r7i', 'r7a', 'r8g', 'r5')
111
+ , ROW ('r6g', 'AmazonEC2', 'Previous', 'Graviton', 'r7i', 'r7a', 'r8g', 'r5')
112
+ , ROW ('r6gd', 'AmazonEC2', 'Previous', 'Graviton', '', '', 'r8gd', 'r5d')
113
+ , ROW ('r6i', 'AmazonEC2', 'Previous', 'Intel', 'r7i', 'r7a', 'r8g', 'r5')
114
+ , ROW ('r6id', 'AmazonEC2', 'Current', 'Intel', '', '', 'r8gd', 'r5d')
115
+ , ROW ('r6idn', 'AmazonEC2', 'Current', 'Intel', '', '', '', 'r5dn')
116
+ , ROW ('r6in', 'AmazonEC2', 'Current', 'Intel', '', '', '', 'r5n')
117
+ , ROW ('r7a', 'AmazonEC2', 'Current', 'AMD', '', '', 'r8g', 'r6i')
118
+ , ROW ('r7g', 'AmazonEC2', 'Previous', 'Graviton', '', '', 'r8g', 'r6i')
119
+ , ROW ('r7gd', 'AmazonEC2', 'Previous', 'Graviton', '', '', 'r8gd', 'r6id')
120
+ , ROW ('r7i', 'AmazonEC2', 'Current', 'Intel', '', '', 'r8g', 'r6i')
121
+ , ROW ('r7iz', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
122
+ , ROW ('r8g', 'AmazonEC2', 'Current', 'Graviton', '', '', '', 'r7i')
123
+ , ROW ('r8gd', 'AmazonEC2', 'Current', 'Graviton', '', '', '', 'r6id')
124
+ , ROW ('t1', 'AmazonEC2', 'Previous', 'Intel', 't3', 't3a', 't4g', '')
125
+ , ROW ('t2', 'AmazonEC2', 'Previous', 'Intel', 't3', 't3a', 't4g', 't1')
126
+ , ROW ('t3', 'AmazonEC2', 'Current', 'Intel', '', '', 't4g', 't2')
127
+ , ROW ('t3a', 'AmazonEC2', 'Current', 'AMD', '', '', 't4g', 't2')
128
+ , ROW ('t4g', 'AmazonEC2', 'Current', 'Graviton', '', '', '', 't3')
129
+ , ROW ('trn1', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
130
+ , ROW ('trn1n', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
131
+ , ROW ('u-12tb1', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
132
+ , ROW ('u-18tb1', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
133
+ , ROW ('u-24tb1', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
134
+ , ROW ('u-3tb1', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
135
+ , ROW ('u-6tb1', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
136
+ , ROW ('u-9tb1', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
137
+ , ROW ('u7i-12tb', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
138
+ , ROW ('u7i-6tb', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
139
+ , ROW ('u7i-8tb', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
140
+ , ROW ('u7in-16tb', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
141
+ , ROW ('u7in-24tb', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
142
+ , ROW ('u7in-32tb', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
143
+ , ROW ('vt1', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
144
+ , ROW ('x1', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
145
+ , ROW ('x1e', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
146
+ , ROW ('x2gd', 'AmazonEC2', 'Current', 'Graviton', '', '', '', '')
147
+ , ROW ('x2idn', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
148
+ , ROW ('x2iedn', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
149
+ , ROW ('x2iezn', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
150
+ , ROW ('x8g', 'AmazonEC2', 'Current', 'Graviton', '', '', '', '')
151
+ , ROW ('z1d', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
152
+ , ROW ('c1', 'AmazonElastiCache', 'Current', 'Intel', '', '', '', '')
153
+ , ROW ('c7gn', 'AmazonElastiCache', 'Current', 'Graviton', '', '', '', '')
154
+ , ROW ('m1', 'AmazonElastiCache', 'Previous', 'Intel', 'm5', '', 'm7g', '')
155
+ , ROW ('m2', 'AmazonElastiCache', 'Previous', 'Intel', 'm5', '', 'm7g', 'm1')
156
+ , ROW ('m3', 'AmazonElastiCache', 'Previous', 'Intel', 'm5', '', 'm7g', 'm2')
157
+ , ROW ('m4', 'AmazonElastiCache', 'Previous', 'Intel', 'm5', '', 'm7g', 'm3')
158
+ , ROW ('m5', 'AmazonElastiCache', 'Current', 'Intel', '', '', 'm7g', 'm4')
159
+ , ROW ('m6g', 'AmazonElastiCache', 'Previous', 'Graviton', '', '', 'm7g', 'm5')
160
+ , ROW ('m7g', 'AmazonElastiCache', 'Current', 'Graviton', '', '', '', 'm5')
161
+ , ROW ('r3', 'AmazonElastiCache', 'Previous', 'Intel', 'r5', '', 'r7g', '')
162
+ , ROW ('r4', 'AmazonElastiCache', 'Previous', 'Intel', 'r5', '', 'r7g', 'r3')
163
+ , ROW ('r5', 'AmazonElastiCache', 'Current', 'Intel', '', '', 'r7g', 'r4')
164
+ , ROW ('r6g', 'AmazonElastiCache', 'Previous', 'Graviton', '', '', 'r7g', 'r5')
165
+ , ROW ('r6gd', 'AmazonElastiCache', 'Current', 'Graviton', '', '', '', '')
166
+ , ROW ('r7g', 'AmazonElastiCache', 'Current', 'Graviton', '', '', '', 'r5')
167
+ , ROW ('t1', 'AmazonElastiCache', 'Previous', 'Intel', 't3', '', 't4g', '')
168
+ , ROW ('t2', 'AmazonElastiCache', 'Previous', 'Intel', 't3', '', 't4g', 't1')
169
+ , ROW ('t3', 'AmazonElastiCache', 'Current', 'Intel', '', '', 't4g', 't2')
170
+ , ROW ('t4g', 'AmazonElastiCache', 'Current', 'Graviton', '', '', '', 't3')
171
+ , ROW ('c6gd', 'AmazonRDS', 'Current', 'Graviton', '', '', '', '')
172
+ , ROW ('cv11', 'AmazonRDS', 'Current', 'Intel', '', '', '', '')
173
+ , ROW ('m1', 'AmazonRDS', 'Previous', 'Intel', 'm7i', '', 'm8g', '')
174
+ , ROW ('m2', 'AmazonRDS', 'Previous', 'Intel', 'm7i', '', 'm8g', 'm1')
175
+ , ROW ('m3', 'AmazonRDS', 'Previous', 'Intel', 'm7i', '', 'm8g', 'm2')
176
+ , ROW ('m4', 'AmazonRDS', 'Previous', 'Intel', 'm7i', '', 'm8g', 'm3')
177
+ , ROW ('m5', 'AmazonRDS', 'Previous', 'Intel', 'm7i', '', 'm8g', 'm4')
178
+ , ROW ('m5d', 'AmazonRDS', 'Previous', 'Intel', 'm6id', '', 'm6gd', '')
179
+ , ROW ('m6g', 'AmazonRDS', 'Previous', 'Graviton', 'm7i', '', 'm8g', 'm5')
180
+ , ROW ('m6gd', 'AmazonRDS', 'Current', 'Graviton', '', '', '', 'm5d')
181
+ , ROW ('m6i', 'AmazonRDS', 'Previous', 'Intel', 'm7i', '', 'm8g', 'm5')
182
+ , ROW ('m6id', 'AmazonRDS', 'Current', 'Intel', '', '', '', 'm5d')
183
+ , ROW ('m6idn', 'AmazonRDS', 'Current', 'Intel', '', '', '', '')
184
+ , ROW ('m6in', 'AmazonRDS', 'Current', 'Intel', '', '', '', '')
185
+ , ROW ('m7g', 'AmazonRDS', 'Previous', 'Graviton', '', '', 'm8g', 'm6i')
186
+ , ROW ('m7i', 'AmazonRDS', 'Current', 'Intel', '', '', 'm8g', 'm6i')
187
+ , ROW ('m8g', 'AmazonRDS', 'Current', 'Graviton', '', '', '', 'm7i')
188
+ , ROW ('mv11', 'AmazonRDS', 'Current', 'Intel', '', '', '', '')
189
+ , ROW ('r3', 'AmazonRDS', 'Previous', 'Intel', 'r7i', '', 'r8g', '')
190
+ , ROW ('r4', 'AmazonRDS', 'Previous', 'Intel', 'r7i', '', 'r8g', 'r3')
191
+ , ROW ('r5', 'AmazonRDS', 'Previous', 'Intel', 'r7i', '', 'r8g', 'r4')
192
+ , ROW ('r5b', 'AmazonRDS', 'Current', 'Intel', '', '', '', '')
193
+ , ROW ('r5d', 'AmazonRDS', 'Previous', 'Intel', 'r6id', '', 'r6gd', '')
194
+ , ROW ('r6g', 'AmazonRDS', 'Previous', 'Graviton', 'r7i', '', 'r8g', 'r5')
195
+ , ROW ('r6gd', 'AmazonRDS', 'Current', 'Graviton', '', '', '', 'r5d')
196
+ , ROW ('r6i', 'AmazonRDS', 'Previous', 'Intel', 'r7i', '', 'r8g', 'r5')
197
+ , ROW ('r6id', 'AmazonRDS', 'Current', 'Intel', '', '', '', 'r5d')
198
+ , ROW ('r6idn', 'AmazonRDS', 'Current', 'Intel', '', '', '', '')
199
+ , ROW ('r6in', 'AmazonRDS', 'Current', 'Intel', '', '', '', '')
200
+ , ROW ('r7g', 'AmazonRDS', 'Previous', 'Graviton', '', '', 'r8g', 'r6i')
201
+ , ROW ('r7i', 'AmazonRDS', 'Current', 'Intel', '', '', 'r8g', 'r6i')
202
+ , ROW ('r8g', 'AmazonRDS', 'Current', 'Graviton', '', '', '', 'r7i')
203
+ , ROW ('rv11', 'AmazonRDS', 'Current', 'Intel', '', '', '', '')
204
+ , ROW ('t1', 'AmazonRDS', 'Previous', 'Intel', 't3', '', 't4g', '')
205
+ , ROW ('t2', 'AmazonRDS', 'Previous', 'Intel', 't3', '', 't4g', 't1')
206
+ , ROW ('t3', 'AmazonRDS', 'Current', 'Intel', '', '', 't4g', 't2')
207
+ , ROW ('t4g', 'AmazonRDS', 'Current', 'Graviton', '', '', '', 't3')
208
+ , ROW ('x1', 'AmazonRDS', 'Current', 'Intel', '', '', 'x2g', '')
209
+ , ROW ('x1e', 'AmazonRDS', 'Current', 'Intel', '', '', '', '')
210
+ , ROW ('x2g', 'AmazonRDS', 'Current', 'Graviton', '', '', '', 'x1')
211
+ , ROW ('x2idn', 'AmazonRDS', 'Current', 'Intel', '', '', '', '')
212
+ , ROW ('x2iedn', 'AmazonRDS', 'Current', 'Intel', '', '', '', '')
213
+ , ROW ('x2iezn', 'AmazonRDS', 'Current', 'Intel', '', '', '', '')
214
+ , ROW ('z1d', 'AmazonRDS', 'Current', 'Intel', '', '', '', '')
215
+ , ROW ('c4', 'AmazonES', 'Previous', 'Intel', 'c7i', '', 'c7g', '')
216
+ , ROW ('c5', 'AmazonES', 'Previous', 'Intel', 'c7i', '', 'c7g', 'c4')
217
+ , ROW ('c6g', 'AmazonES', 'Previous', 'Graviton', 'c7i', '', 'c7g', 'c5')
218
+ , ROW ('c7g', 'AmazonES', 'Current', 'Graviton', '', '', '', 'c5')
219
+ , ROW ('c7i', 'AmazonES', 'Current', 'Intel', '', '', '', 'c5')
220
+ , ROW ('i2', 'AmazonES', 'Previous', 'Intel', 'i4i', '', 'i4g', '')
221
+ , ROW ('i3', 'AmazonES', 'Previous', 'Intel', 'i4i', '', 'i4g', 'i2')
222
+ , ROW ('i4g', 'AmazonES', 'Current', 'Graviton', '', '', '', 'i3')
223
+ , ROW ('i4i', 'AmazonES', 'Current', 'Intel', '', '', '', 'i3')
224
+ , ROW ('im4gn', 'AmazonES', 'Current', 'Graviton', '', '', '', '')
225
+ , ROW ('m3', 'AmazonES', 'Previous', 'Intel', 'm7i', '', 'm7g', '')
226
+ , ROW ('m4', 'AmazonES', 'Previous', 'Intel', 'm7i', '', 'm7g', 'm3')
227
+ , ROW ('m5', 'AmazonES', 'Previous', 'Intel', 'm7i', '', 'm7g', 'm4')
228
+ , ROW ('m6g', 'AmazonES', 'Previous', 'Graviton', 'm7i', '', 'm7g', 'm5')
229
+ , ROW ('m7g', 'AmazonES', 'Current', 'Graviton', '', '', '', 'm5')
230
+ , ROW ('m7i', 'AmazonES', 'Current', 'Intel', '', '', '', 'm5')
231
+ , ROW ('om2', 'AmazonES', 'Previous', 'Unknown', '', '', '', '')
232
+ , ROW ('or1', 'AmazonES', 'Previous', 'Unknown', '', '', '', '')
233
+ , ROW ('or2', 'AmazonES', 'Previous', 'Unknown', '', '', '', '')
234
+ , ROW ('r3', 'AmazonES', 'Previous', 'Intel', 'r7i', '', 'r7g', '')
235
+ , ROW ('r4', 'AmazonES', 'Previous', 'Intel', 'r7i', '', 'r7g', 'r3')
236
+ , ROW ('r5', 'AmazonES', 'Previous', 'Intel', 'r7i', '', 'r7g', 'r4')
237
+ , ROW ('r6g', 'AmazonES', 'Previous', 'Graviton', 'r7i', '', 'r7g', 'r5')
238
+ , ROW ('r6gd', 'AmazonES', 'Previous', 'Graviton', '', '', 'r7gd', '')
239
+ , ROW ('r7g', 'AmazonES', 'Current', 'Graviton', '', '', '', 'r5')
240
+ , ROW ('r7gd', 'AmazonES', 'Current', 'Graviton', '', '', '', '')
241
+ , ROW ('r7i', 'AmazonES', 'Current', 'Intel', '', '', '', 'r5')
242
+ , ROW ('t2', 'AmazonES', 'Previous', 'Intel', 't3', '', '', '')
243
+ , ROW ('t3', 'AmazonES', 'Current', 'Intel', '', '', '', 't2')
244
+ ) ignored_table_name (family, product, generation, instance_processor, latest_intel, latest_amd, latest_graviton, previous_intel)
@@ -139,6 +139,7 @@ datasets:
139
139
  - DataExports
140
140
  views:
141
141
  - ec2_running_cost
142
+ - account_map
142
143
  schedules:
143
144
  - default
144
145
  # CID dataset
@@ -149,6 +150,7 @@ datasets:
149
150
  - DataExports
150
151
  views:
151
152
  - compute_savings_plan_eligible_spend
153
+ - account_map
152
154
  schedules:
153
155
  - default
154
156
  # CID dataset
@@ -906,8 +908,8 @@ views:
906
908
  - compute_optimizer_idle_options
907
909
 
908
910
  # Shared views
909
- #account_map:
910
- # File: queries/shared/account_map.sql
911
+ account_map:
912
+ File: queries/shared/account_map.sql
911
913
  business_units_map:
912
914
  File: queries/shared/business_units_map.sql
913
915
  aws_accounts:
@@ -30,6 +30,7 @@ def format_field_name(field_name: str, ignore_prefix: bool=False) -> str:
30
30
  assert format_field_name('account_name') == 'Account Name'
31
31
  assert format_field_name('a_c_r_o_n_y_m') == 'ACRONYM'
32
32
  assert format_field_name('tag_a_c_r_o_n_y_m') == 'Tag ACRONYM'
33
+ assert format_field_name('tag_service') == 'Tag Service'
33
34
  """
34
35
  parts = field_name.split('_')
35
36
  result = []
@@ -47,11 +48,15 @@ def format_field_name(field_name: str, ignore_prefix: bool=False) -> str:
47
48
  result.append(parts[i].title())
48
49
  i += 1
49
50
  title = ' '.join(result)
51
+ title = title.replace('Aws ', 'AWS ')
50
52
  if ignore_prefix:
53
+ new_title = title
51
54
  if title.startswith('Cost Category '):
52
- title = title.replace('Cost Category ', '')
53
- if title.startswith('Tag '):
54
- title = title.replace('Tag ', '')
55
+ new_title = title.replace('Cost Category ', '')
56
+ elif title.startswith('Tag '):
57
+ new_title = title.replace('Tag ', '')
58
+ if title.lower() not in ('service', 'region', 'account'): # leave prefix for special terms
59
+ title = new_title
55
60
  return title
56
61
 
57
62
  def align_grid_position(elements: List[Dict[str, Any]]) -> None:
@@ -69,7 +69,7 @@ class Dataset(CidQsResource):
69
69
  def _get_athena_columns(table, database=None):
70
70
  '''returns athena columns'''
71
71
  return [
72
- line[0].split()
72
+ line[0].split(None, 1)
73
73
  for line in athena.query(
74
74
  f'SHOW COLUMNS FROM {table}',
75
75
  include_header=True, database=database
@@ -112,7 +112,8 @@ class Dataset(CidQsResource):
112
112
  if 'decimal' in athena_type: return {'Name': col, 'Type': 'DECIMAL', 'SubType': 'FIXED'}
113
113
  if 'double' in athena_type: return {'Name': col, 'Type': 'DECIMAL', 'SubType': 'FIXED'}
114
114
  if 'real' in athena_type: return {'Name': col, 'Type': 'DECIMAL', 'SubType': 'FIXED'} #is it better fit for fixed vs float Decimals
115
- logger.warning(f'Unknown Athena type {athena_type} for {col}. Will use STRING. This might affect dashboard.')
115
+ if 'boolean' in athena_type: return {'Name': col, 'Type': 'BOOLEAN'}
116
+ logger.info(f'Unknown Athena type {athena_type} for {col}. Will use STRING. This might affect dashboard.')
116
117
  return {'Name': col, 'Type': 'STRING'}
117
118
 
118
119
  dataset = deepcopy(dataset)
@@ -305,7 +305,7 @@ def get_parameter(param_name, message, choices=None, default=None, none_as_disab
305
305
  ).execute()
306
306
  else: # it is a text entry
307
307
  if isinstance(default, str) and template_variables:
308
- print(template_variables)
308
+ logger.debug(f'template_variables = {template_variables}')
309
309
  default=default.format(**template_variables)
310
310
  print()
311
311
  if not isatty():
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: cid-cmd
3
- Version: 4.2.0
3
+ Version: 4.2.2
4
4
  Summary: Cloud Intelligence Dashboards deployment helper tool
5
5
  Home-page: https://github.com/aws-samples/aws-cudos-framework-deployment
6
6
  Author: AWS CUDOS Team
@@ -1,2 +0,0 @@
1
- __version__ = '4.2.0'
2
-
@@ -1,168 +0,0 @@
1
- CREATE OR REPLACE VIEW kpi_instance_mapping AS
2
- SELECT *
3
- FROM
4
- (
5
- VALUES
6
- ROW ('a1', 'AmazonEC2', 'Current', 'Graviton', '', '', '', '')
7
- , ROW ('c1', 'AmazonEC2', 'Previous', 'Intel','c6i','c6a','c7g', '')
8
- , ROW ('c3', 'AmazonEC2', 'Previous', 'Intel','c6i','c6a','c7g', '')
9
- , ROW ('c4', 'AmazonEC2', 'Previous', 'Intel','c6i','c6a','c7g', '')
10
- , ROW ('c5', 'AmazonEC2', 'Previous', 'Intel','c6i','c6a','c7g', '')
11
- , ROW ('c5a', 'AmazonEC2', 'Previous', 'AMD', '','c6a','c7g', '')
12
- , ROW ('c5ad', 'AmazonEC2', 'Current', 'AMD', '', 'c5ad', 'c6gd', '')
13
- , ROW ('c5d', 'AmazonEC2', 'Current', 'Intel', '', 'c5ad', 'c6gd', '')
14
- , ROW ('c5n', 'AmazonEC2', 'Current', 'Intel','c6in', '', 'c7gn', '')
15
- , ROW ('c6a', 'AmazonEC2', 'Current', 'AMD', '','c6a', '', '')
16
- , ROW ('c6g', 'AmazonEC2', 'Previous', 'Graviton', '', '','c7g', 'c5')
17
- , ROW ('c6gd', 'AmazonEC2', 'Current', 'Graviton', '', '', '', 'c5d')
18
- , ROW ('c6gn', 'AmazonEC2', 'Previous', 'Graviton', '', '','c7gn', 'c5n')
19
- , ROW ('c6i', 'AmazonEC2', 'Current', 'Intel', '', 'c6a', 'c6g','c5')
20
- , ROW ('c6id', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
21
- , ROW ('c6in', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
22
- , ROW ('c7g', 'AmazonEC2', 'Current', 'Graviton', '', '', '', 'c5')
23
- , ROW ('cc2', 'AmazonEC2', 'Current', 'Intel', 'c6i', 'c6a', 'c7g', '')
24
- , ROW ('cr1', 'AmazonEC2', 'Current', 'Intel', 'r6i', 'r6a', 'r7g', '')
25
- , ROW ('d2', 'AmazonEC2', 'Previous', 'Intel', 'd3', '', '', '')
26
- , ROW ('d3', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
27
- , ROW ('d3en', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
28
- , ROW ('dl1', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
29
- , ROW ('f1', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
30
- , ROW ('g2', 'AmazonEC2', 'Previous', 'Intel','g5', '', '', '')
31
- , ROW ('g3', 'AmazonEC2', 'Previous', 'Intel','g5', '', '', '')
32
- , ROW ('g3s', 'AmazonEC2', 'Previous', 'Intel','g5', '', '', '')
33
- , ROW ('g4ad', 'AmazonEC2', 'Current', 'AMD', '', '', '', '')
34
- , ROW ('g4dn', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
35
- , ROW ('g5', 'AmazonEC2', 'Current', 'Intel', '', '', 'g5g', '')
36
- , ROW ('g5g', 'AmazonEC2', 'Current', 'Graviton', '', '', '', 'g5')
37
- , ROW ('h1', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
38
- , ROW ('hs1', 'AmazonEC2', 'Current', 'Intel', 'd3', '', '', '')
39
- , ROW ('i2', 'AmazonEC2', 'Previous', 'Intel', 'i3', '', '', '')
40
- , ROW ('i3', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
41
- , ROW ('i3en', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
42
- , ROW ('i3p', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
43
- , ROW ('i4g', 'AmazonEC2', 'Current', 'Graviton', '', '', '', '')
44
- , ROW ('i4i', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
45
- , ROW ('im4gn', 'AmazonEC2', 'Current', 'Graviton', '', '', '', '')
46
- , ROW ('inf1', 'AmazonEC2', 'Previous', 'Intel', '', '', '', '')
47
- , ROW ('inf2', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
48
- , ROW ('is4gen', 'AmazonEC2', 'Current', 'Graviton', '', '', '', '')
49
- , ROW ('m1', 'AmazonEC2', 'Previous', 'Intel', 'm6i', 'm6a', 'm7g', '')
50
- , ROW ('m2', 'AmazonEC2', 'Previous', 'Intel', 'm6i', 'm6a', 'm7g', '')
51
- , ROW ('m3', 'AmazonEC2', 'Previous', 'Intel', 'm6i', 'm6a', 'm7g', '')
52
- , ROW ('m4', 'AmazonEC2', 'Previous', 'Intel', 'm6i', 'm6a', 'm7g', '')
53
- , ROW ('m5', 'AmazonEC2', 'Previous', 'Intel', 'm6i', 'm6a', 'm7g', '')
54
- , ROW ('m5a', 'AmazonEC2', 'Previous', 'AMD', 'm6i', 'm6a', 'm7g', '')
55
- , ROW ('m5ad', 'AmazonEC2', 'Current', 'AMD', '', '', 'm6gd', '')
56
- , ROW ('m5d', 'AmazonEC2', 'Previous', 'Intel', 'm6id', 'm6a', 'm6gd', '')
57
- , ROW ('m5dn', 'AmazonEC2', 'Previous', 'Intel', 'm6idn', '', '', '')
58
- , ROW ('m5n', 'AmazonEC2', 'Previous', 'Intel', 'm6in', '', '', '')
59
- , ROW ('m5zn', 'AmazonEC2', 'AmazonEC2', 'Intel', 'm6in', '', '', '')
60
- , ROW ('m6a', 'AmazonEC2', 'Current', 'AMD', '', '', 'm7g', '')
61
- , ROW ('m6g', 'AmazonEC2', 'Previous', 'Graviton', '', '','m7g', 'm5')
62
- , ROW ('m6gd', 'AmazonEC2', 'Current', 'Graviton', '', '', '', 'm5d')
63
- , ROW ('m6i', 'AmazonEC2', 'Current', 'Intel', '', '', 'm7g', '')
64
- , ROW ('m6idn', 'AmazonEC2', 'Current', 'Intel', '', '', 'm6gd', '')
65
- , ROW ('m6in', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
66
- , ROW ('m7g', 'AmazonEC2', 'Current', 'Graviton', '', '', '','m6')
67
- , ROW ('mac1', 'AmazonEC2', 'Previous', 'Intel', '', '', '', '')
68
- , ROW ('mac2', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
69
- , ROW ('p2', 'AmazonEC2', 'Previous', 'Intel', 'p3', '', '', '')
70
- , ROW ('p3', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
71
- , ROW ('p3dn', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
72
- , ROW ('p4d', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
73
- , ROW ('r3', 'AmazonEC2', 'Previous', 'Intel', 'r6i', 'r6a', 'r7g', '')
74
- , ROW ('r4', 'AmazonEC2', 'Previous', 'Intel', 'r6i', 'r6a', 'r7g', '')
75
- , ROW ('r5', 'AmazonEC2', 'Previous', 'Intel', 'r6i', 'r6a', 'r6g', '')
76
- , ROW ('r5a', 'AmazonEC2', 'Previous', 'AMD', '', '', 'r7g', '')
77
- , ROW ('r5ad', 'AmazonEC2', 'Current', 'AMD', '', '', 'r6gd', '')
78
- , ROW ('r5b', 'AmazonEC2', 'Previous', 'Intel', '', '', '', '')
79
- , ROW ('r5d', 'AmazonEC2', 'Previous', 'Intel','r6id', 'r5ad', 'r6gd', '')
80
- , ROW ('r5dn', 'AmazonEC2', 'Current', 'Intel','r6idn', '', '', '')
81
- , ROW ('r5n', 'AmazonEC2', 'Previous', 'Intel','r6in', 'r5', 'r6g', '')
82
- , ROW ('r6a', 'AmazonEC2', 'Current', 'AMD', '', '', 'r7g', '')
83
- , ROW ('r6g', 'AmazonEC2', 'Previous', 'Graviton', '', '', '', 'r5')
84
- , ROW ('r6gd', 'AmazonEC2', 'Current', 'Graviton', '', '', '', 'r5')
85
- , ROW ('r6i', 'AmazonEC2', 'Current', 'Intel', '', 'r5a', 'r6g', '')
86
- , ROW ('r6id', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
87
- , ROW ('r6idn', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
88
- , ROW ('r6in', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
89
- , ROW ('r7g', 'AmazonEC2', 'Current', 'Graviton', '', '', '', '')
90
- , ROW ('t1', 'AmazonEC2', 'Previous', 'Intel', 't3', 't3a', 't4g', '')
91
- , ROW ('t2', 'AmazonEC2', 'Previous', 'Intel', 't3', 't3a', 't4g', '')
92
- , ROW ('t3', 'AmazonEC2', 'Current', 'Intel', '', '', 't4g', '')
93
- , ROW ('t3a', 'AmazonEC2', 'Current', 'AMD', '', '', 't4g', '')
94
- , ROW ('t4g', 'AmazonEC2', 'Current', 'Graviton', '', '', '', 't3')
95
- , ROW ('u-12tb1', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
96
- , ROW ('u-18tb1', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
97
- , ROW ('u-24tb1', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
98
- , ROW ('u-6tb1', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
99
- , ROW ('u-9tb1', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
100
- , ROW ('vt1', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
101
- , ROW ('x1', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
102
- , ROW ('x1e', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
103
- , ROW ('x2gd', 'AmazonEC2', 'Current', 'Graviton', '', '', '', '')
104
- , ROW ('x2idn', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
105
- , ROW ('x2iedn', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
106
- , ROW ('x2iezn', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
107
- , ROW ('z1d', 'AmazonEC2', 'Current', 'Intel', '', '', '', '')
108
- , ROW ('c1', 'AmazonElastiCache', 'Previous', 'Intel', '', '', '', '')
109
- , ROW ('m1', 'AmazonElastiCache', 'Previous', 'Intel', 'm5', '', 'm6g', '')
110
- , ROW ('m2', 'AmazonElastiCache', 'Previous', 'Intel', 'm5', '', 'm6g', '')
111
- , ROW ('m3', 'AmazonElastiCache', 'Previous', 'Intel', 'm5', '', 'm6g', '')
112
- , ROW ('m4', 'AmazonElastiCache', 'Previous', 'Intel', 'm5', '', 'm6g', '')
113
- , ROW ('m5', 'AmazonElastiCache', 'Current', 'Intel', '', '', 'm6g', '')
114
- , ROW ('m6g', 'AmazonElastiCache', 'Current', 'Graviton', '', '', '', 'm5')
115
- , ROW ('r3', 'AmazonElastiCache', 'Previous', 'Intel', 'r5', '', 'r6g', '')
116
- , ROW ('r4', 'AmazonElastiCache', 'Previous', 'Intel', 'r5', '', 'r6g', '')
117
- , ROW ('r5', 'AmazonElastiCache', 'Current', 'Intel', '', '', 'r6g', '')
118
- , ROW ('r6g', 'AmazonElastiCache', 'Current', 'Graviton', '', '', '', 'r5')
119
- , ROW ('r6gd', 'AmazonElastiCache', 'Current', 'Graviton', '', '', '', '')
120
- , ROW ('t1', 'AmazonElastiCache', 'Previous', 'Intel', 't3', '', 't4g', '')
121
- , ROW ('t2', 'AmazonElastiCache', 'Previous', 'Intel', 't3', '', 't4g', '')
122
- , ROW ('t3', 'AmazonElastiCache', 'Current', 'Intel', '', '', 't4g', '')
123
- , ROW ('t4g', 'AmazonElastiCache', 'Current', 'Graviton', '', '', '', 't3')
124
- , ROW ('c4', 'AmazonES', 'Previous', 'Intel', 'c5', '', 'c6g', '')
125
- , ROW ('c5', 'AmazonES', 'Current', 'Intel', '', '', 'c6g', '')
126
- , ROW ('c6g', 'AmazonES', 'Current', 'Graviton', '', '', '', 'c5')
127
- , ROW ('i2', 'AmazonES', 'Previous', 'Intel', 'i3', '', '', '')
128
- , ROW ('i3', 'AmazonES', 'Current', 'Intel', '', '', '', '')
129
- , ROW ('m3', 'AmazonES', 'Previous', 'Intel', 'm5', '', 'm6g', '')
130
- , ROW ('m4', 'AmazonES', 'Previous', 'Intel', 'm5', '', 'm6g', '')
131
- , ROW ('m5', 'AmazonES', 'Current', 'Intel', '', '', 'm6g', '')
132
- , ROW ('m6g', 'AmazonES', 'Current', 'Graviton', '', '', '', 'm5')
133
- , ROW ('r3', 'AmazonES', 'Previous', 'Intel', 'r5', '', 'r6g', '')
134
- , ROW ('r4', 'AmazonES', 'Previous', 'Intel', 'r5', '', 'r6g', '')
135
- , ROW ('r5', 'AmazonES', 'Current', 'Intel', '', '', 'r6g', '')
136
- , ROW ('r6g', 'AmazonES', 'Current', 'Graviton', '', '', '', 'r5')
137
- , ROW ('r6gd', 'AmazonES', 'Current', 'Graviton', '', '', '', 'r5')
138
- , ROW ('t2', 'AmazonES', 'Previous', 'Intel', 't3', '', '', '')
139
- , ROW ('t3', 'AmazonES', 'Current', 'Intel', '', '', '', '')
140
- , ROW ('cv11', 'AmazonRDS', 'Current', 'Intel', '', '', '', '')
141
- , ROW ('m1', 'AmazonRDS', 'Previous', 'Intel', 'm6i', '', 'm6g', '')
142
- , ROW ('m2', 'AmazonRDS', 'Previous', 'Intel', 'm6i', '', 'm6g', '')
143
- , ROW ('m3', 'AmazonRDS', 'Previous', 'Intel', 'm6i', '', 'm6g', '')
144
- , ROW ('m4', 'AmazonRDS', 'Previous', 'Intel', 'm6i', '', 'm6g', '')
145
- , ROW ('m5', 'AmazonRDS', 'Current', 'Intel', '', '', 'm6g', '')
146
- , ROW ('m5d', 'AmazonRDS', 'Current', 'Intel', '', '', '', '')
147
- , ROW ('m6g', 'AmazonRDS', 'Current', 'Graviton', '', '', '', 'm5')
148
- , ROW ('m6gd', 'AmazonRDS', 'Current', 'Graviton', '', '', '', '')
149
- , ROW ('m6i', 'AmazonRDS', 'Current', 'Intel', '', '', 'm6g', 'm5')
150
- , ROW ('mv11', 'AmazonRDS', 'Current', 'Intel', '', '', '', '')
151
- , ROW ('r3', 'AmazonRDS', 'Previous', 'Intel', 'r6i', '', 'r6g', 'r5')
152
- , ROW ('r4', 'AmazonRDS', 'Previous', 'Intel', 'r6i', '', 'r6g', 'r5')
153
- , ROW ('r5', 'AmazonRDS', 'Current', 'Intel', '', '', 'r6g', '')
154
- , ROW ('r5b', 'AmazonRDS', 'Current', 'Intel', '', '', '', '')
155
- , ROW ('r5d', 'AmazonRDS', 'Current', 'Intel', '', '', 'r6gd', '')
156
- , ROW ('r6g', 'AmazonRDS', 'Current', 'Graviton', '', '', '', 'r5')
157
- , ROW ('r6gd', 'AmazonRDS', 'Current', 'Graviton', '', '', '', 'r5d')
158
- , ROW ('r6i', 'AmazonRDS', 'Current', 'Intel', '', '', '', '')
159
- , ROW ('rv11', 'AmazonRDS', 'Current', 'Intel', '', '', '', '')
160
- , ROW ('t1', 'AmazonRDS', 'Previous', 'Intel', 't3', '', 't4g', '')
161
- , ROW ('t2', 'AmazonRDS', 'Previous', 'Intel', 't3', '', 't4g', '')
162
- , ROW ('t3', 'AmazonRDS', 'Current', 'Intel', '', '', 't4g', '')
163
- , ROW ('t4g', 'AmazonRDS', 'Current', 'Graviton', '', '', '', 't3')
164
- , ROW ('x1', 'AmazonRDS', 'Current', 'Intel', '', '', 'x2g', '')
165
- , ROW ('x1e', 'AmazonRDS', 'Current', 'Intel', '', '', '', '')
166
- , ROW ('x2g', 'AmazonRDS', 'Current', 'Graviton', '', '', '', 'x1')
167
- , ROW ('z1d', 'AmazonRDS', 'Current', 'Intel', '', '', '', '')
168
- ) ignored_table_name (family, product, generation, instance_processor, latest_intel, latest_amd, latest_graviton, previous_intel)
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes