Add queries for APPUiO Managed billing #148
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
HappyTetrahedron
force-pushed
the
feat/appuio_managed_queries
branch
2 times, most recently
from
9557e99
to
a46a604
Compare
bastjan
approved these changes
Aug 22, 2023
HappyTetrahedron
force-pushed
the
feat/appuio_managed_queries
branch
from
a46a604
to
d89c741
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
This adds/updates the necessary queries for APPUiO Managed OpenShift reporting.
I've realized that we can use the same vCPU query for both the new and the old billing, and distinguish between the two models based on the SLA - the old model uses a disjoint list of SLAs.
In a similar vein, the Cluster query - used for the cluster base fee from the old billing model - is set up to only return values for clusters with one of the old SLAs. In this way, new clusters won't get facts for the cluster count, and therefore won't be billed for that.
Currently, the queries use a lookup key format ofquery:cloud:sla:tenant:cluster[:role]- this only works if we accept #147. Without #147, the tenant must be at the 3rd position in the lookup key. It could be made to work that way, it would just lead to "uglier" product keys.Queries use the source key format
query:cloud:tenant:cluster:sla[:role]Checklist
bug,enhancement,documentation,change,breaking,dependencyas they show up in the changelog