PR for appcat on change-billing #512
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
zugao
force-pushed
the
appcat/246/change-billing
branch
from
4df6eb5 to
aa24b01
Compare
zugao
requested review from
a team,
Kidswiss,
TheBigLee and
wejdross
and removed request for
a team
Kidswiss
approved these changes
Oct 22, 2024
class/defaults.yml
Outdated
| @@ -55,7 +55,7 @@ parameters: | |||
| appcat: | |||
| registry: ghcr.io | |||
| repository: vshn/appcat | |||
| tag: v4.98.0 | |||
| tag: change-billing | |||
There was a problem hiding this comment.
Please don't break it with git push --force :D
TheBigLee
approved these changes
Oct 22, 2024
zugao
force-pushed
the
appcat/246/change-billing
branch
from
aa24b01 to
9a2b6b9
Compare
Kidswiss
requested changes
Oct 25, 2024
component/billing.jsonnet
Outdated
| @@ -157,8 +157,8 @@ local generateCloudAndManaged = function(name) | |||
| // For postgresql we have a missmatch between the label and the name in our definition. | |||
| local queryName = if name == 'postgres' then name + 'ql' else name; | |||
|
|
|||
| local managedQuery = 'appcat:metering{label_appuio_io_billing_name="appcat-' + queryName + '",label_appcat_vshn_io_sla="%s", tenant_name!="APPUiO"}'; | |||
| local cloudQuery = 'appcat:metering{label_appuio_io_billing_name="appcat-' + queryName + '",label_appcat_vshn_io_sla="%s", tenant_name="APPUiO"} * on(label_appuio_io_organization) group_left(sales_order) label_replace(appuio_control_organization_info{namespace="appuio-control-api-production"}, "label_appuio_io_organization", "$1", "organization", "(.*)")'; | |||
| local managedQuery = 'sum_over_time(appcat:metering{label_appuio_io_billing_name="appcat-' + queryName + '",label_appcat_vshn_io_sla="%s", tenant_name!="APPUiO"}[60:1])/60'; | |||
There was a problem hiding this comment.
I just remembered something:
When we do this exact query via the golang prometheus client, it will be slightly off compared to the GUI and recording rules.
For some weird obscure reason we have to use [59:1] instead of ´[60:1]´.
Refs:
Aldebaran has that in every of their cronjobs: https://github.com/vshn/package-appuio-reporting-aldebaran/blob/master/main.yml#L1015
Note about this the legacy AppCat query: https://github.com/vshn/component-appcat/blob/master/component/promql/appcat.promql#L63
zugao
force-pushed
the
appcat/246/change-billing
branch
from
9a2b6b9 to
fbfa96c
Compare
zugao
force-pushed
the
appcat/246/change-billing
branch
from
fbfa96c to
083d8f5
Compare
Kidswiss
approved these changes
Oct 25, 2024
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
Currently we are getting data for billing from the workloads (deployments and statefulsets) special label
appcat.io/billing=true. This approach proved to be ineffective for some services such as VSHNPostgreSQL which is managed by Stackgres. Unfortunately the operator sometimes is managing the pods directly, by passing the workload. In this particular case we end up without the necessary label in the pod definition.This new approach manages differently the billing architecture. If previously we were having one prometheus rule which would gather unnecessarily difficult specific data, now we have one rule per each instance namespace and it is managed directly by the composition function where we get reliable data from the source.
Checklist
bug,enhancement,documentation,change,breaking,dependencyas they show up in the changelog
Link: vshn/appcat#246