Skip to content

Commit 68de059

Browse files
chrisw-ibmchrisw-ibm
authoredAug 27, 2024··
Add missing columns that are included in Focus 1.0 Specification (#361)
Signed-off-by: Chris Waddington <104161708+chrisw-ibm@users.noreply.github.com>
1 parent c799bf9 commit 68de059

16 files changed

+37
-0
lines changed
 

‎conversion_rules_export/csv/aws-cur.csv

+3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
FOCUS Dimension,Transform Step,Source Column,Source Column Type,Transform Type,Filters/Process/Etc.
22
BillingAccountName,0,Not Defined,Not Defined,Not Defined,Not Defined
33
CommitmentDiscountName,0,Not Defined,Not Defined,Not Defined,Not Defined
4+
ContractedCost,0,Not Defined,Not Defined,Not Defined,Not Defined
5+
ContractedUnitPrice,0,Not Defined,Not Defined,Not Defined,Not Defined
6+
RegionName,0,Not Defined,Not Defined,Not Defined,Not Defined
47
SubAccountName,0,Not Defined,Not Defined,Not Defined,Not Defined
58
AvailabilityZone,1,lineItem/AvailabilityZone,Not Defined,RENAME_COLUMN,
69
BilledCost,1,NA,Not Defined,SQL_CONDITION,"conditions:

‎conversion_rules_export/csv/aws.csv

+3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
FOCUS Dimension,Transform Step,Source Column,Source Column Type,Transform Type,Filters/Process/Etc.
22
BillingAccountName,0,Not Defined,Not Defined,Not Defined,Not Defined
33
CommitmentDiscountName,0,Not Defined,Not Defined,Not Defined,Not Defined
4+
ContractedCost,0,Not Defined,Not Defined,Not Defined,Not Defined
5+
ContractedUnitPrice,0,Not Defined,Not Defined,Not Defined,Not Defined
6+
RegionName,0,Not Defined,Not Defined,Not Defined,Not Defined
47
SubAccountName,0,Not Defined,Not Defined,Not Defined,Not Defined
58
AvailabilityZone,1,line_item_availability_zone,Not Defined,RENAME_COLUMN,
69
BilledCost,1,NA,Not Defined,SQL_CONDITION,"conditions:

‎conversion_rules_export/csv/azure.csv

+3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
FOCUS Dimension,Transform Step,Source Column,Source Column Type,Transform Type,Filters/Process/Etc.
2+
ContractedCost,0,Not Defined,Not Defined,Not Defined,Not Defined
3+
ContractedUnitPrice,0,Not Defined,Not Defined,Not Defined,Not Defined
24
ListCost,0,Not Defined,Not Defined,Not Defined,Not Defined
35
ListUnitPrice,0,Not Defined,Not Defined,Not Defined,Not Defined
46
PricingQuantity,0,Not Defined,Not Defined,Not Defined,Not Defined
57
PricingUnit,0,Not Defined,Not Defined,Not Defined,Not Defined
8+
RegionName,0,Not Defined,Not Defined,Not Defined,Not Defined
69
ResourceType,0,Not Defined,Not Defined,Not Defined,Not Defined
710
SkuId,0,Not Defined,Not Defined,Not Defined,Not Defined
811
AvailabilityZone,1,AvailabilityZone,Not Defined,RENAME_COLUMN,

‎conversion_rules_export/csv/gcp.csv

+3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,12 @@ CommitmentDiscountCategory,0,Not Defined,Not Defined,Not Defined,Not Defined
66
CommitmentDiscountId,0,Not Defined,Not Defined,Not Defined,Not Defined
77
CommitmentDiscountName,0,Not Defined,Not Defined,Not Defined,Not Defined
88
CommitmentDiscountType,0,Not Defined,Not Defined,Not Defined,Not Defined
9+
ContractedCost,0,Not Defined,Not Defined,Not Defined,Not Defined
10+
ContractedUnitPrice,0,Not Defined,Not Defined,Not Defined,Not Defined
911
InvoiceIssuer,0,Not Defined,Not Defined,Not Defined,Not Defined
1012
ListUnitPrice,0,Not Defined,Not Defined,Not Defined,Not Defined
1113
PricingCategory,0,Not Defined,Not Defined,Not Defined,Not Defined
14+
RegionName,0,Not Defined,Not Defined,Not Defined,Not Defined
1215
ResourceType,0,Not Defined,Not Defined,Not Defined,Not Defined
1316
SubAccountId,0,Not Defined,Not Defined,Not Defined,Not Defined
1417
SubAccountName,0,Not Defined,Not Defined,Not Defined,Not Defined

‎conversion_rules_export/csv/oci.csv

+3
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,15 @@ CommitmentDiscountCategory,0,Not Defined,Not Defined,Not Defined,Not Defined
66
CommitmentDiscountId,0,Not Defined,Not Defined,Not Defined,Not Defined
77
CommitmentDiscountName,0,Not Defined,Not Defined,Not Defined,Not Defined
88
CommitmentDiscountType,0,Not Defined,Not Defined,Not Defined,Not Defined
9+
ContractedCost,0,Not Defined,Not Defined,Not Defined,Not Defined
10+
ContractedUnitPrice,0,Not Defined,Not Defined,Not Defined,Not Defined
911
InvoiceIssuer,0,Not Defined,Not Defined,Not Defined,Not Defined
1012
ListCost,0,Not Defined,Not Defined,Not Defined,Not Defined
1113
ListUnitPrice,0,Not Defined,Not Defined,Not Defined,Not Defined
1214
PricingCategory,0,Not Defined,Not Defined,Not Defined,Not Defined
1315
PricingQuantity,0,Not Defined,Not Defined,Not Defined,Not Defined
1416
Publisher,0,Not Defined,Not Defined,Not Defined,Not Defined
17+
RegionName,0,Not Defined,Not Defined,Not Defined,Not Defined
1518
ResourceName,0,Not Defined,Not Defined,Not Defined,Not Defined
1619
ResourceType,0,Not Defined,Not Defined,Not Defined,Not Defined
1720
ServiceCategory,0,Not Defined,Not Defined,Not Defined,Not Defined

‎conversion_rules_export/markdown/aws-cur.md

+3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
|:---------------------------|-----------------:|:-----------------------------|:---------------------|:--------------------|:-----------------------------------------------------------------------------------------------------------------------------------------------|
33
| BillingAccountName | 0 | Not Defined | Not Defined | Not Defined | Not Defined |
44
| CommitmentDiscountName | 0 | Not Defined | Not Defined | Not Defined | Not Defined |
5+
| ContractedCost | 0 | Not Defined | Not Defined | Not Defined | Not Defined |
6+
| ContractedUnitPrice | 0 | Not Defined | Not Defined | Not Defined | Not Defined |
7+
| RegionName | 0 | Not Defined | Not Defined | Not Defined | Not Defined |
58
| SubAccountName | 0 | Not Defined | Not Defined | Not Defined | Not Defined |
69
| AvailabilityZone | 1 | lineItem/AvailabilityZone | Not Defined | RENAME_COLUMN | |
710
| BilledCost | 1 | NA | Not Defined | SQL_CONDITION | conditions: |

‎conversion_rules_export/markdown/aws.md

+3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
|:---------------------------|-----------------:|:--------------------------------|:---------------------|:--------------------|:----------------------------------------------------------------------------------------------------------------------------------------------------|
33
| BillingAccountName | 0 | Not Defined | Not Defined | Not Defined | Not Defined |
44
| CommitmentDiscountName | 0 | Not Defined | Not Defined | Not Defined | Not Defined |
5+
| ContractedCost | 0 | Not Defined | Not Defined | Not Defined | Not Defined |
6+
| ContractedUnitPrice | 0 | Not Defined | Not Defined | Not Defined | Not Defined |
7+
| RegionName | 0 | Not Defined | Not Defined | Not Defined | Not Defined |
58
| SubAccountName | 0 | Not Defined | Not Defined | Not Defined | Not Defined |
69
| AvailabilityZone | 1 | line_item_availability_zone | Not Defined | RENAME_COLUMN | |
710
| BilledCost | 1 | NA | Not Defined | SQL_CONDITION | conditions: |

‎conversion_rules_export/markdown/azure.md

+3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
| FOCUS Dimension | Transform Step | Source Column | Source Column Type | Transform Type | Filters/Process/Etc. |
22
|:---------------------------|-----------------:|:-----------------------|:---------------------|:--------------------|:------------------------------------------------------------------------------------------|
3+
| ContractedCost | 0 | Not Defined | Not Defined | Not Defined | Not Defined |
4+
| ContractedUnitPrice | 0 | Not Defined | Not Defined | Not Defined | Not Defined |
35
| ListCost | 0 | Not Defined | Not Defined | Not Defined | Not Defined |
46
| ListUnitPrice | 0 | Not Defined | Not Defined | Not Defined | Not Defined |
57
| PricingQuantity | 0 | Not Defined | Not Defined | Not Defined | Not Defined |
68
| PricingUnit | 0 | Not Defined | Not Defined | Not Defined | Not Defined |
9+
| RegionName | 0 | Not Defined | Not Defined | Not Defined | Not Defined |
710
| ResourceType | 0 | Not Defined | Not Defined | Not Defined | Not Defined |
811
| SkuId | 0 | Not Defined | Not Defined | Not Defined | Not Defined |
912
| AvailabilityZone | 1 | AvailabilityZone | Not Defined | RENAME_COLUMN | |

‎conversion_rules_export/markdown/gcp.md

+3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,12 @@
77
| CommitmentDiscountId | 0 | Not Defined | Not Defined | Not Defined | Not Defined |
88
| CommitmentDiscountName | 0 | Not Defined | Not Defined | Not Defined | Not Defined |
99
| CommitmentDiscountType | 0 | Not Defined | Not Defined | Not Defined | Not Defined |
10+
| ContractedCost | 0 | Not Defined | Not Defined | Not Defined | Not Defined |
11+
| ContractedUnitPrice | 0 | Not Defined | Not Defined | Not Defined | Not Defined |
1012
| InvoiceIssuer | 0 | Not Defined | Not Defined | Not Defined | Not Defined |
1113
| ListUnitPrice | 0 | Not Defined | Not Defined | Not Defined | Not Defined |
1214
| PricingCategory | 0 | Not Defined | Not Defined | Not Defined | Not Defined |
15+
| RegionName | 0 | Not Defined | Not Defined | Not Defined | Not Defined |
1316
| ResourceType | 0 | Not Defined | Not Defined | Not Defined | Not Defined |
1417
| SubAccountId | 0 | Not Defined | Not Defined | Not Defined | Not Defined |
1518
| SubAccountName | 0 | Not Defined | Not Defined | Not Defined | Not Defined |

‎conversion_rules_export/markdown/oci.md

+3
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,15 @@
77
| CommitmentDiscountId | 0 | Not Defined | Not Defined | Not Defined | Not Defined |
88
| CommitmentDiscountName | 0 | Not Defined | Not Defined | Not Defined | Not Defined |
99
| CommitmentDiscountType | 0 | Not Defined | Not Defined | Not Defined | Not Defined |
10+
| ContractedCost | 0 | Not Defined | Not Defined | Not Defined | Not Defined |
11+
| ContractedUnitPrice | 0 | Not Defined | Not Defined | Not Defined | Not Defined |
1012
| InvoiceIssuer | 0 | Not Defined | Not Defined | Not Defined | Not Defined |
1113
| ListCost | 0 | Not Defined | Not Defined | Not Defined | Not Defined |
1214
| ListUnitPrice | 0 | Not Defined | Not Defined | Not Defined | Not Defined |
1315
| PricingCategory | 0 | Not Defined | Not Defined | Not Defined | Not Defined |
1416
| PricingQuantity | 0 | Not Defined | Not Defined | Not Defined | Not Defined |
1517
| Publisher | 0 | Not Defined | Not Defined | Not Defined | Not Defined |
18+
| RegionName | 0 | Not Defined | Not Defined | Not Defined | Not Defined |
1619
| ResourceName | 0 | Not Defined | Not Defined | Not Defined | Not Defined |
1720
| ResourceType | 0 | Not Defined | Not Defined | Not Defined | Not Defined |
1821
| ServiceCategory | 0 | Not Defined | Not Defined | Not Defined | Not Defined |

‎focus_converter_base/focus_converter/models/focus_column_names.py

+7
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ class FocusColumnNames(Enum):
3333
EFFECTIVE_COST = "EffectiveCost"
3434

3535
REGION = "RegionId"
36+
# RegionName introduced in 1.0: https://focus.finops.org/focus-columns/?prod_focus_columns%5Bquery%5D=region&prod_focus_columns%5BrefinementList%5D%5Bcategories%5D%5B0%5D=Location#modal-column-14473
37+
REGION_NAME = "RegionName"
3638

3739
SERVICE_CATEGORY = "ServiceCategory"
3840
SERVICE_NAME = "ServiceName"
@@ -64,6 +66,11 @@ class FocusColumnNames(Enum):
6466
CONSUMED_QUANTITY = "ConsumedQuantity"
6567
CONSUMED_UNIT = "ConsumedUnit"
6668

69+
# ContractedCost introduced in 1.0: https://focus.finops.org/focus-columns/?prod_focus_columns%5Bquery%5D=Contracted#modal-column-14451
70+
CONTRACTED_COST = "ContractedCost"
71+
# ContractedUnitPrice introduced in 1.0: https://focus.finops.org/focus-columns/?prod_focus_columns%5Bquery%5D=Contracted#modal-column-14453
72+
CONTRACTED_UNIT_PRICE = "ContractedUnitPrice"
73+
6774

6875
FOCUS_DATETIME_ISO_FORMAT = "%Y-%m-%dT%H:%M:%SZ"
6976

‎progress/aws-cur_progress_pie_chart.png

391 Bytes
Loading

‎progress/aws_progress_pie_chart.png

396 Bytes
Loading

‎progress/azure_progress_pie_chart.png

-87 Bytes
Loading

‎progress/gcp_progress_pie_chart.png

-1.03 KB
Loading

‎progress/oci_progress_pie_chart.png

176 Bytes
Loading

0 commit comments

Comments
 (0)
Please sign in to comment.