Extend CommitmentDiscountCategory column allow Commitment coverage de…

…tails to be derived
FinOps-Open-Cost-and-Usage-Spec · Apr 18, 2024 · e82e8fb · e82e8fb
1 parent 19be6c6
commit e82e8fb
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 16 deletions.
diff --git a/specification/columns/commitmentdiscountcategory.md b/specification/columns/commitmentdiscountcategory.md
@@ -1,8 +1,16 @@
 # Commitment Discount Category
 
-Commitment Discount Category indicates whether the [*commitment-based discount*](#glossary:commitment-based-discount) identified in the CommitmentDiscountId column is based on usage quantity or cost (aka "spend").
+Commitment Discount Category indicates the category of a [*commitment-based discount*](#glossary:commitment-based-discount) purchase or the eligibility category of an on-demand or usage-based charges.
 
-The CommitmentDiscountCategory column MUST be present in the billing data when the provider supports *commitment-based discounts*. This column MUST be of type String, MUST be null when [CommitmentDiscountId](#commitmentdiscountid) is null, and MUST NOT be null when CommitmentDiscountId is not null. The CommitmentDiscountCategory MUST be one of the allowed values.
+The CommitmentDiscountCategory column MUST be of type String and be present in the billing data when the provider supports commitment-based discounts.
+
+CommitmentDiscountCategory MUST NOT be *Multiple* when a CommitmentDiscountId exists.
+
+A CommitmentDiscountCategory value MUST be applied to a [*row*](#glossary:row) when [ChargeCategory](#chargecategory) is *Purchase*, or ChargeCategory is *Usage* and [ChargeSubCategory](#chargesubcategory) is *Used* or *Unused*.
+
+A CommitmentDiscountCategory value MUST be applied to a row where the ChargeCategory is *Usage*, ChargeSubCategory is *On-Demand*, and the [SkuId](#skuid) is eligible for one or more commitments offered by the provider.
+
+In all other cases, CommitmentDiscountCategory MUST be null.
 
 ## Column ID
 
@@ -14,7 +22,7 @@ Commitment Discount Category
 
 ## Description
 
-Indicates whether the *commitment-based discount* identified in the CommitmentDiscountId column is based on usage quantity or cost (aka "spend").
+Indicates the category of a Commitment-Based Discount purchase or the eligibility category of an on-demand or usage-based charges
 
 ## Content constraints
 
@@ -28,11 +36,12 @@ Indicates whether the *commitment-based discount* identified in the CommitmentDi
 
 Allowed values:
 
-| Value   | Description                                                              |
-|:--------|:-------------------------------------------------------------------------|
-| Spend   | Commitment-based discounts that require a predetermined amount of spend. |
-| Usage   | Commitment-based discounts that require a predetermined amount of usage. |
+| Value    | Description                                                                                   |
+|:---------|:----------------------------------------------------------------------------------------------|
+| Spend    | Commitment-based discounts that require a predetermined amount of spend.                      |
+| Usage    | Commitment-based discounts that require a predetermined amount of usage.                      |
+| Multiple | On-demand usage charges that are eligible for both Spend and Usage commitment-based discounts | 
 
 ## Introduced (version)
 
-1.0-preview
+1.1
diff --git a/supporting_content/columns/commitmentdiscountcategory.md b/supporting_content/columns/commitmentdiscountcategory.md
@@ -14,14 +14,29 @@ Current column mappings found in available data sets:
 
 Current values observed in billing data for various scenarios:
 
-| Provider | Data set                 | CommitmentDiscountCategory     | CommitmentDiscountProgram (Name TBD)     |
-|----------|--------------------------|----------------------------|------------------------------------------|
-| AWS | CUR (PurchaseOption)                   | Usage               | Reserved Instances              |
-| AWS | CUR (PurchaseOption)                   | Spend               | Savings Plans                   |
-| Google Cloud | BigQuery Billing Export | Usage        | Resource-based CUD                            |
-| Google Cloud | BigQuery Billing Export | Spend        | Spend-based CUD                               |
-| Microsoft | Cost Details (PricingModel)| Spend                     | Savings Plan                     |
-| Microsoft | Cost Details (PricingModel)| Usage                     | Reservation                      |
+| Provider     | CommitmentDiscountName (Name TBD)      | CommitmentDiscountCateogory |
+|--------------|----------------------------------------------------------------------|
+| AWS          | Reserved Instances (RI)                | Usage                       |
+| AWS          | Savings Plan                           | Spend                       |
+| Google Cloud | Committed Use Discount (CUD)           | Usage                       |
+| Google Cloud | Flex Committed Use Discount (Flex CUD) | Usage                       |
+| Google Cloud | BigQuery Reservations                  | Usage                       |
+| Microsoft    | Reservation                            | Usage                       |
+| Microsoft    | Savings Plan                           | Spend                       |
+
+Additionally, typical SaaS annual commits should also fall under *Spend*.
+
+Example of mock dataset with Commitment Discount Category:
+
+| ProviderName | ServiceName         | Charge Category | Charge Subcategory | Commitment Discount Type | Commitment Discount Category |
+|--------------|----------------------------------------------------------------------------------------------------------------------|
+| AWS          | AmazonEC2           | Purchase        | null               | Reserved Instances (RI)  | Usage                        |
+| AWS          | ComputeSavingsPlans | Purchase        | null               | Savings Plan             | Spend                        |
+| AWS          | AmazonEC2           | Usage           | On-Demand          | null                     | Multiple                     |
+| AWS          | AmazonEC2           | Usage           | Used               | Reserved Instances (RI)  | Usage                        |
+| AWS          | AmazonEC2           | Usage           | Unused             | Reserved Instances (RI)  | Usage                        |
+| AWS          | AmazonEC2           | Usage           | Used               | Savings Plan             | Spend                        | 
+| AWS          | AmazonEC2           | Usage           | Unused             | Savings Plan             | Spend                        |
 
 ## Documentation
 - Microsoft

diff --git a/supporting_content/columns/commitmentdiscounttype.md b/supporting_content/columns/commitmentdiscounttype.md
@@ -18,6 +18,7 @@ Examples of found in available data sets:
 | AWS | Savings Plan |
 | AWS | Capacity Blocks for ML |
 | Google Cloud | Committed Use Discount (CUD) |
+| Google Cloud | Flex Committed Use Discount (Flex CUD) |
 | Google Cloud | BigQuery Reservations |
 | Microsoft | Savings Plan |
 | Microsoft | Reservation |