PR for appcat on change-billing

class/defaults.yml

@@ -55,7 +55,7 @@ parameters:
       appcat:
         registry: ghcr.io
         repository: vshn/appcat
-        tag: v4.98.1
+        tag: v4.99.0
       functionAppcat:
         registry: ${appcat:images:appcat:registry}
         repository: ${appcat:images:appcat:repository}

component/billing.jsonnet

@@ -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"}[59:1])/60';
+  local cloudQuery = 'sum_over_time(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", "(.*)")[59:1])/60';
 
   local permutations = [
     {

component/main.jsonnet

@@ -113,10 +113,6 @@ local promQueryTemplate = importstr 'promql/appcat.promql';
 local promQueryWithLabel = std.strReplace(promQueryTemplate, '{{ORGLABEL}}', tenant.label);
 local promQuery = std.strReplace(promQueryWithLabel, '{{TENANT_REPLACE}}', tenant.replace);
 
-local meteringQueryCloud = importstr 'promql/metering_cloud.promql';
-local meteringQueryManagedRaw = importstr 'promql/metering_managed.promql';
-local meteringQueryManaged = std.strReplace(meteringQueryManagedRaw, '{{salesOrderID}}', params.billing.salesOrder);
-
 local legacyBillingRule = std.prune(kube._Object('monitoring.coreos.com/v1', 'PrometheusRule', 'appcat-billing') {
   metadata+: {
     namespace: params.namespace,
@@ -136,25 +132,6 @@ local legacyBillingRule = std.prune(kube._Object('monitoring.coreos.com/v1', 'Pr
   },
 });
 
-local meteringRule = std.prune(kube._Object('monitoring.coreos.com/v1', 'PrometheusRule', 'appcat-metering') {
-  metadata+: {
-    namespace: params.namespace,
-  },
-  spec: {
-    groups: [
-      {
-        name: 'appcat-metering-rules',
-        rules: [
-          {
-            expr: if params.appuioManaged then meteringQueryManaged else meteringQueryCloud,
-            record: 'appcat:metering',
-          },
-        ],
-      },
-    ],
-  },
-});
-
 local mockOrgInfo = kube._Object('monitoring.coreos.com/v1', 'PrometheusRule', 'mock-org-info') {
   metadata+: {
     namespace: params.namespace,
@@ -286,7 +263,6 @@ local haPrometheusRule = {
   '10_appcat_legacy_billing_recording_rule': legacyBillingRule,
   '10_appcat_backup_monitoring': backupPrometheusRule,
   '10_appcat_ha_monitoring': haPrometheusRule,
-  [if params.billing.vshn.meteringRules then '10_appcat_metering_recording_rule']: meteringRule,
   [if params.services.vshn.enabled && params.services.emailAlerting.enabled then '10_mailgun_secret']: emailSecret,
   [if params.billing.enableMockOrgInfo then '10_mock_org_info']: mockOrgInfo,
 }

component/vshn_appcat_services.jsonnet

@@ -15,6 +15,7 @@ local opsgenieRules = import 'vshn_alerting.jsonnet';
 
 local inv = kap.inventory();
 local params = inv.parameters.appcat;
+local appuioManaged = inv.parameters.appcat.appuioManaged;
 
 local serviceNameLabelKey = 'appcat.vshn.io/servicename';
 local serviceNamespaceLabelKey = 'appcat.vshn.io/claim-namespace';
@@ -110,6 +111,7 @@ local vshn_appcat_service(name, serviceParams) =
                         ownerKind: xrd.spec.names.kind,
                         ownerGroup: xrd.spec.group,
                         ownerVersion: xrd.spec.versions[0].name,
+                        salesOrder: if appuioManaged then std.toString(params.billing.salesOrder) else '',
                       } + common.EmailAlerting(params.services.emailAlerting)
                       + restoreSA
                       + additonalInputs

component/vshn_postgres.jsonnet

@@ -13,6 +13,7 @@ local inv = kap.inventory();
 local params = inv.parameters.appcat;
 local pgParams = params.services.vshn.postgres;
 local opsgenieRules = import 'vshn_alerting.jsonnet';
+local appuioManaged = inv.parameters.appcat.appuioManaged;
 
 local defaultDB = 'postgres';
 local defaultUser = 'postgres';
@@ -220,6 +221,7 @@ local composition =
                       bucketEndpoint: pgParams.bucket_endpoint,
                       isOpenshift: std.toString(isOpenshift),
                       sliNamespace: params.slos.namespace,
+                      salesOrder: if appuioManaged then std.toString(params.billing.salesOrder) else '',
                     } + std.get(pgParams, 'additionalInputs', default={}, inc_hidden=true)
                     + common.EmailAlerting(params.services.emailAlerting)
                     + if pgParams.proxyFunction then {

component/vshn_redis.jsonnet

@@ -14,6 +14,7 @@ local inv = kap.inventory();
 local params = inv.parameters.appcat;
 local redisParams = params.services.vshn.redis;
 local opsgenieRules = import 'vshn_alerting.jsonnet';
+local appuioManaged = inv.parameters.appcat.appuioManaged;
 
 local defaultUser = 'default';
 local defaultPort = '6379';
@@ -487,6 +488,7 @@ local composition =
                       ownerVersion: xrd.spec.versions[0].name,
                       isOpenshift: std.toString(isOpenshift),
                       sliNamespace: params.slos.namespace,
+                      salesOrder: if appuioManaged then std.toString(params.billing.salesOrder) else '',
                     } + common.EmailAlerting(params.services.emailAlerting)
                     + if redisParams.proxyFunction then {
                       proxyEndpoint: redisParams.grpcEndpoint,

tests/golden/apiserver/appcat/appcat/10_function_appcat.yaml

@@ -3,6 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-  package: ghcr.io/vshn/appcat:v4.98.1-func
+  package: ghcr.io/vshn/appcat:v4.99.0-func
   runtimeConfigRef:
     name: function-appcat

tests/golden/apiserver/appcat/appcat/apiserver/30_deployment.yaml

@@ -29,7 +29,7 @@ spec:
             - --secure-port=9443
             - --tls-cert-file=/apiserver.local.config/certificates/tls.crt
             - --tls-private-key-file=/apiserver.local.config/certificates/tls.key
-          image: ghcr.io/vshn/appcat:v4.98.1
+          image: ghcr.io/vshn/appcat:v4.99.0
           livenessProbe:
             failureThreshold: 3
             httpGet:

tests/golden/billing/appcat/appcat/10_function_appcat.yaml

@@ -3,6 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-  package: ghcr.io/vshn/appcat:v4.98.1-func
+  package: ghcr.io/vshn/appcat:v4.99.0-func
   runtimeConfigRef:
     name: function-appcat

tests/golden/billing/appcat/appcat/apiserver/30_deployment.yaml

@@ -29,7 +29,7 @@ spec:
             - --secure-port=9443
             - --tls-cert-file=/apiserver.local.config/certificates/tls.crt
             - --tls-private-key-file=/apiserver.local.config/certificates/tls.key
-          image: ghcr.io/vshn/appcat:v4.98.1
+          image: ghcr.io/vshn/appcat:v4.99.0
           livenessProbe:
             failureThreshold: 3
             httpGet: