diff --git a/specification/Makefile b/specification/Makefile index 544dfa51e..63ab1d03b 100644 --- a/specification/Makefile +++ b/specification/Makefile @@ -6,7 +6,7 @@ STYLE="working_draft" endif PDF_MARGINS=--variable margin-top=15 --variable margin-bottom=25 --variable margin-left=0 --variable margin-right=10 PDF_FOOTER=--pdf-engine-opt="--footer-right" --pdf-engine-opt="[page] of [topage]" --pdf-engine-opt="--footer-font-name" --pdf-engine-opt="Palatino" --pdf-engine-opt="--footer-font-size" --pdf-engine-opt="8" -SPEC_SOURCE_FILES=$(filter-out spec.md, $(wildcard *.md*)) $(wildcard dimensions/*.md*) $(wildcard attributes/*.md*) $(wildcard metrics/*.md*) $(wildcard appendix/*.md*) $(wildcard appendix/normalized_dimensions/*.md*) +SPEC_SOURCE_FILES=$(filter-out spec.md, $(wildcard *.md*)) $(wildcard dimensions/*.md*) $(wildcard attributes/*.md*) $(wildcard metrics/*.md*) $(wildcard appendix/*.md*) SPEC_SOURCE_MDFILES=$(filter-out %.mdpp, $(SPEC_SOURCE_FILES)) export TOCDEPTH=2 all: spec.md spec.pdf spec.html @@ -27,7 +27,6 @@ endif ./validate_includes.py metrics ./validate_includes.py attributes ./validate_includes.py appendix - ./validate_includes.py appendix/normalized_dimensions PYTHONPATH=../vendored/ $(MARKDOWNPP) spec.mdpp -o $@ $(PYMARKDOWNLNT) --config markdownlnt.cfg scan $(SPEC_SOURCE_MDFILES) $(PYMARKDOWNLNT) --config markdownlnt.cfg scan $@ diff --git a/specification/appendix/appendix.mdpp b/specification/appendix/appendix.mdpp index c68de4c9d..510b27ceb 100644 --- a/specification/appendix/appendix.mdpp +++ b/specification/appendix/appendix.mdpp @@ -4,5 +4,3 @@ !INCLUDE "grouping_constructs_for_resources_and_or_services.md",1 !INCLUDE "origination_of_cost_data.md",1 - -!INCLUDE "normalized_dimensions/normalized_dimensions.mdpp",1 diff --git a/specification/appendix/normalized_dimensions/chargetype.md b/specification/appendix/normalized_dimensions/chargetype.md deleted file mode 100644 index 4912bf3e9..000000000 --- a/specification/appendix/normalized_dimensions/chargetype.md +++ /dev/null @@ -1,12 +0,0 @@ -# Charge Type - -A charge type indicates whether the record represents an upfront or recurring fee, cost of usage that already occurred, an after-the-fact adjustment (e.g., credits), or taxes. - -## Allowed values - -| Value | Description | -|:-----------|:------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| `Adjustment` | Any adjustments that are applied after the original usage or purchase record. Adjustments may be related to multiple charges. | -| `Purchase` | Charges for the acquisition of a service or resource bought upfront or on a recurring basis. | -| `Tax` | Applicable taxes that are levied by the relevant authorities. Tax charges may vary depending on factors such as the location, jurisdiction, and local or federal regulations. | -| `Usage` | Charges based on the quantity of a service or resource that was consumed over a given period of time. | diff --git a/specification/appendix/normalized_dimensions/normalized_dimensions.mdpp b/specification/appendix/normalized_dimensions/normalized_dimensions.mdpp deleted file mode 100644 index 6dba9ee31..000000000 --- a/specification/appendix/normalized_dimensions/normalized_dimensions.mdpp +++ /dev/null @@ -1,7 +0,0 @@ -# Normalized Dimensions - -Below you will find details about the set of dimensions within the FOCUS specification that limit the allowed values -(referred to as 'normalized' dimensions). Each dimension will have detailed descriptions for the allowed values as -well as criteria for governing future modifications to the allowed values. - -!INCLUDE "chargetype.md",1 diff --git a/specification/contributors.md b/specification/contributors.md index 106f5734d..5707a5f53 100644 --- a/specification/contributors.md +++ b/specification/contributors.md @@ -1,5 +1,33 @@ ## Contributors -* A -* B -* C +Thanks to the following FOCUS members for their contributions to this work. + +* Amit Wadhwa (Google) +* Chandra Deverajan (CloudTrakr) +* Christopher Harris (Datadog) +* Elene Rundle (Google) +* Erik Peterson (CloudZero) +* Graham Murphy (Australian Retirement Trust) +* Irena Jurica (Neos) +* Jason Kelly (Anglepoint Group Inc) +* Joe Ferrero (DB Gurus Inc.) +* John Grubb (platform.sh) +* Josh Kwon (Ternary) +* Karl Kraft (Walmart) +* Mark Krawczeniuk (NetApp) +* Michael Arkoosh (Vega) +* Michael Flanakin (Microsoft) +* Mike Fuller (FinOps Foundation) +* Mike Polson (VMWare) +* Nicolas Fonrose (Teevity) +* Ray Ding (Accenture) +* Ricardo Triana (Accenture) +* Riley Jenkins (Domo) +* Rodney Joyce (CloudMonitor) +* Rupa Patel (Google) +* Sanjna Srivatsa (VMWare) +* Tatiana Dubovchenko (Flexera) +* Tery Morgan (Microsoft) +* Tim O'Brien (Walmart) +* Trig Ghosh (Accenture) +* Udam Dewaraja (FinOps Foundation) diff --git a/specification/dimensions/billingcurrency.md b/specification/dimensions/billingcurrency.md index 7e0d79e07..b0b5cd60e 100644 --- a/specification/dimensions/billingcurrency.md +++ b/specification/dimensions/billingcurrency.md @@ -2,7 +2,7 @@ Billing Currency is an identifier that represents the currency that a charge for resources and/or services was billed in. Billing Currency is commonly used in scenarios where costs need to be grouped or aggregated. -The BillingCurrency column MUST be present in the billing data. BillingCurrency MUST match the currency used in the invoice generated by the invoice issuer. This column must be of type String and MUST NOT contain null values. BillingCurrency MUST conform to [FOCUS Currency Code Format](#currencycodeformatrequirements) requirements. +The BillingCurrency column MUST be present in the billing data. BillingCurrency MUST match the currency used in the invoice generated by the invoice issuer. This column must be of type String and MUST NOT contain null values. BillingCurrency MUST conform to [FOCUS Currency Code Format](#currencycodeformat) requirements. ## Column ID @@ -24,7 +24,7 @@ Represents the currency that a charge was billed in. | Data type | String | | Allows nulls | False | | Value format | list-of-values | -| Allowed Values | Meets [FOCUS Currency Code Format](#currencycodeformatrequirements) requirements | +| Allowed Values | Meets [FOCUS Currency Code Format](#currencycodeformat) requirements | ## Introduced (version) diff --git a/specification/dimensions/chargetype.md b/specification/dimensions/chargetype.md index a047d3eb1..793023e3e 100644 --- a/specification/dimensions/chargetype.md +++ b/specification/dimensions/chargetype.md @@ -31,7 +31,15 @@ after-the-fact adjustment (e.g., credits), or taxes. | Data type | String | | Allows nulls | False | | Value format | list-of-values | -| Allowed values | `Adjustment`, `Purchase`, `Tax`, `Usage` | + +Allowed values: + +| Value | Description | +|:-----------|:------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| Adjustment | Any adjustments that are applied after the original usage or purchase record. Adjustments may be related to multiple charges. | +| Purchase | Charges for the acquisition of a service or resource bought upfront or on a recurring basis. | +| Tax | Applicable taxes that are levied by the relevant authorities. Tax charges may vary depending on factors such as the location, jurisdiction, and local or federal regulations. | +| Usage | Charges based on the quantity of a service or resource that was consumed over a given period of time. | ## Introduced (version)