diff --git a/class/defaults.yml b/class/defaults.yml index fda8b89..f1d0448 100644 --- a/class/defaults.yml +++ b/class/defaults.yml @@ -37,80 +37,70 @@ parameters: enabled: true prometheus_org_id: appuio-managed-openshift-billing products: - # Old pricing model - - product_id: 'openshift-clusters-cloudscale-zero' + - product_id: 'openshift-cloudscale-cluster-premium' params: - vshn_service_level: zero cloud_provider: cloudscale - - product_id: 'openshift-clusters-cloudscale-standard' + vshn_service_level: premium + - product_id: 'openshift-cloudscale-cluster-professional' params: - vshn_service_level: standard cloud_provider: cloudscale - - product_id: 'openshift-clusters-cloudscale-professional' - params: vshn_service_level: professional - cloud_provider: cloudscale - - product_id: 'openshift-clusters-cloudscale-premium' + - product_id: 'openshift-cloudscale-cluster-standard' params: - vshn_service_level: premium cloud_provider: cloudscale - - product_id: 'openshift-clusters-exoscale-zero' + vshn_service_level: standard + - product_id: 'openshift-cloudscale-cluster-zero' params: + cloud_provider: cloudscale vshn_service_level: zero - cloud_provider: exoscale - - product_id: 'openshift-clusters-exoscale-standard' + - product_id: 'openshift-exoscale-cluster-premium' params: - vshn_service_level: standard cloud_provider: exoscale - - product_id: 'openshift-clusters-exoscale-professional' + vshn_service_level: premium + - product_id: 'openshift-exoscale-cluster-professional' params: - vshn_service_level: professional cloud_provider: exoscale - - product_id: 'openshift-clusters-exoscale-premium' + vshn_service_level: professional + - product_id: 'openshift-exoscale-cluster-standard' params: - vshn_service_level: premium cloud_provider: exoscale - - product_id: 'openshift-clusters-vsphere-zero' + vshn_service_level: standard + - product_id: 'openshift-exoscale-cluster-zero' params: + cloud_provider: exoscale vshn_service_level: zero - cloud_provider: vsphere - - product_id: 'openshift-clusters-vsphere-standard' + - product_id: 'openshift-onprem-cluster-premium' params: - vshn_service_level: standard - cloud_provider: vsphere - - product_id: 'openshift-clusters-vsphere-professional' + cloud_provider: vsphere|none + vshn_service_level: premium + - product_id: 'openshift-onprem-cluster-professional' params: + cloud_provider: vsphere|none vshn_service_level: professional - cloud_provider: vsphere - - product_id: 'openshift-clusters-vsphere-premium' + - product_id: 'openshift-onprem-cluster-standard' params: - vshn_service_level: premium - cloud_provider: vsphere - - product_id: 'openshift-clusters-openstack-zero' + cloud_provider: vsphere|none + vshn_service_level: standard + - product_id: 'openshift-onprem-cluster-zero' params: + cloud_provider: vsphere|none vshn_service_level: zero - cloud_provider: openstack - - product_id: 'openshift-clusters-openstack-standard' + - product_id: 'openshift-xelon-cluster-premium' params: - vshn_service_level: standard - cloud_provider: openstack - - product_id: 'openshift-clusters-openstack-professional' + cloud_provider: xelon + vshn_service_level: premium + - product_id: 'openshift-xelon-cluster-professional' params: + cloud_provider: xelon vshn_service_level: professional - cloud_provider: openstack - - product_id: 'openshift-clusters-openstack-premium' + - product_id: 'openshift-xelon-cluster-standard' params: - vshn_service_level: premium - cloud_provider: openstack - # Special cases - - product_id: 'openshift-clusters-vsphere-standard' - params: - vshn_service_level: standard cloud_provider: xelon - - product_id: 'openshift-clusters-vsphere-professional' + vshn_service_level: standard + - product_id: 'openshift-xelon-cluster-zero' params: - vshn_service_level: professional - cloud_provider: none + cloud_provider: xelon + vshn_service_level: zero instance_id_pattern: '%(cluster_id)s' item_group_description_pattern: 'APPUiO Managed OpenShift - Cluster: %(cluster_id)s' unit_id: 'uom_uom_53_4a7e8f3e' #Cluster-Hour @@ -121,7 +111,7 @@ parameters: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="%(cloud_provider)s", + cloud_provider=~"%(cloud_provider)s", vshn_service_level="%(vshn_service_level)s", } )[59m:1m] @@ -131,121 +121,266 @@ parameters: enabled: true prometheus_org_id: appuio-managed-openshift-billing products: - # New pricing model - - product_id: 'openshift-worker-vcpu-cloudscale-besteffort' + - product_id: 'openshift-cloudscale-storagevcpu-besteffort' params: - vshn_service_level: best_effort - cloud_provider: cloudscale - - product_id: 'openshift-worker-vcpu-cloudscale-guaranteedavailability' - params: - vshn_service_level: guaranteed_availability cloud_provider: cloudscale - - product_id: 'openshift-worker-vcpu-exoscale-besteffort' - params: + role: storage vshn_service_level: best_effort - cloud_provider: exoscale - - product_id: 'openshift-worker-vcpu-exoscale-guaranteedavailability' + - product_id: 'openshift-cloudscale-storagevcpu-guaranteed' params: + cloud_provider: cloudscale + role: storage vshn_service_level: guaranteed_availability - cloud_provider: exoscale - - product_id: 'openshift-worker-vcpu-vsphere-besteffort' + - product_id: 'openshift-cloudscale-storagevcpu-premium' params: - vshn_service_level: best_effort - cloud_provider: vsphere - - product_id: 'openshift-worker-vcpu-vsphere-guaranteedavailability' + cloud_provider: cloudscale + role: storage + vshn_service_level: premium + - product_id: 'openshift-cloudscale-storagevcpu-professional' params: - vshn_service_level: guaranteed_availability - cloud_provider: vsphere - - product_id: 'openshift-worker-vcpu-openstack-besteffort' + cloud_provider: cloudscale + role: storage + vshn_service_level: professional + - product_id: 'openshift-cloudscale-storagevcpu-standard' + params: + cloud_provider: cloudscale + role: storage + vshn_service_level: standard + - product_id: 'openshift-cloudscale-workervcpu-besteffort' params: + cloud_provider: cloudscale + role: app vshn_service_level: best_effort - cloud_provider: openstack - - product_id: 'openshift-worker-vcpu-openstack-guaranteedavailability' + - product_id: 'openshift-cloudscale-workervcpu-guaranteed' params: + cloud_provider: cloudscale + role: app vshn_service_level: guaranteed_availability - cloud_provider: openstack - - product_id: 'openshift-worker-vcpu-cloudscale-besteffort' + - product_id: 'openshift-cloudscale-workervcpu-premium' params: - vshn_service_level: best_effort cloud_provider: cloudscale - - product_id: 'openshift-worker-vcpu-cloudscale-guaranteedavailability' + role: app + vshn_service_level: premium + - product_id: 'openshift-cloudscale-workervcpu-professional' params: - vshn_service_level: guaranteed_availability cloud_provider: cloudscale - # Old pricing model - - product_id: 'openshift-worker-vcpu-cloudscale-zero' + role: app + vshn_service_level: professional + - product_id: 'openshift-cloudscale-workervcpu-standard' params: - vshn_service_level: zero cloud_provider: cloudscale - - product_id: 'openshift-worker-vcpu-cloudscale-standard' - params: + role: app vshn_service_level: standard - cloud_provider: cloudscale - - product_id: 'openshift-worker-vcpu-cloudscale-professional' + - product_id: 'openshift-cloudscale-workervcpu-zero' params: - vshn_service_level: professional cloud_provider: cloudscale - - product_id: 'openshift-worker-vcpu-cloudscale-premium' + role: app + vshn_service_level: zero + - product_id: 'openshift-exoscale-storagevcpu-besteffort' + params: + cloud_provider: exoscale + role: storage + vshn_service_level: best_effort + - product_id: 'openshift-exoscale-storagevcpu-guaranteed' params: + cloud_provider: exoscale + role: storage + vshn_service_level: guaranteed_availability + - product_id: 'openshift-exoscale-storagevcpu-premium' + params: + cloud_provider: exoscale + role: storage vshn_service_level: premium - cloud_provider: cloudscale - - product_id: 'openshift-worker-vcpu-exoscale-zero' + - product_id: 'openshift-exoscale-storagevcpu-professional' params: - vshn_service_level: zero cloud_provider: exoscale - - product_id: 'openshift-worker-vcpu-exoscale-standard' + role: storage + vshn_service_level: professional + - product_id: 'openshift-exoscale-storagevcpu-standard' params: + cloud_provider: exoscale + role: storage vshn_service_level: standard + - product_id: 'openshift-exoscale-workervcpu-besteffort' + params: cloud_provider: exoscale - - product_id: 'openshift-worker-vcpu-exoscale-professional' + role: app + vshn_service_level: best_effort + - product_id: 'openshift-exoscale-workervcpu-guaranteed' params: - vshn_service_level: professional cloud_provider: exoscale - - product_id: 'openshift-worker-vcpu-exoscale-premium' + role: app + vshn_service_level: guaranteed_availability + - product_id: 'openshift-exoscale-workervcpu-premium' params: + cloud_provider: exoscale + role: app vshn_service_level: premium + - product_id: 'openshift-exoscale-workervcpu-professional' + params: + cloud_provider: exoscale + role: app + vshn_service_level: professional + - product_id: 'openshift-exoscale-workervcpu-standard' + params: cloud_provider: exoscale - - product_id: 'openshift-worker-vcpu-vsphere-zero' + role: app + vshn_service_level: standard + - product_id: 'openshift-exoscale-workervcpu-zero' params: + cloud_provider: exoscale + role: app vshn_service_level: zero - cloud_provider: vsphere - - product_id: 'openshift-worker-vcpu-vsphere-standard' + - product_id: 'openshift-openstackcsp-workervcpu-besteffort' params: - vshn_service_level: standard - cloud_provider: vsphere - - product_id: 'openshift-worker-vcpu-vsphere-professional' + cloud_provider: openstackcsp + role: app + vshn_service_level: best_effort + - product_id: 'openshift-openstackcsp-workervcpu-guaranteed' params: - vshn_service_level: professional - cloud_provider: vsphere - - product_id: 'openshift-worker-vcpu-vsphere-premium' + cloud_provider: openstackcsp + role: app + vshn_service_level: guaranteed_availability + - product_id: 'openshift-openstackcsp-workervcpu-premium' params: + cloud_provider: openstackcsp + role: app vshn_service_level: premium - cloud_provider: vsphere - - product_id: 'openshift-worker-vcpu-openstack-zero' + - product_id: 'openshift-openstackcsp-workervcpu-professional' + params: + cloud_provider: openstackcsp + role: app + vshn_service_level: professional + - product_id: 'openshift-openstackcsp-workervcpu-standard' + params: + cloud_provider: openstackcsp + role: app + vshn_service_level: standard + - product_id: 'openshift-openstackcsp-workervcpu-zero' params: + cloud_provider: openstackcsp + role: app vshn_service_level: zero - cloud_provider: openstack - - product_id: 'openshift-worker-vcpu-openstack-standard' + - product_id: 'openshift-openstackonprem-workervcpu-besteffort' + params: + cloud_provider: openstack|openstackonprem + role: app + vshn_service_level: best_effort + - product_id: 'openshift-openstackonprem-workervcpu-guaranteed' + params: + cloud_provider: openstack|openstackonprem + role: app + vshn_service_level: guaranteed_availability + - product_id: 'openshift-openstackonprem-workervcpu-premium' + params: + cloud_provider: openstack|openstackonprem + role: app + vshn_service_level: premium + - product_id: 'openshift-openstackonprem-workervcpu-professional' params: + cloud_provider: openstack|openstackonprem + role: app + vshn_service_level: professional + - product_id: 'openshift-openstackonprem-workervcpu-standard' + params: + cloud_provider: openstack|openstackonprem + role: app vshn_service_level: standard - cloud_provider: openstack - - product_id: 'openshift-worker-vcpu-openstack-professional' + - product_id: 'openshift-openstackonprem-workervcpu-zero' + params: + cloud_provider: openstack|openstackonprem + role: app + vshn_service_level: zero + - product_id: 'openshift-vspherecsp-workervcpu-besteffort' + params: + cloud_provider: vspherecsp + role: app + vshn_service_level: best_effort + - product_id: 'openshift-vspherecsp-workervcpu-guaranteed' + params: + cloud_provider: vspherecsp + role: app + vshn_service_level: guaranteed_availability + - product_id: 'openshift-vspherecsp-workervcpu-premium' + params: + cloud_provider: vspherecsp + role: app + vshn_service_level: premium + - product_id: 'openshift-vspherecsp-workervcpu-professional' params: + cloud_provider: vspherecsp + role: app vshn_service_level: professional - cloud_provider: openstack - - product_id: 'openshift-worker-vcpu-openstack-premium' + - product_id: 'openshift-vspherecsp-workervcpu-standard' + params: + cloud_provider: vspherecsp + role: app + vshn_service_level: standard + - product_id: 'openshift-vspherecsp-workervcpu-zero' + params: + cloud_provider: vspherecsp + role: app + vshn_service_level: zero + - product_id: 'openshift-vsphereonprem-workervcpu-besteffort' + params: + cloud_provider: vsphere|vsphereonprem + role: app + vshn_service_level: best_effort + - product_id: 'openshift-vsphereonprem-workervcpu-guaranteed' params: + cloud_provider: vsphere|vsphereonprem + role: app + vshn_service_level: guaranteed_availability + - product_id: 'openshift-vsphereonprem-workervcpu-premium' + params: + cloud_provider: vsphere|vsphereonprem + role: app vshn_service_level: premium - cloud_provider: openstack - # Special cases - - product_id: 'openshift-worker-vcpu-vsphere-standard' + - product_id: 'openshift-vsphereonprem-workervcpu-professional' + params: + cloud_provider: vsphere|vsphereonprem + role: app + vshn_service_level: professional + - product_id: 'openshift-vsphereonprem-workervcpu-standard' params: + cloud_provider: vsphere|vsphereonprem + role: app vshn_service_level: standard + - product_id: 'openshift-vsphereonprem-workervcpu-zero' + params: + cloud_provider: vsphere|vsphereonprem + role: app + vshn_service_level: zero + - product_id: 'openshift-xelon-workervcpu-besteffort' + params: + cloud_provider: xelon + role: app + vshn_service_level: best_effort + - product_id: 'openshift-xelon-workervcpu-guaranteed' + params: cloud_provider: xelon - - product_id: 'openshift-worker-vcpu-vsphere-professional' + role: app + vshn_service_level: guaranteed_availability + - product_id: 'openshift-xelon-workervcpu-premium' params: + cloud_provider: xelon + role: app + vshn_service_level: premium + - product_id: 'openshift-xelon-workervcpu-professional' + params: + cloud_provider: xelon + role: app vshn_service_level: professional - cloud_provider: none + - product_id: 'openshift-xelon-workervcpu-standard' + params: + cloud_provider: xelon + role: app + vshn_service_level: standard + - product_id: 'openshift-xelon-workervcpu-zero' + params: + cloud_provider: xelon + role: app + vshn_service_level: zero instance_id_pattern: '%(cluster_id)s' item_group_description_pattern: 'APPUiO Managed OpenShift - Cluster: %(cluster_id)s' unit_id: 'uom_uom_49_440b0fa7' #vCPU-Hour @@ -260,13 +395,13 @@ parameters: # Limit to worker nodes only * on (cluster_id, instance) group_left() ( # node_cpu_info and kube_node_role use different labels to identify the node. - label_join(kube_node_role{role=~"app|storage"}, "instance", "", "node") + label_join(kube_node_role{role="%(role)s"}, "instance", "", "node") ) )[59m:1m] ) # Pull in the APPUiO managed info labels * on(cluster_id) group_left(sales_order) appuio_managed_info{ - cloud_provider="%(cloud_provider)s", + cloud_provider=~"%(cloud_provider)s", vshn_service_level="%(vshn_service_level)s", } @@ -274,18 +409,18 @@ parameters: enabled: true prometheus_org_id: appuio-managed-kubernetes-services-billing products: - - product_id: kubernetes-iaas-cluster-zero - params: - vshn_service_level: zero - - product_id: kubernetes-iaas-cluster-standard + - product_id: 'kubernetes-iaas-cluster-premium' params: - vshn_service_level: standard - - product_id: kubernetes-iaas-cluster-professional + vshn_service_level: premium + - product_id: 'kubernetes-iaas-cluster-professional' params: vshn_service_level: professional - - product_id: kubernetes-iaas-cluster-premium + - product_id: 'kubernetes-iaas-cluster-standard' params: - vshn_service_level: premium + vshn_service_level: standard + - product_id: 'kubernetes-iaas-cluster-zero' + params: + vshn_service_level: zero instance_id_pattern: '%(cluster_id)s' item_group_description_pattern: 'APPUiO Managed - Cluster: %(cluster_id)s' # TODO unit_id: "uom_uom_53_4a7e8f3e" #Cluster-Hour @@ -305,18 +440,18 @@ parameters: enabled: true prometheus_org_id: appuio-managed-kubernetes-services-billing products: - - product_id: kubernetes-iaas-node-zero + - product_id: 'kubernetes-iaas-node-premium' params: - vshn_service_level: zero - - product_id: kubernetes-iaas-node-standard - params: - vshn_service_level: standard - - product_id: kubernetes-iaas-node-professional + vshn_service_level: premium + - product_id: 'kubernetes-iaas-node-professional' params: vshn_service_level: professional - - product_id: kubernetes-iaas-node-premium + - product_id: 'kubernetes-iaas-node-standard' params: - vshn_service_level: premium + vshn_service_level: standard + - product_id: 'kubernetes-iaas-node-zero' + params: + vshn_service_level: zero instance_id_pattern: '%(cluster_id)s' item_group_description_pattern: 'APPUiO Managed - Cluster: %(cluster_id)s' # TODO unit_id: "uom_uom_191_55730e52" #Node-Hour @@ -338,49 +473,46 @@ parameters: enabled: true prometheus_org_id: appuio-managed-kubernetes-services-billing products: - - product_id: kubernetes-awseks-vcpu-besteffort + - product_id: 'kubernetes-awseks-vcpu-besteffort' params: - vshn_service_level: best_effort - cloud_provider: aws distribution: eks - - product_id: kubernetes-awseks-vcpu-guaranteed - params: - vshn_service_level: guaranteed_availability cloud_provider: aws + vshn_service_level: best_effort + - product_id: 'kubernetes-awseks-vcpu-guaranteed' + params: distribution: eks - - - product_id: kubernetes-exoscalesks-vcpu-besteffort + cloud_provider: aws + vshn_service_level: guaranteed_availability + - product_id: 'kubernetes-azureaks-vcpu-besteffort' params: + distribution: aks + cloud_provider: azure vshn_service_level: best_effort - cloud_provider: exoscale - distribution: sks - - product_id: kubernetes-exoscalesks-vcpu-guaranteed + - product_id: 'kubernetes-azureaks-vcpu-guaranteed' params: + distribution: aks + cloud_provider: azure vshn_service_level: guaranteed_availability - cloud_provider: exoscale - distribution: sks - - - product_id: kubernetes-googlegke-vcpu-besteffort + - product_id: 'kubernetes-exoscalesks-vcpu-besteffort' params: + distribution: sks + cloud_provider: exoscale vshn_service_level: best_effort - cloud_provider: gcp - distribution: gke - - product_id: kubernetes-googlegke-vcpu-guaranteed + - product_id: 'kubernetes-exoscalesks-vcpu-guaranteed' params: + distribution: sks + cloud_provider: exoscale vshn_service_level: guaranteed_availability - cloud_provider: gcp - distribution: gke - - - product_id: kubernetes-azureaks-vcpu-besteffort + - product_id: 'kubernetes-googlegke-vcpu-besteffort' params: + distribution: gke + cloud_provider: google vshn_service_level: best_effort - cloud_provider: azure - distribution: aks - - product_id: kubernetes-azureaks-vcpu-guaranteed + - product_id: 'kubernetes-googlegke-vcpu-guaranteed' params: + distribution: gke + cloud_provider: google vshn_service_level: guaranteed_availability - cloud_provider: azure - distribution: aks instance_id_pattern: '%(cluster_id)s' item_group_description_pattern: 'APPUiO Managed - Cluster: %(cluster_id)s' # TODO unit_id: "uom_uom_49_440b0fa7" #vCPU-Hour @@ -399,18 +531,18 @@ parameters: enabled: true prometheus_org_id: appuio-managed-kubernetes-services-billing products: - - product_id: kubernetes-hyperscaler-cluster-zero - params: - vshn_service_level: zero - - product_id: kubernetes-hyperscaler-cluster-standard + - product_id: 'kubernetes-hyperscaler-cluster-premium' params: - vshn_service_level: standard - - product_id: kubernetes-hyperscaler-cluster-professional + vshn_service_level: premium + - product_id: 'kubernetes-hyperscaler-cluster-professional' params: vshn_service_level: professional - - product_id: kubernetes-hyperscaler-cluster-premium + - product_id: 'kubernetes-hyperscaler-cluster-standard' params: - vshn_service_level: premium + vshn_service_level: standard + - product_id: 'kubernetes-hyperscaler-cluster-zero' + params: + vshn_service_level: zero instance_id_pattern: '%(cluster_id)s' item_group_description_pattern: 'APPUiO Managed - Cluster: %(cluster_id)s' # TODO unit_id: "uom_uom_53_4a7e8f3e" #Cluster-Hour @@ -431,18 +563,18 @@ parameters: enabled: true prometheus_org_id: appuio-managed-kubernetes-services-billing products: - - product_id: kubernetes-hyperscaler-cluster-zero - params: - vshn_service_level: zero - - product_id: kubernetes-hyperscaler-cluster-standard + - product_id: 'kubernetes-hyperscaler-node-premium' params: - vshn_service_level: standard - - product_id: kubernetes-hyperscaler-cluster-professional + vshn_service_level: premium + - product_id: 'kubernetes-hyperscaler-node-professional' params: vshn_service_level: professional - - product_id: kubernetes-hyperscaler-cluster-premium + - product_id: 'kubernetes-hyperscaler-node-standard' params: - vshn_service_level: premium + vshn_service_level: standard + - product_id: 'kubernetes-hyperscaler-node-zero' + params: + vshn_service_level: zero instance_id_pattern: '%(cluster_id)s' item_group_description_pattern: 'APPUiO Managed - Cluster: %(cluster_id)s' # TODO unit_id: "uom_uom_191_55730e52" #Node-Hour diff --git a/tests/golden/defaults/appuio-reporting/appuio-reporting/11_backfill.yaml b/tests/golden/defaults/appuio-reporting/appuio-reporting/11_backfill.yaml index aaf9f65..483d17a 100644 --- a/tests/golden/defaults/appuio-reporting/appuio-reporting/11_backfill.yaml +++ b/tests/golden/defaults/appuio-reporting/appuio-reporting/11_backfill.yaml @@ -2,25 +2,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-besteffort + product-id: openshift-cloudscale-storagevcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-cloudscale-besteffort-0 - name: openshift-worker-vcpu-cloudscale-besteffort-0 + name: openshift-cloudscale-storagevcpu-besteffort-0 + name: openshift-cloudscale-storagevcpu-besteffort-0 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-besteffort + product-id: openshift-cloudscale-storagevcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-cloudscale-besteffort-0 + cron-job-name: openshift-cloudscale-storagevcpu-besteffort-0 spec: template: metadata: @@ -59,7 +59,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-cloudscale-besteffort + value: openshift-cloudscale-storagevcpu-besteffort - name: AR_QUERY value: | # Calculates vCPUs for app nodes of a cluster @@ -72,13 +72,13 @@ spec: # Limit to worker nodes only * on (cluster_id, instance) group_left() ( # node_cpu_info and kube_node_role use different labels to identify the node. - label_join(kube_node_role{role=~"app|storage"}, "instance", "", "node") + label_join(kube_node_role{role="storage"}, "instance", "", "node") ) )[59m:1m] ) # Pull in the APPUiO managed info labels * on(cluster_id) group_left(sales_order) appuio_managed_info{ - cloud_provider="cloudscale", + cloud_provider=~"cloudscale", vshn_service_level="best_effort", } - name: AR_INSTANCE_JSONNET @@ -104,25 +104,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-guaranteedavailability + product-id: openshift-cloudscale-storagevcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-cloudscale-gua-93468ed8b2029fe - name: openshift-worker-vcpu-cloudscale-gua-93468ed8b2029fe + name: openshift-cloudscale-storagevcpu-guaranteed-1 + name: openshift-cloudscale-storagevcpu-guaranteed-1 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-guaranteedavailability + product-id: openshift-cloudscale-storagevcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-cloudscale-guaranteedavailability-1 + cron-job-name: openshift-cloudscale-storagevcpu-guaranteed-1 spec: template: metadata: @@ -161,7 +161,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-cloudscale-guaranteedavailability + value: openshift-cloudscale-storagevcpu-guaranteed - name: AR_QUERY value: | # Calculates vCPUs for app nodes of a cluster @@ -174,13 +174,13 @@ spec: # Limit to worker nodes only * on (cluster_id, instance) group_left() ( # node_cpu_info and kube_node_role use different labels to identify the node. - label_join(kube_node_role{role=~"app|storage"}, "instance", "", "node") + label_join(kube_node_role{role="storage"}, "instance", "", "node") ) )[59m:1m] ) # Pull in the APPUiO managed info labels * on(cluster_id) group_left(sales_order) appuio_managed_info{ - cloud_provider="cloudscale", + cloud_provider=~"cloudscale", vshn_service_level="guaranteed_availability", } - name: AR_INSTANCE_JSONNET @@ -206,25 +206,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-besteffort + product-id: openshift-cloudscale-storagevcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-exoscale-besteffort-2 - name: openshift-worker-vcpu-exoscale-besteffort-2 + name: openshift-cloudscale-storagevcpu-premium-2 + name: openshift-cloudscale-storagevcpu-premium-2 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-besteffort + product-id: openshift-cloudscale-storagevcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-exoscale-besteffort-2 + cron-job-name: openshift-cloudscale-storagevcpu-premium-2 spec: template: metadata: @@ -263,7 +263,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-exoscale-besteffort + value: openshift-cloudscale-storagevcpu-premium - name: AR_QUERY value: | # Calculates vCPUs for app nodes of a cluster @@ -276,14 +276,14 @@ spec: # Limit to worker nodes only * on (cluster_id, instance) group_left() ( # node_cpu_info and kube_node_role use different labels to identify the node. - label_join(kube_node_role{role=~"app|storage"}, "instance", "", "node") + label_join(kube_node_role{role="storage"}, "instance", "", "node") ) )[59m:1m] ) # Pull in the APPUiO managed info labels * on(cluster_id) group_left(sales_order) appuio_managed_info{ - cloud_provider="exoscale", - vshn_service_level="best_effort", + cloud_provider=~"cloudscale", + vshn_service_level="premium", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -308,25 +308,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-guaranteedavailability + product-id: openshift-cloudscale-storagevcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-exoscale-guara-c7fabf75f900683 - name: openshift-worker-vcpu-exoscale-guara-c7fabf75f900683 + name: openshift-cloudscale-storagevcpu-professional-3 + name: openshift-cloudscale-storagevcpu-professional-3 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-guaranteedavailability + product-id: openshift-cloudscale-storagevcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-exoscale-guaranteedavailability-3 + cron-job-name: openshift-cloudscale-storagevcpu-professional-3 spec: template: metadata: @@ -365,7 +365,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-exoscale-guaranteedavailability + value: openshift-cloudscale-storagevcpu-professional - name: AR_QUERY value: | # Calculates vCPUs for app nodes of a cluster @@ -378,14 +378,14 @@ spec: # Limit to worker nodes only * on (cluster_id, instance) group_left() ( # node_cpu_info and kube_node_role use different labels to identify the node. - label_join(kube_node_role{role=~"app|storage"}, "instance", "", "node") + label_join(kube_node_role{role="storage"}, "instance", "", "node") ) )[59m:1m] ) # Pull in the APPUiO managed info labels * on(cluster_id) group_left(sales_order) appuio_managed_info{ - cloud_provider="exoscale", - vshn_service_level="guaranteed_availability", + cloud_provider=~"cloudscale", + vshn_service_level="professional", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -410,25 +410,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-besteffort + product-id: openshift-cloudscale-storagevcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-vsphere-besteffort-4 - name: openshift-worker-vcpu-vsphere-besteffort-4 + name: openshift-cloudscale-storagevcpu-standard-4 + name: openshift-cloudscale-storagevcpu-standard-4 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-besteffort + product-id: openshift-cloudscale-storagevcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-vsphere-besteffort-4 + cron-job-name: openshift-cloudscale-storagevcpu-standard-4 spec: template: metadata: @@ -467,7 +467,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-vsphere-besteffort + value: openshift-cloudscale-storagevcpu-standard - name: AR_QUERY value: | # Calculates vCPUs for app nodes of a cluster @@ -480,14 +480,14 @@ spec: # Limit to worker nodes only * on (cluster_id, instance) group_left() ( # node_cpu_info and kube_node_role use different labels to identify the node. - label_join(kube_node_role{role=~"app|storage"}, "instance", "", "node") + label_join(kube_node_role{role="storage"}, "instance", "", "node") ) )[59m:1m] ) # Pull in the APPUiO managed info labels * on(cluster_id) group_left(sales_order) appuio_managed_info{ - cloud_provider="vsphere", - vshn_service_level="best_effort", + cloud_provider=~"cloudscale", + vshn_service_level="standard", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -512,25 +512,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-guaranteedavailability + product-id: openshift-cloudscale-workervcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-vsphere-guaran-2b28379ea85e0d3 - name: openshift-worker-vcpu-vsphere-guaran-2b28379ea85e0d3 + name: openshift-cloudscale-workervcpu-besteffort-5 + name: openshift-cloudscale-workervcpu-besteffort-5 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-guaranteedavailability + product-id: openshift-cloudscale-workervcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-vsphere-guaranteedavailability-5 + cron-job-name: openshift-cloudscale-workervcpu-besteffort-5 spec: template: metadata: @@ -569,7 +569,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-vsphere-guaranteedavailability + value: openshift-cloudscale-workervcpu-besteffort - name: AR_QUERY value: | # Calculates vCPUs for app nodes of a cluster @@ -582,14 +582,14 @@ spec: # Limit to worker nodes only * on (cluster_id, instance) group_left() ( # node_cpu_info and kube_node_role use different labels to identify the node. - label_join(kube_node_role{role=~"app|storage"}, "instance", "", "node") + label_join(kube_node_role{role="app"}, "instance", "", "node") ) )[59m:1m] ) # Pull in the APPUiO managed info labels * on(cluster_id) group_left(sales_order) appuio_managed_info{ - cloud_provider="vsphere", - vshn_service_level="guaranteed_availability", + cloud_provider=~"cloudscale", + vshn_service_level="best_effort", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -614,25 +614,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-openstack-besteffort + product-id: openshift-cloudscale-workervcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-openstack-besteffort-6 - name: openshift-worker-vcpu-openstack-besteffort-6 + name: openshift-cloudscale-workervcpu-guaranteed-6 + name: openshift-cloudscale-workervcpu-guaranteed-6 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-openstack-besteffort + product-id: openshift-cloudscale-workervcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-openstack-besteffort-6 + cron-job-name: openshift-cloudscale-workervcpu-guaranteed-6 spec: template: metadata: @@ -671,7 +671,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-openstack-besteffort + value: openshift-cloudscale-workervcpu-guaranteed - name: AR_QUERY value: | # Calculates vCPUs for app nodes of a cluster @@ -684,14 +684,14 @@ spec: # Limit to worker nodes only * on (cluster_id, instance) group_left() ( # node_cpu_info and kube_node_role use different labels to identify the node. - label_join(kube_node_role{role=~"app|storage"}, "instance", "", "node") + label_join(kube_node_role{role="app"}, "instance", "", "node") ) )[59m:1m] ) # Pull in the APPUiO managed info labels * on(cluster_id) group_left(sales_order) appuio_managed_info{ - cloud_provider="openstack", - vshn_service_level="best_effort", + cloud_provider=~"cloudscale", + vshn_service_level="guaranteed_availability", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -716,25 +716,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-openstack-guaranteedavailability + product-id: openshift-cloudscale-workervcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-openstack-guar-437fd9b37153898 - name: openshift-worker-vcpu-openstack-guar-437fd9b37153898 + name: openshift-cloudscale-workervcpu-premium-7 + name: openshift-cloudscale-workervcpu-premium-7 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-openstack-guaranteedavailability + product-id: openshift-cloudscale-workervcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-openstack-guaranteedavailability-7 + cron-job-name: openshift-cloudscale-workervcpu-premium-7 spec: template: metadata: @@ -773,7 +773,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-openstack-guaranteedavailability + value: openshift-cloudscale-workervcpu-premium - name: AR_QUERY value: | # Calculates vCPUs for app nodes of a cluster @@ -786,14 +786,14 @@ spec: # Limit to worker nodes only * on (cluster_id, instance) group_left() ( # node_cpu_info and kube_node_role use different labels to identify the node. - label_join(kube_node_role{role=~"app|storage"}, "instance", "", "node") + label_join(kube_node_role{role="app"}, "instance", "", "node") ) )[59m:1m] ) # Pull in the APPUiO managed info labels * on(cluster_id) group_left(sales_order) appuio_managed_info{ - cloud_provider="openstack", - vshn_service_level="guaranteed_availability", + cloud_provider=~"cloudscale", + vshn_service_level="premium", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -818,25 +818,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-besteffort + product-id: openshift-cloudscale-workervcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-cloudscale-besteffort-8 - name: openshift-worker-vcpu-cloudscale-besteffort-8 + name: openshift-cloudscale-workervcpu-professional-8 + name: openshift-cloudscale-workervcpu-professional-8 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-besteffort + product-id: openshift-cloudscale-workervcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-cloudscale-besteffort-8 + cron-job-name: openshift-cloudscale-workervcpu-professional-8 spec: template: metadata: @@ -875,7 +875,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-cloudscale-besteffort + value: openshift-cloudscale-workervcpu-professional - name: AR_QUERY value: | # Calculates vCPUs for app nodes of a cluster @@ -888,14 +888,14 @@ spec: # Limit to worker nodes only * on (cluster_id, instance) group_left() ( # node_cpu_info and kube_node_role use different labels to identify the node. - label_join(kube_node_role{role=~"app|storage"}, "instance", "", "node") + label_join(kube_node_role{role="app"}, "instance", "", "node") ) )[59m:1m] ) # Pull in the APPUiO managed info labels * on(cluster_id) group_left(sales_order) appuio_managed_info{ - cloud_provider="cloudscale", - vshn_service_level="best_effort", + cloud_provider=~"cloudscale", + vshn_service_level="professional", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -920,25 +920,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-guaranteedavailability + product-id: openshift-cloudscale-workervcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-cloudscale-gua-9c5f21dd467a005 - name: openshift-worker-vcpu-cloudscale-gua-9c5f21dd467a005 + name: openshift-cloudscale-workervcpu-standard-9 + name: openshift-cloudscale-workervcpu-standard-9 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-guaranteedavailability + product-id: openshift-cloudscale-workervcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-cloudscale-guaranteedavailability-9 + cron-job-name: openshift-cloudscale-workervcpu-standard-9 spec: template: metadata: @@ -977,7 +977,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-cloudscale-guaranteedavailability + value: openshift-cloudscale-workervcpu-standard - name: AR_QUERY value: | # Calculates vCPUs for app nodes of a cluster @@ -990,14 +990,14 @@ spec: # Limit to worker nodes only * on (cluster_id, instance) group_left() ( # node_cpu_info and kube_node_role use different labels to identify the node. - label_join(kube_node_role{role=~"app|storage"}, "instance", "", "node") + label_join(kube_node_role{role="app"}, "instance", "", "node") ) )[59m:1m] ) # Pull in the APPUiO managed info labels * on(cluster_id) group_left(sales_order) appuio_managed_info{ - cloud_provider="cloudscale", - vshn_service_level="guaranteed_availability", + cloud_provider=~"cloudscale", + vshn_service_level="standard", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -1022,25 +1022,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-zero + product-id: openshift-cloudscale-workervcpu-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-cloudscale-zero-10 - name: openshift-worker-vcpu-cloudscale-zero-10 + name: openshift-cloudscale-workervcpu-zero-10 + name: openshift-cloudscale-workervcpu-zero-10 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-zero + product-id: openshift-cloudscale-workervcpu-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-cloudscale-zero-10 + cron-job-name: openshift-cloudscale-workervcpu-zero-10 spec: template: metadata: @@ -1079,7 +1079,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-cloudscale-zero + value: openshift-cloudscale-workervcpu-zero - name: AR_QUERY value: | # Calculates vCPUs for app nodes of a cluster @@ -1092,13 +1092,13 @@ spec: # Limit to worker nodes only * on (cluster_id, instance) group_left() ( # node_cpu_info and kube_node_role use different labels to identify the node. - label_join(kube_node_role{role=~"app|storage"}, "instance", "", "node") + label_join(kube_node_role{role="app"}, "instance", "", "node") ) )[59m:1m] ) # Pull in the APPUiO managed info labels * on(cluster_id) group_left(sales_order) appuio_managed_info{ - cloud_provider="cloudscale", + cloud_provider=~"cloudscale", vshn_service_level="zero", } - name: AR_INSTANCE_JSONNET @@ -1124,25 +1124,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-standard + product-id: openshift-exoscale-storagevcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-cloudscale-standard-11 - name: openshift-worker-vcpu-cloudscale-standard-11 + name: openshift-exoscale-storagevcpu-besteffort-11 + name: openshift-exoscale-storagevcpu-besteffort-11 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-standard + product-id: openshift-exoscale-storagevcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-cloudscale-standard-11 + cron-job-name: openshift-exoscale-storagevcpu-besteffort-11 spec: template: metadata: @@ -1181,7 +1181,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-cloudscale-standard + value: openshift-exoscale-storagevcpu-besteffort - name: AR_QUERY value: | # Calculates vCPUs for app nodes of a cluster @@ -1194,14 +1194,14 @@ spec: # Limit to worker nodes only * on (cluster_id, instance) group_left() ( # node_cpu_info and kube_node_role use different labels to identify the node. - label_join(kube_node_role{role=~"app|storage"}, "instance", "", "node") + label_join(kube_node_role{role="storage"}, "instance", "", "node") ) )[59m:1m] ) # Pull in the APPUiO managed info labels * on(cluster_id) group_left(sales_order) appuio_managed_info{ - cloud_provider="cloudscale", - vshn_service_level="standard", + cloud_provider=~"exoscale", + vshn_service_level="best_effort", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -1226,25 +1226,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-professional + product-id: openshift-exoscale-storagevcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-cloudscale-professional-12 - name: openshift-worker-vcpu-cloudscale-professional-12 + name: openshift-exoscale-storagevcpu-guaranteed-12 + name: openshift-exoscale-storagevcpu-guaranteed-12 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-professional + product-id: openshift-exoscale-storagevcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-cloudscale-professional-12 + cron-job-name: openshift-exoscale-storagevcpu-guaranteed-12 spec: template: metadata: @@ -1283,7 +1283,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-cloudscale-professional + value: openshift-exoscale-storagevcpu-guaranteed - name: AR_QUERY value: | # Calculates vCPUs for app nodes of a cluster @@ -1296,14 +1296,14 @@ spec: # Limit to worker nodes only * on (cluster_id, instance) group_left() ( # node_cpu_info and kube_node_role use different labels to identify the node. - label_join(kube_node_role{role=~"app|storage"}, "instance", "", "node") + label_join(kube_node_role{role="storage"}, "instance", "", "node") ) )[59m:1m] ) # Pull in the APPUiO managed info labels * on(cluster_id) group_left(sales_order) appuio_managed_info{ - cloud_provider="cloudscale", - vshn_service_level="professional", + cloud_provider=~"exoscale", + vshn_service_level="guaranteed_availability", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -1328,25 +1328,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-premium + product-id: openshift-exoscale-storagevcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-cloudscale-premium-13 - name: openshift-worker-vcpu-cloudscale-premium-13 + name: openshift-exoscale-storagevcpu-premium-13 + name: openshift-exoscale-storagevcpu-premium-13 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-premium + product-id: openshift-exoscale-storagevcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-cloudscale-premium-13 + cron-job-name: openshift-exoscale-storagevcpu-premium-13 spec: template: metadata: @@ -1385,7 +1385,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-cloudscale-premium + value: openshift-exoscale-storagevcpu-premium - name: AR_QUERY value: | # Calculates vCPUs for app nodes of a cluster @@ -1398,13 +1398,13 @@ spec: # Limit to worker nodes only * on (cluster_id, instance) group_left() ( # node_cpu_info and kube_node_role use different labels to identify the node. - label_join(kube_node_role{role=~"app|storage"}, "instance", "", "node") + label_join(kube_node_role{role="storage"}, "instance", "", "node") ) )[59m:1m] ) # Pull in the APPUiO managed info labels * on(cluster_id) group_left(sales_order) appuio_managed_info{ - cloud_provider="cloudscale", + cloud_provider=~"exoscale", vshn_service_level="premium", } - name: AR_INSTANCE_JSONNET @@ -1430,25 +1430,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-zero + product-id: openshift-exoscale-storagevcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-exoscale-zero-14 - name: openshift-worker-vcpu-exoscale-zero-14 + name: openshift-exoscale-storagevcpu-professional-14 + name: openshift-exoscale-storagevcpu-professional-14 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-zero + product-id: openshift-exoscale-storagevcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-exoscale-zero-14 + cron-job-name: openshift-exoscale-storagevcpu-professional-14 spec: template: metadata: @@ -1487,7 +1487,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-exoscale-zero + value: openshift-exoscale-storagevcpu-professional - name: AR_QUERY value: | # Calculates vCPUs for app nodes of a cluster @@ -1500,14 +1500,14 @@ spec: # Limit to worker nodes only * on (cluster_id, instance) group_left() ( # node_cpu_info and kube_node_role use different labels to identify the node. - label_join(kube_node_role{role=~"app|storage"}, "instance", "", "node") + label_join(kube_node_role{role="storage"}, "instance", "", "node") ) )[59m:1m] ) # Pull in the APPUiO managed info labels * on(cluster_id) group_left(sales_order) appuio_managed_info{ - cloud_provider="exoscale", - vshn_service_level="zero", + cloud_provider=~"exoscale", + vshn_service_level="professional", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -1532,25 +1532,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-standard + product-id: openshift-exoscale-storagevcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-exoscale-standard-15 - name: openshift-worker-vcpu-exoscale-standard-15 + name: openshift-exoscale-storagevcpu-standard-15 + name: openshift-exoscale-storagevcpu-standard-15 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-standard + product-id: openshift-exoscale-storagevcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-exoscale-standard-15 + cron-job-name: openshift-exoscale-storagevcpu-standard-15 spec: template: metadata: @@ -1589,7 +1589,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-exoscale-standard + value: openshift-exoscale-storagevcpu-standard - name: AR_QUERY value: | # Calculates vCPUs for app nodes of a cluster @@ -1602,13 +1602,13 @@ spec: # Limit to worker nodes only * on (cluster_id, instance) group_left() ( # node_cpu_info and kube_node_role use different labels to identify the node. - label_join(kube_node_role{role=~"app|storage"}, "instance", "", "node") + label_join(kube_node_role{role="storage"}, "instance", "", "node") ) )[59m:1m] ) # Pull in the APPUiO managed info labels * on(cluster_id) group_left(sales_order) appuio_managed_info{ - cloud_provider="exoscale", + cloud_provider=~"exoscale", vshn_service_level="standard", } - name: AR_INSTANCE_JSONNET @@ -1634,25 +1634,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-professional + product-id: openshift-exoscale-workervcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-exoscale-professional-16 - name: openshift-worker-vcpu-exoscale-professional-16 + name: openshift-exoscale-workervcpu-besteffort-16 + name: openshift-exoscale-workervcpu-besteffort-16 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-professional + product-id: openshift-exoscale-workervcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-exoscale-professional-16 + cron-job-name: openshift-exoscale-workervcpu-besteffort-16 spec: template: metadata: @@ -1691,7 +1691,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-exoscale-professional + value: openshift-exoscale-workervcpu-besteffort - name: AR_QUERY value: | # Calculates vCPUs for app nodes of a cluster @@ -1704,14 +1704,14 @@ spec: # Limit to worker nodes only * on (cluster_id, instance) group_left() ( # node_cpu_info and kube_node_role use different labels to identify the node. - label_join(kube_node_role{role=~"app|storage"}, "instance", "", "node") + label_join(kube_node_role{role="app"}, "instance", "", "node") ) )[59m:1m] ) # Pull in the APPUiO managed info labels * on(cluster_id) group_left(sales_order) appuio_managed_info{ - cloud_provider="exoscale", - vshn_service_level="professional", + cloud_provider=~"exoscale", + vshn_service_level="best_effort", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -1736,25 +1736,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-premium + product-id: openshift-exoscale-workervcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-exoscale-premium-17 - name: openshift-worker-vcpu-exoscale-premium-17 + name: openshift-exoscale-workervcpu-guaranteed-17 + name: openshift-exoscale-workervcpu-guaranteed-17 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-premium + product-id: openshift-exoscale-workervcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-exoscale-premium-17 + cron-job-name: openshift-exoscale-workervcpu-guaranteed-17 spec: template: metadata: @@ -1793,7 +1793,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-exoscale-premium + value: openshift-exoscale-workervcpu-guaranteed - name: AR_QUERY value: | # Calculates vCPUs for app nodes of a cluster @@ -1806,14 +1806,14 @@ spec: # Limit to worker nodes only * on (cluster_id, instance) group_left() ( # node_cpu_info and kube_node_role use different labels to identify the node. - label_join(kube_node_role{role=~"app|storage"}, "instance", "", "node") + label_join(kube_node_role{role="app"}, "instance", "", "node") ) )[59m:1m] ) # Pull in the APPUiO managed info labels * on(cluster_id) group_left(sales_order) appuio_managed_info{ - cloud_provider="exoscale", - vshn_service_level="premium", + cloud_provider=~"exoscale", + vshn_service_level="guaranteed_availability", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -1838,25 +1838,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-zero + product-id: openshift-exoscale-workervcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-vsphere-zero-18 - name: openshift-worker-vcpu-vsphere-zero-18 + name: openshift-exoscale-workervcpu-premium-18 + name: openshift-exoscale-workervcpu-premium-18 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-zero + product-id: openshift-exoscale-workervcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-vsphere-zero-18 + cron-job-name: openshift-exoscale-workervcpu-premium-18 spec: template: metadata: @@ -1895,7 +1895,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-vsphere-zero + value: openshift-exoscale-workervcpu-premium - name: AR_QUERY value: | # Calculates vCPUs for app nodes of a cluster @@ -1908,14 +1908,14 @@ spec: # Limit to worker nodes only * on (cluster_id, instance) group_left() ( # node_cpu_info and kube_node_role use different labels to identify the node. - label_join(kube_node_role{role=~"app|storage"}, "instance", "", "node") + label_join(kube_node_role{role="app"}, "instance", "", "node") ) )[59m:1m] ) # Pull in the APPUiO managed info labels * on(cluster_id) group_left(sales_order) appuio_managed_info{ - cloud_provider="vsphere", - vshn_service_level="zero", + cloud_provider=~"exoscale", + vshn_service_level="premium", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -1940,25 +1940,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-standard + product-id: openshift-exoscale-workervcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-vsphere-standard-19 - name: openshift-worker-vcpu-vsphere-standard-19 + name: openshift-exoscale-workervcpu-professional-19 + name: openshift-exoscale-workervcpu-professional-19 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-standard + product-id: openshift-exoscale-workervcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-vsphere-standard-19 + cron-job-name: openshift-exoscale-workervcpu-professional-19 spec: template: metadata: @@ -1997,7 +1997,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-vsphere-standard + value: openshift-exoscale-workervcpu-professional - name: AR_QUERY value: | # Calculates vCPUs for app nodes of a cluster @@ -2010,14 +2010,14 @@ spec: # Limit to worker nodes only * on (cluster_id, instance) group_left() ( # node_cpu_info and kube_node_role use different labels to identify the node. - label_join(kube_node_role{role=~"app|storage"}, "instance", "", "node") + label_join(kube_node_role{role="app"}, "instance", "", "node") ) )[59m:1m] ) # Pull in the APPUiO managed info labels * on(cluster_id) group_left(sales_order) appuio_managed_info{ - cloud_provider="vsphere", - vshn_service_level="standard", + cloud_provider=~"exoscale", + vshn_service_level="professional", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -2042,25 +2042,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-professional + product-id: openshift-exoscale-workervcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-vsphere-professional-20 - name: openshift-worker-vcpu-vsphere-professional-20 + name: openshift-exoscale-workervcpu-standard-20 + name: openshift-exoscale-workervcpu-standard-20 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-professional + product-id: openshift-exoscale-workervcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-vsphere-professional-20 + cron-job-name: openshift-exoscale-workervcpu-standard-20 spec: template: metadata: @@ -2099,7 +2099,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-vsphere-professional + value: openshift-exoscale-workervcpu-standard - name: AR_QUERY value: | # Calculates vCPUs for app nodes of a cluster @@ -2112,14 +2112,14 @@ spec: # Limit to worker nodes only * on (cluster_id, instance) group_left() ( # node_cpu_info and kube_node_role use different labels to identify the node. - label_join(kube_node_role{role=~"app|storage"}, "instance", "", "node") + label_join(kube_node_role{role="app"}, "instance", "", "node") ) )[59m:1m] ) # Pull in the APPUiO managed info labels * on(cluster_id) group_left(sales_order) appuio_managed_info{ - cloud_provider="vsphere", - vshn_service_level="professional", + cloud_provider=~"exoscale", + vshn_service_level="standard", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -2144,25 +2144,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-premium + product-id: openshift-exoscale-workervcpu-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-vsphere-premium-21 - name: openshift-worker-vcpu-vsphere-premium-21 + name: openshift-exoscale-workervcpu-zero-21 + name: openshift-exoscale-workervcpu-zero-21 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-premium + product-id: openshift-exoscale-workervcpu-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-vsphere-premium-21 + cron-job-name: openshift-exoscale-workervcpu-zero-21 spec: template: metadata: @@ -2201,7 +2201,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-vsphere-premium + value: openshift-exoscale-workervcpu-zero - name: AR_QUERY value: | # Calculates vCPUs for app nodes of a cluster @@ -2214,14 +2214,14 @@ spec: # Limit to worker nodes only * on (cluster_id, instance) group_left() ( # node_cpu_info and kube_node_role use different labels to identify the node. - label_join(kube_node_role{role=~"app|storage"}, "instance", "", "node") + label_join(kube_node_role{role="app"}, "instance", "", "node") ) )[59m:1m] ) # Pull in the APPUiO managed info labels * on(cluster_id) group_left(sales_order) appuio_managed_info{ - cloud_provider="vsphere", - vshn_service_level="premium", + cloud_provider=~"exoscale", + vshn_service_level="zero", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -2246,25 +2246,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-openstack-zero + product-id: openshift-openstackcsp-workervcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-openstack-zero-22 - name: openshift-worker-vcpu-openstack-zero-22 + name: openshift-openstackcsp-workervcpu-besteffort-22 + name: openshift-openstackcsp-workervcpu-besteffort-22 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-openstack-zero + product-id: openshift-openstackcsp-workervcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-openstack-zero-22 + cron-job-name: openshift-openstackcsp-workervcpu-besteffort-22 spec: template: metadata: @@ -2303,7 +2303,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-openstack-zero + value: openshift-openstackcsp-workervcpu-besteffort - name: AR_QUERY value: | # Calculates vCPUs for app nodes of a cluster @@ -2316,14 +2316,14 @@ spec: # Limit to worker nodes only * on (cluster_id, instance) group_left() ( # node_cpu_info and kube_node_role use different labels to identify the node. - label_join(kube_node_role{role=~"app|storage"}, "instance", "", "node") + label_join(kube_node_role{role="app"}, "instance", "", "node") ) )[59m:1m] ) # Pull in the APPUiO managed info labels * on(cluster_id) group_left(sales_order) appuio_managed_info{ - cloud_provider="openstack", - vshn_service_level="zero", + cloud_provider=~"openstackcsp", + vshn_service_level="best_effort", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -2348,25 +2348,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-openstack-standard + product-id: openshift-openstackcsp-workervcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-openstack-standard-23 - name: openshift-worker-vcpu-openstack-standard-23 + name: openshift-openstackcsp-workervcpu-guaranteed-23 + name: openshift-openstackcsp-workervcpu-guaranteed-23 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-openstack-standard + product-id: openshift-openstackcsp-workervcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-openstack-standard-23 + cron-job-name: openshift-openstackcsp-workervcpu-guaranteed-23 spec: template: metadata: @@ -2405,7 +2405,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-openstack-standard + value: openshift-openstackcsp-workervcpu-guaranteed - name: AR_QUERY value: | # Calculates vCPUs for app nodes of a cluster @@ -2418,14 +2418,14 @@ spec: # Limit to worker nodes only * on (cluster_id, instance) group_left() ( # node_cpu_info and kube_node_role use different labels to identify the node. - label_join(kube_node_role{role=~"app|storage"}, "instance", "", "node") + label_join(kube_node_role{role="app"}, "instance", "", "node") ) )[59m:1m] ) # Pull in the APPUiO managed info labels * on(cluster_id) group_left(sales_order) appuio_managed_info{ - cloud_provider="openstack", - vshn_service_level="standard", + cloud_provider=~"openstackcsp", + vshn_service_level="guaranteed_availability", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -2450,25 +2450,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-openstack-professional + product-id: openshift-openstackcsp-workervcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-openstack-professional-24 - name: openshift-worker-vcpu-openstack-professional-24 + name: openshift-openstackcsp-workervcpu-premium-24 + name: openshift-openstackcsp-workervcpu-premium-24 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-openstack-professional + product-id: openshift-openstackcsp-workervcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-openstack-professional-24 + cron-job-name: openshift-openstackcsp-workervcpu-premium-24 spec: template: metadata: @@ -2507,7 +2507,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-openstack-professional + value: openshift-openstackcsp-workervcpu-premium - name: AR_QUERY value: | # Calculates vCPUs for app nodes of a cluster @@ -2520,14 +2520,14 @@ spec: # Limit to worker nodes only * on (cluster_id, instance) group_left() ( # node_cpu_info and kube_node_role use different labels to identify the node. - label_join(kube_node_role{role=~"app|storage"}, "instance", "", "node") + label_join(kube_node_role{role="app"}, "instance", "", "node") ) )[59m:1m] ) # Pull in the APPUiO managed info labels * on(cluster_id) group_left(sales_order) appuio_managed_info{ - cloud_provider="openstack", - vshn_service_level="professional", + cloud_provider=~"openstackcsp", + vshn_service_level="premium", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -2552,25 +2552,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-openstack-premium + product-id: openshift-openstackcsp-workervcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-openstack-premium-25 - name: openshift-worker-vcpu-openstack-premium-25 + name: openshift-openstackcsp-workervcpu-professional-25 + name: openshift-openstackcsp-workervcpu-professional-25 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-openstack-premium + product-id: openshift-openstackcsp-workervcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-openstack-premium-25 + cron-job-name: openshift-openstackcsp-workervcpu-professional-25 spec: template: metadata: @@ -2609,7 +2609,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-openstack-premium + value: openshift-openstackcsp-workervcpu-professional - name: AR_QUERY value: | # Calculates vCPUs for app nodes of a cluster @@ -2622,14 +2622,14 @@ spec: # Limit to worker nodes only * on (cluster_id, instance) group_left() ( # node_cpu_info and kube_node_role use different labels to identify the node. - label_join(kube_node_role{role=~"app|storage"}, "instance", "", "node") + label_join(kube_node_role{role="app"}, "instance", "", "node") ) )[59m:1m] ) # Pull in the APPUiO managed info labels * on(cluster_id) group_left(sales_order) appuio_managed_info{ - cloud_provider="openstack", - vshn_service_level="premium", + cloud_provider=~"openstackcsp", + vshn_service_level="professional", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -2654,25 +2654,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-standard + product-id: openshift-openstackcsp-workervcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-vsphere-standard-26 - name: openshift-worker-vcpu-vsphere-standard-26 + name: openshift-openstackcsp-workervcpu-standard-26 + name: openshift-openstackcsp-workervcpu-standard-26 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-standard + product-id: openshift-openstackcsp-workervcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-vsphere-standard-26 + cron-job-name: openshift-openstackcsp-workervcpu-standard-26 spec: template: metadata: @@ -2711,7 +2711,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-vsphere-standard + value: openshift-openstackcsp-workervcpu-standard - name: AR_QUERY value: | # Calculates vCPUs for app nodes of a cluster @@ -2724,13 +2724,13 @@ spec: # Limit to worker nodes only * on (cluster_id, instance) group_left() ( # node_cpu_info and kube_node_role use different labels to identify the node. - label_join(kube_node_role{role=~"app|storage"}, "instance", "", "node") + label_join(kube_node_role{role="app"}, "instance", "", "node") ) )[59m:1m] ) # Pull in the APPUiO managed info labels * on(cluster_id) group_left(sales_order) appuio_managed_info{ - cloud_provider="xelon", + cloud_provider=~"openstackcsp", vshn_service_level="standard", } - name: AR_INSTANCE_JSONNET @@ -2756,25 +2756,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-professional + product-id: openshift-openstackcsp-workervcpu-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-vsphere-professional-27 - name: openshift-worker-vcpu-vsphere-professional-27 + name: openshift-openstackcsp-workervcpu-zero-27 + name: openshift-openstackcsp-workervcpu-zero-27 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-professional + product-id: openshift-openstackcsp-workervcpu-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-vsphere-professional-27 + cron-job-name: openshift-openstackcsp-workervcpu-zero-27 spec: template: metadata: @@ -2813,7 +2813,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-vsphere-professional + value: openshift-openstackcsp-workervcpu-zero - name: AR_QUERY value: | # Calculates vCPUs for app nodes of a cluster @@ -2826,14 +2826,14 @@ spec: # Limit to worker nodes only * on (cluster_id, instance) group_left() ( # node_cpu_info and kube_node_role use different labels to identify the node. - label_join(kube_node_role{role=~"app|storage"}, "instance", "", "node") + label_join(kube_node_role{role="app"}, "instance", "", "node") ) )[59m:1m] ) # Pull in the APPUiO managed info labels * on(cluster_id) group_left(sales_order) appuio_managed_info{ - cloud_provider="none", - vshn_service_level="professional", + cloud_provider=~"openstackcsp", + vshn_service_level="zero", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -2858,25 +2858,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-awseks-vcpu-besteffort + product-id: openshift-openstackonprem-workervcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-awseks-vcpu-besteffort-0 - name: kubernetes-awseks-vcpu-besteffort-0 + name: openshift-openstackonprem-workervcpu-besteffort-28 + name: openshift-openstackonprem-workervcpu-besteffort-28 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-awseks-vcpu-besteffort + product-id: openshift-openstackonprem-workervcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-awseks-vcpu-besteffort-0 + cron-job-name: openshift-openstackonprem-workervcpu-besteffort-28 spec: template: metadata: @@ -2915,27 +2915,37 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-awseks-vcpu-besteffort + value: openshift-openstackonprem-workervcpu-besteffort - name: AR_QUERY value: | - max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Calculates vCPUs for app nodes of a cluster + # Max values over one hour. + max_over_time( + # Sum the vCPUs by cluster + sum by(cluster_id) ( + # Get the node vCPUs + node_cpu_info + # Limit to worker nodes only + * on (cluster_id, instance) group_left() ( + # node_cpu_info and kube_node_role use different labels to identify the node. + label_join(kube_node_role{role="app"}, "instance", "", "node") + ) + )[59m:1m] + ) # Pull in the APPUiO managed info labels * on(cluster_id) group_left(sales_order) appuio_managed_info{ - sales_order!="NONE", - sales_order!="TERMINATED", - cloud_provider="aws", - distribution="eks", + cloud_provider=~"openstack|openstackonprem", vshn_service_level="best_effort", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: - %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' - name: AR_UNIT_ID value: uom_uom_49_440b0fa7 - name: AR_ORG_ID - value: appuio-managed-kubernetes-services-billing + value: appuio-managed-openshift-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -2950,25 +2960,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-awseks-vcpu-guaranteed + product-id: openshift-openstackonprem-workervcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-awseks-vcpu-guaranteed-1 - name: kubernetes-awseks-vcpu-guaranteed-1 + name: openshift-openstackonprem-workervcpu-guaranteed-29 + name: openshift-openstackonprem-workervcpu-guaranteed-29 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-awseks-vcpu-guaranteed + product-id: openshift-openstackonprem-workervcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-awseks-vcpu-guaranteed-1 + cron-job-name: openshift-openstackonprem-workervcpu-guaranteed-29 spec: template: metadata: @@ -3007,27 +3017,37 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-awseks-vcpu-guaranteed + value: openshift-openstackonprem-workervcpu-guaranteed - name: AR_QUERY value: | - max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Calculates vCPUs for app nodes of a cluster + # Max values over one hour. + max_over_time( + # Sum the vCPUs by cluster + sum by(cluster_id) ( + # Get the node vCPUs + node_cpu_info + # Limit to worker nodes only + * on (cluster_id, instance) group_left() ( + # node_cpu_info and kube_node_role use different labels to identify the node. + label_join(kube_node_role{role="app"}, "instance", "", "node") + ) + )[59m:1m] + ) # Pull in the APPUiO managed info labels * on(cluster_id) group_left(sales_order) appuio_managed_info{ - sales_order!="NONE", - sales_order!="TERMINATED", - cloud_provider="aws", - distribution="eks", + cloud_provider=~"openstack|openstackonprem", vshn_service_level="guaranteed_availability", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: - %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' - name: AR_UNIT_ID value: uom_uom_49_440b0fa7 - name: AR_ORG_ID - value: appuio-managed-kubernetes-services-billing + value: appuio-managed-openshift-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -3042,25 +3062,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-exoscalesks-vcpu-besteffort + product-id: openshift-openstackonprem-workervcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-exoscalesks-vcpu-besteffort-2 - name: kubernetes-exoscalesks-vcpu-besteffort-2 + name: openshift-openstackonprem-workervcpu-premium-30 + name: openshift-openstackonprem-workervcpu-premium-30 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-exoscalesks-vcpu-besteffort + product-id: openshift-openstackonprem-workervcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-exoscalesks-vcpu-besteffort-2 + cron-job-name: openshift-openstackonprem-workervcpu-premium-30 spec: template: metadata: @@ -3099,27 +3119,37 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-exoscalesks-vcpu-besteffort + value: openshift-openstackonprem-workervcpu-premium - name: AR_QUERY value: | - max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Calculates vCPUs for app nodes of a cluster + # Max values over one hour. + max_over_time( + # Sum the vCPUs by cluster + sum by(cluster_id) ( + # Get the node vCPUs + node_cpu_info + # Limit to worker nodes only + * on (cluster_id, instance) group_left() ( + # node_cpu_info and kube_node_role use different labels to identify the node. + label_join(kube_node_role{role="app"}, "instance", "", "node") + ) + )[59m:1m] + ) # Pull in the APPUiO managed info labels * on(cluster_id) group_left(sales_order) appuio_managed_info{ - sales_order!="NONE", - sales_order!="TERMINATED", - cloud_provider="exoscale", - distribution="sks", - vshn_service_level="best_effort", + cloud_provider=~"openstack|openstackonprem", + vshn_service_level="premium", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: - %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' - name: AR_UNIT_ID value: uom_uom_49_440b0fa7 - name: AR_ORG_ID - value: appuio-managed-kubernetes-services-billing + value: appuio-managed-openshift-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -3134,25 +3164,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-exoscalesks-vcpu-guaranteed + product-id: openshift-openstackonprem-workervcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-exoscalesks-vcpu-guaranteed-3 - name: kubernetes-exoscalesks-vcpu-guaranteed-3 + name: openshift-openstackonprem-workervcpu-8b0ab0abec678e9 + name: openshift-openstackonprem-workervcpu-8b0ab0abec678e9 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-exoscalesks-vcpu-guaranteed + product-id: openshift-openstackonprem-workervcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-exoscalesks-vcpu-guaranteed-3 + cron-job-name: openshift-openstackonprem-workervcpu-professional-31 spec: template: metadata: @@ -3191,27 +3221,37 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-exoscalesks-vcpu-guaranteed + value: openshift-openstackonprem-workervcpu-professional - name: AR_QUERY value: | - max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Calculates vCPUs for app nodes of a cluster + # Max values over one hour. + max_over_time( + # Sum the vCPUs by cluster + sum by(cluster_id) ( + # Get the node vCPUs + node_cpu_info + # Limit to worker nodes only + * on (cluster_id, instance) group_left() ( + # node_cpu_info and kube_node_role use different labels to identify the node. + label_join(kube_node_role{role="app"}, "instance", "", "node") + ) + )[59m:1m] + ) # Pull in the APPUiO managed info labels * on(cluster_id) group_left(sales_order) appuio_managed_info{ - sales_order!="NONE", - sales_order!="TERMINATED", - cloud_provider="exoscale", - distribution="sks", - vshn_service_level="guaranteed_availability", + cloud_provider=~"openstack|openstackonprem", + vshn_service_level="professional", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: - %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' - name: AR_UNIT_ID value: uom_uom_49_440b0fa7 - name: AR_ORG_ID - value: appuio-managed-kubernetes-services-billing + value: appuio-managed-openshift-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -3226,25 +3266,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-googlegke-vcpu-besteffort + product-id: openshift-openstackonprem-workervcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-googlegke-vcpu-besteffort-4 - name: kubernetes-googlegke-vcpu-besteffort-4 + name: openshift-openstackonprem-workervcpu-standard-32 + name: openshift-openstackonprem-workervcpu-standard-32 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-googlegke-vcpu-besteffort + product-id: openshift-openstackonprem-workervcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-googlegke-vcpu-besteffort-4 + cron-job-name: openshift-openstackonprem-workervcpu-standard-32 spec: template: metadata: @@ -3283,27 +3323,37 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-googlegke-vcpu-besteffort + value: openshift-openstackonprem-workervcpu-standard - name: AR_QUERY value: | - max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Calculates vCPUs for app nodes of a cluster + # Max values over one hour. + max_over_time( + # Sum the vCPUs by cluster + sum by(cluster_id) ( + # Get the node vCPUs + node_cpu_info + # Limit to worker nodes only + * on (cluster_id, instance) group_left() ( + # node_cpu_info and kube_node_role use different labels to identify the node. + label_join(kube_node_role{role="app"}, "instance", "", "node") + ) + )[59m:1m] + ) # Pull in the APPUiO managed info labels * on(cluster_id) group_left(sales_order) appuio_managed_info{ - sales_order!="NONE", - sales_order!="TERMINATED", - cloud_provider="gcp", - distribution="gke", - vshn_service_level="best_effort", + cloud_provider=~"openstack|openstackonprem", + vshn_service_level="standard", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: - %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' - name: AR_UNIT_ID value: uom_uom_49_440b0fa7 - name: AR_ORG_ID - value: appuio-managed-kubernetes-services-billing + value: appuio-managed-openshift-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -3318,25 +3368,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-googlegke-vcpu-guaranteed + product-id: openshift-openstackonprem-workervcpu-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-googlegke-vcpu-guaranteed-5 - name: kubernetes-googlegke-vcpu-guaranteed-5 + name: openshift-openstackonprem-workervcpu-zero-33 + name: openshift-openstackonprem-workervcpu-zero-33 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-googlegke-vcpu-guaranteed + product-id: openshift-openstackonprem-workervcpu-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-googlegke-vcpu-guaranteed-5 + cron-job-name: openshift-openstackonprem-workervcpu-zero-33 spec: template: metadata: @@ -3375,27 +3425,37 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-googlegke-vcpu-guaranteed + value: openshift-openstackonprem-workervcpu-zero - name: AR_QUERY value: | - max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Calculates vCPUs for app nodes of a cluster + # Max values over one hour. + max_over_time( + # Sum the vCPUs by cluster + sum by(cluster_id) ( + # Get the node vCPUs + node_cpu_info + # Limit to worker nodes only + * on (cluster_id, instance) group_left() ( + # node_cpu_info and kube_node_role use different labels to identify the node. + label_join(kube_node_role{role="app"}, "instance", "", "node") + ) + )[59m:1m] + ) # Pull in the APPUiO managed info labels * on(cluster_id) group_left(sales_order) appuio_managed_info{ - sales_order!="NONE", - sales_order!="TERMINATED", - cloud_provider="gcp", - distribution="gke", - vshn_service_level="guaranteed_availability", + cloud_provider=~"openstack|openstackonprem", + vshn_service_level="zero", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: - %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' - name: AR_UNIT_ID value: uom_uom_49_440b0fa7 - name: AR_ORG_ID - value: appuio-managed-kubernetes-services-billing + value: appuio-managed-openshift-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -3410,25 +3470,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-azureaks-vcpu-besteffort + product-id: openshift-vspherecsp-workervcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-azureaks-vcpu-besteffort-6 - name: kubernetes-azureaks-vcpu-besteffort-6 + name: openshift-vspherecsp-workervcpu-besteffort-34 + name: openshift-vspherecsp-workervcpu-besteffort-34 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-azureaks-vcpu-besteffort + product-id: openshift-vspherecsp-workervcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-azureaks-vcpu-besteffort-6 + cron-job-name: openshift-vspherecsp-workervcpu-besteffort-34 spec: template: metadata: @@ -3467,27 +3527,37 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-azureaks-vcpu-besteffort + value: openshift-vspherecsp-workervcpu-besteffort - name: AR_QUERY value: | - max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Calculates vCPUs for app nodes of a cluster + # Max values over one hour. + max_over_time( + # Sum the vCPUs by cluster + sum by(cluster_id) ( + # Get the node vCPUs + node_cpu_info + # Limit to worker nodes only + * on (cluster_id, instance) group_left() ( + # node_cpu_info and kube_node_role use different labels to identify the node. + label_join(kube_node_role{role="app"}, "instance", "", "node") + ) + )[59m:1m] + ) # Pull in the APPUiO managed info labels * on(cluster_id) group_left(sales_order) appuio_managed_info{ - sales_order!="NONE", - sales_order!="TERMINATED", - cloud_provider="azure", - distribution="aks", + cloud_provider=~"vspherecsp", vshn_service_level="best_effort", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: - %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' - name: AR_UNIT_ID value: uom_uom_49_440b0fa7 - name: AR_ORG_ID - value: appuio-managed-kubernetes-services-billing + value: appuio-managed-openshift-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -3502,25 +3572,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-azureaks-vcpu-guaranteed + product-id: openshift-vspherecsp-workervcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-azureaks-vcpu-guaranteed-7 - name: kubernetes-azureaks-vcpu-guaranteed-7 + name: openshift-vspherecsp-workervcpu-guaranteed-35 + name: openshift-vspherecsp-workervcpu-guaranteed-35 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-azureaks-vcpu-guaranteed + product-id: openshift-vspherecsp-workervcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-azureaks-vcpu-guaranteed-7 + cron-job-name: openshift-vspherecsp-workervcpu-guaranteed-35 spec: template: metadata: @@ -3559,11 +3629,2021 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-azureaks-vcpu-guaranteed + value: openshift-vspherecsp-workervcpu-guaranteed - name: AR_QUERY value: | - max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) - # Pull in the APPUiO managed info labels + # Calculates vCPUs for app nodes of a cluster + # Max values over one hour. + max_over_time( + # Sum the vCPUs by cluster + sum by(cluster_id) ( + # Get the node vCPUs + node_cpu_info + # Limit to worker nodes only + * on (cluster_id, instance) group_left() ( + # node_cpu_info and kube_node_role use different labels to identify the node. + label_join(kube_node_role{role="app"}, "instance", "", "node") + ) + )[59m:1m] + ) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + cloud_provider=~"vspherecsp", + vshn_service_level="guaranteed_availability", + } + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_UNIT_ID + value: uom_uom_49_440b0fa7 + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-vspherecsp-workervcpu-premium + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-vspherecsp-workervcpu-premium-36 + name: openshift-vspherecsp-workervcpu-premium-36 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-vspherecsp-workervcpu-premium + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-vspherecsp-workervcpu-premium-36 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-vspherecsp-workervcpu-premium + - name: AR_QUERY + value: | + # Calculates vCPUs for app nodes of a cluster + # Max values over one hour. + max_over_time( + # Sum the vCPUs by cluster + sum by(cluster_id) ( + # Get the node vCPUs + node_cpu_info + # Limit to worker nodes only + * on (cluster_id, instance) group_left() ( + # node_cpu_info and kube_node_role use different labels to identify the node. + label_join(kube_node_role{role="app"}, "instance", "", "node") + ) + )[59m:1m] + ) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + cloud_provider=~"vspherecsp", + vshn_service_level="premium", + } + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_UNIT_ID + value: uom_uom_49_440b0fa7 + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-vspherecsp-workervcpu-professional + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-vspherecsp-workervcpu-professional-37 + name: openshift-vspherecsp-workervcpu-professional-37 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-vspherecsp-workervcpu-professional + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-vspherecsp-workervcpu-professional-37 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-vspherecsp-workervcpu-professional + - name: AR_QUERY + value: | + # Calculates vCPUs for app nodes of a cluster + # Max values over one hour. + max_over_time( + # Sum the vCPUs by cluster + sum by(cluster_id) ( + # Get the node vCPUs + node_cpu_info + # Limit to worker nodes only + * on (cluster_id, instance) group_left() ( + # node_cpu_info and kube_node_role use different labels to identify the node. + label_join(kube_node_role{role="app"}, "instance", "", "node") + ) + )[59m:1m] + ) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + cloud_provider=~"vspherecsp", + vshn_service_level="professional", + } + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_UNIT_ID + value: uom_uom_49_440b0fa7 + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-vspherecsp-workervcpu-standard + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-vspherecsp-workervcpu-standard-38 + name: openshift-vspherecsp-workervcpu-standard-38 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-vspherecsp-workervcpu-standard + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-vspherecsp-workervcpu-standard-38 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-vspherecsp-workervcpu-standard + - name: AR_QUERY + value: | + # Calculates vCPUs for app nodes of a cluster + # Max values over one hour. + max_over_time( + # Sum the vCPUs by cluster + sum by(cluster_id) ( + # Get the node vCPUs + node_cpu_info + # Limit to worker nodes only + * on (cluster_id, instance) group_left() ( + # node_cpu_info and kube_node_role use different labels to identify the node. + label_join(kube_node_role{role="app"}, "instance", "", "node") + ) + )[59m:1m] + ) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + cloud_provider=~"vspherecsp", + vshn_service_level="standard", + } + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_UNIT_ID + value: uom_uom_49_440b0fa7 + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-vspherecsp-workervcpu-zero + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-vspherecsp-workervcpu-zero-39 + name: openshift-vspherecsp-workervcpu-zero-39 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-vspherecsp-workervcpu-zero + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-vspherecsp-workervcpu-zero-39 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-vspherecsp-workervcpu-zero + - name: AR_QUERY + value: | + # Calculates vCPUs for app nodes of a cluster + # Max values over one hour. + max_over_time( + # Sum the vCPUs by cluster + sum by(cluster_id) ( + # Get the node vCPUs + node_cpu_info + # Limit to worker nodes only + * on (cluster_id, instance) group_left() ( + # node_cpu_info and kube_node_role use different labels to identify the node. + label_join(kube_node_role{role="app"}, "instance", "", "node") + ) + )[59m:1m] + ) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + cloud_provider=~"vspherecsp", + vshn_service_level="zero", + } + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_UNIT_ID + value: uom_uom_49_440b0fa7 + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-vsphereonprem-workervcpu-besteffort-40 + name: openshift-vsphereonprem-workervcpu-besteffort-40 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-vsphereonprem-workervcpu-besteffort-40 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-vsphereonprem-workervcpu-besteffort + - name: AR_QUERY + value: | + # Calculates vCPUs for app nodes of a cluster + # Max values over one hour. + max_over_time( + # Sum the vCPUs by cluster + sum by(cluster_id) ( + # Get the node vCPUs + node_cpu_info + # Limit to worker nodes only + * on (cluster_id, instance) group_left() ( + # node_cpu_info and kube_node_role use different labels to identify the node. + label_join(kube_node_role{role="app"}, "instance", "", "node") + ) + )[59m:1m] + ) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + cloud_provider=~"vsphere|vsphereonprem", + vshn_service_level="best_effort", + } + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_UNIT_ID + value: uom_uom_49_440b0fa7 + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-vsphereonprem-workervcpu-guaranteed-41 + name: openshift-vsphereonprem-workervcpu-guaranteed-41 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-vsphereonprem-workervcpu-guaranteed-41 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-vsphereonprem-workervcpu-guaranteed + - name: AR_QUERY + value: | + # Calculates vCPUs for app nodes of a cluster + # Max values over one hour. + max_over_time( + # Sum the vCPUs by cluster + sum by(cluster_id) ( + # Get the node vCPUs + node_cpu_info + # Limit to worker nodes only + * on (cluster_id, instance) group_left() ( + # node_cpu_info and kube_node_role use different labels to identify the node. + label_join(kube_node_role{role="app"}, "instance", "", "node") + ) + )[59m:1m] + ) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + cloud_provider=~"vsphere|vsphereonprem", + vshn_service_level="guaranteed_availability", + } + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_UNIT_ID + value: uom_uom_49_440b0fa7 + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-premium + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-vsphereonprem-workervcpu-premium-42 + name: openshift-vsphereonprem-workervcpu-premium-42 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-premium + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-vsphereonprem-workervcpu-premium-42 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-vsphereonprem-workervcpu-premium + - name: AR_QUERY + value: | + # Calculates vCPUs for app nodes of a cluster + # Max values over one hour. + max_over_time( + # Sum the vCPUs by cluster + sum by(cluster_id) ( + # Get the node vCPUs + node_cpu_info + # Limit to worker nodes only + * on (cluster_id, instance) group_left() ( + # node_cpu_info and kube_node_role use different labels to identify the node. + label_join(kube_node_role{role="app"}, "instance", "", "node") + ) + )[59m:1m] + ) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + cloud_provider=~"vsphere|vsphereonprem", + vshn_service_level="premium", + } + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_UNIT_ID + value: uom_uom_49_440b0fa7 + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-professional + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-vsphereonprem-workervcpu-professional-43 + name: openshift-vsphereonprem-workervcpu-professional-43 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-professional + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-vsphereonprem-workervcpu-professional-43 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-vsphereonprem-workervcpu-professional + - name: AR_QUERY + value: | + # Calculates vCPUs for app nodes of a cluster + # Max values over one hour. + max_over_time( + # Sum the vCPUs by cluster + sum by(cluster_id) ( + # Get the node vCPUs + node_cpu_info + # Limit to worker nodes only + * on (cluster_id, instance) group_left() ( + # node_cpu_info and kube_node_role use different labels to identify the node. + label_join(kube_node_role{role="app"}, "instance", "", "node") + ) + )[59m:1m] + ) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + cloud_provider=~"vsphere|vsphereonprem", + vshn_service_level="professional", + } + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_UNIT_ID + value: uom_uom_49_440b0fa7 + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-standard + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-vsphereonprem-workervcpu-standard-44 + name: openshift-vsphereonprem-workervcpu-standard-44 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-standard + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-vsphereonprem-workervcpu-standard-44 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-vsphereonprem-workervcpu-standard + - name: AR_QUERY + value: | + # Calculates vCPUs for app nodes of a cluster + # Max values over one hour. + max_over_time( + # Sum the vCPUs by cluster + sum by(cluster_id) ( + # Get the node vCPUs + node_cpu_info + # Limit to worker nodes only + * on (cluster_id, instance) group_left() ( + # node_cpu_info and kube_node_role use different labels to identify the node. + label_join(kube_node_role{role="app"}, "instance", "", "node") + ) + )[59m:1m] + ) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + cloud_provider=~"vsphere|vsphereonprem", + vshn_service_level="standard", + } + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_UNIT_ID + value: uom_uom_49_440b0fa7 + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-zero + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-vsphereonprem-workervcpu-zero-45 + name: openshift-vsphereonprem-workervcpu-zero-45 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-zero + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-vsphereonprem-workervcpu-zero-45 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-vsphereonprem-workervcpu-zero + - name: AR_QUERY + value: | + # Calculates vCPUs for app nodes of a cluster + # Max values over one hour. + max_over_time( + # Sum the vCPUs by cluster + sum by(cluster_id) ( + # Get the node vCPUs + node_cpu_info + # Limit to worker nodes only + * on (cluster_id, instance) group_left() ( + # node_cpu_info and kube_node_role use different labels to identify the node. + label_join(kube_node_role{role="app"}, "instance", "", "node") + ) + )[59m:1m] + ) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + cloud_provider=~"vsphere|vsphereonprem", + vshn_service_level="zero", + } + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_UNIT_ID + value: uom_uom_49_440b0fa7 + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-xelon-workervcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-xelon-workervcpu-besteffort-46 + name: openshift-xelon-workervcpu-besteffort-46 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-xelon-workervcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-xelon-workervcpu-besteffort-46 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-xelon-workervcpu-besteffort + - name: AR_QUERY + value: | + # Calculates vCPUs for app nodes of a cluster + # Max values over one hour. + max_over_time( + # Sum the vCPUs by cluster + sum by(cluster_id) ( + # Get the node vCPUs + node_cpu_info + # Limit to worker nodes only + * on (cluster_id, instance) group_left() ( + # node_cpu_info and kube_node_role use different labels to identify the node. + label_join(kube_node_role{role="app"}, "instance", "", "node") + ) + )[59m:1m] + ) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + cloud_provider=~"xelon", + vshn_service_level="best_effort", + } + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_UNIT_ID + value: uom_uom_49_440b0fa7 + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-xelon-workervcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-xelon-workervcpu-guaranteed-47 + name: openshift-xelon-workervcpu-guaranteed-47 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-xelon-workervcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-xelon-workervcpu-guaranteed-47 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-xelon-workervcpu-guaranteed + - name: AR_QUERY + value: | + # Calculates vCPUs for app nodes of a cluster + # Max values over one hour. + max_over_time( + # Sum the vCPUs by cluster + sum by(cluster_id) ( + # Get the node vCPUs + node_cpu_info + # Limit to worker nodes only + * on (cluster_id, instance) group_left() ( + # node_cpu_info and kube_node_role use different labels to identify the node. + label_join(kube_node_role{role="app"}, "instance", "", "node") + ) + )[59m:1m] + ) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + cloud_provider=~"xelon", + vshn_service_level="guaranteed_availability", + } + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_UNIT_ID + value: uom_uom_49_440b0fa7 + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-xelon-workervcpu-premium + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-xelon-workervcpu-premium-48 + name: openshift-xelon-workervcpu-premium-48 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-xelon-workervcpu-premium + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-xelon-workervcpu-premium-48 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-xelon-workervcpu-premium + - name: AR_QUERY + value: | + # Calculates vCPUs for app nodes of a cluster + # Max values over one hour. + max_over_time( + # Sum the vCPUs by cluster + sum by(cluster_id) ( + # Get the node vCPUs + node_cpu_info + # Limit to worker nodes only + * on (cluster_id, instance) group_left() ( + # node_cpu_info and kube_node_role use different labels to identify the node. + label_join(kube_node_role{role="app"}, "instance", "", "node") + ) + )[59m:1m] + ) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + cloud_provider=~"xelon", + vshn_service_level="premium", + } + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_UNIT_ID + value: uom_uom_49_440b0fa7 + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-xelon-workervcpu-professional + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-xelon-workervcpu-professional-49 + name: openshift-xelon-workervcpu-professional-49 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-xelon-workervcpu-professional + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-xelon-workervcpu-professional-49 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-xelon-workervcpu-professional + - name: AR_QUERY + value: | + # Calculates vCPUs for app nodes of a cluster + # Max values over one hour. + max_over_time( + # Sum the vCPUs by cluster + sum by(cluster_id) ( + # Get the node vCPUs + node_cpu_info + # Limit to worker nodes only + * on (cluster_id, instance) group_left() ( + # node_cpu_info and kube_node_role use different labels to identify the node. + label_join(kube_node_role{role="app"}, "instance", "", "node") + ) + )[59m:1m] + ) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + cloud_provider=~"xelon", + vshn_service_level="professional", + } + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_UNIT_ID + value: uom_uom_49_440b0fa7 + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-xelon-workervcpu-standard + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-xelon-workervcpu-standard-50 + name: openshift-xelon-workervcpu-standard-50 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-xelon-workervcpu-standard + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-xelon-workervcpu-standard-50 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-xelon-workervcpu-standard + - name: AR_QUERY + value: | + # Calculates vCPUs for app nodes of a cluster + # Max values over one hour. + max_over_time( + # Sum the vCPUs by cluster + sum by(cluster_id) ( + # Get the node vCPUs + node_cpu_info + # Limit to worker nodes only + * on (cluster_id, instance) group_left() ( + # node_cpu_info and kube_node_role use different labels to identify the node. + label_join(kube_node_role{role="app"}, "instance", "", "node") + ) + )[59m:1m] + ) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + cloud_provider=~"xelon", + vshn_service_level="standard", + } + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_UNIT_ID + value: uom_uom_49_440b0fa7 + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-xelon-workervcpu-zero + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-xelon-workervcpu-zero-51 + name: openshift-xelon-workervcpu-zero-51 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-xelon-workervcpu-zero + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-xelon-workervcpu-zero-51 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-xelon-workervcpu-zero + - name: AR_QUERY + value: | + # Calculates vCPUs for app nodes of a cluster + # Max values over one hour. + max_over_time( + # Sum the vCPUs by cluster + sum by(cluster_id) ( + # Get the node vCPUs + node_cpu_info + # Limit to worker nodes only + * on (cluster_id, instance) group_left() ( + # node_cpu_info and kube_node_role use different labels to identify the node. + label_join(kube_node_role{role="app"}, "instance", "", "node") + ) + )[59m:1m] + ) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + cloud_provider=~"xelon", + vshn_service_level="zero", + } + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_UNIT_ID + value: uom_uom_49_440b0fa7 + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: kubernetes-awseks-vcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: kubernetes-awseks-vcpu-besteffort-0 + name: kubernetes-awseks-vcpu-besteffort-0 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: kubernetes-awseks-vcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: kubernetes-awseks-vcpu-besteffort-0 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: kubernetes-awseks-vcpu-besteffort + - name: AR_QUERY + value: | + max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + sales_order!="NONE", + sales_order!="TERMINATED", + cloud_provider="aws", + distribution="eks", + vshn_service_level="best_effort", + } + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: + %(cluster_id)s" % labels' + - name: AR_UNIT_ID + value: uom_uom_49_440b0fa7 + - name: AR_ORG_ID + value: appuio-managed-kubernetes-services-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: kubernetes-awseks-vcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: kubernetes-awseks-vcpu-guaranteed-1 + name: kubernetes-awseks-vcpu-guaranteed-1 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: kubernetes-awseks-vcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: kubernetes-awseks-vcpu-guaranteed-1 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: kubernetes-awseks-vcpu-guaranteed + - name: AR_QUERY + value: | + max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + sales_order!="NONE", + sales_order!="TERMINATED", + cloud_provider="aws", + distribution="eks", + vshn_service_level="guaranteed_availability", + } + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: + %(cluster_id)s" % labels' + - name: AR_UNIT_ID + value: uom_uom_49_440b0fa7 + - name: AR_ORG_ID + value: appuio-managed-kubernetes-services-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: kubernetes-azureaks-vcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: kubernetes-azureaks-vcpu-besteffort-2 + name: kubernetes-azureaks-vcpu-besteffort-2 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: kubernetes-azureaks-vcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: kubernetes-azureaks-vcpu-besteffort-2 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: kubernetes-azureaks-vcpu-besteffort + - name: AR_QUERY + value: | + max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + sales_order!="NONE", + sales_order!="TERMINATED", + cloud_provider="azure", + distribution="aks", + vshn_service_level="best_effort", + } + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: + %(cluster_id)s" % labels' + - name: AR_UNIT_ID + value: uom_uom_49_440b0fa7 + - name: AR_ORG_ID + value: appuio-managed-kubernetes-services-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: kubernetes-azureaks-vcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: kubernetes-azureaks-vcpu-guaranteed-3 + name: kubernetes-azureaks-vcpu-guaranteed-3 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: kubernetes-azureaks-vcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: kubernetes-azureaks-vcpu-guaranteed-3 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: kubernetes-azureaks-vcpu-guaranteed + - name: AR_QUERY + value: | + max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Pull in the APPUiO managed info labels * on(cluster_id) group_left(sales_order) appuio_managed_info{ sales_order!="NONE", sales_order!="TERMINATED", @@ -3594,25 +5674,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-zero + product-id: kubernetes-exoscalesks-vcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-hyperscaler-cluster-zero-0 - name: kubernetes-hyperscaler-cluster-zero-0 + name: kubernetes-exoscalesks-vcpu-besteffort-4 + name: kubernetes-exoscalesks-vcpu-besteffort-4 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-zero + product-id: kubernetes-exoscalesks-vcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-hyperscaler-cluster-zero-0 + cron-job-name: kubernetes-exoscalesks-vcpu-besteffort-4 spec: template: metadata: @@ -3651,27 +5731,209 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-hyperscaler-cluster-zero + value: kubernetes-exoscalesks-vcpu-besteffort - name: AR_QUERY value: | - max_over_time( - group by(cluster_id, sales_order) ( - appuio_managed_info{ - distribution!="rke2", - distribution!="rancher", - sales_order!="TERMINATED", - sales_order!="NONE", - vshn_service_level="zero", - } - )[59m:1m] - ) + max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + sales_order!="NONE", + sales_order!="TERMINATED", + cloud_provider="exoscale", + distribution="sks", + vshn_service_level="best_effort", + } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: %(cluster_id)s" % labels' - name: AR_UNIT_ID - value: uom_uom_53_4a7e8f3e + value: uom_uom_49_440b0fa7 + - name: AR_ORG_ID + value: appuio-managed-kubernetes-services-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: kubernetes-exoscalesks-vcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: kubernetes-exoscalesks-vcpu-guaranteed-5 + name: kubernetes-exoscalesks-vcpu-guaranteed-5 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: kubernetes-exoscalesks-vcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: kubernetes-exoscalesks-vcpu-guaranteed-5 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: kubernetes-exoscalesks-vcpu-guaranteed + - name: AR_QUERY + value: | + max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + sales_order!="NONE", + sales_order!="TERMINATED", + cloud_provider="exoscale", + distribution="sks", + vshn_service_level="guaranteed_availability", + } + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: + %(cluster_id)s" % labels' + - name: AR_UNIT_ID + value: uom_uom_49_440b0fa7 + - name: AR_ORG_ID + value: appuio-managed-kubernetes-services-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: kubernetes-googlegke-vcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: kubernetes-googlegke-vcpu-besteffort-6 + name: kubernetes-googlegke-vcpu-besteffort-6 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: kubernetes-googlegke-vcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: kubernetes-googlegke-vcpu-besteffort-6 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: kubernetes-googlegke-vcpu-besteffort + - name: AR_QUERY + value: | + max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + sales_order!="NONE", + sales_order!="TERMINATED", + cloud_provider="google", + distribution="gke", + vshn_service_level="best_effort", + } + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: + %(cluster_id)s" % labels' + - name: AR_UNIT_ID + value: uom_uom_49_440b0fa7 - name: AR_ORG_ID value: appuio-managed-kubernetes-services-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 @@ -3688,25 +5950,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-standard + product-id: kubernetes-googlegke-vcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-hyperscaler-cluster-standard-1 - name: kubernetes-hyperscaler-cluster-standard-1 + name: kubernetes-googlegke-vcpu-guaranteed-7 + name: kubernetes-googlegke-vcpu-guaranteed-7 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-standard + product-id: kubernetes-googlegke-vcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-hyperscaler-cluster-standard-1 + cron-job-name: kubernetes-googlegke-vcpu-guaranteed-7 spec: template: metadata: @@ -3745,27 +6007,25 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-hyperscaler-cluster-standard + value: kubernetes-googlegke-vcpu-guaranteed - name: AR_QUERY value: | - max_over_time( - group by(cluster_id, sales_order) ( - appuio_managed_info{ - distribution!="rke2", - distribution!="rancher", - sales_order!="TERMINATED", - sales_order!="NONE", - vshn_service_level="standard", - } - )[59m:1m] - ) + max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + sales_order!="NONE", + sales_order!="TERMINATED", + cloud_provider="google", + distribution="gke", + vshn_service_level="guaranteed_availability", + } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: %(cluster_id)s" % labels' - name: AR_UNIT_ID - value: uom_uom_53_4a7e8f3e + value: uom_uom_49_440b0fa7 - name: AR_ORG_ID value: appuio-managed-kubernetes-services-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 @@ -3782,25 +6042,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-professional + product-id: kubernetes-hyperscaler-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-hyperscaler-cluster-professional-2 - name: kubernetes-hyperscaler-cluster-professional-2 + name: kubernetes-hyperscaler-cluster-premium-0 + name: kubernetes-hyperscaler-cluster-premium-0 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-professional + product-id: kubernetes-hyperscaler-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-hyperscaler-cluster-professional-2 + cron-job-name: kubernetes-hyperscaler-cluster-premium-0 spec: template: metadata: @@ -3839,7 +6099,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-hyperscaler-cluster-professional + value: kubernetes-hyperscaler-cluster-premium - name: AR_QUERY value: | max_over_time( @@ -3849,7 +6109,7 @@ spec: distribution!="rancher", sales_order!="TERMINATED", sales_order!="NONE", - vshn_service_level="professional", + vshn_service_level="premium", } )[59m:1m] ) @@ -3876,25 +6136,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-premium + product-id: kubernetes-hyperscaler-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-hyperscaler-cluster-premium-3 - name: kubernetes-hyperscaler-cluster-premium-3 + name: kubernetes-hyperscaler-cluster-professional-1 + name: kubernetes-hyperscaler-cluster-professional-1 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-premium + product-id: kubernetes-hyperscaler-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-hyperscaler-cluster-premium-3 + cron-job-name: kubernetes-hyperscaler-cluster-professional-1 spec: template: metadata: @@ -3933,7 +6193,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-hyperscaler-cluster-premium + value: kubernetes-hyperscaler-cluster-professional - name: AR_QUERY value: | max_over_time( @@ -3943,7 +6203,7 @@ spec: distribution!="rancher", sales_order!="TERMINATED", sales_order!="NONE", - vshn_service_level="premium", + vshn_service_level="professional", } )[59m:1m] ) @@ -3970,25 +6230,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-zero + product-id: kubernetes-hyperscaler-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-hyperscaler-cluster-zero-0 - name: kubernetes-hyperscaler-cluster-zero-0 + name: kubernetes-hyperscaler-cluster-standard-2 + name: kubernetes-hyperscaler-cluster-standard-2 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-zero + product-id: kubernetes-hyperscaler-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-hyperscaler-cluster-zero-0 + cron-job-name: kubernetes-hyperscaler-cluster-standard-2 spec: template: metadata: @@ -4027,25 +6287,27 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-hyperscaler-cluster-zero + value: kubernetes-hyperscaler-cluster-standard - name: AR_QUERY value: | - max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) - # Pull in the APPUiO managed info labels - * on(cluster_id) group_left(sales_order) appuio_managed_info{ - distribution!="rke2", - distribution!="rancher", - sales_order!="TERMINATED", - sales_order!="NONE", - vshn_service_level="zero", - } + max_over_time( + group by(cluster_id, sales_order) ( + appuio_managed_info{ + distribution!="rke2", + distribution!="rancher", + sales_order!="TERMINATED", + sales_order!="NONE", + vshn_service_level="standard", + } + )[59m:1m] + ) - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: %(cluster_id)s" % labels' - name: AR_UNIT_ID - value: uom_uom_191_55730e52 + value: uom_uom_53_4a7e8f3e - name: AR_ORG_ID value: appuio-managed-kubernetes-services-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 @@ -4062,25 +6324,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-standard + product-id: kubernetes-hyperscaler-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-hyperscaler-cluster-standard-1 - name: kubernetes-hyperscaler-cluster-standard-1 + name: kubernetes-hyperscaler-cluster-zero-3 + name: kubernetes-hyperscaler-cluster-zero-3 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-standard + product-id: kubernetes-hyperscaler-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-hyperscaler-cluster-standard-1 + cron-job-name: kubernetes-hyperscaler-cluster-zero-3 spec: template: metadata: @@ -4119,25 +6381,27 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-hyperscaler-cluster-standard + value: kubernetes-hyperscaler-cluster-zero - name: AR_QUERY value: | - max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) - # Pull in the APPUiO managed info labels - * on(cluster_id) group_left(sales_order) appuio_managed_info{ - distribution!="rke2", - distribution!="rancher", - sales_order!="TERMINATED", - sales_order!="NONE", - vshn_service_level="standard", - } + max_over_time( + group by(cluster_id, sales_order) ( + appuio_managed_info{ + distribution!="rke2", + distribution!="rancher", + sales_order!="TERMINATED", + sales_order!="NONE", + vshn_service_level="zero", + } + )[59m:1m] + ) - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: %(cluster_id)s" % labels' - name: AR_UNIT_ID - value: uom_uom_191_55730e52 + value: uom_uom_53_4a7e8f3e - name: AR_ORG_ID value: appuio-managed-kubernetes-services-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 @@ -4154,25 +6418,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-professional + product-id: kubernetes-hyperscaler-node-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-hyperscaler-cluster-professional-2 - name: kubernetes-hyperscaler-cluster-professional-2 + name: kubernetes-hyperscaler-node-premium-0 + name: kubernetes-hyperscaler-node-premium-0 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-professional + product-id: kubernetes-hyperscaler-node-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-hyperscaler-cluster-professional-2 + cron-job-name: kubernetes-hyperscaler-node-premium-0 spec: template: metadata: @@ -4211,7 +6475,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-hyperscaler-cluster-professional + value: kubernetes-hyperscaler-node-premium - name: AR_QUERY value: | max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) @@ -4221,7 +6485,7 @@ spec: distribution!="rancher", sales_order!="TERMINATED", sales_order!="NONE", - vshn_service_level="professional", + vshn_service_level="premium", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -4246,25 +6510,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-premium + product-id: kubernetes-hyperscaler-node-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-hyperscaler-cluster-premium-3 - name: kubernetes-hyperscaler-cluster-premium-3 + name: kubernetes-hyperscaler-node-professional-1 + name: kubernetes-hyperscaler-node-professional-1 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-premium + product-id: kubernetes-hyperscaler-node-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-hyperscaler-cluster-premium-3 + cron-job-name: kubernetes-hyperscaler-node-professional-1 spec: template: metadata: @@ -4303,7 +6567,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-hyperscaler-cluster-premium + value: kubernetes-hyperscaler-node-professional - name: AR_QUERY value: | max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) @@ -4313,7 +6577,7 @@ spec: distribution!="rancher", sales_order!="TERMINATED", sales_order!="NONE", - vshn_service_level="premium", + vshn_service_level="professional", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -4338,25 +6602,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-cloudscale-zero + product-id: kubernetes-hyperscaler-node-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-cloudscale-zero-0 - name: openshift-clusters-cloudscale-zero-0 + name: kubernetes-hyperscaler-node-standard-2 + name: kubernetes-hyperscaler-node-standard-2 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-cloudscale-zero + product-id: kubernetes-hyperscaler-node-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-cloudscale-zero-0 + cron-job-name: kubernetes-hyperscaler-node-standard-2 spec: template: metadata: @@ -4395,28 +6659,27 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-cloudscale-zero + value: kubernetes-hyperscaler-node-standard - name: AR_QUERY value: | - # Calculates number of clusters per cluster. Always returns 1. - # Max values over one hour. - max_over_time( - # Use aggregation to drop labels of no interest. - group by(cluster_id, sales_order) ( - appuio_managed_info{ - cloud_provider="cloudscale", - vshn_service_level="zero"}, - )[59m:1m] - ) + max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + distribution!="rke2", + distribution!="rancher", + sales_order!="TERMINATED", + sales_order!="NONE", + vshn_service_level="standard", + } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift - - Cluster: %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: + %(cluster_id)s" % labels' - name: AR_UNIT_ID - value: uom_uom_53_4a7e8f3e + value: uom_uom_191_55730e52 - name: AR_ORG_ID - value: appuio-managed-openshift-billing + value: appuio-managed-kubernetes-services-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -4431,25 +6694,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-cloudscale-standard + product-id: kubernetes-hyperscaler-node-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-cloudscale-standard-1 - name: openshift-clusters-cloudscale-standard-1 + name: kubernetes-hyperscaler-node-zero-3 + name: kubernetes-hyperscaler-node-zero-3 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-cloudscale-standard + product-id: kubernetes-hyperscaler-node-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-cloudscale-standard-1 + cron-job-name: kubernetes-hyperscaler-node-zero-3 spec: template: metadata: @@ -4488,28 +6751,27 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-cloudscale-standard + value: kubernetes-hyperscaler-node-zero - name: AR_QUERY value: | - # Calculates number of clusters per cluster. Always returns 1. - # Max values over one hour. - max_over_time( - # Use aggregation to drop labels of no interest. - group by(cluster_id, sales_order) ( - appuio_managed_info{ - cloud_provider="cloudscale", - vshn_service_level="standard"}, - )[59m:1m] - ) + max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + distribution!="rke2", + distribution!="rancher", + sales_order!="TERMINATED", + sales_order!="NONE", + vshn_service_level="zero", + } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift - - Cluster: %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: + %(cluster_id)s" % labels' - name: AR_UNIT_ID - value: uom_uom_53_4a7e8f3e + value: uom_uom_191_55730e52 - name: AR_ORG_ID - value: appuio-managed-openshift-billing + value: appuio-managed-kubernetes-services-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -4524,25 +6786,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-cloudscale-professional + product-id: openshift-cloudscale-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-cloudscale-professional-2 - name: openshift-clusters-cloudscale-professional-2 + name: openshift-cloudscale-cluster-premium-0 + name: openshift-cloudscale-cluster-premium-0 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-cloudscale-professional + product-id: openshift-cloudscale-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-cloudscale-professional-2 + cron-job-name: openshift-cloudscale-cluster-premium-0 spec: template: metadata: @@ -4581,7 +6843,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-cloudscale-professional + value: openshift-cloudscale-cluster-premium - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -4590,8 +6852,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="cloudscale", - vshn_service_level="professional"}, + cloud_provider=~"cloudscale", + vshn_service_level="premium", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -4617,25 +6880,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-cloudscale-premium + product-id: openshift-cloudscale-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-cloudscale-premium-3 - name: openshift-clusters-cloudscale-premium-3 + name: openshift-cloudscale-cluster-professional-1 + name: openshift-cloudscale-cluster-professional-1 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-cloudscale-premium + product-id: openshift-cloudscale-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-cloudscale-premium-3 + cron-job-name: openshift-cloudscale-cluster-professional-1 spec: template: metadata: @@ -4674,7 +6937,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-cloudscale-premium + value: openshift-cloudscale-cluster-professional - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -4683,8 +6946,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="cloudscale", - vshn_service_level="premium"}, + cloud_provider=~"cloudscale", + vshn_service_level="professional", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -4710,25 +6974,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-exoscale-zero + product-id: openshift-cloudscale-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-exoscale-zero-4 - name: openshift-clusters-exoscale-zero-4 + name: openshift-cloudscale-cluster-standard-2 + name: openshift-cloudscale-cluster-standard-2 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-exoscale-zero + product-id: openshift-cloudscale-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-exoscale-zero-4 + cron-job-name: openshift-cloudscale-cluster-standard-2 spec: template: metadata: @@ -4767,7 +7031,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-exoscale-zero + value: openshift-cloudscale-cluster-standard - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -4776,8 +7040,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="exoscale", - vshn_service_level="zero"}, + cloud_provider=~"cloudscale", + vshn_service_level="standard", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -4803,25 +7068,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-exoscale-standard + product-id: openshift-cloudscale-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-exoscale-standard-5 - name: openshift-clusters-exoscale-standard-5 + name: openshift-cloudscale-cluster-zero-3 + name: openshift-cloudscale-cluster-zero-3 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-exoscale-standard + product-id: openshift-cloudscale-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-exoscale-standard-5 + cron-job-name: openshift-cloudscale-cluster-zero-3 spec: template: metadata: @@ -4860,7 +7125,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-exoscale-standard + value: openshift-cloudscale-cluster-zero - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -4869,8 +7134,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="exoscale", - vshn_service_level="standard"}, + cloud_provider=~"cloudscale", + vshn_service_level="zero", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -4896,25 +7162,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-exoscale-professional + product-id: openshift-exoscale-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-exoscale-professional-6 - name: openshift-clusters-exoscale-professional-6 + name: openshift-exoscale-cluster-premium-4 + name: openshift-exoscale-cluster-premium-4 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-exoscale-professional + product-id: openshift-exoscale-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-exoscale-professional-6 + cron-job-name: openshift-exoscale-cluster-premium-4 spec: template: metadata: @@ -4953,7 +7219,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-exoscale-professional + value: openshift-exoscale-cluster-premium - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -4962,8 +7228,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="exoscale", - vshn_service_level="professional"}, + cloud_provider=~"exoscale", + vshn_service_level="premium", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -4989,25 +7256,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-exoscale-premium + product-id: openshift-exoscale-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-exoscale-premium-7 - name: openshift-clusters-exoscale-premium-7 + name: openshift-exoscale-cluster-professional-5 + name: openshift-exoscale-cluster-professional-5 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-exoscale-premium + product-id: openshift-exoscale-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-exoscale-premium-7 + cron-job-name: openshift-exoscale-cluster-professional-5 spec: template: metadata: @@ -5046,7 +7313,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-exoscale-premium + value: openshift-exoscale-cluster-professional - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -5055,8 +7322,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="exoscale", - vshn_service_level="premium"}, + cloud_provider=~"exoscale", + vshn_service_level="professional", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -5082,25 +7350,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-vsphere-zero + product-id: openshift-exoscale-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-vsphere-zero-8 - name: openshift-clusters-vsphere-zero-8 + name: openshift-exoscale-cluster-standard-6 + name: openshift-exoscale-cluster-standard-6 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-vsphere-zero + product-id: openshift-exoscale-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-vsphere-zero-8 + cron-job-name: openshift-exoscale-cluster-standard-6 spec: template: metadata: @@ -5139,7 +7407,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-vsphere-zero + value: openshift-exoscale-cluster-standard - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -5148,8 +7416,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="vsphere", - vshn_service_level="zero"}, + cloud_provider=~"exoscale", + vshn_service_level="standard", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -5175,25 +7444,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-vsphere-standard + product-id: openshift-exoscale-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-vsphere-standard-9 - name: openshift-clusters-vsphere-standard-9 + name: openshift-exoscale-cluster-zero-7 + name: openshift-exoscale-cluster-zero-7 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-vsphere-standard + product-id: openshift-exoscale-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-vsphere-standard-9 + cron-job-name: openshift-exoscale-cluster-zero-7 spec: template: metadata: @@ -5232,7 +7501,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-vsphere-standard + value: openshift-exoscale-cluster-zero - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -5241,8 +7510,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="vsphere", - vshn_service_level="standard"}, + cloud_provider=~"exoscale", + vshn_service_level="zero", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -5268,25 +7538,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-vsphere-professional + product-id: openshift-onprem-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-vsphere-professional-10 - name: openshift-clusters-vsphere-professional-10 + name: openshift-onprem-cluster-premium-8 + name: openshift-onprem-cluster-premium-8 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-vsphere-professional + product-id: openshift-onprem-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-vsphere-professional-10 + cron-job-name: openshift-onprem-cluster-premium-8 spec: template: metadata: @@ -5325,7 +7595,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-vsphere-professional + value: openshift-onprem-cluster-premium - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -5334,8 +7604,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="vsphere", - vshn_service_level="professional"}, + cloud_provider=~"vsphere|none", + vshn_service_level="premium", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -5361,25 +7632,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-vsphere-premium + product-id: openshift-onprem-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-vsphere-premium-11 - name: openshift-clusters-vsphere-premium-11 + name: openshift-onprem-cluster-professional-9 + name: openshift-onprem-cluster-professional-9 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-vsphere-premium + product-id: openshift-onprem-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-vsphere-premium-11 + cron-job-name: openshift-onprem-cluster-professional-9 spec: template: metadata: @@ -5418,7 +7689,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-vsphere-premium + value: openshift-onprem-cluster-professional - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -5427,8 +7698,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="vsphere", - vshn_service_level="premium"}, + cloud_provider=~"vsphere|none", + vshn_service_level="professional", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -5454,25 +7726,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-openstack-zero + product-id: openshift-onprem-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-openstack-zero-12 - name: openshift-clusters-openstack-zero-12 + name: openshift-onprem-cluster-standard-10 + name: openshift-onprem-cluster-standard-10 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-openstack-zero + product-id: openshift-onprem-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-openstack-zero-12 + cron-job-name: openshift-onprem-cluster-standard-10 spec: template: metadata: @@ -5511,7 +7783,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-openstack-zero + value: openshift-onprem-cluster-standard - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -5520,8 +7792,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="openstack", - vshn_service_level="zero"}, + cloud_provider=~"vsphere|none", + vshn_service_level="standard", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -5547,25 +7820,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-openstack-standard + product-id: openshift-onprem-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-openstack-standard-13 - name: openshift-clusters-openstack-standard-13 + name: openshift-onprem-cluster-zero-11 + name: openshift-onprem-cluster-zero-11 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-openstack-standard + product-id: openshift-onprem-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-openstack-standard-13 + cron-job-name: openshift-onprem-cluster-zero-11 spec: template: metadata: @@ -5604,7 +7877,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-openstack-standard + value: openshift-onprem-cluster-zero - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -5613,8 +7886,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="openstack", - vshn_service_level="standard"}, + cloud_provider=~"vsphere|none", + vshn_service_level="zero", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -5640,25 +7914,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-openstack-professional + product-id: openshift-xelon-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-openstack-professional-14 - name: openshift-clusters-openstack-professional-14 + name: openshift-xelon-cluster-premium-12 + name: openshift-xelon-cluster-premium-12 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-openstack-professional + product-id: openshift-xelon-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-openstack-professional-14 + cron-job-name: openshift-xelon-cluster-premium-12 spec: template: metadata: @@ -5697,7 +7971,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-openstack-professional + value: openshift-xelon-cluster-premium - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -5706,8 +7980,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="openstack", - vshn_service_level="professional"}, + cloud_provider=~"xelon", + vshn_service_level="premium", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -5733,25 +8008,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-openstack-premium + product-id: openshift-xelon-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-openstack-premium-15 - name: openshift-clusters-openstack-premium-15 + name: openshift-xelon-cluster-professional-13 + name: openshift-xelon-cluster-professional-13 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-openstack-premium + product-id: openshift-xelon-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-openstack-premium-15 + cron-job-name: openshift-xelon-cluster-professional-13 spec: template: metadata: @@ -5790,7 +8065,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-openstack-premium + value: openshift-xelon-cluster-professional - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -5799,8 +8074,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="openstack", - vshn_service_level="premium"}, + cloud_provider=~"xelon", + vshn_service_level="professional", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -5826,25 +8102,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-vsphere-standard + product-id: openshift-xelon-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-vsphere-standard-16 - name: openshift-clusters-vsphere-standard-16 + name: openshift-xelon-cluster-standard-14 + name: openshift-xelon-cluster-standard-14 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-vsphere-standard + product-id: openshift-xelon-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-vsphere-standard-16 + cron-job-name: openshift-xelon-cluster-standard-14 spec: template: metadata: @@ -5883,7 +8159,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-vsphere-standard + value: openshift-xelon-cluster-standard - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -5892,8 +8168,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="xelon", - vshn_service_level="standard"}, + cloud_provider=~"xelon", + vshn_service_level="standard", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -5919,25 +8196,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-vsphere-professional + product-id: openshift-xelon-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-vsphere-professional-17 - name: openshift-clusters-vsphere-professional-17 + name: openshift-xelon-cluster-zero-15 + name: openshift-xelon-cluster-zero-15 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-vsphere-professional + product-id: openshift-xelon-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-vsphere-professional-17 + cron-job-name: openshift-xelon-cluster-zero-15 spec: template: metadata: @@ -5976,7 +8253,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-vsphere-professional + value: openshift-xelon-cluster-zero - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -5985,8 +8262,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="none", - vshn_service_level="professional"}, + cloud_provider=~"xelon", + vshn_service_level="zero", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -6012,25 +8290,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-iaas-cluster-zero + product-id: kubernetes-iaas-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-iaas-cluster-zero-0 - name: kubernetes-iaas-cluster-zero-0 + name: kubernetes-iaas-cluster-premium-0 + name: kubernetes-iaas-cluster-premium-0 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-iaas-cluster-zero + product-id: kubernetes-iaas-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-iaas-cluster-zero-0 + cron-job-name: kubernetes-iaas-cluster-premium-0 spec: template: metadata: @@ -6069,7 +8347,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-iaas-cluster-zero + value: kubernetes-iaas-cluster-premium - name: AR_QUERY value: | max_over_time( @@ -6078,7 +8356,7 @@ spec: sales_order!="TERMINATED", sales_order!="NONE", distribution=~"rancher|rke2", - vshn_service_level="zero", + vshn_service_level="premium", } )[59m:1m] ) @@ -6105,25 +8383,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-iaas-cluster-standard + product-id: kubernetes-iaas-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-iaas-cluster-standard-1 - name: kubernetes-iaas-cluster-standard-1 + name: kubernetes-iaas-cluster-professional-1 + name: kubernetes-iaas-cluster-professional-1 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-iaas-cluster-standard + product-id: kubernetes-iaas-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-iaas-cluster-standard-1 + cron-job-name: kubernetes-iaas-cluster-professional-1 spec: template: metadata: @@ -6162,7 +8440,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-iaas-cluster-standard + value: kubernetes-iaas-cluster-professional - name: AR_QUERY value: | max_over_time( @@ -6171,7 +8449,7 @@ spec: sales_order!="TERMINATED", sales_order!="NONE", distribution=~"rancher|rke2", - vshn_service_level="standard", + vshn_service_level="professional", } )[59m:1m] ) @@ -6198,25 +8476,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-iaas-cluster-professional + product-id: kubernetes-iaas-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-iaas-cluster-professional-2 - name: kubernetes-iaas-cluster-professional-2 + name: kubernetes-iaas-cluster-standard-2 + name: kubernetes-iaas-cluster-standard-2 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-iaas-cluster-professional + product-id: kubernetes-iaas-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-iaas-cluster-professional-2 + cron-job-name: kubernetes-iaas-cluster-standard-2 spec: template: metadata: @@ -6255,7 +8533,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-iaas-cluster-professional + value: kubernetes-iaas-cluster-standard - name: AR_QUERY value: | max_over_time( @@ -6264,7 +8542,7 @@ spec: sales_order!="TERMINATED", sales_order!="NONE", distribution=~"rancher|rke2", - vshn_service_level="professional", + vshn_service_level="standard", } )[59m:1m] ) @@ -6291,25 +8569,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-iaas-cluster-premium + product-id: kubernetes-iaas-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-iaas-cluster-premium-3 - name: kubernetes-iaas-cluster-premium-3 + name: kubernetes-iaas-cluster-zero-3 + name: kubernetes-iaas-cluster-zero-3 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-iaas-cluster-premium + product-id: kubernetes-iaas-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-iaas-cluster-premium-3 + cron-job-name: kubernetes-iaas-cluster-zero-3 spec: template: metadata: @@ -6348,7 +8626,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-iaas-cluster-premium + value: kubernetes-iaas-cluster-zero - name: AR_QUERY value: | max_over_time( @@ -6357,7 +8635,7 @@ spec: sales_order!="TERMINATED", sales_order!="NONE", distribution=~"rancher|rke2", - vshn_service_level="premium", + vshn_service_level="zero", } )[59m:1m] ) @@ -6384,25 +8662,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-iaas-node-zero + product-id: kubernetes-iaas-node-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-iaas-node-zero-0 - name: kubernetes-iaas-node-zero-0 + name: kubernetes-iaas-node-premium-0 + name: kubernetes-iaas-node-premium-0 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-iaas-node-zero + product-id: kubernetes-iaas-node-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-iaas-node-zero-0 + cron-job-name: kubernetes-iaas-node-premium-0 spec: template: metadata: @@ -6441,7 +8719,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-iaas-node-zero + value: kubernetes-iaas-node-premium - name: AR_QUERY value: | max_over_time( @@ -6454,7 +8732,7 @@ spec: sales_order!="TERMINATED", sales_order!="NONE", distribution=~"rke2|rancher", - vshn_service_level="zero", + vshn_service_level="premium", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -6479,25 +8757,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-iaas-node-standard + product-id: kubernetes-iaas-node-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-iaas-node-standard-1 - name: kubernetes-iaas-node-standard-1 + name: kubernetes-iaas-node-professional-1 + name: kubernetes-iaas-node-professional-1 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-iaas-node-standard + product-id: kubernetes-iaas-node-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-iaas-node-standard-1 + cron-job-name: kubernetes-iaas-node-professional-1 spec: template: metadata: @@ -6536,7 +8814,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-iaas-node-standard + value: kubernetes-iaas-node-professional - name: AR_QUERY value: | max_over_time( @@ -6549,7 +8827,7 @@ spec: sales_order!="TERMINATED", sales_order!="NONE", distribution=~"rke2|rancher", - vshn_service_level="standard", + vshn_service_level="professional", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -6574,25 +8852,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-iaas-node-professional + product-id: kubernetes-iaas-node-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-iaas-node-professional-2 - name: kubernetes-iaas-node-professional-2 + name: kubernetes-iaas-node-standard-2 + name: kubernetes-iaas-node-standard-2 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-iaas-node-professional + product-id: kubernetes-iaas-node-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-iaas-node-professional-2 + cron-job-name: kubernetes-iaas-node-standard-2 spec: template: metadata: @@ -6631,7 +8909,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-iaas-node-professional + value: kubernetes-iaas-node-standard - name: AR_QUERY value: | max_over_time( @@ -6644,7 +8922,7 @@ spec: sales_order!="TERMINATED", sales_order!="NONE", distribution=~"rke2|rancher", - vshn_service_level="professional", + vshn_service_level="standard", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -6669,25 +8947,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-iaas-node-premium + product-id: kubernetes-iaas-node-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-iaas-node-premium-3 - name: kubernetes-iaas-node-premium-3 + name: kubernetes-iaas-node-zero-3 + name: kubernetes-iaas-node-zero-3 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-iaas-node-premium + product-id: kubernetes-iaas-node-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-iaas-node-premium-3 + cron-job-name: kubernetes-iaas-node-zero-3 spec: template: metadata: @@ -6726,7 +9004,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-iaas-node-premium + value: kubernetes-iaas-node-zero - name: AR_QUERY value: | max_over_time( @@ -6739,7 +9017,7 @@ spec: sales_order!="TERMINATED", sales_order!="NONE", distribution=~"rke2|rancher", - vshn_service_level="premium", + vshn_service_level="zero", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels diff --git a/tests/golden/external-secret/appuio-reporting/appuio-reporting/11_backfill.yaml b/tests/golden/external-secret/appuio-reporting/appuio-reporting/11_backfill.yaml index 7a807b1..d8ccd85 100644 --- a/tests/golden/external-secret/appuio-reporting/appuio-reporting/11_backfill.yaml +++ b/tests/golden/external-secret/appuio-reporting/appuio-reporting/11_backfill.yaml @@ -2,25 +2,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-besteffort + product-id: openshift-cloudscale-storagevcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-cloudscale-besteffort-0 - name: openshift-worker-vcpu-cloudscale-besteffort-0 + name: openshift-cloudscale-storagevcpu-besteffort-0 + name: openshift-cloudscale-storagevcpu-besteffort-0 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-besteffort + product-id: openshift-cloudscale-storagevcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-cloudscale-besteffort-0 + cron-job-name: openshift-cloudscale-storagevcpu-besteffort-0 spec: template: metadata: @@ -59,7 +59,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-cloudscale-besteffort + value: openshift-cloudscale-storagevcpu-besteffort - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -97,25 +97,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-guaranteedavailability + product-id: openshift-cloudscale-storagevcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-cloudscale-gua-93468ed8b2029fe - name: openshift-worker-vcpu-cloudscale-gua-93468ed8b2029fe + name: openshift-cloudscale-storagevcpu-guaranteed-1 + name: openshift-cloudscale-storagevcpu-guaranteed-1 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-guaranteedavailability + product-id: openshift-cloudscale-storagevcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-cloudscale-guaranteedavailability-1 + cron-job-name: openshift-cloudscale-storagevcpu-guaranteed-1 spec: template: metadata: @@ -154,7 +154,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-cloudscale-guaranteedavailability + value: openshift-cloudscale-storagevcpu-guaranteed - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -192,25 +192,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-besteffort + product-id: openshift-cloudscale-storagevcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-exoscale-besteffort-2 - name: openshift-worker-vcpu-exoscale-besteffort-2 + name: openshift-cloudscale-storagevcpu-premium-2 + name: openshift-cloudscale-storagevcpu-premium-2 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-besteffort + product-id: openshift-cloudscale-storagevcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-exoscale-besteffort-2 + cron-job-name: openshift-cloudscale-storagevcpu-premium-2 spec: template: metadata: @@ -249,7 +249,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-exoscale-besteffort + value: openshift-cloudscale-storagevcpu-premium - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -287,25 +287,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-guaranteedavailability + product-id: openshift-cloudscale-storagevcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-exoscale-guara-c7fabf75f900683 - name: openshift-worker-vcpu-exoscale-guara-c7fabf75f900683 + name: openshift-cloudscale-storagevcpu-professional-3 + name: openshift-cloudscale-storagevcpu-professional-3 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-guaranteedavailability + product-id: openshift-cloudscale-storagevcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-exoscale-guaranteedavailability-3 + cron-job-name: openshift-cloudscale-storagevcpu-professional-3 spec: template: metadata: @@ -344,7 +344,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-exoscale-guaranteedavailability + value: openshift-cloudscale-storagevcpu-professional - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -382,25 +382,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-besteffort + product-id: openshift-cloudscale-storagevcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-vsphere-besteffort-4 - name: openshift-worker-vcpu-vsphere-besteffort-4 + name: openshift-cloudscale-storagevcpu-standard-4 + name: openshift-cloudscale-storagevcpu-standard-4 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-besteffort + product-id: openshift-cloudscale-storagevcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-vsphere-besteffort-4 + cron-job-name: openshift-cloudscale-storagevcpu-standard-4 spec: template: metadata: @@ -439,7 +439,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-vsphere-besteffort + value: openshift-cloudscale-storagevcpu-standard - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -477,25 +477,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-guaranteedavailability + product-id: openshift-cloudscale-workervcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-vsphere-guaran-2b28379ea85e0d3 - name: openshift-worker-vcpu-vsphere-guaran-2b28379ea85e0d3 + name: openshift-cloudscale-workervcpu-besteffort-5 + name: openshift-cloudscale-workervcpu-besteffort-5 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-guaranteedavailability + product-id: openshift-cloudscale-workervcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-vsphere-guaranteedavailability-5 + cron-job-name: openshift-cloudscale-workervcpu-besteffort-5 spec: template: metadata: @@ -534,7 +534,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-vsphere-guaranteedavailability + value: openshift-cloudscale-workervcpu-besteffort - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -572,25 +572,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-openstack-besteffort + product-id: openshift-cloudscale-workervcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-openstack-besteffort-6 - name: openshift-worker-vcpu-openstack-besteffort-6 + name: openshift-cloudscale-workervcpu-guaranteed-6 + name: openshift-cloudscale-workervcpu-guaranteed-6 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-openstack-besteffort + product-id: openshift-cloudscale-workervcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-openstack-besteffort-6 + cron-job-name: openshift-cloudscale-workervcpu-guaranteed-6 spec: template: metadata: @@ -629,7 +629,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-openstack-besteffort + value: openshift-cloudscale-workervcpu-guaranteed - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -667,25 +667,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-openstack-guaranteedavailability + product-id: openshift-cloudscale-workervcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-openstack-guar-437fd9b37153898 - name: openshift-worker-vcpu-openstack-guar-437fd9b37153898 + name: openshift-cloudscale-workervcpu-premium-7 + name: openshift-cloudscale-workervcpu-premium-7 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-openstack-guaranteedavailability + product-id: openshift-cloudscale-workervcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-openstack-guaranteedavailability-7 + cron-job-name: openshift-cloudscale-workervcpu-premium-7 spec: template: metadata: @@ -724,7 +724,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-openstack-guaranteedavailability + value: openshift-cloudscale-workervcpu-premium - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -762,25 +762,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-besteffort + product-id: openshift-cloudscale-workervcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-cloudscale-besteffort-8 - name: openshift-worker-vcpu-cloudscale-besteffort-8 + name: openshift-cloudscale-workervcpu-professional-8 + name: openshift-cloudscale-workervcpu-professional-8 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-besteffort + product-id: openshift-cloudscale-workervcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-cloudscale-besteffort-8 + cron-job-name: openshift-cloudscale-workervcpu-professional-8 spec: template: metadata: @@ -819,7 +819,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-cloudscale-besteffort + value: openshift-cloudscale-workervcpu-professional - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -857,25 +857,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-guaranteedavailability + product-id: openshift-cloudscale-workervcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-cloudscale-gua-9c5f21dd467a005 - name: openshift-worker-vcpu-cloudscale-gua-9c5f21dd467a005 + name: openshift-cloudscale-workervcpu-standard-9 + name: openshift-cloudscale-workervcpu-standard-9 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-guaranteedavailability + product-id: openshift-cloudscale-workervcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-cloudscale-guaranteedavailability-9 + cron-job-name: openshift-cloudscale-workervcpu-standard-9 spec: template: metadata: @@ -914,7 +914,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-cloudscale-guaranteedavailability + value: openshift-cloudscale-workervcpu-standard - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -952,25 +952,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-zero + product-id: openshift-cloudscale-workervcpu-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-cloudscale-zero-10 - name: openshift-worker-vcpu-cloudscale-zero-10 + name: openshift-cloudscale-workervcpu-zero-10 + name: openshift-cloudscale-workervcpu-zero-10 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-zero + product-id: openshift-cloudscale-workervcpu-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-cloudscale-zero-10 + cron-job-name: openshift-cloudscale-workervcpu-zero-10 spec: template: metadata: @@ -1009,7 +1009,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-cloudscale-zero + value: openshift-cloudscale-workervcpu-zero - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -1047,25 +1047,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-standard + product-id: openshift-exoscale-storagevcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-cloudscale-standard-11 - name: openshift-worker-vcpu-cloudscale-standard-11 + name: openshift-exoscale-storagevcpu-besteffort-11 + name: openshift-exoscale-storagevcpu-besteffort-11 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-standard + product-id: openshift-exoscale-storagevcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-cloudscale-standard-11 + cron-job-name: openshift-exoscale-storagevcpu-besteffort-11 spec: template: metadata: @@ -1104,7 +1104,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-cloudscale-standard + value: openshift-exoscale-storagevcpu-besteffort - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -1142,25 +1142,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-professional + product-id: openshift-exoscale-storagevcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-cloudscale-professional-12 - name: openshift-worker-vcpu-cloudscale-professional-12 + name: openshift-exoscale-storagevcpu-guaranteed-12 + name: openshift-exoscale-storagevcpu-guaranteed-12 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-professional + product-id: openshift-exoscale-storagevcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-cloudscale-professional-12 + cron-job-name: openshift-exoscale-storagevcpu-guaranteed-12 spec: template: metadata: @@ -1199,7 +1199,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-cloudscale-professional + value: openshift-exoscale-storagevcpu-guaranteed - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -1237,25 +1237,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-premium + product-id: openshift-exoscale-storagevcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-cloudscale-premium-13 - name: openshift-worker-vcpu-cloudscale-premium-13 + name: openshift-exoscale-storagevcpu-premium-13 + name: openshift-exoscale-storagevcpu-premium-13 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-premium + product-id: openshift-exoscale-storagevcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-cloudscale-premium-13 + cron-job-name: openshift-exoscale-storagevcpu-premium-13 spec: template: metadata: @@ -1294,7 +1294,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-cloudscale-premium + value: openshift-exoscale-storagevcpu-premium - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -1332,25 +1332,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-zero + product-id: openshift-exoscale-storagevcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-exoscale-zero-14 - name: openshift-worker-vcpu-exoscale-zero-14 + name: openshift-exoscale-storagevcpu-professional-14 + name: openshift-exoscale-storagevcpu-professional-14 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-zero + product-id: openshift-exoscale-storagevcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-exoscale-zero-14 + cron-job-name: openshift-exoscale-storagevcpu-professional-14 spec: template: metadata: @@ -1389,7 +1389,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-exoscale-zero + value: openshift-exoscale-storagevcpu-professional - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -1427,25 +1427,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-standard + product-id: openshift-exoscale-storagevcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-exoscale-standard-15 - name: openshift-worker-vcpu-exoscale-standard-15 + name: openshift-exoscale-storagevcpu-standard-15 + name: openshift-exoscale-storagevcpu-standard-15 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-standard + product-id: openshift-exoscale-storagevcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-exoscale-standard-15 + cron-job-name: openshift-exoscale-storagevcpu-standard-15 spec: template: metadata: @@ -1484,7 +1484,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-exoscale-standard + value: openshift-exoscale-storagevcpu-standard - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -1522,25 +1522,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-professional + product-id: openshift-exoscale-workervcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-exoscale-professional-16 - name: openshift-worker-vcpu-exoscale-professional-16 + name: openshift-exoscale-workervcpu-besteffort-16 + name: openshift-exoscale-workervcpu-besteffort-16 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-professional + product-id: openshift-exoscale-workervcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-exoscale-professional-16 + cron-job-name: openshift-exoscale-workervcpu-besteffort-16 spec: template: metadata: @@ -1579,7 +1579,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-exoscale-professional + value: openshift-exoscale-workervcpu-besteffort - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -1617,25 +1617,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-premium + product-id: openshift-exoscale-workervcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-exoscale-premium-17 - name: openshift-worker-vcpu-exoscale-premium-17 + name: openshift-exoscale-workervcpu-guaranteed-17 + name: openshift-exoscale-workervcpu-guaranteed-17 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-premium + product-id: openshift-exoscale-workervcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-exoscale-premium-17 + cron-job-name: openshift-exoscale-workervcpu-guaranteed-17 spec: template: metadata: @@ -1674,7 +1674,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-exoscale-premium + value: openshift-exoscale-workervcpu-guaranteed - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -1712,25 +1712,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-zero + product-id: openshift-exoscale-workervcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-vsphere-zero-18 - name: openshift-worker-vcpu-vsphere-zero-18 + name: openshift-exoscale-workervcpu-premium-18 + name: openshift-exoscale-workervcpu-premium-18 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-zero + product-id: openshift-exoscale-workervcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-vsphere-zero-18 + cron-job-name: openshift-exoscale-workervcpu-premium-18 spec: template: metadata: @@ -1769,7 +1769,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-vsphere-zero + value: openshift-exoscale-workervcpu-premium - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -1807,25 +1807,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-standard + product-id: openshift-exoscale-workervcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-vsphere-standard-19 - name: openshift-worker-vcpu-vsphere-standard-19 + name: openshift-exoscale-workervcpu-professional-19 + name: openshift-exoscale-workervcpu-professional-19 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-standard + product-id: openshift-exoscale-workervcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-vsphere-standard-19 + cron-job-name: openshift-exoscale-workervcpu-professional-19 spec: template: metadata: @@ -1864,7 +1864,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-vsphere-standard + value: openshift-exoscale-workervcpu-professional - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -1902,25 +1902,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-professional + product-id: openshift-exoscale-workervcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-vsphere-professional-20 - name: openshift-worker-vcpu-vsphere-professional-20 + name: openshift-exoscale-workervcpu-standard-20 + name: openshift-exoscale-workervcpu-standard-20 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-professional + product-id: openshift-exoscale-workervcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-vsphere-professional-20 + cron-job-name: openshift-exoscale-workervcpu-standard-20 spec: template: metadata: @@ -1959,7 +1959,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-vsphere-professional + value: openshift-exoscale-workervcpu-standard - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -1997,25 +1997,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-premium + product-id: openshift-exoscale-workervcpu-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-vsphere-premium-21 - name: openshift-worker-vcpu-vsphere-premium-21 + name: openshift-exoscale-workervcpu-zero-21 + name: openshift-exoscale-workervcpu-zero-21 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-premium + product-id: openshift-exoscale-workervcpu-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-vsphere-premium-21 + cron-job-name: openshift-exoscale-workervcpu-zero-21 spec: template: metadata: @@ -2054,7 +2054,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-vsphere-premium + value: openshift-exoscale-workervcpu-zero - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -2092,25 +2092,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-openstack-zero + product-id: openshift-openstackcsp-workervcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-openstack-zero-22 - name: openshift-worker-vcpu-openstack-zero-22 + name: openshift-openstackcsp-workervcpu-besteffort-22 + name: openshift-openstackcsp-workervcpu-besteffort-22 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-openstack-zero + product-id: openshift-openstackcsp-workervcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-openstack-zero-22 + cron-job-name: openshift-openstackcsp-workervcpu-besteffort-22 spec: template: metadata: @@ -2149,7 +2149,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-openstack-zero + value: openshift-openstackcsp-workervcpu-besteffort - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -2187,25 +2187,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-openstack-standard + product-id: openshift-openstackcsp-workervcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-openstack-standard-23 - name: openshift-worker-vcpu-openstack-standard-23 + name: openshift-openstackcsp-workervcpu-guaranteed-23 + name: openshift-openstackcsp-workervcpu-guaranteed-23 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-openstack-standard + product-id: openshift-openstackcsp-workervcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-openstack-standard-23 + cron-job-name: openshift-openstackcsp-workervcpu-guaranteed-23 spec: template: metadata: @@ -2244,7 +2244,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-openstack-standard + value: openshift-openstackcsp-workervcpu-guaranteed - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -2282,25 +2282,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-openstack-professional + product-id: openshift-openstackcsp-workervcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-openstack-professional-24 - name: openshift-worker-vcpu-openstack-professional-24 + name: openshift-openstackcsp-workervcpu-premium-24 + name: openshift-openstackcsp-workervcpu-premium-24 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-openstack-professional + product-id: openshift-openstackcsp-workervcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-openstack-professional-24 + cron-job-name: openshift-openstackcsp-workervcpu-premium-24 spec: template: metadata: @@ -2339,7 +2339,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-openstack-professional + value: openshift-openstackcsp-workervcpu-premium - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -2377,25 +2377,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-openstack-premium + product-id: openshift-openstackcsp-workervcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-openstack-premium-25 - name: openshift-worker-vcpu-openstack-premium-25 + name: openshift-openstackcsp-workervcpu-professional-25 + name: openshift-openstackcsp-workervcpu-professional-25 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-openstack-premium + product-id: openshift-openstackcsp-workervcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-openstack-premium-25 + cron-job-name: openshift-openstackcsp-workervcpu-professional-25 spec: template: metadata: @@ -2434,7 +2434,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-openstack-premium + value: openshift-openstackcsp-workervcpu-professional - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -2472,25 +2472,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-standard + product-id: openshift-openstackcsp-workervcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-vsphere-standard-26 - name: openshift-worker-vcpu-vsphere-standard-26 + name: openshift-openstackcsp-workervcpu-standard-26 + name: openshift-openstackcsp-workervcpu-standard-26 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-standard + product-id: openshift-openstackcsp-workervcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-vsphere-standard-26 + cron-job-name: openshift-openstackcsp-workervcpu-standard-26 spec: template: metadata: @@ -2529,7 +2529,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-vsphere-standard + value: openshift-openstackcsp-workervcpu-standard - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -2567,25 +2567,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-professional + product-id: openshift-openstackcsp-workervcpu-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-vsphere-professional-27 - name: openshift-worker-vcpu-vsphere-professional-27 + name: openshift-openstackcsp-workervcpu-zero-27 + name: openshift-openstackcsp-workervcpu-zero-27 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-professional + product-id: openshift-openstackcsp-workervcpu-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-vsphere-professional-27 + cron-job-name: openshift-openstackcsp-workervcpu-zero-27 spec: template: metadata: @@ -2624,7 +2624,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-vsphere-professional + value: openshift-openstackcsp-workervcpu-zero - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -2662,25 +2662,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-besteffort + product-id: openshift-openstackonprem-workervcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-cloudscale-besteffort-28 - name: openshift-worker-vcpu-cloudscale-besteffort-28 + name: openshift-openstackonprem-workervcpu-besteffort-28 + name: openshift-openstackonprem-workervcpu-besteffort-28 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-besteffort + product-id: openshift-openstackonprem-workervcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-cloudscale-besteffort-28 + cron-job-name: openshift-openstackonprem-workervcpu-besteffort-28 spec: template: metadata: @@ -2719,7 +2719,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-cloudscale-besteffort + value: openshift-openstackonprem-workervcpu-besteffort - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -2757,25 +2757,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-awseks-vcpu-besteffort + product-id: openshift-openstackonprem-workervcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-awseks-vcpu-besteffort-0 - name: kubernetes-awseks-vcpu-besteffort-0 + name: openshift-openstackonprem-workervcpu-guaranteed-29 + name: openshift-openstackonprem-workervcpu-guaranteed-29 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-awseks-vcpu-besteffort + product-id: openshift-openstackonprem-workervcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-awseks-vcpu-besteffort-0 + cron-job-name: openshift-openstackonprem-workervcpu-guaranteed-29 spec: template: metadata: @@ -2814,27 +2814,21 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-awseks-vcpu-besteffort + value: openshift-openstackonprem-workervcpu-guaranteed - name: AR_QUERY - value: | - max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) - # Pull in the APPUiO managed info labels - * on(cluster_id) group_left(sales_order) appuio_managed_info{ - sales_order!="NONE", - sales_order!="TERMINATED", - cloud_provider="aws", - distribution="eks", - vshn_service_level="best_effort", - } + value: query - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: - %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels - name: AR_UNIT_ID - value: uom_uom_49_440b0fa7 + value: '300' - name: AR_ORG_ID - value: appuio-managed-kubernetes-services-billing + value: appuio-managed-openshift-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -2858,25 +2852,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-awseks-vcpu-guaranteed + product-id: openshift-openstackonprem-workervcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-awseks-vcpu-guaranteed-1 - name: kubernetes-awseks-vcpu-guaranteed-1 + name: openshift-openstackonprem-workervcpu-premium-30 + name: openshift-openstackonprem-workervcpu-premium-30 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-awseks-vcpu-guaranteed + product-id: openshift-openstackonprem-workervcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-awseks-vcpu-guaranteed-1 + cron-job-name: openshift-openstackonprem-workervcpu-premium-30 spec: template: metadata: @@ -2915,27 +2909,21 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-awseks-vcpu-guaranteed + value: openshift-openstackonprem-workervcpu-premium - name: AR_QUERY - value: | - max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) - # Pull in the APPUiO managed info labels - * on(cluster_id) group_left(sales_order) appuio_managed_info{ - sales_order!="NONE", - sales_order!="TERMINATED", - cloud_provider="aws", - distribution="eks", - vshn_service_level="guaranteed_availability", - } + value: query - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: - %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels - name: AR_UNIT_ID - value: uom_uom_49_440b0fa7 + value: '300' - name: AR_ORG_ID - value: appuio-managed-kubernetes-services-billing + value: appuio-managed-openshift-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -2959,25 +2947,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-exoscalesks-vcpu-besteffort + product-id: openshift-openstackonprem-workervcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-exoscalesks-vcpu-besteffort-2 - name: kubernetes-exoscalesks-vcpu-besteffort-2 + name: openshift-openstackonprem-workervcpu-8b0ab0abec678e9 + name: openshift-openstackonprem-workervcpu-8b0ab0abec678e9 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-exoscalesks-vcpu-besteffort + product-id: openshift-openstackonprem-workervcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-exoscalesks-vcpu-besteffort-2 + cron-job-name: openshift-openstackonprem-workervcpu-professional-31 spec: template: metadata: @@ -3016,27 +3004,21 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-exoscalesks-vcpu-besteffort + value: openshift-openstackonprem-workervcpu-professional - name: AR_QUERY - value: | - max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) - # Pull in the APPUiO managed info labels - * on(cluster_id) group_left(sales_order) appuio_managed_info{ - sales_order!="NONE", - sales_order!="TERMINATED", - cloud_provider="exoscale", - distribution="sks", - vshn_service_level="best_effort", - } + value: query - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: - %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels - name: AR_UNIT_ID - value: uom_uom_49_440b0fa7 + value: '300' - name: AR_ORG_ID - value: appuio-managed-kubernetes-services-billing + value: appuio-managed-openshift-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -3060,25 +3042,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-exoscalesks-vcpu-guaranteed + product-id: openshift-openstackonprem-workervcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-exoscalesks-vcpu-guaranteed-3 - name: kubernetes-exoscalesks-vcpu-guaranteed-3 + name: openshift-openstackonprem-workervcpu-standard-32 + name: openshift-openstackonprem-workervcpu-standard-32 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-exoscalesks-vcpu-guaranteed + product-id: openshift-openstackonprem-workervcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-exoscalesks-vcpu-guaranteed-3 + cron-job-name: openshift-openstackonprem-workervcpu-standard-32 spec: template: metadata: @@ -3117,27 +3099,21 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-exoscalesks-vcpu-guaranteed + value: openshift-openstackonprem-workervcpu-standard - name: AR_QUERY - value: | - max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) - # Pull in the APPUiO managed info labels - * on(cluster_id) group_left(sales_order) appuio_managed_info{ - sales_order!="NONE", - sales_order!="TERMINATED", - cloud_provider="exoscale", - distribution="sks", - vshn_service_level="guaranteed_availability", - } + value: query - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: - %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels - name: AR_UNIT_ID - value: uom_uom_49_440b0fa7 + value: '300' - name: AR_ORG_ID - value: appuio-managed-kubernetes-services-billing + value: appuio-managed-openshift-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -3161,25 +3137,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-googlegke-vcpu-besteffort + product-id: openshift-openstackonprem-workervcpu-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-googlegke-vcpu-besteffort-4 - name: kubernetes-googlegke-vcpu-besteffort-4 + name: openshift-openstackonprem-workervcpu-zero-33 + name: openshift-openstackonprem-workervcpu-zero-33 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-googlegke-vcpu-besteffort + product-id: openshift-openstackonprem-workervcpu-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-googlegke-vcpu-besteffort-4 + cron-job-name: openshift-openstackonprem-workervcpu-zero-33 spec: template: metadata: @@ -3218,27 +3194,21 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-googlegke-vcpu-besteffort + value: openshift-openstackonprem-workervcpu-zero - name: AR_QUERY - value: | - max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) - # Pull in the APPUiO managed info labels - * on(cluster_id) group_left(sales_order) appuio_managed_info{ - sales_order!="NONE", - sales_order!="TERMINATED", - cloud_provider="gcp", - distribution="gke", - vshn_service_level="best_effort", - } + value: query - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: - %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels - name: AR_UNIT_ID - value: uom_uom_49_440b0fa7 + value: '300' - name: AR_ORG_ID - value: appuio-managed-kubernetes-services-billing + value: appuio-managed-openshift-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -3262,25 +3232,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-googlegke-vcpu-guaranteed + product-id: openshift-vspherecsp-workervcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-googlegke-vcpu-guaranteed-5 - name: kubernetes-googlegke-vcpu-guaranteed-5 + name: openshift-vspherecsp-workervcpu-besteffort-34 + name: openshift-vspherecsp-workervcpu-besteffort-34 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-googlegke-vcpu-guaranteed + product-id: openshift-vspherecsp-workervcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-googlegke-vcpu-guaranteed-5 + cron-job-name: openshift-vspherecsp-workervcpu-besteffort-34 spec: template: metadata: @@ -3319,27 +3289,21 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-googlegke-vcpu-guaranteed + value: openshift-vspherecsp-workervcpu-besteffort - name: AR_QUERY - value: | - max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) - # Pull in the APPUiO managed info labels - * on(cluster_id) group_left(sales_order) appuio_managed_info{ - sales_order!="NONE", - sales_order!="TERMINATED", - cloud_provider="gcp", - distribution="gke", - vshn_service_level="guaranteed_availability", - } + value: query - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: - %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels - name: AR_UNIT_ID - value: uom_uom_49_440b0fa7 + value: '300' - name: AR_ORG_ID - value: appuio-managed-kubernetes-services-billing + value: appuio-managed-openshift-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -3363,25 +3327,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-azureaks-vcpu-besteffort + product-id: openshift-vspherecsp-workervcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-azureaks-vcpu-besteffort-6 - name: kubernetes-azureaks-vcpu-besteffort-6 + name: openshift-vspherecsp-workervcpu-guaranteed-35 + name: openshift-vspherecsp-workervcpu-guaranteed-35 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-azureaks-vcpu-besteffort + product-id: openshift-vspherecsp-workervcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-azureaks-vcpu-besteffort-6 + cron-job-name: openshift-vspherecsp-workervcpu-guaranteed-35 spec: template: metadata: @@ -3420,27 +3384,21 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-azureaks-vcpu-besteffort + value: openshift-vspherecsp-workervcpu-guaranteed - name: AR_QUERY - value: | - max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) - # Pull in the APPUiO managed info labels - * on(cluster_id) group_left(sales_order) appuio_managed_info{ - sales_order!="NONE", - sales_order!="TERMINATED", - cloud_provider="azure", - distribution="aks", - vshn_service_level="best_effort", - } + value: query - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: - %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels - name: AR_UNIT_ID - value: uom_uom_49_440b0fa7 + value: '300' - name: AR_ORG_ID - value: appuio-managed-kubernetes-services-billing + value: appuio-managed-openshift-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -3464,25 +3422,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-azureaks-vcpu-guaranteed + product-id: openshift-vspherecsp-workervcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-azureaks-vcpu-guaranteed-7 - name: kubernetes-azureaks-vcpu-guaranteed-7 + name: openshift-vspherecsp-workervcpu-premium-36 + name: openshift-vspherecsp-workervcpu-premium-36 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-azureaks-vcpu-guaranteed + product-id: openshift-vspherecsp-workervcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-azureaks-vcpu-guaranteed-7 + cron-job-name: openshift-vspherecsp-workervcpu-premium-36 spec: template: metadata: @@ -3521,27 +3479,21 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-azureaks-vcpu-guaranteed + value: openshift-vspherecsp-workervcpu-premium - name: AR_QUERY - value: | - max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) - # Pull in the APPUiO managed info labels - * on(cluster_id) group_left(sales_order) appuio_managed_info{ - sales_order!="NONE", - sales_order!="TERMINATED", - cloud_provider="azure", - distribution="aks", - vshn_service_level="guaranteed_availability", - } + value: query - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: - %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels - name: AR_UNIT_ID - value: uom_uom_49_440b0fa7 + value: '300' - name: AR_ORG_ID - value: appuio-managed-kubernetes-services-billing + value: appuio-managed-openshift-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -3565,25 +3517,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-zero + product-id: openshift-vspherecsp-workervcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-hyperscaler-cluster-zero-0 - name: kubernetes-hyperscaler-cluster-zero-0 + name: openshift-vspherecsp-workervcpu-professional-37 + name: openshift-vspherecsp-workervcpu-professional-37 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-zero + product-id: openshift-vspherecsp-workervcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-hyperscaler-cluster-zero-0 + cron-job-name: openshift-vspherecsp-workervcpu-professional-37 spec: template: metadata: @@ -3622,29 +3574,21 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-hyperscaler-cluster-zero + value: openshift-vspherecsp-workervcpu-professional - name: AR_QUERY - value: | - max_over_time( - group by(cluster_id, sales_order) ( - appuio_managed_info{ - distribution!="rke2", - distribution!="rancher", - sales_order!="TERMINATED", - sales_order!="NONE", - vshn_service_level="zero", - } - )[59m:1m] - ) + value: query - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: - %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels - name: AR_UNIT_ID - value: uom_uom_53_4a7e8f3e + value: '300' - name: AR_ORG_ID - value: appuio-managed-kubernetes-services-billing + value: appuio-managed-openshift-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -3668,25 +3612,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-standard + product-id: openshift-vspherecsp-workervcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-hyperscaler-cluster-standard-1 - name: kubernetes-hyperscaler-cluster-standard-1 + name: openshift-vspherecsp-workervcpu-standard-38 + name: openshift-vspherecsp-workervcpu-standard-38 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-standard + product-id: openshift-vspherecsp-workervcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-hyperscaler-cluster-standard-1 + cron-job-name: openshift-vspherecsp-workervcpu-standard-38 spec: template: metadata: @@ -3725,27 +3669,2157 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-hyperscaler-cluster-standard + value: openshift-vspherecsp-workervcpu-standard - name: AR_QUERY - value: | - max_over_time( - group by(cluster_id, sales_order) ( - appuio_managed_info{ - distribution!="rke2", - distribution!="rancher", - sales_order!="TERMINATED", - sales_order!="NONE", - vshn_service_level="standard", - } - )[59m:1m] - ) + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + volumeMounts: + - mountPath: /secrets/database + name: dbsecret + readOnly: true + initContainers: [] + restartPolicy: OnFailure + volumes: + - name: dbsecret + secret: + defaultMode: 384 + secretName: reporting-db-prod-cred + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-vspherecsp-workervcpu-zero + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-vspherecsp-workervcpu-zero-39 + name: openshift-vspherecsp-workervcpu-zero-39 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-vspherecsp-workervcpu-zero + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-vspherecsp-workervcpu-zero-39 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-vspherecsp-workervcpu-zero + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + volumeMounts: + - mountPath: /secrets/database + name: dbsecret + readOnly: true + initContainers: [] + restartPolicy: OnFailure + volumes: + - name: dbsecret + secret: + defaultMode: 384 + secretName: reporting-db-prod-cred + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-vsphereonprem-workervcpu-besteffort-40 + name: openshift-vsphereonprem-workervcpu-besteffort-40 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-vsphereonprem-workervcpu-besteffort-40 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-vsphereonprem-workervcpu-besteffort + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + volumeMounts: + - mountPath: /secrets/database + name: dbsecret + readOnly: true + initContainers: [] + restartPolicy: OnFailure + volumes: + - name: dbsecret + secret: + defaultMode: 384 + secretName: reporting-db-prod-cred + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-vsphereonprem-workervcpu-guaranteed-41 + name: openshift-vsphereonprem-workervcpu-guaranteed-41 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-vsphereonprem-workervcpu-guaranteed-41 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-vsphereonprem-workervcpu-guaranteed + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + volumeMounts: + - mountPath: /secrets/database + name: dbsecret + readOnly: true + initContainers: [] + restartPolicy: OnFailure + volumes: + - name: dbsecret + secret: + defaultMode: 384 + secretName: reporting-db-prod-cred + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-premium + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-vsphereonprem-workervcpu-premium-42 + name: openshift-vsphereonprem-workervcpu-premium-42 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-premium + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-vsphereonprem-workervcpu-premium-42 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-vsphereonprem-workervcpu-premium + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + volumeMounts: + - mountPath: /secrets/database + name: dbsecret + readOnly: true + initContainers: [] + restartPolicy: OnFailure + volumes: + - name: dbsecret + secret: + defaultMode: 384 + secretName: reporting-db-prod-cred + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-professional + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-vsphereonprem-workervcpu-professional-43 + name: openshift-vsphereonprem-workervcpu-professional-43 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-professional + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-vsphereonprem-workervcpu-professional-43 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-vsphereonprem-workervcpu-professional + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + volumeMounts: + - mountPath: /secrets/database + name: dbsecret + readOnly: true + initContainers: [] + restartPolicy: OnFailure + volumes: + - name: dbsecret + secret: + defaultMode: 384 + secretName: reporting-db-prod-cred + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-standard + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-vsphereonprem-workervcpu-standard-44 + name: openshift-vsphereonprem-workervcpu-standard-44 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-standard + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-vsphereonprem-workervcpu-standard-44 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-vsphereonprem-workervcpu-standard + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + volumeMounts: + - mountPath: /secrets/database + name: dbsecret + readOnly: true + initContainers: [] + restartPolicy: OnFailure + volumes: + - name: dbsecret + secret: + defaultMode: 384 + secretName: reporting-db-prod-cred + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-zero + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-vsphereonprem-workervcpu-zero-45 + name: openshift-vsphereonprem-workervcpu-zero-45 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-zero + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-vsphereonprem-workervcpu-zero-45 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-vsphereonprem-workervcpu-zero + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + volumeMounts: + - mountPath: /secrets/database + name: dbsecret + readOnly: true + initContainers: [] + restartPolicy: OnFailure + volumes: + - name: dbsecret + secret: + defaultMode: 384 + secretName: reporting-db-prod-cred + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-xelon-workervcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-xelon-workervcpu-besteffort-46 + name: openshift-xelon-workervcpu-besteffort-46 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-xelon-workervcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-xelon-workervcpu-besteffort-46 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-xelon-workervcpu-besteffort + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + volumeMounts: + - mountPath: /secrets/database + name: dbsecret + readOnly: true + initContainers: [] + restartPolicy: OnFailure + volumes: + - name: dbsecret + secret: + defaultMode: 384 + secretName: reporting-db-prod-cred + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-xelon-workervcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-xelon-workervcpu-guaranteed-47 + name: openshift-xelon-workervcpu-guaranteed-47 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-xelon-workervcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-xelon-workervcpu-guaranteed-47 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-xelon-workervcpu-guaranteed + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + volumeMounts: + - mountPath: /secrets/database + name: dbsecret + readOnly: true + initContainers: [] + restartPolicy: OnFailure + volumes: + - name: dbsecret + secret: + defaultMode: 384 + secretName: reporting-db-prod-cred + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-xelon-workervcpu-premium + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-xelon-workervcpu-premium-48 + name: openshift-xelon-workervcpu-premium-48 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-xelon-workervcpu-premium + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-xelon-workervcpu-premium-48 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-xelon-workervcpu-premium + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + volumeMounts: + - mountPath: /secrets/database + name: dbsecret + readOnly: true + initContainers: [] + restartPolicy: OnFailure + volumes: + - name: dbsecret + secret: + defaultMode: 384 + secretName: reporting-db-prod-cred + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-xelon-workervcpu-professional + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-xelon-workervcpu-professional-49 + name: openshift-xelon-workervcpu-professional-49 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-xelon-workervcpu-professional + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-xelon-workervcpu-professional-49 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-xelon-workervcpu-professional + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + volumeMounts: + - mountPath: /secrets/database + name: dbsecret + readOnly: true + initContainers: [] + restartPolicy: OnFailure + volumes: + - name: dbsecret + secret: + defaultMode: 384 + secretName: reporting-db-prod-cred + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-xelon-workervcpu-standard + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-xelon-workervcpu-standard-50 + name: openshift-xelon-workervcpu-standard-50 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-xelon-workervcpu-standard + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-xelon-workervcpu-standard-50 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-xelon-workervcpu-standard + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + volumeMounts: + - mountPath: /secrets/database + name: dbsecret + readOnly: true + initContainers: [] + restartPolicy: OnFailure + volumes: + - name: dbsecret + secret: + defaultMode: 384 + secretName: reporting-db-prod-cred + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-xelon-workervcpu-zero + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-xelon-workervcpu-zero-51 + name: openshift-xelon-workervcpu-zero-51 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-xelon-workervcpu-zero + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-xelon-workervcpu-zero-51 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-xelon-workervcpu-zero + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + volumeMounts: + - mountPath: /secrets/database + name: dbsecret + readOnly: true + initContainers: [] + restartPolicy: OnFailure + volumes: + - name: dbsecret + secret: + defaultMode: 384 + secretName: reporting-db-prod-cred + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-worker-vcpu-cloudscale-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-worker-vcpu-cloudscale-besteffort-52 + name: openshift-worker-vcpu-cloudscale-besteffort-52 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-worker-vcpu-cloudscale-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-worker-vcpu-cloudscale-besteffort-52 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-worker-vcpu-cloudscale-besteffort + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + volumeMounts: + - mountPath: /secrets/database + name: dbsecret + readOnly: true + initContainers: [] + restartPolicy: OnFailure + volumes: + - name: dbsecret + secret: + defaultMode: 384 + secretName: reporting-db-prod-cred + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: kubernetes-awseks-vcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: kubernetes-awseks-vcpu-besteffort-0 + name: kubernetes-awseks-vcpu-besteffort-0 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: kubernetes-awseks-vcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: kubernetes-awseks-vcpu-besteffort-0 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: kubernetes-awseks-vcpu-besteffort + - name: AR_QUERY + value: | + max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + sales_order!="NONE", + sales_order!="TERMINATED", + cloud_provider="aws", + distribution="eks", + vshn_service_level="best_effort", + } + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: + %(cluster_id)s" % labels' + - name: AR_UNIT_ID + value: uom_uom_49_440b0fa7 + - name: AR_ORG_ID + value: appuio-managed-kubernetes-services-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + volumeMounts: + - mountPath: /secrets/database + name: dbsecret + readOnly: true + initContainers: [] + restartPolicy: OnFailure + volumes: + - name: dbsecret + secret: + defaultMode: 384 + secretName: reporting-db-prod-cred + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: kubernetes-awseks-vcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: kubernetes-awseks-vcpu-guaranteed-1 + name: kubernetes-awseks-vcpu-guaranteed-1 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: kubernetes-awseks-vcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: kubernetes-awseks-vcpu-guaranteed-1 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: kubernetes-awseks-vcpu-guaranteed + - name: AR_QUERY + value: | + max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + sales_order!="NONE", + sales_order!="TERMINATED", + cloud_provider="aws", + distribution="eks", + vshn_service_level="guaranteed_availability", + } + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: + %(cluster_id)s" % labels' + - name: AR_UNIT_ID + value: uom_uom_49_440b0fa7 + - name: AR_ORG_ID + value: appuio-managed-kubernetes-services-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + volumeMounts: + - mountPath: /secrets/database + name: dbsecret + readOnly: true + initContainers: [] + restartPolicy: OnFailure + volumes: + - name: dbsecret + secret: + defaultMode: 384 + secretName: reporting-db-prod-cred + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: kubernetes-azureaks-vcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: kubernetes-azureaks-vcpu-besteffort-2 + name: kubernetes-azureaks-vcpu-besteffort-2 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: kubernetes-azureaks-vcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: kubernetes-azureaks-vcpu-besteffort-2 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: kubernetes-azureaks-vcpu-besteffort + - name: AR_QUERY + value: | + max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + sales_order!="NONE", + sales_order!="TERMINATED", + cloud_provider="azure", + distribution="aks", + vshn_service_level="best_effort", + } + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: + %(cluster_id)s" % labels' + - name: AR_UNIT_ID + value: uom_uom_49_440b0fa7 + - name: AR_ORG_ID + value: appuio-managed-kubernetes-services-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + volumeMounts: + - mountPath: /secrets/database + name: dbsecret + readOnly: true + initContainers: [] + restartPolicy: OnFailure + volumes: + - name: dbsecret + secret: + defaultMode: 384 + secretName: reporting-db-prod-cred + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: kubernetes-azureaks-vcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: kubernetes-azureaks-vcpu-guaranteed-3 + name: kubernetes-azureaks-vcpu-guaranteed-3 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: kubernetes-azureaks-vcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: kubernetes-azureaks-vcpu-guaranteed-3 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: kubernetes-azureaks-vcpu-guaranteed + - name: AR_QUERY + value: | + max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + sales_order!="NONE", + sales_order!="TERMINATED", + cloud_provider="azure", + distribution="aks", + vshn_service_level="guaranteed_availability", + } + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: + %(cluster_id)s" % labels' + - name: AR_UNIT_ID + value: uom_uom_49_440b0fa7 + - name: AR_ORG_ID + value: appuio-managed-kubernetes-services-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + volumeMounts: + - mountPath: /secrets/database + name: dbsecret + readOnly: true + initContainers: [] + restartPolicy: OnFailure + volumes: + - name: dbsecret + secret: + defaultMode: 384 + secretName: reporting-db-prod-cred + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: kubernetes-exoscalesks-vcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: kubernetes-exoscalesks-vcpu-besteffort-4 + name: kubernetes-exoscalesks-vcpu-besteffort-4 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: kubernetes-exoscalesks-vcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: kubernetes-exoscalesks-vcpu-besteffort-4 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: kubernetes-exoscalesks-vcpu-besteffort + - name: AR_QUERY + value: | + max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + sales_order!="NONE", + sales_order!="TERMINATED", + cloud_provider="exoscale", + distribution="sks", + vshn_service_level="best_effort", + } + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: + %(cluster_id)s" % labels' + - name: AR_UNIT_ID + value: uom_uom_49_440b0fa7 + - name: AR_ORG_ID + value: appuio-managed-kubernetes-services-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + volumeMounts: + - mountPath: /secrets/database + name: dbsecret + readOnly: true + initContainers: [] + restartPolicy: OnFailure + volumes: + - name: dbsecret + secret: + defaultMode: 384 + secretName: reporting-db-prod-cred + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: kubernetes-exoscalesks-vcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: kubernetes-exoscalesks-vcpu-guaranteed-5 + name: kubernetes-exoscalesks-vcpu-guaranteed-5 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: kubernetes-exoscalesks-vcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: kubernetes-exoscalesks-vcpu-guaranteed-5 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: kubernetes-exoscalesks-vcpu-guaranteed + - name: AR_QUERY + value: | + max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + sales_order!="NONE", + sales_order!="TERMINATED", + cloud_provider="exoscale", + distribution="sks", + vshn_service_level="guaranteed_availability", + } + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: + %(cluster_id)s" % labels' + - name: AR_UNIT_ID + value: uom_uom_49_440b0fa7 + - name: AR_ORG_ID + value: appuio-managed-kubernetes-services-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + volumeMounts: + - mountPath: /secrets/database + name: dbsecret + readOnly: true + initContainers: [] + restartPolicy: OnFailure + volumes: + - name: dbsecret + secret: + defaultMode: 384 + secretName: reporting-db-prod-cred + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: kubernetes-googlegke-vcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: kubernetes-googlegke-vcpu-besteffort-6 + name: kubernetes-googlegke-vcpu-besteffort-6 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: kubernetes-googlegke-vcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: kubernetes-googlegke-vcpu-besteffort-6 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: kubernetes-googlegke-vcpu-besteffort + - name: AR_QUERY + value: | + max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + sales_order!="NONE", + sales_order!="TERMINATED", + cloud_provider="google", + distribution="gke", + vshn_service_level="best_effort", + } + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: + %(cluster_id)s" % labels' + - name: AR_UNIT_ID + value: uom_uom_49_440b0fa7 + - name: AR_ORG_ID + value: appuio-managed-kubernetes-services-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + volumeMounts: + - mountPath: /secrets/database + name: dbsecret + readOnly: true + initContainers: [] + restartPolicy: OnFailure + volumes: + - name: dbsecret + secret: + defaultMode: 384 + secretName: reporting-db-prod-cred + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: kubernetes-googlegke-vcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: kubernetes-googlegke-vcpu-guaranteed-7 + name: kubernetes-googlegke-vcpu-guaranteed-7 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: kubernetes-googlegke-vcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: kubernetes-googlegke-vcpu-guaranteed-7 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: kubernetes-googlegke-vcpu-guaranteed + - name: AR_QUERY + value: | + max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + sales_order!="NONE", + sales_order!="TERMINATED", + cloud_provider="google", + distribution="gke", + vshn_service_level="guaranteed_availability", + } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: %(cluster_id)s" % labels' - name: AR_UNIT_ID - value: uom_uom_53_4a7e8f3e + value: uom_uom_49_440b0fa7 - name: AR_ORG_ID value: appuio-managed-kubernetes-services-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 @@ -3771,25 +5845,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-professional + product-id: kubernetes-hyperscaler-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-hyperscaler-cluster-professional-2 - name: kubernetes-hyperscaler-cluster-professional-2 + name: kubernetes-hyperscaler-cluster-premium-0 + name: kubernetes-hyperscaler-cluster-premium-0 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-professional + product-id: kubernetes-hyperscaler-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-hyperscaler-cluster-professional-2 + cron-job-name: kubernetes-hyperscaler-cluster-premium-0 spec: template: metadata: @@ -3828,7 +5902,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-hyperscaler-cluster-professional + value: kubernetes-hyperscaler-cluster-premium - name: AR_QUERY value: | max_over_time( @@ -3838,7 +5912,7 @@ spec: distribution!="rancher", sales_order!="TERMINATED", sales_order!="NONE", - vshn_service_level="professional", + vshn_service_level="premium", } )[59m:1m] ) @@ -3874,25 +5948,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-premium + product-id: kubernetes-hyperscaler-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-hyperscaler-cluster-premium-3 - name: kubernetes-hyperscaler-cluster-premium-3 + name: kubernetes-hyperscaler-cluster-professional-1 + name: kubernetes-hyperscaler-cluster-professional-1 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-premium + product-id: kubernetes-hyperscaler-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-hyperscaler-cluster-premium-3 + cron-job-name: kubernetes-hyperscaler-cluster-professional-1 spec: template: metadata: @@ -3931,7 +6005,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-hyperscaler-cluster-premium + value: kubernetes-hyperscaler-cluster-professional - name: AR_QUERY value: | max_over_time( @@ -3941,7 +6015,7 @@ spec: distribution!="rancher", sales_order!="TERMINATED", sales_order!="NONE", - vshn_service_level="premium", + vshn_service_level="professional", } )[59m:1m] ) @@ -3977,25 +6051,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-zero + product-id: kubernetes-hyperscaler-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-hyperscaler-cluster-zero-0 - name: kubernetes-hyperscaler-cluster-zero-0 + name: kubernetes-hyperscaler-cluster-standard-2 + name: kubernetes-hyperscaler-cluster-standard-2 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-zero + product-id: kubernetes-hyperscaler-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-hyperscaler-cluster-zero-0 + cron-job-name: kubernetes-hyperscaler-cluster-standard-2 spec: template: metadata: @@ -4034,25 +6108,27 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-hyperscaler-cluster-zero + value: kubernetes-hyperscaler-cluster-standard - name: AR_QUERY value: | - max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) - # Pull in the APPUiO managed info labels - * on(cluster_id) group_left(sales_order) appuio_managed_info{ - distribution!="rke2", - distribution!="rancher", - sales_order!="TERMINATED", - sales_order!="NONE", - vshn_service_level="zero", - } + max_over_time( + group by(cluster_id, sales_order) ( + appuio_managed_info{ + distribution!="rke2", + distribution!="rancher", + sales_order!="TERMINATED", + sales_order!="NONE", + vshn_service_level="standard", + } + )[59m:1m] + ) - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: %(cluster_id)s" % labels' - name: AR_UNIT_ID - value: uom_uom_191_55730e52 + value: uom_uom_53_4a7e8f3e - name: AR_ORG_ID value: appuio-managed-kubernetes-services-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 @@ -4078,25 +6154,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-standard + product-id: kubernetes-hyperscaler-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-hyperscaler-cluster-standard-1 - name: kubernetes-hyperscaler-cluster-standard-1 + name: kubernetes-hyperscaler-cluster-zero-3 + name: kubernetes-hyperscaler-cluster-zero-3 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-standard + product-id: kubernetes-hyperscaler-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-hyperscaler-cluster-standard-1 + cron-job-name: kubernetes-hyperscaler-cluster-zero-3 spec: template: metadata: @@ -4135,25 +6211,27 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-hyperscaler-cluster-standard + value: kubernetes-hyperscaler-cluster-zero - name: AR_QUERY value: | - max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) - # Pull in the APPUiO managed info labels - * on(cluster_id) group_left(sales_order) appuio_managed_info{ - distribution!="rke2", - distribution!="rancher", - sales_order!="TERMINATED", - sales_order!="NONE", - vshn_service_level="standard", - } + max_over_time( + group by(cluster_id, sales_order) ( + appuio_managed_info{ + distribution!="rke2", + distribution!="rancher", + sales_order!="TERMINATED", + sales_order!="NONE", + vshn_service_level="zero", + } + )[59m:1m] + ) - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: %(cluster_id)s" % labels' - name: AR_UNIT_ID - value: uom_uom_191_55730e52 + value: uom_uom_53_4a7e8f3e - name: AR_ORG_ID value: appuio-managed-kubernetes-services-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 @@ -4179,25 +6257,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-professional + product-id: kubernetes-hyperscaler-node-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-hyperscaler-cluster-professional-2 - name: kubernetes-hyperscaler-cluster-professional-2 + name: kubernetes-hyperscaler-node-premium-0 + name: kubernetes-hyperscaler-node-premium-0 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-professional + product-id: kubernetes-hyperscaler-node-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-hyperscaler-cluster-professional-2 + cron-job-name: kubernetes-hyperscaler-node-premium-0 spec: template: metadata: @@ -4236,7 +6314,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-hyperscaler-cluster-professional + value: kubernetes-hyperscaler-node-premium - name: AR_QUERY value: | max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) @@ -4246,7 +6324,7 @@ spec: distribution!="rancher", sales_order!="TERMINATED", sales_order!="NONE", - vshn_service_level="professional", + vshn_service_level="premium", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -4280,25 +6358,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-premium + product-id: kubernetes-hyperscaler-node-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-hyperscaler-cluster-premium-3 - name: kubernetes-hyperscaler-cluster-premium-3 + name: kubernetes-hyperscaler-node-professional-1 + name: kubernetes-hyperscaler-node-professional-1 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-premium + product-id: kubernetes-hyperscaler-node-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-hyperscaler-cluster-premium-3 + cron-job-name: kubernetes-hyperscaler-node-professional-1 spec: template: metadata: @@ -4337,7 +6415,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-hyperscaler-cluster-premium + value: kubernetes-hyperscaler-node-professional - name: AR_QUERY value: | max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) @@ -4347,7 +6425,7 @@ spec: distribution!="rancher", sales_order!="TERMINATED", sales_order!="NONE", - vshn_service_level="premium", + vshn_service_level="professional", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -4381,25 +6459,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-cloudscale-zero + product-id: kubernetes-hyperscaler-node-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-cloudscale-zero-0 - name: openshift-clusters-cloudscale-zero-0 + name: kubernetes-hyperscaler-node-standard-2 + name: kubernetes-hyperscaler-node-standard-2 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-cloudscale-zero + product-id: kubernetes-hyperscaler-node-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-cloudscale-zero-0 + cron-job-name: kubernetes-hyperscaler-node-standard-2 spec: template: metadata: @@ -4438,28 +6516,27 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-cloudscale-zero + value: kubernetes-hyperscaler-node-standard - name: AR_QUERY value: | - # Calculates number of clusters per cluster. Always returns 1. - # Max values over one hour. - max_over_time( - # Use aggregation to drop labels of no interest. - group by(cluster_id, sales_order) ( - appuio_managed_info{ - cloud_provider="cloudscale", - vshn_service_level="zero"}, - )[59m:1m] - ) + max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + distribution!="rke2", + distribution!="rancher", + sales_order!="TERMINATED", + sales_order!="NONE", + vshn_service_level="standard", + } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift - - Cluster: %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: + %(cluster_id)s" % labels' - name: AR_UNIT_ID - value: uom_uom_53_4a7e8f3e + value: uom_uom_191_55730e52 - name: AR_ORG_ID - value: appuio-managed-openshift-billing + value: appuio-managed-kubernetes-services-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -4483,25 +6560,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-cloudscale-standard + product-id: kubernetes-hyperscaler-node-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-cloudscale-standard-1 - name: openshift-clusters-cloudscale-standard-1 + name: kubernetes-hyperscaler-node-zero-3 + name: kubernetes-hyperscaler-node-zero-3 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-cloudscale-standard + product-id: kubernetes-hyperscaler-node-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-cloudscale-standard-1 + cron-job-name: kubernetes-hyperscaler-node-zero-3 spec: template: metadata: @@ -4540,28 +6617,27 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-cloudscale-standard + value: kubernetes-hyperscaler-node-zero - name: AR_QUERY value: | - # Calculates number of clusters per cluster. Always returns 1. - # Max values over one hour. - max_over_time( - # Use aggregation to drop labels of no interest. - group by(cluster_id, sales_order) ( - appuio_managed_info{ - cloud_provider="cloudscale", - vshn_service_level="standard"}, - )[59m:1m] - ) + max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + distribution!="rke2", + distribution!="rancher", + sales_order!="TERMINATED", + sales_order!="NONE", + vshn_service_level="zero", + } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift - - Cluster: %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: + %(cluster_id)s" % labels' - name: AR_UNIT_ID - value: uom_uom_53_4a7e8f3e + value: uom_uom_191_55730e52 - name: AR_ORG_ID - value: appuio-managed-openshift-billing + value: appuio-managed-kubernetes-services-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -4585,25 +6661,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-cloudscale-professional + product-id: openshift-cloudscale-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-cloudscale-professional-2 - name: openshift-clusters-cloudscale-professional-2 + name: openshift-cloudscale-cluster-premium-0 + name: openshift-cloudscale-cluster-premium-0 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-cloudscale-professional + product-id: openshift-cloudscale-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-cloudscale-professional-2 + cron-job-name: openshift-cloudscale-cluster-premium-0 spec: template: metadata: @@ -4642,7 +6718,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-cloudscale-professional + value: openshift-cloudscale-cluster-premium - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -4651,8 +6727,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="cloudscale", - vshn_service_level="professional"}, + cloud_provider=~"cloudscale", + vshn_service_level="premium", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -4687,25 +6764,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-cloudscale-premium + product-id: openshift-cloudscale-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-cloudscale-premium-3 - name: openshift-clusters-cloudscale-premium-3 + name: openshift-cloudscale-cluster-professional-1 + name: openshift-cloudscale-cluster-professional-1 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-cloudscale-premium + product-id: openshift-cloudscale-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-cloudscale-premium-3 + cron-job-name: openshift-cloudscale-cluster-professional-1 spec: template: metadata: @@ -4744,7 +6821,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-cloudscale-premium + value: openshift-cloudscale-cluster-professional - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -4753,8 +6830,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="cloudscale", - vshn_service_level="premium"}, + cloud_provider=~"cloudscale", + vshn_service_level="professional", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -4789,25 +6867,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-exoscale-zero + product-id: openshift-cloudscale-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-exoscale-zero-4 - name: openshift-clusters-exoscale-zero-4 + name: openshift-cloudscale-cluster-standard-2 + name: openshift-cloudscale-cluster-standard-2 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-exoscale-zero + product-id: openshift-cloudscale-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-exoscale-zero-4 + cron-job-name: openshift-cloudscale-cluster-standard-2 spec: template: metadata: @@ -4846,7 +6924,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-exoscale-zero + value: openshift-cloudscale-cluster-standard - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -4855,8 +6933,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="exoscale", - vshn_service_level="zero"}, + cloud_provider=~"cloudscale", + vshn_service_level="standard", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -4891,25 +6970,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-exoscale-standard + product-id: openshift-cloudscale-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-exoscale-standard-5 - name: openshift-clusters-exoscale-standard-5 + name: openshift-cloudscale-cluster-zero-3 + name: openshift-cloudscale-cluster-zero-3 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-exoscale-standard + product-id: openshift-cloudscale-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-exoscale-standard-5 + cron-job-name: openshift-cloudscale-cluster-zero-3 spec: template: metadata: @@ -4948,7 +7027,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-exoscale-standard + value: openshift-cloudscale-cluster-zero - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -4957,8 +7036,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="exoscale", - vshn_service_level="standard"}, + cloud_provider=~"cloudscale", + vshn_service_level="zero", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -4993,25 +7073,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-exoscale-professional + product-id: openshift-exoscale-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-exoscale-professional-6 - name: openshift-clusters-exoscale-professional-6 + name: openshift-exoscale-cluster-premium-4 + name: openshift-exoscale-cluster-premium-4 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-exoscale-professional + product-id: openshift-exoscale-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-exoscale-professional-6 + cron-job-name: openshift-exoscale-cluster-premium-4 spec: template: metadata: @@ -5050,7 +7130,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-exoscale-professional + value: openshift-exoscale-cluster-premium - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -5059,8 +7139,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="exoscale", - vshn_service_level="professional"}, + cloud_provider=~"exoscale", + vshn_service_level="premium", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -5095,25 +7176,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-exoscale-premium + product-id: openshift-exoscale-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-exoscale-premium-7 - name: openshift-clusters-exoscale-premium-7 + name: openshift-exoscale-cluster-professional-5 + name: openshift-exoscale-cluster-professional-5 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-exoscale-premium + product-id: openshift-exoscale-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-exoscale-premium-7 + cron-job-name: openshift-exoscale-cluster-professional-5 spec: template: metadata: @@ -5152,7 +7233,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-exoscale-premium + value: openshift-exoscale-cluster-professional - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -5161,8 +7242,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="exoscale", - vshn_service_level="premium"}, + cloud_provider=~"exoscale", + vshn_service_level="professional", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -5197,25 +7279,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-vsphere-zero + product-id: openshift-exoscale-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-vsphere-zero-8 - name: openshift-clusters-vsphere-zero-8 + name: openshift-exoscale-cluster-standard-6 + name: openshift-exoscale-cluster-standard-6 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-vsphere-zero + product-id: openshift-exoscale-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-vsphere-zero-8 + cron-job-name: openshift-exoscale-cluster-standard-6 spec: template: metadata: @@ -5254,7 +7336,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-vsphere-zero + value: openshift-exoscale-cluster-standard - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -5263,8 +7345,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="vsphere", - vshn_service_level="zero"}, + cloud_provider=~"exoscale", + vshn_service_level="standard", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -5299,25 +7382,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-vsphere-standard + product-id: openshift-exoscale-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-vsphere-standard-9 - name: openshift-clusters-vsphere-standard-9 + name: openshift-exoscale-cluster-zero-7 + name: openshift-exoscale-cluster-zero-7 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-vsphere-standard + product-id: openshift-exoscale-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-vsphere-standard-9 + cron-job-name: openshift-exoscale-cluster-zero-7 spec: template: metadata: @@ -5356,7 +7439,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-vsphere-standard + value: openshift-exoscale-cluster-zero - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -5365,8 +7448,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="vsphere", - vshn_service_level="standard"}, + cloud_provider=~"exoscale", + vshn_service_level="zero", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -5401,25 +7485,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-vsphere-professional + product-id: openshift-onprem-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-vsphere-professional-10 - name: openshift-clusters-vsphere-professional-10 + name: openshift-onprem-cluster-premium-8 + name: openshift-onprem-cluster-premium-8 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-vsphere-professional + product-id: openshift-onprem-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-vsphere-professional-10 + cron-job-name: openshift-onprem-cluster-premium-8 spec: template: metadata: @@ -5458,7 +7542,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-vsphere-professional + value: openshift-onprem-cluster-premium - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -5467,8 +7551,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="vsphere", - vshn_service_level="professional"}, + cloud_provider=~"vsphere|none", + vshn_service_level="premium", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -5503,25 +7588,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-vsphere-premium + product-id: openshift-onprem-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-vsphere-premium-11 - name: openshift-clusters-vsphere-premium-11 + name: openshift-onprem-cluster-professional-9 + name: openshift-onprem-cluster-professional-9 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-vsphere-premium + product-id: openshift-onprem-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-vsphere-premium-11 + cron-job-name: openshift-onprem-cluster-professional-9 spec: template: metadata: @@ -5560,7 +7645,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-vsphere-premium + value: openshift-onprem-cluster-professional - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -5569,8 +7654,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="vsphere", - vshn_service_level="premium"}, + cloud_provider=~"vsphere|none", + vshn_service_level="professional", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -5605,25 +7691,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-openstack-zero + product-id: openshift-onprem-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-openstack-zero-12 - name: openshift-clusters-openstack-zero-12 + name: openshift-onprem-cluster-standard-10 + name: openshift-onprem-cluster-standard-10 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-openstack-zero + product-id: openshift-onprem-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-openstack-zero-12 + cron-job-name: openshift-onprem-cluster-standard-10 spec: template: metadata: @@ -5662,7 +7748,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-openstack-zero + value: openshift-onprem-cluster-standard - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -5671,8 +7757,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="openstack", - vshn_service_level="zero"}, + cloud_provider=~"vsphere|none", + vshn_service_level="standard", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -5707,25 +7794,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-openstack-standard + product-id: openshift-onprem-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-openstack-standard-13 - name: openshift-clusters-openstack-standard-13 + name: openshift-onprem-cluster-zero-11 + name: openshift-onprem-cluster-zero-11 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-openstack-standard + product-id: openshift-onprem-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-openstack-standard-13 + cron-job-name: openshift-onprem-cluster-zero-11 spec: template: metadata: @@ -5764,7 +7851,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-openstack-standard + value: openshift-onprem-cluster-zero - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -5773,8 +7860,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="openstack", - vshn_service_level="standard"}, + cloud_provider=~"vsphere|none", + vshn_service_level="zero", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -5809,25 +7897,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-openstack-professional + product-id: openshift-xelon-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-openstack-professional-14 - name: openshift-clusters-openstack-professional-14 + name: openshift-xelon-cluster-premium-12 + name: openshift-xelon-cluster-premium-12 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-openstack-professional + product-id: openshift-xelon-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-openstack-professional-14 + cron-job-name: openshift-xelon-cluster-premium-12 spec: template: metadata: @@ -5866,7 +7954,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-openstack-professional + value: openshift-xelon-cluster-premium - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -5875,8 +7963,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="openstack", - vshn_service_level="professional"}, + cloud_provider=~"xelon", + vshn_service_level="premium", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -5911,25 +8000,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-openstack-premium + product-id: openshift-xelon-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-openstack-premium-15 - name: openshift-clusters-openstack-premium-15 + name: openshift-xelon-cluster-professional-13 + name: openshift-xelon-cluster-professional-13 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-openstack-premium + product-id: openshift-xelon-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-openstack-premium-15 + cron-job-name: openshift-xelon-cluster-professional-13 spec: template: metadata: @@ -5968,7 +8057,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-openstack-premium + value: openshift-xelon-cluster-professional - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -5977,8 +8066,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="openstack", - vshn_service_level="premium"}, + cloud_provider=~"xelon", + vshn_service_level="professional", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -6013,25 +8103,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-vsphere-standard + product-id: openshift-xelon-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-vsphere-standard-16 - name: openshift-clusters-vsphere-standard-16 + name: openshift-xelon-cluster-standard-14 + name: openshift-xelon-cluster-standard-14 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-vsphere-standard + product-id: openshift-xelon-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-vsphere-standard-16 + cron-job-name: openshift-xelon-cluster-standard-14 spec: template: metadata: @@ -6070,7 +8160,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-vsphere-standard + value: openshift-xelon-cluster-standard - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -6079,8 +8169,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="xelon", - vshn_service_level="standard"}, + cloud_provider=~"xelon", + vshn_service_level="standard", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -6115,25 +8206,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-vsphere-professional + product-id: openshift-xelon-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-vsphere-professional-17 - name: openshift-clusters-vsphere-professional-17 + name: openshift-xelon-cluster-zero-15 + name: openshift-xelon-cluster-zero-15 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-vsphere-professional + product-id: openshift-xelon-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-vsphere-professional-17 + cron-job-name: openshift-xelon-cluster-zero-15 spec: template: metadata: @@ -6172,7 +8263,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-vsphere-professional + value: openshift-xelon-cluster-zero - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -6181,8 +8272,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="none", - vshn_service_level="professional"}, + cloud_provider=~"xelon", + vshn_service_level="zero", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -6217,25 +8309,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-iaas-cluster-zero + product-id: kubernetes-iaas-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-iaas-cluster-zero-0 - name: kubernetes-iaas-cluster-zero-0 + name: kubernetes-iaas-cluster-premium-0 + name: kubernetes-iaas-cluster-premium-0 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-iaas-cluster-zero + product-id: kubernetes-iaas-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-iaas-cluster-zero-0 + cron-job-name: kubernetes-iaas-cluster-premium-0 spec: template: metadata: @@ -6274,7 +8366,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-iaas-cluster-zero + value: kubernetes-iaas-cluster-premium - name: AR_QUERY value: | max_over_time( @@ -6283,7 +8375,7 @@ spec: sales_order!="TERMINATED", sales_order!="NONE", distribution=~"rancher|rke2", - vshn_service_level="zero", + vshn_service_level="premium", } )[59m:1m] ) @@ -6319,25 +8411,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-iaas-cluster-standard + product-id: kubernetes-iaas-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-iaas-cluster-standard-1 - name: kubernetes-iaas-cluster-standard-1 + name: kubernetes-iaas-cluster-professional-1 + name: kubernetes-iaas-cluster-professional-1 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-iaas-cluster-standard + product-id: kubernetes-iaas-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-iaas-cluster-standard-1 + cron-job-name: kubernetes-iaas-cluster-professional-1 spec: template: metadata: @@ -6376,7 +8468,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-iaas-cluster-standard + value: kubernetes-iaas-cluster-professional - name: AR_QUERY value: | max_over_time( @@ -6385,7 +8477,7 @@ spec: sales_order!="TERMINATED", sales_order!="NONE", distribution=~"rancher|rke2", - vshn_service_level="standard", + vshn_service_level="professional", } )[59m:1m] ) @@ -6421,25 +8513,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-iaas-cluster-professional + product-id: kubernetes-iaas-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-iaas-cluster-professional-2 - name: kubernetes-iaas-cluster-professional-2 + name: kubernetes-iaas-cluster-standard-2 + name: kubernetes-iaas-cluster-standard-2 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-iaas-cluster-professional + product-id: kubernetes-iaas-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-iaas-cluster-professional-2 + cron-job-name: kubernetes-iaas-cluster-standard-2 spec: template: metadata: @@ -6478,7 +8570,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-iaas-cluster-professional + value: kubernetes-iaas-cluster-standard - name: AR_QUERY value: | max_over_time( @@ -6487,7 +8579,7 @@ spec: sales_order!="TERMINATED", sales_order!="NONE", distribution=~"rancher|rke2", - vshn_service_level="professional", + vshn_service_level="standard", } )[59m:1m] ) @@ -6523,25 +8615,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-iaas-cluster-premium + product-id: kubernetes-iaas-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-iaas-cluster-premium-3 - name: kubernetes-iaas-cluster-premium-3 + name: kubernetes-iaas-cluster-zero-3 + name: kubernetes-iaas-cluster-zero-3 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-iaas-cluster-premium + product-id: kubernetes-iaas-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-iaas-cluster-premium-3 + cron-job-name: kubernetes-iaas-cluster-zero-3 spec: template: metadata: @@ -6580,7 +8672,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-iaas-cluster-premium + value: kubernetes-iaas-cluster-zero - name: AR_QUERY value: | max_over_time( @@ -6589,7 +8681,7 @@ spec: sales_order!="TERMINATED", sales_order!="NONE", distribution=~"rancher|rke2", - vshn_service_level="premium", + vshn_service_level="zero", } )[59m:1m] ) @@ -6625,25 +8717,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-iaas-node-zero + product-id: kubernetes-iaas-node-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-iaas-node-zero-0 - name: kubernetes-iaas-node-zero-0 + name: kubernetes-iaas-node-premium-0 + name: kubernetes-iaas-node-premium-0 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-iaas-node-zero + product-id: kubernetes-iaas-node-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-iaas-node-zero-0 + cron-job-name: kubernetes-iaas-node-premium-0 spec: template: metadata: @@ -6682,7 +8774,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-iaas-node-zero + value: kubernetes-iaas-node-premium - name: AR_QUERY value: | max_over_time( @@ -6695,7 +8787,7 @@ spec: sales_order!="TERMINATED", sales_order!="NONE", distribution=~"rke2|rancher", - vshn_service_level="zero", + vshn_service_level="premium", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -6729,25 +8821,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-iaas-node-standard + product-id: kubernetes-iaas-node-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-iaas-node-standard-1 - name: kubernetes-iaas-node-standard-1 + name: kubernetes-iaas-node-professional-1 + name: kubernetes-iaas-node-professional-1 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-iaas-node-standard + product-id: kubernetes-iaas-node-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-iaas-node-standard-1 + cron-job-name: kubernetes-iaas-node-professional-1 spec: template: metadata: @@ -6786,7 +8878,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-iaas-node-standard + value: kubernetes-iaas-node-professional - name: AR_QUERY value: | max_over_time( @@ -6799,7 +8891,7 @@ spec: sales_order!="TERMINATED", sales_order!="NONE", distribution=~"rke2|rancher", - vshn_service_level="standard", + vshn_service_level="professional", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -6833,25 +8925,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-iaas-node-professional + product-id: kubernetes-iaas-node-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-iaas-node-professional-2 - name: kubernetes-iaas-node-professional-2 + name: kubernetes-iaas-node-standard-2 + name: kubernetes-iaas-node-standard-2 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-iaas-node-professional + product-id: kubernetes-iaas-node-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-iaas-node-professional-2 + cron-job-name: kubernetes-iaas-node-standard-2 spec: template: metadata: @@ -6890,7 +8982,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-iaas-node-professional + value: kubernetes-iaas-node-standard - name: AR_QUERY value: | max_over_time( @@ -6903,7 +8995,7 @@ spec: sales_order!="TERMINATED", sales_order!="NONE", distribution=~"rke2|rancher", - vshn_service_level="professional", + vshn_service_level="standard", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -6937,25 +9029,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-iaas-node-premium + product-id: kubernetes-iaas-node-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-iaas-node-premium-3 - name: kubernetes-iaas-node-premium-3 + name: kubernetes-iaas-node-zero-3 + name: kubernetes-iaas-node-zero-3 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-iaas-node-premium + product-id: kubernetes-iaas-node-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-iaas-node-premium-3 + cron-job-name: kubernetes-iaas-node-zero-3 spec: template: metadata: @@ -6994,7 +9086,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-iaas-node-premium + value: kubernetes-iaas-node-zero - name: AR_QUERY value: | max_over_time( @@ -7007,7 +9099,7 @@ spec: sales_order!="TERMINATED", sales_order!="NONE", distribution=~"rke2|rancher", - vshn_service_level="premium", + vshn_service_level="zero", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels diff --git a/tests/golden/suspended-cronjobs/appuio-reporting/appuio-reporting/11_backfill.yaml b/tests/golden/suspended-cronjobs/appuio-reporting/appuio-reporting/11_backfill.yaml index 45b72a5..a0a79d8 100644 --- a/tests/golden/suspended-cronjobs/appuio-reporting/appuio-reporting/11_backfill.yaml +++ b/tests/golden/suspended-cronjobs/appuio-reporting/appuio-reporting/11_backfill.yaml @@ -2,25 +2,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-besteffort + product-id: openshift-cloudscale-storagevcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-cloudscale-besteffort-0 - name: openshift-worker-vcpu-cloudscale-besteffort-0 + name: openshift-cloudscale-storagevcpu-besteffort-0 + name: openshift-cloudscale-storagevcpu-besteffort-0 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-besteffort + product-id: openshift-cloudscale-storagevcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-cloudscale-besteffort-0 + cron-job-name: openshift-cloudscale-storagevcpu-besteffort-0 spec: template: metadata: @@ -59,7 +59,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-cloudscale-besteffort + value: openshift-cloudscale-storagevcpu-besteffort - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -88,25 +88,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-guaranteedavailability + product-id: openshift-cloudscale-storagevcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-cloudscale-gua-93468ed8b2029fe - name: openshift-worker-vcpu-cloudscale-gua-93468ed8b2029fe + name: openshift-cloudscale-storagevcpu-guaranteed-1 + name: openshift-cloudscale-storagevcpu-guaranteed-1 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-guaranteedavailability + product-id: openshift-cloudscale-storagevcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-cloudscale-guaranteedavailability-1 + cron-job-name: openshift-cloudscale-storagevcpu-guaranteed-1 spec: template: metadata: @@ -145,7 +145,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-cloudscale-guaranteedavailability + value: openshift-cloudscale-storagevcpu-guaranteed - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -174,25 +174,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-besteffort + product-id: openshift-cloudscale-storagevcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-exoscale-besteffort-2 - name: openshift-worker-vcpu-exoscale-besteffort-2 + name: openshift-cloudscale-storagevcpu-premium-2 + name: openshift-cloudscale-storagevcpu-premium-2 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-besteffort + product-id: openshift-cloudscale-storagevcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-exoscale-besteffort-2 + cron-job-name: openshift-cloudscale-storagevcpu-premium-2 spec: template: metadata: @@ -231,7 +231,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-exoscale-besteffort + value: openshift-cloudscale-storagevcpu-premium - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -260,25 +260,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-guaranteedavailability + product-id: openshift-cloudscale-storagevcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-exoscale-guara-c7fabf75f900683 - name: openshift-worker-vcpu-exoscale-guara-c7fabf75f900683 + name: openshift-cloudscale-storagevcpu-professional-3 + name: openshift-cloudscale-storagevcpu-professional-3 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-guaranteedavailability + product-id: openshift-cloudscale-storagevcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-exoscale-guaranteedavailability-3 + cron-job-name: openshift-cloudscale-storagevcpu-professional-3 spec: template: metadata: @@ -317,7 +317,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-exoscale-guaranteedavailability + value: openshift-cloudscale-storagevcpu-professional - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -346,25 +346,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-besteffort + product-id: openshift-cloudscale-storagevcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-vsphere-besteffort-4 - name: openshift-worker-vcpu-vsphere-besteffort-4 + name: openshift-cloudscale-storagevcpu-standard-4 + name: openshift-cloudscale-storagevcpu-standard-4 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-besteffort + product-id: openshift-cloudscale-storagevcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-vsphere-besteffort-4 + cron-job-name: openshift-cloudscale-storagevcpu-standard-4 spec: template: metadata: @@ -403,7 +403,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-vsphere-besteffort + value: openshift-cloudscale-storagevcpu-standard - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -432,25 +432,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-guaranteedavailability + product-id: openshift-cloudscale-workervcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-vsphere-guaran-2b28379ea85e0d3 - name: openshift-worker-vcpu-vsphere-guaran-2b28379ea85e0d3 + name: openshift-cloudscale-workervcpu-besteffort-5 + name: openshift-cloudscale-workervcpu-besteffort-5 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-guaranteedavailability + product-id: openshift-cloudscale-workervcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-vsphere-guaranteedavailability-5 + cron-job-name: openshift-cloudscale-workervcpu-besteffort-5 spec: template: metadata: @@ -489,7 +489,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-vsphere-guaranteedavailability + value: openshift-cloudscale-workervcpu-besteffort - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -518,25 +518,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-openstack-besteffort + product-id: openshift-cloudscale-workervcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-openstack-besteffort-6 - name: openshift-worker-vcpu-openstack-besteffort-6 + name: openshift-cloudscale-workervcpu-guaranteed-6 + name: openshift-cloudscale-workervcpu-guaranteed-6 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-openstack-besteffort + product-id: openshift-cloudscale-workervcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-openstack-besteffort-6 + cron-job-name: openshift-cloudscale-workervcpu-guaranteed-6 spec: template: metadata: @@ -575,7 +575,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-openstack-besteffort + value: openshift-cloudscale-workervcpu-guaranteed - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -604,25 +604,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-openstack-guaranteedavailability + product-id: openshift-cloudscale-workervcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-openstack-guar-437fd9b37153898 - name: openshift-worker-vcpu-openstack-guar-437fd9b37153898 + name: openshift-cloudscale-workervcpu-premium-7 + name: openshift-cloudscale-workervcpu-premium-7 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-openstack-guaranteedavailability + product-id: openshift-cloudscale-workervcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-openstack-guaranteedavailability-7 + cron-job-name: openshift-cloudscale-workervcpu-premium-7 spec: template: metadata: @@ -661,7 +661,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-openstack-guaranteedavailability + value: openshift-cloudscale-workervcpu-premium - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -690,25 +690,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-besteffort + product-id: openshift-cloudscale-workervcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-cloudscale-besteffort-8 - name: openshift-worker-vcpu-cloudscale-besteffort-8 + name: openshift-cloudscale-workervcpu-professional-8 + name: openshift-cloudscale-workervcpu-professional-8 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-besteffort + product-id: openshift-cloudscale-workervcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-cloudscale-besteffort-8 + cron-job-name: openshift-cloudscale-workervcpu-professional-8 spec: template: metadata: @@ -747,7 +747,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-cloudscale-besteffort + value: openshift-cloudscale-workervcpu-professional - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -776,25 +776,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-guaranteedavailability + product-id: openshift-cloudscale-workervcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-cloudscale-gua-9c5f21dd467a005 - name: openshift-worker-vcpu-cloudscale-gua-9c5f21dd467a005 + name: openshift-cloudscale-workervcpu-standard-9 + name: openshift-cloudscale-workervcpu-standard-9 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-guaranteedavailability + product-id: openshift-cloudscale-workervcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-cloudscale-guaranteedavailability-9 + cron-job-name: openshift-cloudscale-workervcpu-standard-9 spec: template: metadata: @@ -833,7 +833,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-cloudscale-guaranteedavailability + value: openshift-cloudscale-workervcpu-standard - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -862,25 +862,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-zero + product-id: openshift-cloudscale-workervcpu-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-cloudscale-zero-10 - name: openshift-worker-vcpu-cloudscale-zero-10 + name: openshift-cloudscale-workervcpu-zero-10 + name: openshift-cloudscale-workervcpu-zero-10 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-zero + product-id: openshift-cloudscale-workervcpu-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-cloudscale-zero-10 + cron-job-name: openshift-cloudscale-workervcpu-zero-10 spec: template: metadata: @@ -919,7 +919,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-cloudscale-zero + value: openshift-cloudscale-workervcpu-zero - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -948,25 +948,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-standard + product-id: openshift-exoscale-storagevcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-cloudscale-standard-11 - name: openshift-worker-vcpu-cloudscale-standard-11 + name: openshift-exoscale-storagevcpu-besteffort-11 + name: openshift-exoscale-storagevcpu-besteffort-11 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-standard + product-id: openshift-exoscale-storagevcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-cloudscale-standard-11 + cron-job-name: openshift-exoscale-storagevcpu-besteffort-11 spec: template: metadata: @@ -1005,7 +1005,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-cloudscale-standard + value: openshift-exoscale-storagevcpu-besteffort - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -1034,25 +1034,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-professional + product-id: openshift-exoscale-storagevcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-cloudscale-professional-12 - name: openshift-worker-vcpu-cloudscale-professional-12 + name: openshift-exoscale-storagevcpu-guaranteed-12 + name: openshift-exoscale-storagevcpu-guaranteed-12 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-professional + product-id: openshift-exoscale-storagevcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-cloudscale-professional-12 + cron-job-name: openshift-exoscale-storagevcpu-guaranteed-12 spec: template: metadata: @@ -1091,7 +1091,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-cloudscale-professional + value: openshift-exoscale-storagevcpu-guaranteed - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -1120,25 +1120,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-premium + product-id: openshift-exoscale-storagevcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-cloudscale-premium-13 - name: openshift-worker-vcpu-cloudscale-premium-13 + name: openshift-exoscale-storagevcpu-premium-13 + name: openshift-exoscale-storagevcpu-premium-13 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-premium + product-id: openshift-exoscale-storagevcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-cloudscale-premium-13 + cron-job-name: openshift-exoscale-storagevcpu-premium-13 spec: template: metadata: @@ -1177,7 +1177,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-cloudscale-premium + value: openshift-exoscale-storagevcpu-premium - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -1206,25 +1206,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-zero + product-id: openshift-exoscale-storagevcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-exoscale-zero-14 - name: openshift-worker-vcpu-exoscale-zero-14 + name: openshift-exoscale-storagevcpu-professional-14 + name: openshift-exoscale-storagevcpu-professional-14 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-zero + product-id: openshift-exoscale-storagevcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-exoscale-zero-14 + cron-job-name: openshift-exoscale-storagevcpu-professional-14 spec: template: metadata: @@ -1263,7 +1263,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-exoscale-zero + value: openshift-exoscale-storagevcpu-professional - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -1292,25 +1292,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-standard + product-id: openshift-exoscale-storagevcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-exoscale-standard-15 - name: openshift-worker-vcpu-exoscale-standard-15 + name: openshift-exoscale-storagevcpu-standard-15 + name: openshift-exoscale-storagevcpu-standard-15 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-standard + product-id: openshift-exoscale-storagevcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-exoscale-standard-15 + cron-job-name: openshift-exoscale-storagevcpu-standard-15 spec: template: metadata: @@ -1349,7 +1349,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-exoscale-standard + value: openshift-exoscale-storagevcpu-standard - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -1378,25 +1378,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-professional + product-id: openshift-exoscale-workervcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-exoscale-professional-16 - name: openshift-worker-vcpu-exoscale-professional-16 + name: openshift-exoscale-workervcpu-besteffort-16 + name: openshift-exoscale-workervcpu-besteffort-16 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-professional + product-id: openshift-exoscale-workervcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-exoscale-professional-16 + cron-job-name: openshift-exoscale-workervcpu-besteffort-16 spec: template: metadata: @@ -1435,7 +1435,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-exoscale-professional + value: openshift-exoscale-workervcpu-besteffort - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -1464,25 +1464,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-premium + product-id: openshift-exoscale-workervcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-exoscale-premium-17 - name: openshift-worker-vcpu-exoscale-premium-17 + name: openshift-exoscale-workervcpu-guaranteed-17 + name: openshift-exoscale-workervcpu-guaranteed-17 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-premium + product-id: openshift-exoscale-workervcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-exoscale-premium-17 + cron-job-name: openshift-exoscale-workervcpu-guaranteed-17 spec: template: metadata: @@ -1521,7 +1521,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-exoscale-premium + value: openshift-exoscale-workervcpu-guaranteed - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -1550,25 +1550,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-zero + product-id: openshift-exoscale-workervcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-vsphere-zero-18 - name: openshift-worker-vcpu-vsphere-zero-18 + name: openshift-exoscale-workervcpu-premium-18 + name: openshift-exoscale-workervcpu-premium-18 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-zero + product-id: openshift-exoscale-workervcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-vsphere-zero-18 + cron-job-name: openshift-exoscale-workervcpu-premium-18 spec: template: metadata: @@ -1607,7 +1607,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-vsphere-zero + value: openshift-exoscale-workervcpu-premium - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -1636,25 +1636,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-standard + product-id: openshift-exoscale-workervcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-vsphere-standard-19 - name: openshift-worker-vcpu-vsphere-standard-19 + name: openshift-exoscale-workervcpu-professional-19 + name: openshift-exoscale-workervcpu-professional-19 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-standard + product-id: openshift-exoscale-workervcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-vsphere-standard-19 + cron-job-name: openshift-exoscale-workervcpu-professional-19 spec: template: metadata: @@ -1693,7 +1693,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-vsphere-standard + value: openshift-exoscale-workervcpu-professional - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -1722,25 +1722,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-professional + product-id: openshift-exoscale-workervcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-vsphere-professional-20 - name: openshift-worker-vcpu-vsphere-professional-20 + name: openshift-exoscale-workervcpu-standard-20 + name: openshift-exoscale-workervcpu-standard-20 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-professional + product-id: openshift-exoscale-workervcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-vsphere-professional-20 + cron-job-name: openshift-exoscale-workervcpu-standard-20 spec: template: metadata: @@ -1779,7 +1779,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-vsphere-professional + value: openshift-exoscale-workervcpu-standard - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -1808,25 +1808,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-premium + product-id: openshift-exoscale-workervcpu-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-vsphere-premium-21 - name: openshift-worker-vcpu-vsphere-premium-21 + name: openshift-exoscale-workervcpu-zero-21 + name: openshift-exoscale-workervcpu-zero-21 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-premium + product-id: openshift-exoscale-workervcpu-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-vsphere-premium-21 + cron-job-name: openshift-exoscale-workervcpu-zero-21 spec: template: metadata: @@ -1865,7 +1865,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-vsphere-premium + value: openshift-exoscale-workervcpu-zero - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -1894,25 +1894,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-openstack-zero + product-id: openshift-openstackcsp-workervcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-openstack-zero-22 - name: openshift-worker-vcpu-openstack-zero-22 + name: openshift-openstackcsp-workervcpu-besteffort-22 + name: openshift-openstackcsp-workervcpu-besteffort-22 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-openstack-zero + product-id: openshift-openstackcsp-workervcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-openstack-zero-22 + cron-job-name: openshift-openstackcsp-workervcpu-besteffort-22 spec: template: metadata: @@ -1951,7 +1951,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-openstack-zero + value: openshift-openstackcsp-workervcpu-besteffort - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -1980,25 +1980,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-openstack-standard + product-id: openshift-openstackcsp-workervcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-openstack-standard-23 - name: openshift-worker-vcpu-openstack-standard-23 + name: openshift-openstackcsp-workervcpu-guaranteed-23 + name: openshift-openstackcsp-workervcpu-guaranteed-23 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-openstack-standard + product-id: openshift-openstackcsp-workervcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-openstack-standard-23 + cron-job-name: openshift-openstackcsp-workervcpu-guaranteed-23 spec: template: metadata: @@ -2037,7 +2037,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-openstack-standard + value: openshift-openstackcsp-workervcpu-guaranteed - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -2066,25 +2066,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-openstack-professional + product-id: openshift-openstackcsp-workervcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-openstack-professional-24 - name: openshift-worker-vcpu-openstack-professional-24 + name: openshift-openstackcsp-workervcpu-premium-24 + name: openshift-openstackcsp-workervcpu-premium-24 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-openstack-professional + product-id: openshift-openstackcsp-workervcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-openstack-professional-24 + cron-job-name: openshift-openstackcsp-workervcpu-premium-24 spec: template: metadata: @@ -2123,7 +2123,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-openstack-professional + value: openshift-openstackcsp-workervcpu-premium - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -2152,25 +2152,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-openstack-premium + product-id: openshift-openstackcsp-workervcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-openstack-premium-25 - name: openshift-worker-vcpu-openstack-premium-25 + name: openshift-openstackcsp-workervcpu-professional-25 + name: openshift-openstackcsp-workervcpu-professional-25 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-openstack-premium + product-id: openshift-openstackcsp-workervcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-openstack-premium-25 + cron-job-name: openshift-openstackcsp-workervcpu-professional-25 spec: template: metadata: @@ -2209,7 +2209,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-openstack-premium + value: openshift-openstackcsp-workervcpu-professional - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -2238,25 +2238,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-standard + product-id: openshift-openstackcsp-workervcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-vsphere-standard-26 - name: openshift-worker-vcpu-vsphere-standard-26 + name: openshift-openstackcsp-workervcpu-standard-26 + name: openshift-openstackcsp-workervcpu-standard-26 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-standard + product-id: openshift-openstackcsp-workervcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-vsphere-standard-26 + cron-job-name: openshift-openstackcsp-workervcpu-standard-26 spec: template: metadata: @@ -2295,7 +2295,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-vsphere-standard + value: openshift-openstackcsp-workervcpu-standard - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -2324,25 +2324,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-professional + product-id: openshift-openstackcsp-workervcpu-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-vsphere-professional-27 - name: openshift-worker-vcpu-vsphere-professional-27 + name: openshift-openstackcsp-workervcpu-zero-27 + name: openshift-openstackcsp-workervcpu-zero-27 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-professional + product-id: openshift-openstackcsp-workervcpu-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-vsphere-professional-27 + cron-job-name: openshift-openstackcsp-workervcpu-zero-27 spec: template: metadata: @@ -2381,7 +2381,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-vsphere-professional + value: openshift-openstackcsp-workervcpu-zero - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -2410,25 +2410,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-besteffort + product-id: openshift-openstackonprem-workervcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-cloudscale-besteffort-28 - name: openshift-worker-vcpu-cloudscale-besteffort-28 + name: openshift-openstackonprem-workervcpu-besteffort-28 + name: openshift-openstackonprem-workervcpu-besteffort-28 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-besteffort + product-id: openshift-openstackonprem-workervcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-cloudscale-besteffort-28 + cron-job-name: openshift-openstackonprem-workervcpu-besteffort-28 spec: template: metadata: @@ -2467,7 +2467,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-cloudscale-besteffort + value: openshift-openstackonprem-workervcpu-besteffort - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -2496,25 +2496,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-awseks-vcpu-besteffort + product-id: openshift-openstackonprem-workervcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-awseks-vcpu-besteffort-0 - name: kubernetes-awseks-vcpu-besteffort-0 + name: openshift-openstackonprem-workervcpu-guaranteed-29 + name: openshift-openstackonprem-workervcpu-guaranteed-29 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-awseks-vcpu-besteffort + product-id: openshift-openstackonprem-workervcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-awseks-vcpu-besteffort-0 + cron-job-name: openshift-openstackonprem-workervcpu-guaranteed-29 spec: template: metadata: @@ -2553,27 +2553,21 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-awseks-vcpu-besteffort + value: openshift-openstackonprem-workervcpu-guaranteed - name: AR_QUERY - value: | - max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) - # Pull in the APPUiO managed info labels - * on(cluster_id) group_left(sales_order) appuio_managed_info{ - sales_order!="NONE", - sales_order!="TERMINATED", - cloud_provider="aws", - distribution="eks", - vshn_service_level="best_effort", - } + value: query - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: - %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels - name: AR_UNIT_ID - value: uom_uom_49_440b0fa7 + value: '300' - name: AR_ORG_ID - value: appuio-managed-kubernetes-services-billing + value: appuio-managed-openshift-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -2588,25 +2582,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-awseks-vcpu-guaranteed + product-id: openshift-openstackonprem-workervcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-awseks-vcpu-guaranteed-1 - name: kubernetes-awseks-vcpu-guaranteed-1 + name: openshift-openstackonprem-workervcpu-premium-30 + name: openshift-openstackonprem-workervcpu-premium-30 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-awseks-vcpu-guaranteed + product-id: openshift-openstackonprem-workervcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-awseks-vcpu-guaranteed-1 + cron-job-name: openshift-openstackonprem-workervcpu-premium-30 spec: template: metadata: @@ -2645,27 +2639,21 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-awseks-vcpu-guaranteed + value: openshift-openstackonprem-workervcpu-premium - name: AR_QUERY - value: | - max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) - # Pull in the APPUiO managed info labels - * on(cluster_id) group_left(sales_order) appuio_managed_info{ - sales_order!="NONE", - sales_order!="TERMINATED", - cloud_provider="aws", - distribution="eks", - vshn_service_level="guaranteed_availability", - } + value: query - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: - %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels - name: AR_UNIT_ID - value: uom_uom_49_440b0fa7 + value: '300' - name: AR_ORG_ID - value: appuio-managed-kubernetes-services-billing + value: appuio-managed-openshift-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -2680,25 +2668,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-exoscalesks-vcpu-besteffort + product-id: openshift-openstackonprem-workervcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-exoscalesks-vcpu-besteffort-2 - name: kubernetes-exoscalesks-vcpu-besteffort-2 + name: openshift-openstackonprem-workervcpu-8b0ab0abec678e9 + name: openshift-openstackonprem-workervcpu-8b0ab0abec678e9 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-exoscalesks-vcpu-besteffort + product-id: openshift-openstackonprem-workervcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-exoscalesks-vcpu-besteffort-2 + cron-job-name: openshift-openstackonprem-workervcpu-professional-31 spec: template: metadata: @@ -2737,27 +2725,21 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-exoscalesks-vcpu-besteffort + value: openshift-openstackonprem-workervcpu-professional - name: AR_QUERY - value: | - max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) - # Pull in the APPUiO managed info labels - * on(cluster_id) group_left(sales_order) appuio_managed_info{ - sales_order!="NONE", - sales_order!="TERMINATED", - cloud_provider="exoscale", - distribution="sks", - vshn_service_level="best_effort", - } + value: query - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: - %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels - name: AR_UNIT_ID - value: uom_uom_49_440b0fa7 + value: '300' - name: AR_ORG_ID - value: appuio-managed-kubernetes-services-billing + value: appuio-managed-openshift-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -2772,25 +2754,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-exoscalesks-vcpu-guaranteed + product-id: openshift-openstackonprem-workervcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-exoscalesks-vcpu-guaranteed-3 - name: kubernetes-exoscalesks-vcpu-guaranteed-3 + name: openshift-openstackonprem-workervcpu-standard-32 + name: openshift-openstackonprem-workervcpu-standard-32 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-exoscalesks-vcpu-guaranteed + product-id: openshift-openstackonprem-workervcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-exoscalesks-vcpu-guaranteed-3 + cron-job-name: openshift-openstackonprem-workervcpu-standard-32 spec: template: metadata: @@ -2829,27 +2811,21 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-exoscalesks-vcpu-guaranteed + value: openshift-openstackonprem-workervcpu-standard - name: AR_QUERY - value: | - max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) - # Pull in the APPUiO managed info labels - * on(cluster_id) group_left(sales_order) appuio_managed_info{ - sales_order!="NONE", - sales_order!="TERMINATED", - cloud_provider="exoscale", - distribution="sks", - vshn_service_level="guaranteed_availability", - } + value: query - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: - %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels - name: AR_UNIT_ID - value: uom_uom_49_440b0fa7 + value: '300' - name: AR_ORG_ID - value: appuio-managed-kubernetes-services-billing + value: appuio-managed-openshift-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -2864,25 +2840,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-googlegke-vcpu-besteffort + product-id: openshift-openstackonprem-workervcpu-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-googlegke-vcpu-besteffort-4 - name: kubernetes-googlegke-vcpu-besteffort-4 + name: openshift-openstackonprem-workervcpu-zero-33 + name: openshift-openstackonprem-workervcpu-zero-33 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-googlegke-vcpu-besteffort + product-id: openshift-openstackonprem-workervcpu-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-googlegke-vcpu-besteffort-4 + cron-job-name: openshift-openstackonprem-workervcpu-zero-33 spec: template: metadata: @@ -2921,27 +2897,21 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-googlegke-vcpu-besteffort + value: openshift-openstackonprem-workervcpu-zero - name: AR_QUERY - value: | - max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) - # Pull in the APPUiO managed info labels - * on(cluster_id) group_left(sales_order) appuio_managed_info{ - sales_order!="NONE", - sales_order!="TERMINATED", - cloud_provider="gcp", - distribution="gke", - vshn_service_level="best_effort", - } + value: query - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: - %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels - name: AR_UNIT_ID - value: uom_uom_49_440b0fa7 + value: '300' - name: AR_ORG_ID - value: appuio-managed-kubernetes-services-billing + value: appuio-managed-openshift-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -2956,25 +2926,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-googlegke-vcpu-guaranteed + product-id: openshift-vspherecsp-workervcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-googlegke-vcpu-guaranteed-5 - name: kubernetes-googlegke-vcpu-guaranteed-5 + name: openshift-vspherecsp-workervcpu-besteffort-34 + name: openshift-vspherecsp-workervcpu-besteffort-34 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-googlegke-vcpu-guaranteed + product-id: openshift-vspherecsp-workervcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-googlegke-vcpu-guaranteed-5 + cron-job-name: openshift-vspherecsp-workervcpu-besteffort-34 spec: template: metadata: @@ -3013,27 +2983,21 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-googlegke-vcpu-guaranteed + value: openshift-vspherecsp-workervcpu-besteffort - name: AR_QUERY - value: | - max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) - # Pull in the APPUiO managed info labels - * on(cluster_id) group_left(sales_order) appuio_managed_info{ - sales_order!="NONE", - sales_order!="TERMINATED", - cloud_provider="gcp", - distribution="gke", - vshn_service_level="guaranteed_availability", - } + value: query - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: - %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels - name: AR_UNIT_ID - value: uom_uom_49_440b0fa7 + value: '300' - name: AR_ORG_ID - value: appuio-managed-kubernetes-services-billing + value: appuio-managed-openshift-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -3048,25 +3012,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-azureaks-vcpu-besteffort + product-id: openshift-vspherecsp-workervcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-azureaks-vcpu-besteffort-6 - name: kubernetes-azureaks-vcpu-besteffort-6 + name: openshift-vspherecsp-workervcpu-guaranteed-35 + name: openshift-vspherecsp-workervcpu-guaranteed-35 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-azureaks-vcpu-besteffort + product-id: openshift-vspherecsp-workervcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-azureaks-vcpu-besteffort-6 + cron-job-name: openshift-vspherecsp-workervcpu-guaranteed-35 spec: template: metadata: @@ -3105,27 +3069,21 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-azureaks-vcpu-besteffort + value: openshift-vspherecsp-workervcpu-guaranteed - name: AR_QUERY - value: | - max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) - # Pull in the APPUiO managed info labels - * on(cluster_id) group_left(sales_order) appuio_managed_info{ - sales_order!="NONE", - sales_order!="TERMINATED", - cloud_provider="azure", - distribution="aks", - vshn_service_level="best_effort", - } + value: query - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: - %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels - name: AR_UNIT_ID - value: uom_uom_49_440b0fa7 + value: '300' - name: AR_ORG_ID - value: appuio-managed-kubernetes-services-billing + value: appuio-managed-openshift-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -3140,25 +3098,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-azureaks-vcpu-guaranteed + product-id: openshift-vspherecsp-workervcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-azureaks-vcpu-guaranteed-7 - name: kubernetes-azureaks-vcpu-guaranteed-7 + name: openshift-vspherecsp-workervcpu-premium-36 + name: openshift-vspherecsp-workervcpu-premium-36 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-azureaks-vcpu-guaranteed + product-id: openshift-vspherecsp-workervcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-azureaks-vcpu-guaranteed-7 + cron-job-name: openshift-vspherecsp-workervcpu-premium-36 spec: template: metadata: @@ -3197,27 +3155,21 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-azureaks-vcpu-guaranteed + value: openshift-vspherecsp-workervcpu-premium - name: AR_QUERY - value: | - max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) - # Pull in the APPUiO managed info labels - * on(cluster_id) group_left(sales_order) appuio_managed_info{ - sales_order!="NONE", - sales_order!="TERMINATED", - cloud_provider="azure", - distribution="aks", - vshn_service_level="guaranteed_availability", - } + value: query - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: - %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels - name: AR_UNIT_ID - value: uom_uom_49_440b0fa7 + value: '300' - name: AR_ORG_ID - value: appuio-managed-kubernetes-services-billing + value: appuio-managed-openshift-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -3232,25 +3184,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-zero + product-id: openshift-vspherecsp-workervcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-hyperscaler-cluster-zero-0 - name: kubernetes-hyperscaler-cluster-zero-0 + name: openshift-vspherecsp-workervcpu-professional-37 + name: openshift-vspherecsp-workervcpu-professional-37 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-zero + product-id: openshift-vspherecsp-workervcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-hyperscaler-cluster-zero-0 + cron-job-name: openshift-vspherecsp-workervcpu-professional-37 spec: template: metadata: @@ -3289,29 +3241,21 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-hyperscaler-cluster-zero + value: openshift-vspherecsp-workervcpu-professional - name: AR_QUERY - value: | - max_over_time( - group by(cluster_id, sales_order) ( - appuio_managed_info{ - distribution!="rke2", - distribution!="rancher", - sales_order!="TERMINATED", - sales_order!="NONE", - vshn_service_level="zero", - } - )[59m:1m] - ) + value: query - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: - %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels - name: AR_UNIT_ID - value: uom_uom_53_4a7e8f3e + value: '300' - name: AR_ORG_ID - value: appuio-managed-kubernetes-services-billing + value: appuio-managed-openshift-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -3326,25 +3270,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-standard + product-id: openshift-vspherecsp-workervcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-hyperscaler-cluster-standard-1 - name: kubernetes-hyperscaler-cluster-standard-1 + name: openshift-vspherecsp-workervcpu-standard-38 + name: openshift-vspherecsp-workervcpu-standard-38 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-standard + product-id: openshift-vspherecsp-workervcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-hyperscaler-cluster-standard-1 + cron-job-name: openshift-vspherecsp-workervcpu-standard-38 spec: template: metadata: @@ -3383,27 +3327,1959 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-hyperscaler-cluster-standard + value: openshift-vspherecsp-workervcpu-standard - name: AR_QUERY - value: | - max_over_time( - group by(cluster_id, sales_order) ( - appuio_managed_info{ - distribution!="rke2", - distribution!="rancher", - sales_order!="TERMINATED", - sales_order!="NONE", - vshn_service_level="standard", - } - )[59m:1m] - ) + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: true +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-vspherecsp-workervcpu-zero + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-vspherecsp-workervcpu-zero-39 + name: openshift-vspherecsp-workervcpu-zero-39 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-vspherecsp-workervcpu-zero + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-vspherecsp-workervcpu-zero-39 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-vspherecsp-workervcpu-zero + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: true +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-vsphereonprem-workervcpu-besteffort-40 + name: openshift-vsphereonprem-workervcpu-besteffort-40 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-vsphereonprem-workervcpu-besteffort-40 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-vsphereonprem-workervcpu-besteffort + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: true +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-vsphereonprem-workervcpu-guaranteed-41 + name: openshift-vsphereonprem-workervcpu-guaranteed-41 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-vsphereonprem-workervcpu-guaranteed-41 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-vsphereonprem-workervcpu-guaranteed + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: true +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-premium + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-vsphereonprem-workervcpu-premium-42 + name: openshift-vsphereonprem-workervcpu-premium-42 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-premium + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-vsphereonprem-workervcpu-premium-42 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-vsphereonprem-workervcpu-premium + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: true +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-professional + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-vsphereonprem-workervcpu-professional-43 + name: openshift-vsphereonprem-workervcpu-professional-43 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-professional + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-vsphereonprem-workervcpu-professional-43 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-vsphereonprem-workervcpu-professional + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: true +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-standard + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-vsphereonprem-workervcpu-standard-44 + name: openshift-vsphereonprem-workervcpu-standard-44 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-standard + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-vsphereonprem-workervcpu-standard-44 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-vsphereonprem-workervcpu-standard + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: true +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-zero + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-vsphereonprem-workervcpu-zero-45 + name: openshift-vsphereonprem-workervcpu-zero-45 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-zero + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-vsphereonprem-workervcpu-zero-45 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-vsphereonprem-workervcpu-zero + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: true +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-xelon-workervcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-xelon-workervcpu-besteffort-46 + name: openshift-xelon-workervcpu-besteffort-46 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-xelon-workervcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-xelon-workervcpu-besteffort-46 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-xelon-workervcpu-besteffort + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: true +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-xelon-workervcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-xelon-workervcpu-guaranteed-47 + name: openshift-xelon-workervcpu-guaranteed-47 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-xelon-workervcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-xelon-workervcpu-guaranteed-47 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-xelon-workervcpu-guaranteed + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: true +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-xelon-workervcpu-premium + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-xelon-workervcpu-premium-48 + name: openshift-xelon-workervcpu-premium-48 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-xelon-workervcpu-premium + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-xelon-workervcpu-premium-48 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-xelon-workervcpu-premium + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: true +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-xelon-workervcpu-professional + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-xelon-workervcpu-professional-49 + name: openshift-xelon-workervcpu-professional-49 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-xelon-workervcpu-professional + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-xelon-workervcpu-professional-49 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-xelon-workervcpu-professional + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: true +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-xelon-workervcpu-standard + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-xelon-workervcpu-standard-50 + name: openshift-xelon-workervcpu-standard-50 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-xelon-workervcpu-standard + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-xelon-workervcpu-standard-50 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-xelon-workervcpu-standard + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: true +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-xelon-workervcpu-zero + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-xelon-workervcpu-zero-51 + name: openshift-xelon-workervcpu-zero-51 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-xelon-workervcpu-zero + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-xelon-workervcpu-zero-51 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-xelon-workervcpu-zero + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: true +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-worker-vcpu-cloudscale-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-worker-vcpu-cloudscale-besteffort-52 + name: openshift-worker-vcpu-cloudscale-besteffort-52 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-worker-vcpu-cloudscale-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-worker-vcpu-cloudscale-besteffort-52 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-worker-vcpu-cloudscale-besteffort + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: true +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: kubernetes-awseks-vcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: kubernetes-awseks-vcpu-besteffort-0 + name: kubernetes-awseks-vcpu-besteffort-0 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: kubernetes-awseks-vcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: kubernetes-awseks-vcpu-besteffort-0 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: kubernetes-awseks-vcpu-besteffort + - name: AR_QUERY + value: | + max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + sales_order!="NONE", + sales_order!="TERMINATED", + cloud_provider="aws", + distribution="eks", + vshn_service_level="best_effort", + } + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: + %(cluster_id)s" % labels' + - name: AR_UNIT_ID + value: uom_uom_49_440b0fa7 + - name: AR_ORG_ID + value: appuio-managed-kubernetes-services-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: true +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: kubernetes-awseks-vcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: kubernetes-awseks-vcpu-guaranteed-1 + name: kubernetes-awseks-vcpu-guaranteed-1 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: kubernetes-awseks-vcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: kubernetes-awseks-vcpu-guaranteed-1 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: kubernetes-awseks-vcpu-guaranteed + - name: AR_QUERY + value: | + max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + sales_order!="NONE", + sales_order!="TERMINATED", + cloud_provider="aws", + distribution="eks", + vshn_service_level="guaranteed_availability", + } + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: + %(cluster_id)s" % labels' + - name: AR_UNIT_ID + value: uom_uom_49_440b0fa7 + - name: AR_ORG_ID + value: appuio-managed-kubernetes-services-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: true +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: kubernetes-azureaks-vcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: kubernetes-azureaks-vcpu-besteffort-2 + name: kubernetes-azureaks-vcpu-besteffort-2 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: kubernetes-azureaks-vcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: kubernetes-azureaks-vcpu-besteffort-2 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: kubernetes-azureaks-vcpu-besteffort + - name: AR_QUERY + value: | + max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + sales_order!="NONE", + sales_order!="TERMINATED", + cloud_provider="azure", + distribution="aks", + vshn_service_level="best_effort", + } + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: + %(cluster_id)s" % labels' + - name: AR_UNIT_ID + value: uom_uom_49_440b0fa7 + - name: AR_ORG_ID + value: appuio-managed-kubernetes-services-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: true +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: kubernetes-azureaks-vcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: kubernetes-azureaks-vcpu-guaranteed-3 + name: kubernetes-azureaks-vcpu-guaranteed-3 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: kubernetes-azureaks-vcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: kubernetes-azureaks-vcpu-guaranteed-3 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: kubernetes-azureaks-vcpu-guaranteed + - name: AR_QUERY + value: | + max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + sales_order!="NONE", + sales_order!="TERMINATED", + cloud_provider="azure", + distribution="aks", + vshn_service_level="guaranteed_availability", + } + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: + %(cluster_id)s" % labels' + - name: AR_UNIT_ID + value: uom_uom_49_440b0fa7 + - name: AR_ORG_ID + value: appuio-managed-kubernetes-services-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: true +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: kubernetes-exoscalesks-vcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: kubernetes-exoscalesks-vcpu-besteffort-4 + name: kubernetes-exoscalesks-vcpu-besteffort-4 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: kubernetes-exoscalesks-vcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: kubernetes-exoscalesks-vcpu-besteffort-4 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: kubernetes-exoscalesks-vcpu-besteffort + - name: AR_QUERY + value: | + max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + sales_order!="NONE", + sales_order!="TERMINATED", + cloud_provider="exoscale", + distribution="sks", + vshn_service_level="best_effort", + } + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: + %(cluster_id)s" % labels' + - name: AR_UNIT_ID + value: uom_uom_49_440b0fa7 + - name: AR_ORG_ID + value: appuio-managed-kubernetes-services-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: true +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: kubernetes-exoscalesks-vcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: kubernetes-exoscalesks-vcpu-guaranteed-5 + name: kubernetes-exoscalesks-vcpu-guaranteed-5 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: kubernetes-exoscalesks-vcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: kubernetes-exoscalesks-vcpu-guaranteed-5 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: kubernetes-exoscalesks-vcpu-guaranteed + - name: AR_QUERY + value: | + max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + sales_order!="NONE", + sales_order!="TERMINATED", + cloud_provider="exoscale", + distribution="sks", + vshn_service_level="guaranteed_availability", + } + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: + %(cluster_id)s" % labels' + - name: AR_UNIT_ID + value: uom_uom_49_440b0fa7 + - name: AR_ORG_ID + value: appuio-managed-kubernetes-services-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: true +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: kubernetes-googlegke-vcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: kubernetes-googlegke-vcpu-besteffort-6 + name: kubernetes-googlegke-vcpu-besteffort-6 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: kubernetes-googlegke-vcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: kubernetes-googlegke-vcpu-besteffort-6 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: kubernetes-googlegke-vcpu-besteffort + - name: AR_QUERY + value: | + max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + sales_order!="NONE", + sales_order!="TERMINATED", + cloud_provider="google", + distribution="gke", + vshn_service_level="best_effort", + } + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: + %(cluster_id)s" % labels' + - name: AR_UNIT_ID + value: uom_uom_49_440b0fa7 + - name: AR_ORG_ID + value: appuio-managed-kubernetes-services-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: true +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: kubernetes-googlegke-vcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: kubernetes-googlegke-vcpu-guaranteed-7 + name: kubernetes-googlegke-vcpu-guaranteed-7 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: kubernetes-googlegke-vcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: kubernetes-googlegke-vcpu-guaranteed-7 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: kubernetes-googlegke-vcpu-guaranteed + - name: AR_QUERY + value: | + max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + sales_order!="NONE", + sales_order!="TERMINATED", + cloud_provider="google", + distribution="gke", + vshn_service_level="guaranteed_availability", + } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: %(cluster_id)s" % labels' - name: AR_UNIT_ID - value: uom_uom_53_4a7e8f3e + value: uom_uom_49_440b0fa7 - name: AR_ORG_ID value: appuio-managed-kubernetes-services-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 @@ -3420,25 +5296,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-professional + product-id: kubernetes-hyperscaler-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-hyperscaler-cluster-professional-2 - name: kubernetes-hyperscaler-cluster-professional-2 + name: kubernetes-hyperscaler-cluster-premium-0 + name: kubernetes-hyperscaler-cluster-premium-0 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-professional + product-id: kubernetes-hyperscaler-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-hyperscaler-cluster-professional-2 + cron-job-name: kubernetes-hyperscaler-cluster-premium-0 spec: template: metadata: @@ -3477,7 +5353,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-hyperscaler-cluster-professional + value: kubernetes-hyperscaler-cluster-premium - name: AR_QUERY value: | max_over_time( @@ -3487,7 +5363,7 @@ spec: distribution!="rancher", sales_order!="TERMINATED", sales_order!="NONE", - vshn_service_level="professional", + vshn_service_level="premium", } )[59m:1m] ) @@ -3514,25 +5390,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-premium + product-id: kubernetes-hyperscaler-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-hyperscaler-cluster-premium-3 - name: kubernetes-hyperscaler-cluster-premium-3 + name: kubernetes-hyperscaler-cluster-professional-1 + name: kubernetes-hyperscaler-cluster-professional-1 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-premium + product-id: kubernetes-hyperscaler-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-hyperscaler-cluster-premium-3 + cron-job-name: kubernetes-hyperscaler-cluster-professional-1 spec: template: metadata: @@ -3571,7 +5447,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-hyperscaler-cluster-premium + value: kubernetes-hyperscaler-cluster-professional - name: AR_QUERY value: | max_over_time( @@ -3581,7 +5457,7 @@ spec: distribution!="rancher", sales_order!="TERMINATED", sales_order!="NONE", - vshn_service_level="premium", + vshn_service_level="professional", } )[59m:1m] ) @@ -3608,25 +5484,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-zero + product-id: kubernetes-hyperscaler-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-hyperscaler-cluster-zero-0 - name: kubernetes-hyperscaler-cluster-zero-0 + name: kubernetes-hyperscaler-cluster-standard-2 + name: kubernetes-hyperscaler-cluster-standard-2 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-zero + product-id: kubernetes-hyperscaler-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-hyperscaler-cluster-zero-0 + cron-job-name: kubernetes-hyperscaler-cluster-standard-2 spec: template: metadata: @@ -3665,25 +5541,27 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-hyperscaler-cluster-zero + value: kubernetes-hyperscaler-cluster-standard - name: AR_QUERY value: | - max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) - # Pull in the APPUiO managed info labels - * on(cluster_id) group_left(sales_order) appuio_managed_info{ - distribution!="rke2", - distribution!="rancher", - sales_order!="TERMINATED", - sales_order!="NONE", - vshn_service_level="zero", - } + max_over_time( + group by(cluster_id, sales_order) ( + appuio_managed_info{ + distribution!="rke2", + distribution!="rancher", + sales_order!="TERMINATED", + sales_order!="NONE", + vshn_service_level="standard", + } + )[59m:1m] + ) - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: %(cluster_id)s" % labels' - name: AR_UNIT_ID - value: uom_uom_191_55730e52 + value: uom_uom_53_4a7e8f3e - name: AR_ORG_ID value: appuio-managed-kubernetes-services-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 @@ -3700,25 +5578,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-standard + product-id: kubernetes-hyperscaler-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-hyperscaler-cluster-standard-1 - name: kubernetes-hyperscaler-cluster-standard-1 + name: kubernetes-hyperscaler-cluster-zero-3 + name: kubernetes-hyperscaler-cluster-zero-3 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-standard + product-id: kubernetes-hyperscaler-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-hyperscaler-cluster-standard-1 + cron-job-name: kubernetes-hyperscaler-cluster-zero-3 spec: template: metadata: @@ -3757,25 +5635,27 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-hyperscaler-cluster-standard + value: kubernetes-hyperscaler-cluster-zero - name: AR_QUERY value: | - max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) - # Pull in the APPUiO managed info labels - * on(cluster_id) group_left(sales_order) appuio_managed_info{ - distribution!="rke2", - distribution!="rancher", - sales_order!="TERMINATED", - sales_order!="NONE", - vshn_service_level="standard", - } + max_over_time( + group by(cluster_id, sales_order) ( + appuio_managed_info{ + distribution!="rke2", + distribution!="rancher", + sales_order!="TERMINATED", + sales_order!="NONE", + vshn_service_level="zero", + } + )[59m:1m] + ) - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: %(cluster_id)s" % labels' - name: AR_UNIT_ID - value: uom_uom_191_55730e52 + value: uom_uom_53_4a7e8f3e - name: AR_ORG_ID value: appuio-managed-kubernetes-services-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 @@ -3792,25 +5672,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-professional + product-id: kubernetes-hyperscaler-node-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-hyperscaler-cluster-professional-2 - name: kubernetes-hyperscaler-cluster-professional-2 + name: kubernetes-hyperscaler-node-premium-0 + name: kubernetes-hyperscaler-node-premium-0 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-professional + product-id: kubernetes-hyperscaler-node-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-hyperscaler-cluster-professional-2 + cron-job-name: kubernetes-hyperscaler-node-premium-0 spec: template: metadata: @@ -3849,7 +5729,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-hyperscaler-cluster-professional + value: kubernetes-hyperscaler-node-premium - name: AR_QUERY value: | max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) @@ -3859,7 +5739,7 @@ spec: distribution!="rancher", sales_order!="TERMINATED", sales_order!="NONE", - vshn_service_level="professional", + vshn_service_level="premium", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -3884,25 +5764,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-premium + product-id: kubernetes-hyperscaler-node-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-hyperscaler-cluster-premium-3 - name: kubernetes-hyperscaler-cluster-premium-3 + name: kubernetes-hyperscaler-node-professional-1 + name: kubernetes-hyperscaler-node-professional-1 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-premium + product-id: kubernetes-hyperscaler-node-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-hyperscaler-cluster-premium-3 + cron-job-name: kubernetes-hyperscaler-node-professional-1 spec: template: metadata: @@ -3941,7 +5821,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-hyperscaler-cluster-premium + value: kubernetes-hyperscaler-node-professional - name: AR_QUERY value: | max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) @@ -3951,7 +5831,7 @@ spec: distribution!="rancher", sales_order!="TERMINATED", sales_order!="NONE", - vshn_service_level="premium", + vshn_service_level="professional", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -3976,25 +5856,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-cloudscale-zero + product-id: kubernetes-hyperscaler-node-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-cloudscale-zero-0 - name: openshift-clusters-cloudscale-zero-0 + name: kubernetes-hyperscaler-node-standard-2 + name: kubernetes-hyperscaler-node-standard-2 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-cloudscale-zero + product-id: kubernetes-hyperscaler-node-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-cloudscale-zero-0 + cron-job-name: kubernetes-hyperscaler-node-standard-2 spec: template: metadata: @@ -4033,28 +5913,27 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-cloudscale-zero + value: kubernetes-hyperscaler-node-standard - name: AR_QUERY value: | - # Calculates number of clusters per cluster. Always returns 1. - # Max values over one hour. - max_over_time( - # Use aggregation to drop labels of no interest. - group by(cluster_id, sales_order) ( - appuio_managed_info{ - cloud_provider="cloudscale", - vshn_service_level="zero"}, - )[59m:1m] - ) + max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + distribution!="rke2", + distribution!="rancher", + sales_order!="TERMINATED", + sales_order!="NONE", + vshn_service_level="standard", + } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift - - Cluster: %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: + %(cluster_id)s" % labels' - name: AR_UNIT_ID - value: uom_uom_53_4a7e8f3e + value: uom_uom_191_55730e52 - name: AR_ORG_ID - value: appuio-managed-openshift-billing + value: appuio-managed-kubernetes-services-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -4069,25 +5948,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-cloudscale-standard + product-id: kubernetes-hyperscaler-node-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-cloudscale-standard-1 - name: openshift-clusters-cloudscale-standard-1 + name: kubernetes-hyperscaler-node-zero-3 + name: kubernetes-hyperscaler-node-zero-3 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-cloudscale-standard + product-id: kubernetes-hyperscaler-node-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-cloudscale-standard-1 + cron-job-name: kubernetes-hyperscaler-node-zero-3 spec: template: metadata: @@ -4126,28 +6005,27 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-cloudscale-standard + value: kubernetes-hyperscaler-node-zero - name: AR_QUERY value: | - # Calculates number of clusters per cluster. Always returns 1. - # Max values over one hour. - max_over_time( - # Use aggregation to drop labels of no interest. - group by(cluster_id, sales_order) ( - appuio_managed_info{ - cloud_provider="cloudscale", - vshn_service_level="standard"}, - )[59m:1m] - ) + max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + distribution!="rke2", + distribution!="rancher", + sales_order!="TERMINATED", + sales_order!="NONE", + vshn_service_level="zero", + } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift - - Cluster: %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: + %(cluster_id)s" % labels' - name: AR_UNIT_ID - value: uom_uom_53_4a7e8f3e + value: uom_uom_191_55730e52 - name: AR_ORG_ID - value: appuio-managed-openshift-billing + value: appuio-managed-kubernetes-services-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -4162,25 +6040,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-cloudscale-professional + product-id: openshift-cloudscale-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-cloudscale-professional-2 - name: openshift-clusters-cloudscale-professional-2 + name: openshift-cloudscale-cluster-premium-0 + name: openshift-cloudscale-cluster-premium-0 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-cloudscale-professional + product-id: openshift-cloudscale-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-cloudscale-professional-2 + cron-job-name: openshift-cloudscale-cluster-premium-0 spec: template: metadata: @@ -4219,7 +6097,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-cloudscale-professional + value: openshift-cloudscale-cluster-premium - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -4228,8 +6106,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="cloudscale", - vshn_service_level="professional"}, + cloud_provider=~"cloudscale", + vshn_service_level="premium", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -4255,25 +6134,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-cloudscale-premium + product-id: openshift-cloudscale-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-cloudscale-premium-3 - name: openshift-clusters-cloudscale-premium-3 + name: openshift-cloudscale-cluster-professional-1 + name: openshift-cloudscale-cluster-professional-1 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-cloudscale-premium + product-id: openshift-cloudscale-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-cloudscale-premium-3 + cron-job-name: openshift-cloudscale-cluster-professional-1 spec: template: metadata: @@ -4312,7 +6191,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-cloudscale-premium + value: openshift-cloudscale-cluster-professional - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -4321,8 +6200,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="cloudscale", - vshn_service_level="premium"}, + cloud_provider=~"cloudscale", + vshn_service_level="professional", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -4348,25 +6228,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-exoscale-zero + product-id: openshift-cloudscale-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-exoscale-zero-4 - name: openshift-clusters-exoscale-zero-4 + name: openshift-cloudscale-cluster-standard-2 + name: openshift-cloudscale-cluster-standard-2 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-exoscale-zero + product-id: openshift-cloudscale-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-exoscale-zero-4 + cron-job-name: openshift-cloudscale-cluster-standard-2 spec: template: metadata: @@ -4405,7 +6285,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-exoscale-zero + value: openshift-cloudscale-cluster-standard - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -4414,8 +6294,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="exoscale", - vshn_service_level="zero"}, + cloud_provider=~"cloudscale", + vshn_service_level="standard", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -4441,25 +6322,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-exoscale-standard + product-id: openshift-cloudscale-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-exoscale-standard-5 - name: openshift-clusters-exoscale-standard-5 + name: openshift-cloudscale-cluster-zero-3 + name: openshift-cloudscale-cluster-zero-3 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-exoscale-standard + product-id: openshift-cloudscale-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-exoscale-standard-5 + cron-job-name: openshift-cloudscale-cluster-zero-3 spec: template: metadata: @@ -4498,7 +6379,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-exoscale-standard + value: openshift-cloudscale-cluster-zero - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -4507,8 +6388,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="exoscale", - vshn_service_level="standard"}, + cloud_provider=~"cloudscale", + vshn_service_level="zero", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -4534,25 +6416,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-exoscale-professional + product-id: openshift-exoscale-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-exoscale-professional-6 - name: openshift-clusters-exoscale-professional-6 + name: openshift-exoscale-cluster-premium-4 + name: openshift-exoscale-cluster-premium-4 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-exoscale-professional + product-id: openshift-exoscale-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-exoscale-professional-6 + cron-job-name: openshift-exoscale-cluster-premium-4 spec: template: metadata: @@ -4591,7 +6473,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-exoscale-professional + value: openshift-exoscale-cluster-premium - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -4600,8 +6482,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="exoscale", - vshn_service_level="professional"}, + cloud_provider=~"exoscale", + vshn_service_level="premium", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -4627,25 +6510,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-exoscale-premium + product-id: openshift-exoscale-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-exoscale-premium-7 - name: openshift-clusters-exoscale-premium-7 + name: openshift-exoscale-cluster-professional-5 + name: openshift-exoscale-cluster-professional-5 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-exoscale-premium + product-id: openshift-exoscale-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-exoscale-premium-7 + cron-job-name: openshift-exoscale-cluster-professional-5 spec: template: metadata: @@ -4684,7 +6567,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-exoscale-premium + value: openshift-exoscale-cluster-professional - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -4693,8 +6576,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="exoscale", - vshn_service_level="premium"}, + cloud_provider=~"exoscale", + vshn_service_level="professional", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -4720,25 +6604,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-vsphere-zero + product-id: openshift-exoscale-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-vsphere-zero-8 - name: openshift-clusters-vsphere-zero-8 + name: openshift-exoscale-cluster-standard-6 + name: openshift-exoscale-cluster-standard-6 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-vsphere-zero + product-id: openshift-exoscale-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-vsphere-zero-8 + cron-job-name: openshift-exoscale-cluster-standard-6 spec: template: metadata: @@ -4777,7 +6661,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-vsphere-zero + value: openshift-exoscale-cluster-standard - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -4786,8 +6670,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="vsphere", - vshn_service_level="zero"}, + cloud_provider=~"exoscale", + vshn_service_level="standard", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -4813,25 +6698,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-vsphere-standard + product-id: openshift-exoscale-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-vsphere-standard-9 - name: openshift-clusters-vsphere-standard-9 + name: openshift-exoscale-cluster-zero-7 + name: openshift-exoscale-cluster-zero-7 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-vsphere-standard + product-id: openshift-exoscale-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-vsphere-standard-9 + cron-job-name: openshift-exoscale-cluster-zero-7 spec: template: metadata: @@ -4870,7 +6755,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-vsphere-standard + value: openshift-exoscale-cluster-zero - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -4879,8 +6764,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="vsphere", - vshn_service_level="standard"}, + cloud_provider=~"exoscale", + vshn_service_level="zero", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -4906,25 +6792,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-vsphere-professional + product-id: openshift-onprem-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-vsphere-professional-10 - name: openshift-clusters-vsphere-professional-10 + name: openshift-onprem-cluster-premium-8 + name: openshift-onprem-cluster-premium-8 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-vsphere-professional + product-id: openshift-onprem-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-vsphere-professional-10 + cron-job-name: openshift-onprem-cluster-premium-8 spec: template: metadata: @@ -4963,7 +6849,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-vsphere-professional + value: openshift-onprem-cluster-premium - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -4972,8 +6858,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="vsphere", - vshn_service_level="professional"}, + cloud_provider=~"vsphere|none", + vshn_service_level="premium", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -4999,25 +6886,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-vsphere-premium + product-id: openshift-onprem-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-vsphere-premium-11 - name: openshift-clusters-vsphere-premium-11 + name: openshift-onprem-cluster-professional-9 + name: openshift-onprem-cluster-professional-9 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-vsphere-premium + product-id: openshift-onprem-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-vsphere-premium-11 + cron-job-name: openshift-onprem-cluster-professional-9 spec: template: metadata: @@ -5056,7 +6943,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-vsphere-premium + value: openshift-onprem-cluster-professional - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -5065,8 +6952,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="vsphere", - vshn_service_level="premium"}, + cloud_provider=~"vsphere|none", + vshn_service_level="professional", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -5092,25 +6980,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-openstack-zero + product-id: openshift-onprem-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-openstack-zero-12 - name: openshift-clusters-openstack-zero-12 + name: openshift-onprem-cluster-standard-10 + name: openshift-onprem-cluster-standard-10 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-openstack-zero + product-id: openshift-onprem-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-openstack-zero-12 + cron-job-name: openshift-onprem-cluster-standard-10 spec: template: metadata: @@ -5149,7 +7037,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-openstack-zero + value: openshift-onprem-cluster-standard - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -5158,8 +7046,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="openstack", - vshn_service_level="zero"}, + cloud_provider=~"vsphere|none", + vshn_service_level="standard", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -5185,25 +7074,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-openstack-standard + product-id: openshift-onprem-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-openstack-standard-13 - name: openshift-clusters-openstack-standard-13 + name: openshift-onprem-cluster-zero-11 + name: openshift-onprem-cluster-zero-11 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-openstack-standard + product-id: openshift-onprem-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-openstack-standard-13 + cron-job-name: openshift-onprem-cluster-zero-11 spec: template: metadata: @@ -5242,7 +7131,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-openstack-standard + value: openshift-onprem-cluster-zero - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -5251,8 +7140,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="openstack", - vshn_service_level="standard"}, + cloud_provider=~"vsphere|none", + vshn_service_level="zero", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -5278,25 +7168,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-openstack-professional + product-id: openshift-xelon-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-openstack-professional-14 - name: openshift-clusters-openstack-professional-14 + name: openshift-xelon-cluster-premium-12 + name: openshift-xelon-cluster-premium-12 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-openstack-professional + product-id: openshift-xelon-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-openstack-professional-14 + cron-job-name: openshift-xelon-cluster-premium-12 spec: template: metadata: @@ -5335,7 +7225,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-openstack-professional + value: openshift-xelon-cluster-premium - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -5344,8 +7234,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="openstack", - vshn_service_level="professional"}, + cloud_provider=~"xelon", + vshn_service_level="premium", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -5371,25 +7262,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-openstack-premium + product-id: openshift-xelon-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-openstack-premium-15 - name: openshift-clusters-openstack-premium-15 + name: openshift-xelon-cluster-professional-13 + name: openshift-xelon-cluster-professional-13 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-openstack-premium + product-id: openshift-xelon-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-openstack-premium-15 + cron-job-name: openshift-xelon-cluster-professional-13 spec: template: metadata: @@ -5428,7 +7319,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-openstack-premium + value: openshift-xelon-cluster-professional - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -5437,8 +7328,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="openstack", - vshn_service_level="premium"}, + cloud_provider=~"xelon", + vshn_service_level="professional", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -5464,25 +7356,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-vsphere-standard + product-id: openshift-xelon-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-vsphere-standard-16 - name: openshift-clusters-vsphere-standard-16 + name: openshift-xelon-cluster-standard-14 + name: openshift-xelon-cluster-standard-14 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-vsphere-standard + product-id: openshift-xelon-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-vsphere-standard-16 + cron-job-name: openshift-xelon-cluster-standard-14 spec: template: metadata: @@ -5521,7 +7413,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-vsphere-standard + value: openshift-xelon-cluster-standard - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -5530,8 +7422,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="xelon", - vshn_service_level="standard"}, + cloud_provider=~"xelon", + vshn_service_level="standard", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -5557,25 +7450,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-vsphere-professional + product-id: openshift-xelon-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-vsphere-professional-17 - name: openshift-clusters-vsphere-professional-17 + name: openshift-xelon-cluster-zero-15 + name: openshift-xelon-cluster-zero-15 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-vsphere-professional + product-id: openshift-xelon-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-vsphere-professional-17 + cron-job-name: openshift-xelon-cluster-zero-15 spec: template: metadata: @@ -5614,7 +7507,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-vsphere-professional + value: openshift-xelon-cluster-zero - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -5623,8 +7516,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="none", - vshn_service_level="professional"}, + cloud_provider=~"xelon", + vshn_service_level="zero", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -5650,25 +7544,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-iaas-cluster-zero + product-id: kubernetes-iaas-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-iaas-cluster-zero-0 - name: kubernetes-iaas-cluster-zero-0 + name: kubernetes-iaas-cluster-premium-0 + name: kubernetes-iaas-cluster-premium-0 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-iaas-cluster-zero + product-id: kubernetes-iaas-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-iaas-cluster-zero-0 + cron-job-name: kubernetes-iaas-cluster-premium-0 spec: template: metadata: @@ -5707,7 +7601,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-iaas-cluster-zero + value: kubernetes-iaas-cluster-premium - name: AR_QUERY value: | max_over_time( @@ -5716,7 +7610,7 @@ spec: sales_order!="TERMINATED", sales_order!="NONE", distribution=~"rancher|rke2", - vshn_service_level="zero", + vshn_service_level="premium", } )[59m:1m] ) @@ -5743,25 +7637,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-iaas-cluster-standard + product-id: kubernetes-iaas-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-iaas-cluster-standard-1 - name: kubernetes-iaas-cluster-standard-1 + name: kubernetes-iaas-cluster-professional-1 + name: kubernetes-iaas-cluster-professional-1 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-iaas-cluster-standard + product-id: kubernetes-iaas-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-iaas-cluster-standard-1 + cron-job-name: kubernetes-iaas-cluster-professional-1 spec: template: metadata: @@ -5800,7 +7694,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-iaas-cluster-standard + value: kubernetes-iaas-cluster-professional - name: AR_QUERY value: | max_over_time( @@ -5809,7 +7703,7 @@ spec: sales_order!="TERMINATED", sales_order!="NONE", distribution=~"rancher|rke2", - vshn_service_level="standard", + vshn_service_level="professional", } )[59m:1m] ) @@ -5836,25 +7730,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-iaas-cluster-professional + product-id: kubernetes-iaas-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-iaas-cluster-professional-2 - name: kubernetes-iaas-cluster-professional-2 + name: kubernetes-iaas-cluster-standard-2 + name: kubernetes-iaas-cluster-standard-2 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-iaas-cluster-professional + product-id: kubernetes-iaas-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-iaas-cluster-professional-2 + cron-job-name: kubernetes-iaas-cluster-standard-2 spec: template: metadata: @@ -5893,7 +7787,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-iaas-cluster-professional + value: kubernetes-iaas-cluster-standard - name: AR_QUERY value: | max_over_time( @@ -5902,7 +7796,7 @@ spec: sales_order!="TERMINATED", sales_order!="NONE", distribution=~"rancher|rke2", - vshn_service_level="professional", + vshn_service_level="standard", } )[59m:1m] ) @@ -5929,25 +7823,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-iaas-cluster-premium + product-id: kubernetes-iaas-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-iaas-cluster-premium-3 - name: kubernetes-iaas-cluster-premium-3 + name: kubernetes-iaas-cluster-zero-3 + name: kubernetes-iaas-cluster-zero-3 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-iaas-cluster-premium + product-id: kubernetes-iaas-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-iaas-cluster-premium-3 + cron-job-name: kubernetes-iaas-cluster-zero-3 spec: template: metadata: @@ -5986,7 +7880,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-iaas-cluster-premium + value: kubernetes-iaas-cluster-zero - name: AR_QUERY value: | max_over_time( @@ -5995,7 +7889,7 @@ spec: sales_order!="TERMINATED", sales_order!="NONE", distribution=~"rancher|rke2", - vshn_service_level="premium", + vshn_service_level="zero", } )[59m:1m] ) @@ -6022,25 +7916,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-iaas-node-zero + product-id: kubernetes-iaas-node-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-iaas-node-zero-0 - name: kubernetes-iaas-node-zero-0 + name: kubernetes-iaas-node-premium-0 + name: kubernetes-iaas-node-premium-0 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-iaas-node-zero + product-id: kubernetes-iaas-node-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-iaas-node-zero-0 + cron-job-name: kubernetes-iaas-node-premium-0 spec: template: metadata: @@ -6079,7 +7973,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-iaas-node-zero + value: kubernetes-iaas-node-premium - name: AR_QUERY value: | max_over_time( @@ -6092,7 +7986,7 @@ spec: sales_order!="TERMINATED", sales_order!="NONE", distribution=~"rke2|rancher", - vshn_service_level="zero", + vshn_service_level="premium", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -6117,25 +8011,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-iaas-node-standard + product-id: kubernetes-iaas-node-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-iaas-node-standard-1 - name: kubernetes-iaas-node-standard-1 + name: kubernetes-iaas-node-professional-1 + name: kubernetes-iaas-node-professional-1 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-iaas-node-standard + product-id: kubernetes-iaas-node-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-iaas-node-standard-1 + cron-job-name: kubernetes-iaas-node-professional-1 spec: template: metadata: @@ -6174,7 +8068,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-iaas-node-standard + value: kubernetes-iaas-node-professional - name: AR_QUERY value: | max_over_time( @@ -6187,7 +8081,7 @@ spec: sales_order!="TERMINATED", sales_order!="NONE", distribution=~"rke2|rancher", - vshn_service_level="standard", + vshn_service_level="professional", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -6212,25 +8106,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-iaas-node-professional + product-id: kubernetes-iaas-node-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-iaas-node-professional-2 - name: kubernetes-iaas-node-professional-2 + name: kubernetes-iaas-node-standard-2 + name: kubernetes-iaas-node-standard-2 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-iaas-node-professional + product-id: kubernetes-iaas-node-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-iaas-node-professional-2 + cron-job-name: kubernetes-iaas-node-standard-2 spec: template: metadata: @@ -6269,7 +8163,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-iaas-node-professional + value: kubernetes-iaas-node-standard - name: AR_QUERY value: | max_over_time( @@ -6282,7 +8176,7 @@ spec: sales_order!="TERMINATED", sales_order!="NONE", distribution=~"rke2|rancher", - vshn_service_level="professional", + vshn_service_level="standard", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -6307,25 +8201,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-iaas-node-premium + product-id: kubernetes-iaas-node-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-iaas-node-premium-3 - name: kubernetes-iaas-node-premium-3 + name: kubernetes-iaas-node-zero-3 + name: kubernetes-iaas-node-zero-3 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-iaas-node-premium + product-id: kubernetes-iaas-node-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-iaas-node-premium-3 + cron-job-name: kubernetes-iaas-node-zero-3 spec: template: metadata: @@ -6364,7 +8258,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-iaas-node-premium + value: kubernetes-iaas-node-zero - name: AR_QUERY value: | max_over_time( @@ -6377,7 +8271,7 @@ spec: sales_order!="TERMINATED", sales_order!="NONE", distribution=~"rke2|rancher", - vshn_service_level="premium", + vshn_service_level="zero", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels diff --git a/tests/golden/test-mode/appuio-reporting/appuio-reporting/11_backfill.yaml b/tests/golden/test-mode/appuio-reporting/appuio-reporting/11_backfill.yaml index 6282ad5..26ae51b 100644 --- a/tests/golden/test-mode/appuio-reporting/appuio-reporting/11_backfill.yaml +++ b/tests/golden/test-mode/appuio-reporting/appuio-reporting/11_backfill.yaml @@ -2,25 +2,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-besteffort + product-id: openshift-cloudscale-storagevcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-cloudscale-besteffort-0 - name: openshift-worker-vcpu-cloudscale-besteffort-0 + name: openshift-cloudscale-storagevcpu-besteffort-0 + name: openshift-cloudscale-storagevcpu-besteffort-0 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-besteffort + product-id: openshift-cloudscale-storagevcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-cloudscale-besteffort-0 + cron-job-name: openshift-cloudscale-storagevcpu-besteffort-0 spec: template: metadata: @@ -60,7 +60,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-cloudscale-besteffort + value: openshift-cloudscale-storagevcpu-besteffort - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -89,25 +89,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-guaranteedavailability + product-id: openshift-cloudscale-storagevcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-cloudscale-gua-93468ed8b2029fe - name: openshift-worker-vcpu-cloudscale-gua-93468ed8b2029fe + name: openshift-cloudscale-storagevcpu-guaranteed-1 + name: openshift-cloudscale-storagevcpu-guaranteed-1 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-guaranteedavailability + product-id: openshift-cloudscale-storagevcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-cloudscale-guaranteedavailability-1 + cron-job-name: openshift-cloudscale-storagevcpu-guaranteed-1 spec: template: metadata: @@ -147,7 +147,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-cloudscale-guaranteedavailability + value: openshift-cloudscale-storagevcpu-guaranteed - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -176,25 +176,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-besteffort + product-id: openshift-cloudscale-storagevcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-exoscale-besteffort-2 - name: openshift-worker-vcpu-exoscale-besteffort-2 + name: openshift-cloudscale-storagevcpu-premium-2 + name: openshift-cloudscale-storagevcpu-premium-2 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-besteffort + product-id: openshift-cloudscale-storagevcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-exoscale-besteffort-2 + cron-job-name: openshift-cloudscale-storagevcpu-premium-2 spec: template: metadata: @@ -234,7 +234,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-exoscale-besteffort + value: openshift-cloudscale-storagevcpu-premium - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -263,25 +263,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-guaranteedavailability + product-id: openshift-cloudscale-storagevcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-exoscale-guara-c7fabf75f900683 - name: openshift-worker-vcpu-exoscale-guara-c7fabf75f900683 + name: openshift-cloudscale-storagevcpu-professional-3 + name: openshift-cloudscale-storagevcpu-professional-3 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-guaranteedavailability + product-id: openshift-cloudscale-storagevcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-exoscale-guaranteedavailability-3 + cron-job-name: openshift-cloudscale-storagevcpu-professional-3 spec: template: metadata: @@ -321,7 +321,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-exoscale-guaranteedavailability + value: openshift-cloudscale-storagevcpu-professional - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -350,25 +350,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-besteffort + product-id: openshift-cloudscale-storagevcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-vsphere-besteffort-4 - name: openshift-worker-vcpu-vsphere-besteffort-4 + name: openshift-cloudscale-storagevcpu-standard-4 + name: openshift-cloudscale-storagevcpu-standard-4 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-besteffort + product-id: openshift-cloudscale-storagevcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-vsphere-besteffort-4 + cron-job-name: openshift-cloudscale-storagevcpu-standard-4 spec: template: metadata: @@ -408,7 +408,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-vsphere-besteffort + value: openshift-cloudscale-storagevcpu-standard - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -437,25 +437,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-guaranteedavailability + product-id: openshift-cloudscale-workervcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-vsphere-guaran-2b28379ea85e0d3 - name: openshift-worker-vcpu-vsphere-guaran-2b28379ea85e0d3 + name: openshift-cloudscale-workervcpu-besteffort-5 + name: openshift-cloudscale-workervcpu-besteffort-5 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-guaranteedavailability + product-id: openshift-cloudscale-workervcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-vsphere-guaranteedavailability-5 + cron-job-name: openshift-cloudscale-workervcpu-besteffort-5 spec: template: metadata: @@ -495,7 +495,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-vsphere-guaranteedavailability + value: openshift-cloudscale-workervcpu-besteffort - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -524,25 +524,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-openstack-besteffort + product-id: openshift-cloudscale-workervcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-openstack-besteffort-6 - name: openshift-worker-vcpu-openstack-besteffort-6 + name: openshift-cloudscale-workervcpu-guaranteed-6 + name: openshift-cloudscale-workervcpu-guaranteed-6 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-openstack-besteffort + product-id: openshift-cloudscale-workervcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-openstack-besteffort-6 + cron-job-name: openshift-cloudscale-workervcpu-guaranteed-6 spec: template: metadata: @@ -582,7 +582,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-openstack-besteffort + value: openshift-cloudscale-workervcpu-guaranteed - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -611,25 +611,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-openstack-guaranteedavailability + product-id: openshift-cloudscale-workervcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-openstack-guar-437fd9b37153898 - name: openshift-worker-vcpu-openstack-guar-437fd9b37153898 + name: openshift-cloudscale-workervcpu-premium-7 + name: openshift-cloudscale-workervcpu-premium-7 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-openstack-guaranteedavailability + product-id: openshift-cloudscale-workervcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-openstack-guaranteedavailability-7 + cron-job-name: openshift-cloudscale-workervcpu-premium-7 spec: template: metadata: @@ -669,7 +669,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-openstack-guaranteedavailability + value: openshift-cloudscale-workervcpu-premium - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -698,25 +698,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-besteffort + product-id: openshift-cloudscale-workervcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-cloudscale-besteffort-8 - name: openshift-worker-vcpu-cloudscale-besteffort-8 + name: openshift-cloudscale-workervcpu-professional-8 + name: openshift-cloudscale-workervcpu-professional-8 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-besteffort + product-id: openshift-cloudscale-workervcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-cloudscale-besteffort-8 + cron-job-name: openshift-cloudscale-workervcpu-professional-8 spec: template: metadata: @@ -756,7 +756,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-cloudscale-besteffort + value: openshift-cloudscale-workervcpu-professional - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -785,25 +785,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-guaranteedavailability + product-id: openshift-cloudscale-workervcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-cloudscale-gua-9c5f21dd467a005 - name: openshift-worker-vcpu-cloudscale-gua-9c5f21dd467a005 + name: openshift-cloudscale-workervcpu-standard-9 + name: openshift-cloudscale-workervcpu-standard-9 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-guaranteedavailability + product-id: openshift-cloudscale-workervcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-cloudscale-guaranteedavailability-9 + cron-job-name: openshift-cloudscale-workervcpu-standard-9 spec: template: metadata: @@ -843,7 +843,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-cloudscale-guaranteedavailability + value: openshift-cloudscale-workervcpu-standard - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -872,25 +872,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-zero + product-id: openshift-cloudscale-workervcpu-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-cloudscale-zero-10 - name: openshift-worker-vcpu-cloudscale-zero-10 + name: openshift-cloudscale-workervcpu-zero-10 + name: openshift-cloudscale-workervcpu-zero-10 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-zero + product-id: openshift-cloudscale-workervcpu-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-cloudscale-zero-10 + cron-job-name: openshift-cloudscale-workervcpu-zero-10 spec: template: metadata: @@ -930,7 +930,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-cloudscale-zero + value: openshift-cloudscale-workervcpu-zero - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -959,25 +959,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-standard + product-id: openshift-exoscale-storagevcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-cloudscale-standard-11 - name: openshift-worker-vcpu-cloudscale-standard-11 + name: openshift-exoscale-storagevcpu-besteffort-11 + name: openshift-exoscale-storagevcpu-besteffort-11 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-standard + product-id: openshift-exoscale-storagevcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-cloudscale-standard-11 + cron-job-name: openshift-exoscale-storagevcpu-besteffort-11 spec: template: metadata: @@ -1017,7 +1017,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-cloudscale-standard + value: openshift-exoscale-storagevcpu-besteffort - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -1046,25 +1046,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-professional + product-id: openshift-exoscale-storagevcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-cloudscale-professional-12 - name: openshift-worker-vcpu-cloudscale-professional-12 + name: openshift-exoscale-storagevcpu-guaranteed-12 + name: openshift-exoscale-storagevcpu-guaranteed-12 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-professional + product-id: openshift-exoscale-storagevcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-cloudscale-professional-12 + cron-job-name: openshift-exoscale-storagevcpu-guaranteed-12 spec: template: metadata: @@ -1104,7 +1104,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-cloudscale-professional + value: openshift-exoscale-storagevcpu-guaranteed - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -1133,25 +1133,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-premium + product-id: openshift-exoscale-storagevcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-cloudscale-premium-13 - name: openshift-worker-vcpu-cloudscale-premium-13 + name: openshift-exoscale-storagevcpu-premium-13 + name: openshift-exoscale-storagevcpu-premium-13 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-premium + product-id: openshift-exoscale-storagevcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-cloudscale-premium-13 + cron-job-name: openshift-exoscale-storagevcpu-premium-13 spec: template: metadata: @@ -1191,7 +1191,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-cloudscale-premium + value: openshift-exoscale-storagevcpu-premium - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -1220,25 +1220,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-zero + product-id: openshift-exoscale-storagevcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-exoscale-zero-14 - name: openshift-worker-vcpu-exoscale-zero-14 + name: openshift-exoscale-storagevcpu-professional-14 + name: openshift-exoscale-storagevcpu-professional-14 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-zero + product-id: openshift-exoscale-storagevcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-exoscale-zero-14 + cron-job-name: openshift-exoscale-storagevcpu-professional-14 spec: template: metadata: @@ -1278,7 +1278,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-exoscale-zero + value: openshift-exoscale-storagevcpu-professional - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -1307,25 +1307,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-standard + product-id: openshift-exoscale-storagevcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-exoscale-standard-15 - name: openshift-worker-vcpu-exoscale-standard-15 + name: openshift-exoscale-storagevcpu-standard-15 + name: openshift-exoscale-storagevcpu-standard-15 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-standard + product-id: openshift-exoscale-storagevcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-exoscale-standard-15 + cron-job-name: openshift-exoscale-storagevcpu-standard-15 spec: template: metadata: @@ -1365,7 +1365,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-exoscale-standard + value: openshift-exoscale-storagevcpu-standard - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -1394,25 +1394,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-professional + product-id: openshift-exoscale-workervcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-exoscale-professional-16 - name: openshift-worker-vcpu-exoscale-professional-16 + name: openshift-exoscale-workervcpu-besteffort-16 + name: openshift-exoscale-workervcpu-besteffort-16 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-professional + product-id: openshift-exoscale-workervcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-exoscale-professional-16 + cron-job-name: openshift-exoscale-workervcpu-besteffort-16 spec: template: metadata: @@ -1452,7 +1452,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-exoscale-professional + value: openshift-exoscale-workervcpu-besteffort - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -1481,25 +1481,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-premium + product-id: openshift-exoscale-workervcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-exoscale-premium-17 - name: openshift-worker-vcpu-exoscale-premium-17 + name: openshift-exoscale-workervcpu-guaranteed-17 + name: openshift-exoscale-workervcpu-guaranteed-17 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-premium + product-id: openshift-exoscale-workervcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-exoscale-premium-17 + cron-job-name: openshift-exoscale-workervcpu-guaranteed-17 spec: template: metadata: @@ -1539,7 +1539,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-exoscale-premium + value: openshift-exoscale-workervcpu-guaranteed - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -1568,25 +1568,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-zero + product-id: openshift-exoscale-workervcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-vsphere-zero-18 - name: openshift-worker-vcpu-vsphere-zero-18 + name: openshift-exoscale-workervcpu-premium-18 + name: openshift-exoscale-workervcpu-premium-18 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-zero + product-id: openshift-exoscale-workervcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-vsphere-zero-18 + cron-job-name: openshift-exoscale-workervcpu-premium-18 spec: template: metadata: @@ -1626,7 +1626,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-vsphere-zero + value: openshift-exoscale-workervcpu-premium - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -1655,25 +1655,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-standard + product-id: openshift-exoscale-workervcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-vsphere-standard-19 - name: openshift-worker-vcpu-vsphere-standard-19 + name: openshift-exoscale-workervcpu-professional-19 + name: openshift-exoscale-workervcpu-professional-19 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-standard + product-id: openshift-exoscale-workervcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-vsphere-standard-19 + cron-job-name: openshift-exoscale-workervcpu-professional-19 spec: template: metadata: @@ -1713,7 +1713,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-vsphere-standard + value: openshift-exoscale-workervcpu-professional - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -1742,25 +1742,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-professional + product-id: openshift-exoscale-workervcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-vsphere-professional-20 - name: openshift-worker-vcpu-vsphere-professional-20 + name: openshift-exoscale-workervcpu-standard-20 + name: openshift-exoscale-workervcpu-standard-20 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-professional + product-id: openshift-exoscale-workervcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-vsphere-professional-20 + cron-job-name: openshift-exoscale-workervcpu-standard-20 spec: template: metadata: @@ -1800,7 +1800,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-vsphere-professional + value: openshift-exoscale-workervcpu-standard - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -1829,25 +1829,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-premium + product-id: openshift-exoscale-workervcpu-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-vsphere-premium-21 - name: openshift-worker-vcpu-vsphere-premium-21 + name: openshift-exoscale-workervcpu-zero-21 + name: openshift-exoscale-workervcpu-zero-21 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-premium + product-id: openshift-exoscale-workervcpu-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-vsphere-premium-21 + cron-job-name: openshift-exoscale-workervcpu-zero-21 spec: template: metadata: @@ -1887,7 +1887,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-vsphere-premium + value: openshift-exoscale-workervcpu-zero - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -1916,25 +1916,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-openstack-zero + product-id: openshift-openstackcsp-workervcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-openstack-zero-22 - name: openshift-worker-vcpu-openstack-zero-22 + name: openshift-openstackcsp-workervcpu-besteffort-22 + name: openshift-openstackcsp-workervcpu-besteffort-22 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-openstack-zero + product-id: openshift-openstackcsp-workervcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-openstack-zero-22 + cron-job-name: openshift-openstackcsp-workervcpu-besteffort-22 spec: template: metadata: @@ -1974,7 +1974,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-openstack-zero + value: openshift-openstackcsp-workervcpu-besteffort - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -2003,25 +2003,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-openstack-standard + product-id: openshift-openstackcsp-workervcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-openstack-standard-23 - name: openshift-worker-vcpu-openstack-standard-23 + name: openshift-openstackcsp-workervcpu-guaranteed-23 + name: openshift-openstackcsp-workervcpu-guaranteed-23 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-openstack-standard + product-id: openshift-openstackcsp-workervcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-openstack-standard-23 + cron-job-name: openshift-openstackcsp-workervcpu-guaranteed-23 spec: template: metadata: @@ -2061,7 +2061,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-openstack-standard + value: openshift-openstackcsp-workervcpu-guaranteed - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -2090,25 +2090,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-openstack-professional + product-id: openshift-openstackcsp-workervcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-openstack-professional-24 - name: openshift-worker-vcpu-openstack-professional-24 + name: openshift-openstackcsp-workervcpu-premium-24 + name: openshift-openstackcsp-workervcpu-premium-24 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-openstack-professional + product-id: openshift-openstackcsp-workervcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-openstack-professional-24 + cron-job-name: openshift-openstackcsp-workervcpu-premium-24 spec: template: metadata: @@ -2148,7 +2148,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-openstack-professional + value: openshift-openstackcsp-workervcpu-premium - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -2177,25 +2177,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-openstack-premium + product-id: openshift-openstackcsp-workervcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-openstack-premium-25 - name: openshift-worker-vcpu-openstack-premium-25 + name: openshift-openstackcsp-workervcpu-professional-25 + name: openshift-openstackcsp-workervcpu-professional-25 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-openstack-premium + product-id: openshift-openstackcsp-workervcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-openstack-premium-25 + cron-job-name: openshift-openstackcsp-workervcpu-professional-25 spec: template: metadata: @@ -2235,7 +2235,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-openstack-premium + value: openshift-openstackcsp-workervcpu-professional - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -2264,25 +2264,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-standard + product-id: openshift-openstackcsp-workervcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-vsphere-standard-26 - name: openshift-worker-vcpu-vsphere-standard-26 + name: openshift-openstackcsp-workervcpu-standard-26 + name: openshift-openstackcsp-workervcpu-standard-26 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-standard + product-id: openshift-openstackcsp-workervcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-vsphere-standard-26 + cron-job-name: openshift-openstackcsp-workervcpu-standard-26 spec: template: metadata: @@ -2322,7 +2322,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-vsphere-standard + value: openshift-openstackcsp-workervcpu-standard - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -2351,25 +2351,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-professional + product-id: openshift-openstackcsp-workervcpu-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-vsphere-professional-27 - name: openshift-worker-vcpu-vsphere-professional-27 + name: openshift-openstackcsp-workervcpu-zero-27 + name: openshift-openstackcsp-workervcpu-zero-27 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-professional + product-id: openshift-openstackcsp-workervcpu-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-vsphere-professional-27 + cron-job-name: openshift-openstackcsp-workervcpu-zero-27 spec: template: metadata: @@ -2409,7 +2409,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-vsphere-professional + value: openshift-openstackcsp-workervcpu-zero - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -2438,25 +2438,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-besteffort + product-id: openshift-openstackonprem-workervcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-cloudscale-besteffort-28 - name: openshift-worker-vcpu-cloudscale-besteffort-28 + name: openshift-openstackonprem-workervcpu-besteffort-28 + name: openshift-openstackonprem-workervcpu-besteffort-28 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-besteffort + product-id: openshift-openstackonprem-workervcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-cloudscale-besteffort-28 + cron-job-name: openshift-openstackonprem-workervcpu-besteffort-28 spec: template: metadata: @@ -2496,7 +2496,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-cloudscale-besteffort + value: openshift-openstackonprem-workervcpu-besteffort - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -2525,25 +2525,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-awseks-vcpu-besteffort + product-id: openshift-openstackonprem-workervcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-awseks-vcpu-besteffort-0 - name: kubernetes-awseks-vcpu-besteffort-0 + name: openshift-openstackonprem-workervcpu-guaranteed-29 + name: openshift-openstackonprem-workervcpu-guaranteed-29 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-awseks-vcpu-besteffort + product-id: openshift-openstackonprem-workervcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-awseks-vcpu-besteffort-0 + cron-job-name: openshift-openstackonprem-workervcpu-guaranteed-29 spec: template: metadata: @@ -2583,27 +2583,21 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-awseks-vcpu-besteffort + value: openshift-openstackonprem-workervcpu-guaranteed - name: AR_QUERY - value: | - max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) - # Pull in the APPUiO managed info labels - * on(cluster_id) group_left(sales_order) appuio_managed_info{ - sales_order!="NONE", - sales_order!="TERMINATED", - cloud_provider="aws", - distribution="eks", - vshn_service_level="best_effort", - } + value: query - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: - %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels - name: AR_UNIT_ID - value: uom_uom_49_440b0fa7 + value: '300' - name: AR_ORG_ID - value: appuio-managed-kubernetes-services-billing + value: appuio-managed-openshift-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -2618,25 +2612,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-awseks-vcpu-guaranteed + product-id: openshift-openstackonprem-workervcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-awseks-vcpu-guaranteed-1 - name: kubernetes-awseks-vcpu-guaranteed-1 + name: openshift-openstackonprem-workervcpu-premium-30 + name: openshift-openstackonprem-workervcpu-premium-30 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-awseks-vcpu-guaranteed + product-id: openshift-openstackonprem-workervcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-awseks-vcpu-guaranteed-1 + cron-job-name: openshift-openstackonprem-workervcpu-premium-30 spec: template: metadata: @@ -2676,27 +2670,21 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-awseks-vcpu-guaranteed + value: openshift-openstackonprem-workervcpu-premium - name: AR_QUERY - value: | - max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) - # Pull in the APPUiO managed info labels - * on(cluster_id) group_left(sales_order) appuio_managed_info{ - sales_order!="NONE", - sales_order!="TERMINATED", - cloud_provider="aws", - distribution="eks", - vshn_service_level="guaranteed_availability", - } + value: query - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: - %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels - name: AR_UNIT_ID - value: uom_uom_49_440b0fa7 + value: '300' - name: AR_ORG_ID - value: appuio-managed-kubernetes-services-billing + value: appuio-managed-openshift-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -2711,25 +2699,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-exoscalesks-vcpu-besteffort + product-id: openshift-openstackonprem-workervcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-exoscalesks-vcpu-besteffort-2 - name: kubernetes-exoscalesks-vcpu-besteffort-2 + name: openshift-openstackonprem-workervcpu-8b0ab0abec678e9 + name: openshift-openstackonprem-workervcpu-8b0ab0abec678e9 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-exoscalesks-vcpu-besteffort + product-id: openshift-openstackonprem-workervcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-exoscalesks-vcpu-besteffort-2 + cron-job-name: openshift-openstackonprem-workervcpu-professional-31 spec: template: metadata: @@ -2769,27 +2757,21 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-exoscalesks-vcpu-besteffort + value: openshift-openstackonprem-workervcpu-professional - name: AR_QUERY - value: | - max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) - # Pull in the APPUiO managed info labels - * on(cluster_id) group_left(sales_order) appuio_managed_info{ - sales_order!="NONE", - sales_order!="TERMINATED", - cloud_provider="exoscale", - distribution="sks", - vshn_service_level="best_effort", - } + value: query - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: - %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels - name: AR_UNIT_ID - value: uom_uom_49_440b0fa7 + value: '300' - name: AR_ORG_ID - value: appuio-managed-kubernetes-services-billing + value: appuio-managed-openshift-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -2804,25 +2786,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-exoscalesks-vcpu-guaranteed + product-id: openshift-openstackonprem-workervcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-exoscalesks-vcpu-guaranteed-3 - name: kubernetes-exoscalesks-vcpu-guaranteed-3 + name: openshift-openstackonprem-workervcpu-standard-32 + name: openshift-openstackonprem-workervcpu-standard-32 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-exoscalesks-vcpu-guaranteed + product-id: openshift-openstackonprem-workervcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-exoscalesks-vcpu-guaranteed-3 + cron-job-name: openshift-openstackonprem-workervcpu-standard-32 spec: template: metadata: @@ -2862,27 +2844,21 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-exoscalesks-vcpu-guaranteed + value: openshift-openstackonprem-workervcpu-standard - name: AR_QUERY - value: | - max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) - # Pull in the APPUiO managed info labels - * on(cluster_id) group_left(sales_order) appuio_managed_info{ - sales_order!="NONE", - sales_order!="TERMINATED", - cloud_provider="exoscale", - distribution="sks", - vshn_service_level="guaranteed_availability", - } + value: query - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: - %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels - name: AR_UNIT_ID - value: uom_uom_49_440b0fa7 + value: '300' - name: AR_ORG_ID - value: appuio-managed-kubernetes-services-billing + value: appuio-managed-openshift-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -2897,25 +2873,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-googlegke-vcpu-besteffort + product-id: openshift-openstackonprem-workervcpu-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-googlegke-vcpu-besteffort-4 - name: kubernetes-googlegke-vcpu-besteffort-4 + name: openshift-openstackonprem-workervcpu-zero-33 + name: openshift-openstackonprem-workervcpu-zero-33 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-googlegke-vcpu-besteffort + product-id: openshift-openstackonprem-workervcpu-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-googlegke-vcpu-besteffort-4 + cron-job-name: openshift-openstackonprem-workervcpu-zero-33 spec: template: metadata: @@ -2955,27 +2931,21 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-googlegke-vcpu-besteffort + value: openshift-openstackonprem-workervcpu-zero - name: AR_QUERY - value: | - max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) - # Pull in the APPUiO managed info labels - * on(cluster_id) group_left(sales_order) appuio_managed_info{ - sales_order!="NONE", - sales_order!="TERMINATED", - cloud_provider="gcp", - distribution="gke", - vshn_service_level="best_effort", - } + value: query - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: - %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels - name: AR_UNIT_ID - value: uom_uom_49_440b0fa7 + value: '300' - name: AR_ORG_ID - value: appuio-managed-kubernetes-services-billing + value: appuio-managed-openshift-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -2990,25 +2960,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-googlegke-vcpu-guaranteed + product-id: openshift-vspherecsp-workervcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-googlegke-vcpu-guaranteed-5 - name: kubernetes-googlegke-vcpu-guaranteed-5 + name: openshift-vspherecsp-workervcpu-besteffort-34 + name: openshift-vspherecsp-workervcpu-besteffort-34 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-googlegke-vcpu-guaranteed + product-id: openshift-vspherecsp-workervcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-googlegke-vcpu-guaranteed-5 + cron-job-name: openshift-vspherecsp-workervcpu-besteffort-34 spec: template: metadata: @@ -3048,27 +3018,21 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-googlegke-vcpu-guaranteed + value: openshift-vspherecsp-workervcpu-besteffort - name: AR_QUERY - value: | - max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) - # Pull in the APPUiO managed info labels - * on(cluster_id) group_left(sales_order) appuio_managed_info{ - sales_order!="NONE", - sales_order!="TERMINATED", - cloud_provider="gcp", - distribution="gke", - vshn_service_level="guaranteed_availability", - } + value: query - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: - %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels - name: AR_UNIT_ID - value: uom_uom_49_440b0fa7 + value: '300' - name: AR_ORG_ID - value: appuio-managed-kubernetes-services-billing + value: appuio-managed-openshift-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -3083,25 +3047,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-azureaks-vcpu-besteffort + product-id: openshift-vspherecsp-workervcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-azureaks-vcpu-besteffort-6 - name: kubernetes-azureaks-vcpu-besteffort-6 + name: openshift-vspherecsp-workervcpu-guaranteed-35 + name: openshift-vspherecsp-workervcpu-guaranteed-35 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-azureaks-vcpu-besteffort + product-id: openshift-vspherecsp-workervcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-azureaks-vcpu-besteffort-6 + cron-job-name: openshift-vspherecsp-workervcpu-guaranteed-35 spec: template: metadata: @@ -3141,27 +3105,21 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-azureaks-vcpu-besteffort + value: openshift-vspherecsp-workervcpu-guaranteed - name: AR_QUERY - value: | - max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) - # Pull in the APPUiO managed info labels - * on(cluster_id) group_left(sales_order) appuio_managed_info{ - sales_order!="NONE", - sales_order!="TERMINATED", - cloud_provider="azure", - distribution="aks", - vshn_service_level="best_effort", - } + value: query - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: - %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels - name: AR_UNIT_ID - value: uom_uom_49_440b0fa7 + value: '300' - name: AR_ORG_ID - value: appuio-managed-kubernetes-services-billing + value: appuio-managed-openshift-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -3176,25 +3134,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-azureaks-vcpu-guaranteed + product-id: openshift-vspherecsp-workervcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-azureaks-vcpu-guaranteed-7 - name: kubernetes-azureaks-vcpu-guaranteed-7 + name: openshift-vspherecsp-workervcpu-premium-36 + name: openshift-vspherecsp-workervcpu-premium-36 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-azureaks-vcpu-guaranteed + product-id: openshift-vspherecsp-workervcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-azureaks-vcpu-guaranteed-7 + cron-job-name: openshift-vspherecsp-workervcpu-premium-36 spec: template: metadata: @@ -3234,27 +3192,21 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-azureaks-vcpu-guaranteed + value: openshift-vspherecsp-workervcpu-premium - name: AR_QUERY - value: | - max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) - # Pull in the APPUiO managed info labels - * on(cluster_id) group_left(sales_order) appuio_managed_info{ - sales_order!="NONE", - sales_order!="TERMINATED", - cloud_provider="azure", - distribution="aks", - vshn_service_level="guaranteed_availability", - } + value: query - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: - %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels - name: AR_UNIT_ID - value: uom_uom_49_440b0fa7 + value: '300' - name: AR_ORG_ID - value: appuio-managed-kubernetes-services-billing + value: appuio-managed-openshift-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -3269,25 +3221,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-zero + product-id: openshift-vspherecsp-workervcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-hyperscaler-cluster-zero-0 - name: kubernetes-hyperscaler-cluster-zero-0 + name: openshift-vspherecsp-workervcpu-professional-37 + name: openshift-vspherecsp-workervcpu-professional-37 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-zero + product-id: openshift-vspherecsp-workervcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-hyperscaler-cluster-zero-0 + cron-job-name: openshift-vspherecsp-workervcpu-professional-37 spec: template: metadata: @@ -3327,29 +3279,21 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-hyperscaler-cluster-zero + value: openshift-vspherecsp-workervcpu-professional - name: AR_QUERY - value: | - max_over_time( - group by(cluster_id, sales_order) ( - appuio_managed_info{ - distribution!="rke2", - distribution!="rancher", - sales_order!="TERMINATED", - sales_order!="NONE", - vshn_service_level="zero", - } - )[59m:1m] - ) + value: query - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: - %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels - name: AR_UNIT_ID - value: uom_uom_53_4a7e8f3e + value: '300' - name: AR_ORG_ID - value: appuio-managed-kubernetes-services-billing + value: appuio-managed-openshift-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -3364,25 +3308,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-standard + product-id: openshift-vspherecsp-workervcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-hyperscaler-cluster-standard-1 - name: kubernetes-hyperscaler-cluster-standard-1 + name: openshift-vspherecsp-workervcpu-standard-38 + name: openshift-vspherecsp-workervcpu-standard-38 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-standard + product-id: openshift-vspherecsp-workervcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-hyperscaler-cluster-standard-1 + cron-job-name: openshift-vspherecsp-workervcpu-standard-38 spec: template: metadata: @@ -3422,27 +3366,1981 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-hyperscaler-cluster-standard + value: openshift-vspherecsp-workervcpu-standard - name: AR_QUERY - value: | - max_over_time( - group by(cluster_id, sales_order) ( - appuio_managed_info{ - distribution!="rke2", - distribution!="rancher", - sales_order!="TERMINATED", - sales_order!="NONE", - vshn_service_level="standard", - } - )[59m:1m] - ) + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-vspherecsp-workervcpu-zero + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-vspherecsp-workervcpu-zero-39 + name: openshift-vspherecsp-workervcpu-zero-39 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-vspherecsp-workervcpu-zero + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-vspherecsp-workervcpu-zero-39 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + --debug-override-sales-order-id=OVERRIDE + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-vspherecsp-workervcpu-zero + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-vsphereonprem-workervcpu-besteffort-40 + name: openshift-vsphereonprem-workervcpu-besteffort-40 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-vsphereonprem-workervcpu-besteffort-40 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + --debug-override-sales-order-id=OVERRIDE + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-vsphereonprem-workervcpu-besteffort + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-vsphereonprem-workervcpu-guaranteed-41 + name: openshift-vsphereonprem-workervcpu-guaranteed-41 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-vsphereonprem-workervcpu-guaranteed-41 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + --debug-override-sales-order-id=OVERRIDE + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-vsphereonprem-workervcpu-guaranteed + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-premium + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-vsphereonprem-workervcpu-premium-42 + name: openshift-vsphereonprem-workervcpu-premium-42 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-premium + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-vsphereonprem-workervcpu-premium-42 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + --debug-override-sales-order-id=OVERRIDE + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-vsphereonprem-workervcpu-premium + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-professional + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-vsphereonprem-workervcpu-professional-43 + name: openshift-vsphereonprem-workervcpu-professional-43 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-professional + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-vsphereonprem-workervcpu-professional-43 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + --debug-override-sales-order-id=OVERRIDE + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-vsphereonprem-workervcpu-professional + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-standard + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-vsphereonprem-workervcpu-standard-44 + name: openshift-vsphereonprem-workervcpu-standard-44 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-standard + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-vsphereonprem-workervcpu-standard-44 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + --debug-override-sales-order-id=OVERRIDE + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-vsphereonprem-workervcpu-standard + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-zero + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-vsphereonprem-workervcpu-zero-45 + name: openshift-vsphereonprem-workervcpu-zero-45 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-zero + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-vsphereonprem-workervcpu-zero-45 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + --debug-override-sales-order-id=OVERRIDE + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-vsphereonprem-workervcpu-zero + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-xelon-workervcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-xelon-workervcpu-besteffort-46 + name: openshift-xelon-workervcpu-besteffort-46 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-xelon-workervcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-xelon-workervcpu-besteffort-46 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + --debug-override-sales-order-id=OVERRIDE + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-xelon-workervcpu-besteffort + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-xelon-workervcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-xelon-workervcpu-guaranteed-47 + name: openshift-xelon-workervcpu-guaranteed-47 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-xelon-workervcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-xelon-workervcpu-guaranteed-47 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + --debug-override-sales-order-id=OVERRIDE + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-xelon-workervcpu-guaranteed + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-xelon-workervcpu-premium + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-xelon-workervcpu-premium-48 + name: openshift-xelon-workervcpu-premium-48 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-xelon-workervcpu-premium + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-xelon-workervcpu-premium-48 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + --debug-override-sales-order-id=OVERRIDE + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-xelon-workervcpu-premium + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-xelon-workervcpu-professional + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-xelon-workervcpu-professional-49 + name: openshift-xelon-workervcpu-professional-49 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-xelon-workervcpu-professional + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-xelon-workervcpu-professional-49 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + --debug-override-sales-order-id=OVERRIDE + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-xelon-workervcpu-professional + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-xelon-workervcpu-standard + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-xelon-workervcpu-standard-50 + name: openshift-xelon-workervcpu-standard-50 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-xelon-workervcpu-standard + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-xelon-workervcpu-standard-50 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + --debug-override-sales-order-id=OVERRIDE + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-xelon-workervcpu-standard + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-xelon-workervcpu-zero + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-xelon-workervcpu-zero-51 + name: openshift-xelon-workervcpu-zero-51 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-xelon-workervcpu-zero + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-xelon-workervcpu-zero-51 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + --debug-override-sales-order-id=OVERRIDE + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-xelon-workervcpu-zero + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-worker-vcpu-cloudscale-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-worker-vcpu-cloudscale-besteffort-52 + name: openshift-worker-vcpu-cloudscale-besteffort-52 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-worker-vcpu-cloudscale-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-worker-vcpu-cloudscale-besteffort-52 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + --debug-override-sales-order-id=OVERRIDE + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-worker-vcpu-cloudscale-besteffort + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: appuio-managed-openshift-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: kubernetes-awseks-vcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: kubernetes-awseks-vcpu-besteffort-0 + name: kubernetes-awseks-vcpu-besteffort-0 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: kubernetes-awseks-vcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: kubernetes-awseks-vcpu-besteffort-0 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + --debug-override-sales-order-id=OVERRIDE + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: kubernetes-awseks-vcpu-besteffort + - name: AR_QUERY + value: | + max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + sales_order!="NONE", + sales_order!="TERMINATED", + cloud_provider="aws", + distribution="eks", + vshn_service_level="best_effort", + } + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: + %(cluster_id)s" % labels' + - name: AR_UNIT_ID + value: uom_uom_49_440b0fa7 + - name: AR_ORG_ID + value: appuio-managed-kubernetes-services-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: kubernetes-awseks-vcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: kubernetes-awseks-vcpu-guaranteed-1 + name: kubernetes-awseks-vcpu-guaranteed-1 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: kubernetes-awseks-vcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: kubernetes-awseks-vcpu-guaranteed-1 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + --debug-override-sales-order-id=OVERRIDE + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: kubernetes-awseks-vcpu-guaranteed + - name: AR_QUERY + value: | + max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + sales_order!="NONE", + sales_order!="TERMINATED", + cloud_provider="aws", + distribution="eks", + vshn_service_level="guaranteed_availability", + } + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: + %(cluster_id)s" % labels' + - name: AR_UNIT_ID + value: uom_uom_49_440b0fa7 + - name: AR_ORG_ID + value: appuio-managed-kubernetes-services-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: kubernetes-azureaks-vcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: kubernetes-azureaks-vcpu-besteffort-2 + name: kubernetes-azureaks-vcpu-besteffort-2 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: kubernetes-azureaks-vcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: kubernetes-azureaks-vcpu-besteffort-2 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + --debug-override-sales-order-id=OVERRIDE + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: kubernetes-azureaks-vcpu-besteffort + - name: AR_QUERY + value: | + max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + sales_order!="NONE", + sales_order!="TERMINATED", + cloud_provider="azure", + distribution="aks", + vshn_service_level="best_effort", + } + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: + %(cluster_id)s" % labels' + - name: AR_UNIT_ID + value: uom_uom_49_440b0fa7 + - name: AR_ORG_ID + value: appuio-managed-kubernetes-services-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: kubernetes-azureaks-vcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: kubernetes-azureaks-vcpu-guaranteed-3 + name: kubernetes-azureaks-vcpu-guaranteed-3 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: kubernetes-azureaks-vcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: kubernetes-azureaks-vcpu-guaranteed-3 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + --debug-override-sales-order-id=OVERRIDE + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: kubernetes-azureaks-vcpu-guaranteed + - name: AR_QUERY + value: | + max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + sales_order!="NONE", + sales_order!="TERMINATED", + cloud_provider="azure", + distribution="aks", + vshn_service_level="guaranteed_availability", + } + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: + %(cluster_id)s" % labels' + - name: AR_UNIT_ID + value: uom_uom_49_440b0fa7 + - name: AR_ORG_ID + value: appuio-managed-kubernetes-services-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: kubernetes-exoscalesks-vcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: kubernetes-exoscalesks-vcpu-besteffort-4 + name: kubernetes-exoscalesks-vcpu-besteffort-4 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: kubernetes-exoscalesks-vcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: kubernetes-exoscalesks-vcpu-besteffort-4 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + --debug-override-sales-order-id=OVERRIDE + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: kubernetes-exoscalesks-vcpu-besteffort + - name: AR_QUERY + value: | + max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + sales_order!="NONE", + sales_order!="TERMINATED", + cloud_provider="exoscale", + distribution="sks", + vshn_service_level="best_effort", + } + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: + %(cluster_id)s" % labels' + - name: AR_UNIT_ID + value: uom_uom_49_440b0fa7 + - name: AR_ORG_ID + value: appuio-managed-kubernetes-services-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: kubernetes-exoscalesks-vcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: kubernetes-exoscalesks-vcpu-guaranteed-5 + name: kubernetes-exoscalesks-vcpu-guaranteed-5 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: kubernetes-exoscalesks-vcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: kubernetes-exoscalesks-vcpu-guaranteed-5 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + --debug-override-sales-order-id=OVERRIDE + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: kubernetes-exoscalesks-vcpu-guaranteed + - name: AR_QUERY + value: | + max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + sales_order!="NONE", + sales_order!="TERMINATED", + cloud_provider="exoscale", + distribution="sks", + vshn_service_level="guaranteed_availability", + } + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: + %(cluster_id)s" % labels' + - name: AR_UNIT_ID + value: uom_uom_49_440b0fa7 + - name: AR_ORG_ID + value: appuio-managed-kubernetes-services-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: kubernetes-googlegke-vcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: kubernetes-googlegke-vcpu-besteffort-6 + name: kubernetes-googlegke-vcpu-besteffort-6 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: kubernetes-googlegke-vcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: kubernetes-googlegke-vcpu-besteffort-6 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + --debug-override-sales-order-id=OVERRIDE + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: kubernetes-googlegke-vcpu-besteffort + - name: AR_QUERY + value: | + max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + sales_order!="NONE", + sales_order!="TERMINATED", + cloud_provider="google", + distribution="gke", + vshn_service_level="best_effort", + } + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: + %(cluster_id)s" % labels' + - name: AR_UNIT_ID + value: uom_uom_49_440b0fa7 + - name: AR_ORG_ID + value: appuio-managed-kubernetes-services-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: kubernetes-googlegke-vcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: kubernetes-googlegke-vcpu-guaranteed-7 + name: kubernetes-googlegke-vcpu-guaranteed-7 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: kubernetes-googlegke-vcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: kubernetes-googlegke-vcpu-guaranteed-7 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + --debug-override-sales-order-id=OVERRIDE + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: kubernetes-googlegke-vcpu-guaranteed + - name: AR_QUERY + value: | + max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + sales_order!="NONE", + sales_order!="TERMINATED", + cloud_provider="google", + distribution="gke", + vshn_service_level="guaranteed_availability", + } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: %(cluster_id)s" % labels' - name: AR_UNIT_ID - value: uom_uom_53_4a7e8f3e + value: uom_uom_49_440b0fa7 - name: AR_ORG_ID value: appuio-managed-kubernetes-services-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 @@ -3459,25 +5357,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-professional + product-id: kubernetes-hyperscaler-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-hyperscaler-cluster-professional-2 - name: kubernetes-hyperscaler-cluster-professional-2 + name: kubernetes-hyperscaler-cluster-premium-0 + name: kubernetes-hyperscaler-cluster-premium-0 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-professional + product-id: kubernetes-hyperscaler-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-hyperscaler-cluster-professional-2 + cron-job-name: kubernetes-hyperscaler-cluster-premium-0 spec: template: metadata: @@ -3517,7 +5415,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-hyperscaler-cluster-professional + value: kubernetes-hyperscaler-cluster-premium - name: AR_QUERY value: | max_over_time( @@ -3527,7 +5425,7 @@ spec: distribution!="rancher", sales_order!="TERMINATED", sales_order!="NONE", - vshn_service_level="professional", + vshn_service_level="premium", } )[59m:1m] ) @@ -3554,25 +5452,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-premium + product-id: kubernetes-hyperscaler-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-hyperscaler-cluster-premium-3 - name: kubernetes-hyperscaler-cluster-premium-3 + name: kubernetes-hyperscaler-cluster-professional-1 + name: kubernetes-hyperscaler-cluster-professional-1 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-premium + product-id: kubernetes-hyperscaler-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-hyperscaler-cluster-premium-3 + cron-job-name: kubernetes-hyperscaler-cluster-professional-1 spec: template: metadata: @@ -3612,7 +5510,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-hyperscaler-cluster-premium + value: kubernetes-hyperscaler-cluster-professional - name: AR_QUERY value: | max_over_time( @@ -3622,7 +5520,7 @@ spec: distribution!="rancher", sales_order!="TERMINATED", sales_order!="NONE", - vshn_service_level="premium", + vshn_service_level="professional", } )[59m:1m] ) @@ -3649,25 +5547,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-zero + product-id: kubernetes-hyperscaler-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-hyperscaler-cluster-zero-0 - name: kubernetes-hyperscaler-cluster-zero-0 + name: kubernetes-hyperscaler-cluster-standard-2 + name: kubernetes-hyperscaler-cluster-standard-2 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-zero + product-id: kubernetes-hyperscaler-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-hyperscaler-cluster-zero-0 + cron-job-name: kubernetes-hyperscaler-cluster-standard-2 spec: template: metadata: @@ -3707,25 +5605,27 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-hyperscaler-cluster-zero + value: kubernetes-hyperscaler-cluster-standard - name: AR_QUERY value: | - max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) - # Pull in the APPUiO managed info labels - * on(cluster_id) group_left(sales_order) appuio_managed_info{ - distribution!="rke2", - distribution!="rancher", - sales_order!="TERMINATED", - sales_order!="NONE", - vshn_service_level="zero", - } + max_over_time( + group by(cluster_id, sales_order) ( + appuio_managed_info{ + distribution!="rke2", + distribution!="rancher", + sales_order!="TERMINATED", + sales_order!="NONE", + vshn_service_level="standard", + } + )[59m:1m] + ) - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: %(cluster_id)s" % labels' - name: AR_UNIT_ID - value: uom_uom_191_55730e52 + value: uom_uom_53_4a7e8f3e - name: AR_ORG_ID value: appuio-managed-kubernetes-services-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 @@ -3742,25 +5642,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-standard + product-id: kubernetes-hyperscaler-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-hyperscaler-cluster-standard-1 - name: kubernetes-hyperscaler-cluster-standard-1 + name: kubernetes-hyperscaler-cluster-zero-3 + name: kubernetes-hyperscaler-cluster-zero-3 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-standard + product-id: kubernetes-hyperscaler-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-hyperscaler-cluster-standard-1 + cron-job-name: kubernetes-hyperscaler-cluster-zero-3 spec: template: metadata: @@ -3800,25 +5700,27 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-hyperscaler-cluster-standard + value: kubernetes-hyperscaler-cluster-zero - name: AR_QUERY value: | - max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) - # Pull in the APPUiO managed info labels - * on(cluster_id) group_left(sales_order) appuio_managed_info{ - distribution!="rke2", - distribution!="rancher", - sales_order!="TERMINATED", - sales_order!="NONE", - vshn_service_level="standard", - } + max_over_time( + group by(cluster_id, sales_order) ( + appuio_managed_info{ + distribution!="rke2", + distribution!="rancher", + sales_order!="TERMINATED", + sales_order!="NONE", + vshn_service_level="zero", + } + )[59m:1m] + ) - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: %(cluster_id)s" % labels' - name: AR_UNIT_ID - value: uom_uom_191_55730e52 + value: uom_uom_53_4a7e8f3e - name: AR_ORG_ID value: appuio-managed-kubernetes-services-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 @@ -3835,25 +5737,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-professional + product-id: kubernetes-hyperscaler-node-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-hyperscaler-cluster-professional-2 - name: kubernetes-hyperscaler-cluster-professional-2 + name: kubernetes-hyperscaler-node-premium-0 + name: kubernetes-hyperscaler-node-premium-0 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-professional + product-id: kubernetes-hyperscaler-node-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-hyperscaler-cluster-professional-2 + cron-job-name: kubernetes-hyperscaler-node-premium-0 spec: template: metadata: @@ -3893,7 +5795,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-hyperscaler-cluster-professional + value: kubernetes-hyperscaler-node-premium - name: AR_QUERY value: | max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) @@ -3903,7 +5805,7 @@ spec: distribution!="rancher", sales_order!="TERMINATED", sales_order!="NONE", - vshn_service_level="professional", + vshn_service_level="premium", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -3928,25 +5830,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-premium + product-id: kubernetes-hyperscaler-node-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-hyperscaler-cluster-premium-3 - name: kubernetes-hyperscaler-cluster-premium-3 + name: kubernetes-hyperscaler-node-professional-1 + name: kubernetes-hyperscaler-node-professional-1 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-premium + product-id: kubernetes-hyperscaler-node-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-hyperscaler-cluster-premium-3 + cron-job-name: kubernetes-hyperscaler-node-professional-1 spec: template: metadata: @@ -3986,7 +5888,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-hyperscaler-cluster-premium + value: kubernetes-hyperscaler-node-professional - name: AR_QUERY value: | max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) @@ -3996,7 +5898,7 @@ spec: distribution!="rancher", sales_order!="TERMINATED", sales_order!="NONE", - vshn_service_level="premium", + vshn_service_level="professional", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -4021,25 +5923,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-cloudscale-zero + product-id: kubernetes-hyperscaler-node-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-cloudscale-zero-0 - name: openshift-clusters-cloudscale-zero-0 + name: kubernetes-hyperscaler-node-standard-2 + name: kubernetes-hyperscaler-node-standard-2 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-cloudscale-zero + product-id: kubernetes-hyperscaler-node-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-cloudscale-zero-0 + cron-job-name: kubernetes-hyperscaler-node-standard-2 spec: template: metadata: @@ -4079,28 +5981,27 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-cloudscale-zero + value: kubernetes-hyperscaler-node-standard - name: AR_QUERY value: | - # Calculates number of clusters per cluster. Always returns 1. - # Max values over one hour. - max_over_time( - # Use aggregation to drop labels of no interest. - group by(cluster_id, sales_order) ( - appuio_managed_info{ - cloud_provider="cloudscale", - vshn_service_level="zero"}, - )[59m:1m] - ) + max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + distribution!="rke2", + distribution!="rancher", + sales_order!="TERMINATED", + sales_order!="NONE", + vshn_service_level="standard", + } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift - - Cluster: %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: + %(cluster_id)s" % labels' - name: AR_UNIT_ID - value: uom_uom_53_4a7e8f3e + value: uom_uom_191_55730e52 - name: AR_ORG_ID - value: appuio-managed-openshift-billing + value: appuio-managed-kubernetes-services-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -4115,25 +6016,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-cloudscale-standard + product-id: kubernetes-hyperscaler-node-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-cloudscale-standard-1 - name: openshift-clusters-cloudscale-standard-1 + name: kubernetes-hyperscaler-node-zero-3 + name: kubernetes-hyperscaler-node-zero-3 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-cloudscale-standard + product-id: kubernetes-hyperscaler-node-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-cloudscale-standard-1 + cron-job-name: kubernetes-hyperscaler-node-zero-3 spec: template: metadata: @@ -4173,28 +6074,27 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-cloudscale-standard + value: kubernetes-hyperscaler-node-zero - name: AR_QUERY value: | - # Calculates number of clusters per cluster. Always returns 1. - # Max values over one hour. - max_over_time( - # Use aggregation to drop labels of no interest. - group by(cluster_id, sales_order) ( - appuio_managed_info{ - cloud_provider="cloudscale", - vshn_service_level="standard"}, - )[59m:1m] - ) + max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + distribution!="rke2", + distribution!="rancher", + sales_order!="TERMINATED", + sales_order!="NONE", + vshn_service_level="zero", + } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift - - Cluster: %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: + %(cluster_id)s" % labels' - name: AR_UNIT_ID - value: uom_uom_53_4a7e8f3e + value: uom_uom_191_55730e52 - name: AR_ORG_ID - value: appuio-managed-openshift-billing + value: appuio-managed-kubernetes-services-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -4209,25 +6109,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-cloudscale-professional + product-id: openshift-cloudscale-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-cloudscale-professional-2 - name: openshift-clusters-cloudscale-professional-2 + name: openshift-cloudscale-cluster-premium-0 + name: openshift-cloudscale-cluster-premium-0 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-cloudscale-professional + product-id: openshift-cloudscale-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-cloudscale-professional-2 + cron-job-name: openshift-cloudscale-cluster-premium-0 spec: template: metadata: @@ -4267,7 +6167,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-cloudscale-professional + value: openshift-cloudscale-cluster-premium - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -4276,8 +6176,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="cloudscale", - vshn_service_level="professional"}, + cloud_provider=~"cloudscale", + vshn_service_level="premium", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -4303,25 +6204,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-cloudscale-premium + product-id: openshift-cloudscale-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-cloudscale-premium-3 - name: openshift-clusters-cloudscale-premium-3 + name: openshift-cloudscale-cluster-professional-1 + name: openshift-cloudscale-cluster-professional-1 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-cloudscale-premium + product-id: openshift-cloudscale-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-cloudscale-premium-3 + cron-job-name: openshift-cloudscale-cluster-professional-1 spec: template: metadata: @@ -4361,7 +6262,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-cloudscale-premium + value: openshift-cloudscale-cluster-professional - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -4370,8 +6271,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="cloudscale", - vshn_service_level="premium"}, + cloud_provider=~"cloudscale", + vshn_service_level="professional", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -4397,25 +6299,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-exoscale-zero + product-id: openshift-cloudscale-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-exoscale-zero-4 - name: openshift-clusters-exoscale-zero-4 + name: openshift-cloudscale-cluster-standard-2 + name: openshift-cloudscale-cluster-standard-2 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-exoscale-zero + product-id: openshift-cloudscale-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-exoscale-zero-4 + cron-job-name: openshift-cloudscale-cluster-standard-2 spec: template: metadata: @@ -4455,7 +6357,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-exoscale-zero + value: openshift-cloudscale-cluster-standard - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -4464,8 +6366,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="exoscale", - vshn_service_level="zero"}, + cloud_provider=~"cloudscale", + vshn_service_level="standard", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -4491,25 +6394,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-exoscale-standard + product-id: openshift-cloudscale-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-exoscale-standard-5 - name: openshift-clusters-exoscale-standard-5 + name: openshift-cloudscale-cluster-zero-3 + name: openshift-cloudscale-cluster-zero-3 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-exoscale-standard + product-id: openshift-cloudscale-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-exoscale-standard-5 + cron-job-name: openshift-cloudscale-cluster-zero-3 spec: template: metadata: @@ -4549,7 +6452,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-exoscale-standard + value: openshift-cloudscale-cluster-zero - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -4558,8 +6461,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="exoscale", - vshn_service_level="standard"}, + cloud_provider=~"cloudscale", + vshn_service_level="zero", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -4585,25 +6489,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-exoscale-professional + product-id: openshift-exoscale-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-exoscale-professional-6 - name: openshift-clusters-exoscale-professional-6 + name: openshift-exoscale-cluster-premium-4 + name: openshift-exoscale-cluster-premium-4 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-exoscale-professional + product-id: openshift-exoscale-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-exoscale-professional-6 + cron-job-name: openshift-exoscale-cluster-premium-4 spec: template: metadata: @@ -4643,7 +6547,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-exoscale-professional + value: openshift-exoscale-cluster-premium - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -4652,8 +6556,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="exoscale", - vshn_service_level="professional"}, + cloud_provider=~"exoscale", + vshn_service_level="premium", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -4679,25 +6584,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-exoscale-premium + product-id: openshift-exoscale-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-exoscale-premium-7 - name: openshift-clusters-exoscale-premium-7 + name: openshift-exoscale-cluster-professional-5 + name: openshift-exoscale-cluster-professional-5 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-exoscale-premium + product-id: openshift-exoscale-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-exoscale-premium-7 + cron-job-name: openshift-exoscale-cluster-professional-5 spec: template: metadata: @@ -4737,7 +6642,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-exoscale-premium + value: openshift-exoscale-cluster-professional - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -4746,8 +6651,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="exoscale", - vshn_service_level="premium"}, + cloud_provider=~"exoscale", + vshn_service_level="professional", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -4773,25 +6679,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-vsphere-zero + product-id: openshift-exoscale-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-vsphere-zero-8 - name: openshift-clusters-vsphere-zero-8 + name: openshift-exoscale-cluster-standard-6 + name: openshift-exoscale-cluster-standard-6 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-vsphere-zero + product-id: openshift-exoscale-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-vsphere-zero-8 + cron-job-name: openshift-exoscale-cluster-standard-6 spec: template: metadata: @@ -4831,7 +6737,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-vsphere-zero + value: openshift-exoscale-cluster-standard - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -4840,8 +6746,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="vsphere", - vshn_service_level="zero"}, + cloud_provider=~"exoscale", + vshn_service_level="standard", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -4867,25 +6774,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-vsphere-standard + product-id: openshift-exoscale-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-vsphere-standard-9 - name: openshift-clusters-vsphere-standard-9 + name: openshift-exoscale-cluster-zero-7 + name: openshift-exoscale-cluster-zero-7 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-vsphere-standard + product-id: openshift-exoscale-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-vsphere-standard-9 + cron-job-name: openshift-exoscale-cluster-zero-7 spec: template: metadata: @@ -4925,7 +6832,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-vsphere-standard + value: openshift-exoscale-cluster-zero - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -4934,8 +6841,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="vsphere", - vshn_service_level="standard"}, + cloud_provider=~"exoscale", + vshn_service_level="zero", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -4961,25 +6869,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-vsphere-professional + product-id: openshift-onprem-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-vsphere-professional-10 - name: openshift-clusters-vsphere-professional-10 + name: openshift-onprem-cluster-premium-8 + name: openshift-onprem-cluster-premium-8 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-vsphere-professional + product-id: openshift-onprem-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-vsphere-professional-10 + cron-job-name: openshift-onprem-cluster-premium-8 spec: template: metadata: @@ -5019,7 +6927,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-vsphere-professional + value: openshift-onprem-cluster-premium - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -5028,8 +6936,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="vsphere", - vshn_service_level="professional"}, + cloud_provider=~"vsphere|none", + vshn_service_level="premium", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -5055,25 +6964,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-vsphere-premium + product-id: openshift-onprem-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-vsphere-premium-11 - name: openshift-clusters-vsphere-premium-11 + name: openshift-onprem-cluster-professional-9 + name: openshift-onprem-cluster-professional-9 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-vsphere-premium + product-id: openshift-onprem-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-vsphere-premium-11 + cron-job-name: openshift-onprem-cluster-professional-9 spec: template: metadata: @@ -5113,7 +7022,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-vsphere-premium + value: openshift-onprem-cluster-professional - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -5122,8 +7031,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="vsphere", - vshn_service_level="premium"}, + cloud_provider=~"vsphere|none", + vshn_service_level="professional", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -5149,25 +7059,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-openstack-zero + product-id: openshift-onprem-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-openstack-zero-12 - name: openshift-clusters-openstack-zero-12 + name: openshift-onprem-cluster-standard-10 + name: openshift-onprem-cluster-standard-10 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-openstack-zero + product-id: openshift-onprem-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-openstack-zero-12 + cron-job-name: openshift-onprem-cluster-standard-10 spec: template: metadata: @@ -5207,7 +7117,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-openstack-zero + value: openshift-onprem-cluster-standard - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -5216,8 +7126,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="openstack", - vshn_service_level="zero"}, + cloud_provider=~"vsphere|none", + vshn_service_level="standard", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -5243,25 +7154,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-openstack-standard + product-id: openshift-onprem-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-openstack-standard-13 - name: openshift-clusters-openstack-standard-13 + name: openshift-onprem-cluster-zero-11 + name: openshift-onprem-cluster-zero-11 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-openstack-standard + product-id: openshift-onprem-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-openstack-standard-13 + cron-job-name: openshift-onprem-cluster-zero-11 spec: template: metadata: @@ -5301,7 +7212,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-openstack-standard + value: openshift-onprem-cluster-zero - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -5310,8 +7221,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="openstack", - vshn_service_level="standard"}, + cloud_provider=~"vsphere|none", + vshn_service_level="zero", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -5337,25 +7249,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-openstack-professional + product-id: openshift-xelon-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-openstack-professional-14 - name: openshift-clusters-openstack-professional-14 + name: openshift-xelon-cluster-premium-12 + name: openshift-xelon-cluster-premium-12 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-openstack-professional + product-id: openshift-xelon-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-openstack-professional-14 + cron-job-name: openshift-xelon-cluster-premium-12 spec: template: metadata: @@ -5395,7 +7307,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-openstack-professional + value: openshift-xelon-cluster-premium - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -5404,8 +7316,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="openstack", - vshn_service_level="professional"}, + cloud_provider=~"xelon", + vshn_service_level="premium", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -5431,25 +7344,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-openstack-premium + product-id: openshift-xelon-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-openstack-premium-15 - name: openshift-clusters-openstack-premium-15 + name: openshift-xelon-cluster-professional-13 + name: openshift-xelon-cluster-professional-13 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-openstack-premium + product-id: openshift-xelon-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-openstack-premium-15 + cron-job-name: openshift-xelon-cluster-professional-13 spec: template: metadata: @@ -5489,7 +7402,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-openstack-premium + value: openshift-xelon-cluster-professional - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -5498,8 +7411,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="openstack", - vshn_service_level="premium"}, + cloud_provider=~"xelon", + vshn_service_level="professional", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -5525,25 +7439,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-vsphere-standard + product-id: openshift-xelon-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-vsphere-standard-16 - name: openshift-clusters-vsphere-standard-16 + name: openshift-xelon-cluster-standard-14 + name: openshift-xelon-cluster-standard-14 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-vsphere-standard + product-id: openshift-xelon-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-vsphere-standard-16 + cron-job-name: openshift-xelon-cluster-standard-14 spec: template: metadata: @@ -5583,7 +7497,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-vsphere-standard + value: openshift-xelon-cluster-standard - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -5592,8 +7506,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="xelon", - vshn_service_level="standard"}, + cloud_provider=~"xelon", + vshn_service_level="standard", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -5619,25 +7534,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-vsphere-professional + product-id: openshift-xelon-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-vsphere-professional-17 - name: openshift-clusters-vsphere-professional-17 + name: openshift-xelon-cluster-zero-15 + name: openshift-xelon-cluster-zero-15 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-vsphere-professional + product-id: openshift-xelon-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-vsphere-professional-17 + cron-job-name: openshift-xelon-cluster-zero-15 spec: template: metadata: @@ -5677,7 +7592,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-vsphere-professional + value: openshift-xelon-cluster-zero - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -5686,8 +7601,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="none", - vshn_service_level="professional"}, + cloud_provider=~"xelon", + vshn_service_level="zero", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -5713,25 +7629,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-iaas-cluster-zero + product-id: kubernetes-iaas-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-iaas-cluster-zero-0 - name: kubernetes-iaas-cluster-zero-0 + name: kubernetes-iaas-cluster-premium-0 + name: kubernetes-iaas-cluster-premium-0 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-iaas-cluster-zero + product-id: kubernetes-iaas-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-iaas-cluster-zero-0 + cron-job-name: kubernetes-iaas-cluster-premium-0 spec: template: metadata: @@ -5771,7 +7687,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-iaas-cluster-zero + value: kubernetes-iaas-cluster-premium - name: AR_QUERY value: | max_over_time( @@ -5780,7 +7696,7 @@ spec: sales_order!="TERMINATED", sales_order!="NONE", distribution=~"rancher|rke2", - vshn_service_level="zero", + vshn_service_level="premium", } )[59m:1m] ) @@ -5807,25 +7723,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-iaas-cluster-standard + product-id: kubernetes-iaas-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-iaas-cluster-standard-1 - name: kubernetes-iaas-cluster-standard-1 + name: kubernetes-iaas-cluster-professional-1 + name: kubernetes-iaas-cluster-professional-1 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-iaas-cluster-standard + product-id: kubernetes-iaas-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-iaas-cluster-standard-1 + cron-job-name: kubernetes-iaas-cluster-professional-1 spec: template: metadata: @@ -5865,7 +7781,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-iaas-cluster-standard + value: kubernetes-iaas-cluster-professional - name: AR_QUERY value: | max_over_time( @@ -5874,7 +7790,7 @@ spec: sales_order!="TERMINATED", sales_order!="NONE", distribution=~"rancher|rke2", - vshn_service_level="standard", + vshn_service_level="professional", } )[59m:1m] ) @@ -5901,25 +7817,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-iaas-cluster-professional + product-id: kubernetes-iaas-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-iaas-cluster-professional-2 - name: kubernetes-iaas-cluster-professional-2 + name: kubernetes-iaas-cluster-standard-2 + name: kubernetes-iaas-cluster-standard-2 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-iaas-cluster-professional + product-id: kubernetes-iaas-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-iaas-cluster-professional-2 + cron-job-name: kubernetes-iaas-cluster-standard-2 spec: template: metadata: @@ -5959,7 +7875,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-iaas-cluster-professional + value: kubernetes-iaas-cluster-standard - name: AR_QUERY value: | max_over_time( @@ -5968,7 +7884,7 @@ spec: sales_order!="TERMINATED", sales_order!="NONE", distribution=~"rancher|rke2", - vshn_service_level="professional", + vshn_service_level="standard", } )[59m:1m] ) @@ -5995,25 +7911,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-iaas-cluster-premium + product-id: kubernetes-iaas-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-iaas-cluster-premium-3 - name: kubernetes-iaas-cluster-premium-3 + name: kubernetes-iaas-cluster-zero-3 + name: kubernetes-iaas-cluster-zero-3 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-iaas-cluster-premium + product-id: kubernetes-iaas-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-iaas-cluster-premium-3 + cron-job-name: kubernetes-iaas-cluster-zero-3 spec: template: metadata: @@ -6053,7 +7969,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-iaas-cluster-premium + value: kubernetes-iaas-cluster-zero - name: AR_QUERY value: | max_over_time( @@ -6062,7 +7978,7 @@ spec: sales_order!="TERMINATED", sales_order!="NONE", distribution=~"rancher|rke2", - vshn_service_level="premium", + vshn_service_level="zero", } )[59m:1m] ) @@ -6089,25 +8005,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-iaas-node-zero + product-id: kubernetes-iaas-node-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-iaas-node-zero-0 - name: kubernetes-iaas-node-zero-0 + name: kubernetes-iaas-node-premium-0 + name: kubernetes-iaas-node-premium-0 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-iaas-node-zero + product-id: kubernetes-iaas-node-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-iaas-node-zero-0 + cron-job-name: kubernetes-iaas-node-premium-0 spec: template: metadata: @@ -6147,7 +8063,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-iaas-node-zero + value: kubernetes-iaas-node-premium - name: AR_QUERY value: | max_over_time( @@ -6160,7 +8076,7 @@ spec: sales_order!="TERMINATED", sales_order!="NONE", distribution=~"rke2|rancher", - vshn_service_level="zero", + vshn_service_level="premium", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -6185,25 +8101,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-iaas-node-standard + product-id: kubernetes-iaas-node-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-iaas-node-standard-1 - name: kubernetes-iaas-node-standard-1 + name: kubernetes-iaas-node-professional-1 + name: kubernetes-iaas-node-professional-1 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-iaas-node-standard + product-id: kubernetes-iaas-node-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-iaas-node-standard-1 + cron-job-name: kubernetes-iaas-node-professional-1 spec: template: metadata: @@ -6243,7 +8159,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-iaas-node-standard + value: kubernetes-iaas-node-professional - name: AR_QUERY value: | max_over_time( @@ -6256,7 +8172,7 @@ spec: sales_order!="TERMINATED", sales_order!="NONE", distribution=~"rke2|rancher", - vshn_service_level="standard", + vshn_service_level="professional", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -6281,25 +8197,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-iaas-node-professional + product-id: kubernetes-iaas-node-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-iaas-node-professional-2 - name: kubernetes-iaas-node-professional-2 + name: kubernetes-iaas-node-standard-2 + name: kubernetes-iaas-node-standard-2 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-iaas-node-professional + product-id: kubernetes-iaas-node-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-iaas-node-professional-2 + cron-job-name: kubernetes-iaas-node-standard-2 spec: template: metadata: @@ -6339,7 +8255,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-iaas-node-professional + value: kubernetes-iaas-node-standard - name: AR_QUERY value: | max_over_time( @@ -6352,7 +8268,7 @@ spec: sales_order!="TERMINATED", sales_order!="NONE", distribution=~"rke2|rancher", - vshn_service_level="professional", + vshn_service_level="standard", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -6377,25 +8293,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-iaas-node-premium + product-id: kubernetes-iaas-node-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-iaas-node-premium-3 - name: kubernetes-iaas-node-premium-3 + name: kubernetes-iaas-node-zero-3 + name: kubernetes-iaas-node-zero-3 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-iaas-node-premium + product-id: kubernetes-iaas-node-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-iaas-node-premium-3 + cron-job-name: kubernetes-iaas-node-zero-3 spec: template: metadata: @@ -6435,7 +8351,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-iaas-node-premium + value: kubernetes-iaas-node-zero - name: AR_QUERY value: | max_over_time( @@ -6448,7 +8364,7 @@ spec: sales_order!="TERMINATED", sales_order!="NONE", distribution=~"rke2|rancher", - vshn_service_level="premium", + vshn_service_level="zero", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels diff --git a/tests/golden/with-org-id/appuio-reporting/appuio-reporting/11_backfill.yaml b/tests/golden/with-org-id/appuio-reporting/appuio-reporting/11_backfill.yaml index 5b188ed..47126f8 100644 --- a/tests/golden/with-org-id/appuio-reporting/appuio-reporting/11_backfill.yaml +++ b/tests/golden/with-org-id/appuio-reporting/appuio-reporting/11_backfill.yaml @@ -2,25 +2,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-besteffort + product-id: openshift-cloudscale-storagevcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-cloudscale-besteffort-0 - name: openshift-worker-vcpu-cloudscale-besteffort-0 + name: openshift-cloudscale-storagevcpu-besteffort-0 + name: openshift-cloudscale-storagevcpu-besteffort-0 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-besteffort + product-id: openshift-cloudscale-storagevcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-cloudscale-besteffort-0 + cron-job-name: openshift-cloudscale-storagevcpu-besteffort-0 spec: template: metadata: @@ -59,7 +59,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-cloudscale-besteffort + value: openshift-cloudscale-storagevcpu-besteffort - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -88,25 +88,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-guaranteedavailability + product-id: openshift-cloudscale-storagevcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-cloudscale-gua-93468ed8b2029fe - name: openshift-worker-vcpu-cloudscale-gua-93468ed8b2029fe + name: openshift-cloudscale-storagevcpu-guaranteed-1 + name: openshift-cloudscale-storagevcpu-guaranteed-1 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-guaranteedavailability + product-id: openshift-cloudscale-storagevcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-cloudscale-guaranteedavailability-1 + cron-job-name: openshift-cloudscale-storagevcpu-guaranteed-1 spec: template: metadata: @@ -145,7 +145,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-cloudscale-guaranteedavailability + value: openshift-cloudscale-storagevcpu-guaranteed - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -174,25 +174,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-besteffort + product-id: openshift-cloudscale-storagevcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-exoscale-besteffort-2 - name: openshift-worker-vcpu-exoscale-besteffort-2 + name: openshift-cloudscale-storagevcpu-premium-2 + name: openshift-cloudscale-storagevcpu-premium-2 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-besteffort + product-id: openshift-cloudscale-storagevcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-exoscale-besteffort-2 + cron-job-name: openshift-cloudscale-storagevcpu-premium-2 spec: template: metadata: @@ -231,7 +231,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-exoscale-besteffort + value: openshift-cloudscale-storagevcpu-premium - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -260,25 +260,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-guaranteedavailability + product-id: openshift-cloudscale-storagevcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-exoscale-guara-c7fabf75f900683 - name: openshift-worker-vcpu-exoscale-guara-c7fabf75f900683 + name: openshift-cloudscale-storagevcpu-professional-3 + name: openshift-cloudscale-storagevcpu-professional-3 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-guaranteedavailability + product-id: openshift-cloudscale-storagevcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-exoscale-guaranteedavailability-3 + cron-job-name: openshift-cloudscale-storagevcpu-professional-3 spec: template: metadata: @@ -317,7 +317,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-exoscale-guaranteedavailability + value: openshift-cloudscale-storagevcpu-professional - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -346,25 +346,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-besteffort + product-id: openshift-cloudscale-storagevcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-vsphere-besteffort-4 - name: openshift-worker-vcpu-vsphere-besteffort-4 + name: openshift-cloudscale-storagevcpu-standard-4 + name: openshift-cloudscale-storagevcpu-standard-4 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-besteffort + product-id: openshift-cloudscale-storagevcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-vsphere-besteffort-4 + cron-job-name: openshift-cloudscale-storagevcpu-standard-4 spec: template: metadata: @@ -403,7 +403,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-vsphere-besteffort + value: openshift-cloudscale-storagevcpu-standard - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -432,25 +432,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-guaranteedavailability + product-id: openshift-cloudscale-workervcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-vsphere-guaran-2b28379ea85e0d3 - name: openshift-worker-vcpu-vsphere-guaran-2b28379ea85e0d3 + name: openshift-cloudscale-workervcpu-besteffort-5 + name: openshift-cloudscale-workervcpu-besteffort-5 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-guaranteedavailability + product-id: openshift-cloudscale-workervcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-vsphere-guaranteedavailability-5 + cron-job-name: openshift-cloudscale-workervcpu-besteffort-5 spec: template: metadata: @@ -489,7 +489,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-vsphere-guaranteedavailability + value: openshift-cloudscale-workervcpu-besteffort - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -518,25 +518,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-openstack-besteffort + product-id: openshift-cloudscale-workervcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-openstack-besteffort-6 - name: openshift-worker-vcpu-openstack-besteffort-6 + name: openshift-cloudscale-workervcpu-guaranteed-6 + name: openshift-cloudscale-workervcpu-guaranteed-6 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-openstack-besteffort + product-id: openshift-cloudscale-workervcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-openstack-besteffort-6 + cron-job-name: openshift-cloudscale-workervcpu-guaranteed-6 spec: template: metadata: @@ -575,7 +575,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-openstack-besteffort + value: openshift-cloudscale-workervcpu-guaranteed - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -604,25 +604,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-openstack-guaranteedavailability + product-id: openshift-cloudscale-workervcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-openstack-guar-437fd9b37153898 - name: openshift-worker-vcpu-openstack-guar-437fd9b37153898 + name: openshift-cloudscale-workervcpu-premium-7 + name: openshift-cloudscale-workervcpu-premium-7 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-openstack-guaranteedavailability + product-id: openshift-cloudscale-workervcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-openstack-guaranteedavailability-7 + cron-job-name: openshift-cloudscale-workervcpu-premium-7 spec: template: metadata: @@ -661,7 +661,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-openstack-guaranteedavailability + value: openshift-cloudscale-workervcpu-premium - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -690,25 +690,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-besteffort + product-id: openshift-cloudscale-workervcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-cloudscale-besteffort-8 - name: openshift-worker-vcpu-cloudscale-besteffort-8 + name: openshift-cloudscale-workervcpu-professional-8 + name: openshift-cloudscale-workervcpu-professional-8 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-besteffort + product-id: openshift-cloudscale-workervcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-cloudscale-besteffort-8 + cron-job-name: openshift-cloudscale-workervcpu-professional-8 spec: template: metadata: @@ -747,7 +747,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-cloudscale-besteffort + value: openshift-cloudscale-workervcpu-professional - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -776,25 +776,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-guaranteedavailability + product-id: openshift-cloudscale-workervcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-cloudscale-gua-9c5f21dd467a005 - name: openshift-worker-vcpu-cloudscale-gua-9c5f21dd467a005 + name: openshift-cloudscale-workervcpu-standard-9 + name: openshift-cloudscale-workervcpu-standard-9 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-guaranteedavailability + product-id: openshift-cloudscale-workervcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-cloudscale-guaranteedavailability-9 + cron-job-name: openshift-cloudscale-workervcpu-standard-9 spec: template: metadata: @@ -833,7 +833,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-cloudscale-guaranteedavailability + value: openshift-cloudscale-workervcpu-standard - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -862,25 +862,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-zero + product-id: openshift-cloudscale-workervcpu-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-cloudscale-zero-10 - name: openshift-worker-vcpu-cloudscale-zero-10 + name: openshift-cloudscale-workervcpu-zero-10 + name: openshift-cloudscale-workervcpu-zero-10 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-zero + product-id: openshift-cloudscale-workervcpu-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-cloudscale-zero-10 + cron-job-name: openshift-cloudscale-workervcpu-zero-10 spec: template: metadata: @@ -919,7 +919,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-cloudscale-zero + value: openshift-cloudscale-workervcpu-zero - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -948,25 +948,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-standard + product-id: openshift-exoscale-storagevcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-cloudscale-standard-11 - name: openshift-worker-vcpu-cloudscale-standard-11 + name: openshift-exoscale-storagevcpu-besteffort-11 + name: openshift-exoscale-storagevcpu-besteffort-11 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-standard + product-id: openshift-exoscale-storagevcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-cloudscale-standard-11 + cron-job-name: openshift-exoscale-storagevcpu-besteffort-11 spec: template: metadata: @@ -1005,7 +1005,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-cloudscale-standard + value: openshift-exoscale-storagevcpu-besteffort - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -1034,25 +1034,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-professional + product-id: openshift-exoscale-storagevcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-cloudscale-professional-12 - name: openshift-worker-vcpu-cloudscale-professional-12 + name: openshift-exoscale-storagevcpu-guaranteed-12 + name: openshift-exoscale-storagevcpu-guaranteed-12 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-professional + product-id: openshift-exoscale-storagevcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-cloudscale-professional-12 + cron-job-name: openshift-exoscale-storagevcpu-guaranteed-12 spec: template: metadata: @@ -1091,7 +1091,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-cloudscale-professional + value: openshift-exoscale-storagevcpu-guaranteed - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -1120,25 +1120,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-premium + product-id: openshift-exoscale-storagevcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-cloudscale-premium-13 - name: openshift-worker-vcpu-cloudscale-premium-13 + name: openshift-exoscale-storagevcpu-premium-13 + name: openshift-exoscale-storagevcpu-premium-13 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-premium + product-id: openshift-exoscale-storagevcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-cloudscale-premium-13 + cron-job-name: openshift-exoscale-storagevcpu-premium-13 spec: template: metadata: @@ -1177,7 +1177,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-cloudscale-premium + value: openshift-exoscale-storagevcpu-premium - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -1206,25 +1206,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-zero + product-id: openshift-exoscale-storagevcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-exoscale-zero-14 - name: openshift-worker-vcpu-exoscale-zero-14 + name: openshift-exoscale-storagevcpu-professional-14 + name: openshift-exoscale-storagevcpu-professional-14 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-zero + product-id: openshift-exoscale-storagevcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-exoscale-zero-14 + cron-job-name: openshift-exoscale-storagevcpu-professional-14 spec: template: metadata: @@ -1263,7 +1263,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-exoscale-zero + value: openshift-exoscale-storagevcpu-professional - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -1292,25 +1292,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-standard + product-id: openshift-exoscale-storagevcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-exoscale-standard-15 - name: openshift-worker-vcpu-exoscale-standard-15 + name: openshift-exoscale-storagevcpu-standard-15 + name: openshift-exoscale-storagevcpu-standard-15 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-standard + product-id: openshift-exoscale-storagevcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-exoscale-standard-15 + cron-job-name: openshift-exoscale-storagevcpu-standard-15 spec: template: metadata: @@ -1349,7 +1349,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-exoscale-standard + value: openshift-exoscale-storagevcpu-standard - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -1378,25 +1378,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-professional + product-id: openshift-exoscale-workervcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-exoscale-professional-16 - name: openshift-worker-vcpu-exoscale-professional-16 + name: openshift-exoscale-workervcpu-besteffort-16 + name: openshift-exoscale-workervcpu-besteffort-16 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-professional + product-id: openshift-exoscale-workervcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-exoscale-professional-16 + cron-job-name: openshift-exoscale-workervcpu-besteffort-16 spec: template: metadata: @@ -1435,7 +1435,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-exoscale-professional + value: openshift-exoscale-workervcpu-besteffort - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -1464,25 +1464,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-premium + product-id: openshift-exoscale-workervcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-exoscale-premium-17 - name: openshift-worker-vcpu-exoscale-premium-17 + name: openshift-exoscale-workervcpu-guaranteed-17 + name: openshift-exoscale-workervcpu-guaranteed-17 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-exoscale-premium + product-id: openshift-exoscale-workervcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-exoscale-premium-17 + cron-job-name: openshift-exoscale-workervcpu-guaranteed-17 spec: template: metadata: @@ -1521,7 +1521,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-exoscale-premium + value: openshift-exoscale-workervcpu-guaranteed - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -1550,25 +1550,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-zero + product-id: openshift-exoscale-workervcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-vsphere-zero-18 - name: openshift-worker-vcpu-vsphere-zero-18 + name: openshift-exoscale-workervcpu-premium-18 + name: openshift-exoscale-workervcpu-premium-18 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-zero + product-id: openshift-exoscale-workervcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-vsphere-zero-18 + cron-job-name: openshift-exoscale-workervcpu-premium-18 spec: template: metadata: @@ -1607,7 +1607,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-vsphere-zero + value: openshift-exoscale-workervcpu-premium - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -1636,25 +1636,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-standard + product-id: openshift-exoscale-workervcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-vsphere-standard-19 - name: openshift-worker-vcpu-vsphere-standard-19 + name: openshift-exoscale-workervcpu-professional-19 + name: openshift-exoscale-workervcpu-professional-19 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-standard + product-id: openshift-exoscale-workervcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-vsphere-standard-19 + cron-job-name: openshift-exoscale-workervcpu-professional-19 spec: template: metadata: @@ -1693,7 +1693,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-vsphere-standard + value: openshift-exoscale-workervcpu-professional - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -1722,25 +1722,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-professional + product-id: openshift-exoscale-workervcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-vsphere-professional-20 - name: openshift-worker-vcpu-vsphere-professional-20 + name: openshift-exoscale-workervcpu-standard-20 + name: openshift-exoscale-workervcpu-standard-20 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-professional + product-id: openshift-exoscale-workervcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-vsphere-professional-20 + cron-job-name: openshift-exoscale-workervcpu-standard-20 spec: template: metadata: @@ -1779,7 +1779,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-vsphere-professional + value: openshift-exoscale-workervcpu-standard - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -1808,25 +1808,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-premium + product-id: openshift-exoscale-workervcpu-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-vsphere-premium-21 - name: openshift-worker-vcpu-vsphere-premium-21 + name: openshift-exoscale-workervcpu-zero-21 + name: openshift-exoscale-workervcpu-zero-21 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-premium + product-id: openshift-exoscale-workervcpu-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-vsphere-premium-21 + cron-job-name: openshift-exoscale-workervcpu-zero-21 spec: template: metadata: @@ -1865,7 +1865,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-vsphere-premium + value: openshift-exoscale-workervcpu-zero - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -1894,25 +1894,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-openstack-zero + product-id: openshift-openstackcsp-workervcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-openstack-zero-22 - name: openshift-worker-vcpu-openstack-zero-22 + name: openshift-openstackcsp-workervcpu-besteffort-22 + name: openshift-openstackcsp-workervcpu-besteffort-22 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-openstack-zero + product-id: openshift-openstackcsp-workervcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-openstack-zero-22 + cron-job-name: openshift-openstackcsp-workervcpu-besteffort-22 spec: template: metadata: @@ -1951,7 +1951,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-openstack-zero + value: openshift-openstackcsp-workervcpu-besteffort - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -1980,25 +1980,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-openstack-standard + product-id: openshift-openstackcsp-workervcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-openstack-standard-23 - name: openshift-worker-vcpu-openstack-standard-23 + name: openshift-openstackcsp-workervcpu-guaranteed-23 + name: openshift-openstackcsp-workervcpu-guaranteed-23 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-openstack-standard + product-id: openshift-openstackcsp-workervcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-openstack-standard-23 + cron-job-name: openshift-openstackcsp-workervcpu-guaranteed-23 spec: template: metadata: @@ -2037,7 +2037,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-openstack-standard + value: openshift-openstackcsp-workervcpu-guaranteed - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -2066,25 +2066,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-openstack-professional + product-id: openshift-openstackcsp-workervcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-openstack-professional-24 - name: openshift-worker-vcpu-openstack-professional-24 + name: openshift-openstackcsp-workervcpu-premium-24 + name: openshift-openstackcsp-workervcpu-premium-24 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-openstack-professional + product-id: openshift-openstackcsp-workervcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-openstack-professional-24 + cron-job-name: openshift-openstackcsp-workervcpu-premium-24 spec: template: metadata: @@ -2123,7 +2123,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-openstack-professional + value: openshift-openstackcsp-workervcpu-premium - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -2152,25 +2152,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-openstack-premium + product-id: openshift-openstackcsp-workervcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-openstack-premium-25 - name: openshift-worker-vcpu-openstack-premium-25 + name: openshift-openstackcsp-workervcpu-professional-25 + name: openshift-openstackcsp-workervcpu-professional-25 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-openstack-premium + product-id: openshift-openstackcsp-workervcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-openstack-premium-25 + cron-job-name: openshift-openstackcsp-workervcpu-professional-25 spec: template: metadata: @@ -2209,7 +2209,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-openstack-premium + value: openshift-openstackcsp-workervcpu-professional - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -2238,25 +2238,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-standard + product-id: openshift-openstackcsp-workervcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-vsphere-standard-26 - name: openshift-worker-vcpu-vsphere-standard-26 + name: openshift-openstackcsp-workervcpu-standard-26 + name: openshift-openstackcsp-workervcpu-standard-26 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-standard + product-id: openshift-openstackcsp-workervcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-vsphere-standard-26 + cron-job-name: openshift-openstackcsp-workervcpu-standard-26 spec: template: metadata: @@ -2295,7 +2295,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-vsphere-standard + value: openshift-openstackcsp-workervcpu-standard - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -2324,25 +2324,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-professional + product-id: openshift-openstackcsp-workervcpu-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-vsphere-professional-27 - name: openshift-worker-vcpu-vsphere-professional-27 + name: openshift-openstackcsp-workervcpu-zero-27 + name: openshift-openstackcsp-workervcpu-zero-27 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-vsphere-professional + product-id: openshift-openstackcsp-workervcpu-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-vsphere-professional-27 + cron-job-name: openshift-openstackcsp-workervcpu-zero-27 spec: template: metadata: @@ -2381,7 +2381,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-vsphere-professional + value: openshift-openstackcsp-workervcpu-zero - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -2410,25 +2410,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-besteffort + product-id: openshift-openstackonprem-workervcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-worker-vcpu-cloudscale-besteffort-28 - name: openshift-worker-vcpu-cloudscale-besteffort-28 + name: openshift-openstackonprem-workervcpu-besteffort-28 + name: openshift-openstackonprem-workervcpu-besteffort-28 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-worker-vcpu-cloudscale-besteffort + product-id: openshift-openstackonprem-workervcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-worker-vcpu-cloudscale-besteffort-28 + cron-job-name: openshift-openstackonprem-workervcpu-besteffort-28 spec: template: metadata: @@ -2467,7 +2467,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-worker-vcpu-cloudscale-besteffort + value: openshift-openstackonprem-workervcpu-besteffort - name: AR_QUERY value: query - name: AR_INSTANCE_JSONNET @@ -2496,25 +2496,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-awseks-vcpu-besteffort + product-id: openshift-openstackonprem-workervcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-awseks-vcpu-besteffort-0 - name: kubernetes-awseks-vcpu-besteffort-0 + name: openshift-openstackonprem-workervcpu-guaranteed-29 + name: openshift-openstackonprem-workervcpu-guaranteed-29 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-awseks-vcpu-besteffort + product-id: openshift-openstackonprem-workervcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-awseks-vcpu-besteffort-0 + cron-job-name: openshift-openstackonprem-workervcpu-guaranteed-29 spec: template: metadata: @@ -2553,27 +2553,21 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-awseks-vcpu-besteffort + value: openshift-openstackonprem-workervcpu-guaranteed - name: AR_QUERY - value: | - max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) - # Pull in the APPUiO managed info labels - * on(cluster_id) group_left(sales_order) appuio_managed_info{ - sales_order!="NONE", - sales_order!="TERMINATED", - cloud_provider="aws", - distribution="eks", - vshn_service_level="best_effort", - } + value: query - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: - %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels - name: AR_UNIT_ID - value: uom_uom_49_440b0fa7 + value: '300' - name: AR_ORG_ID - value: appuio-managed-kubernetes-services-billing + value: foo-org image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -2588,25 +2582,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-awseks-vcpu-guaranteed + product-id: openshift-openstackonprem-workervcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-awseks-vcpu-guaranteed-1 - name: kubernetes-awseks-vcpu-guaranteed-1 + name: openshift-openstackonprem-workervcpu-premium-30 + name: openshift-openstackonprem-workervcpu-premium-30 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-awseks-vcpu-guaranteed + product-id: openshift-openstackonprem-workervcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-awseks-vcpu-guaranteed-1 + cron-job-name: openshift-openstackonprem-workervcpu-premium-30 spec: template: metadata: @@ -2645,27 +2639,21 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-awseks-vcpu-guaranteed + value: openshift-openstackonprem-workervcpu-premium - name: AR_QUERY - value: | - max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) - # Pull in the APPUiO managed info labels - * on(cluster_id) group_left(sales_order) appuio_managed_info{ - sales_order!="NONE", - sales_order!="TERMINATED", - cloud_provider="aws", - distribution="eks", - vshn_service_level="guaranteed_availability", - } + value: query - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: - %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels - name: AR_UNIT_ID - value: uom_uom_49_440b0fa7 + value: '300' - name: AR_ORG_ID - value: appuio-managed-kubernetes-services-billing + value: foo-org image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -2680,25 +2668,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-exoscalesks-vcpu-besteffort + product-id: openshift-openstackonprem-workervcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-exoscalesks-vcpu-besteffort-2 - name: kubernetes-exoscalesks-vcpu-besteffort-2 + name: openshift-openstackonprem-workervcpu-8b0ab0abec678e9 + name: openshift-openstackonprem-workervcpu-8b0ab0abec678e9 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-exoscalesks-vcpu-besteffort + product-id: openshift-openstackonprem-workervcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-exoscalesks-vcpu-besteffort-2 + cron-job-name: openshift-openstackonprem-workervcpu-professional-31 spec: template: metadata: @@ -2737,27 +2725,21 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-exoscalesks-vcpu-besteffort + value: openshift-openstackonprem-workervcpu-professional - name: AR_QUERY - value: | - max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) - # Pull in the APPUiO managed info labels - * on(cluster_id) group_left(sales_order) appuio_managed_info{ - sales_order!="NONE", - sales_order!="TERMINATED", - cloud_provider="exoscale", - distribution="sks", - vshn_service_level="best_effort", - } + value: query - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: - %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels - name: AR_UNIT_ID - value: uom_uom_49_440b0fa7 + value: '300' - name: AR_ORG_ID - value: appuio-managed-kubernetes-services-billing + value: foo-org image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -2772,25 +2754,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-exoscalesks-vcpu-guaranteed + product-id: openshift-openstackonprem-workervcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-exoscalesks-vcpu-guaranteed-3 - name: kubernetes-exoscalesks-vcpu-guaranteed-3 + name: openshift-openstackonprem-workervcpu-standard-32 + name: openshift-openstackonprem-workervcpu-standard-32 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-exoscalesks-vcpu-guaranteed + product-id: openshift-openstackonprem-workervcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-exoscalesks-vcpu-guaranteed-3 + cron-job-name: openshift-openstackonprem-workervcpu-standard-32 spec: template: metadata: @@ -2829,27 +2811,21 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-exoscalesks-vcpu-guaranteed + value: openshift-openstackonprem-workervcpu-standard - name: AR_QUERY - value: | - max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) - # Pull in the APPUiO managed info labels - * on(cluster_id) group_left(sales_order) appuio_managed_info{ - sales_order!="NONE", - sales_order!="TERMINATED", - cloud_provider="exoscale", - distribution="sks", - vshn_service_level="guaranteed_availability", - } + value: query - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: - %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels - name: AR_UNIT_ID - value: uom_uom_49_440b0fa7 + value: '300' - name: AR_ORG_ID - value: appuio-managed-kubernetes-services-billing + value: foo-org image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -2864,25 +2840,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-googlegke-vcpu-besteffort + product-id: openshift-openstackonprem-workervcpu-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-googlegke-vcpu-besteffort-4 - name: kubernetes-googlegke-vcpu-besteffort-4 + name: openshift-openstackonprem-workervcpu-zero-33 + name: openshift-openstackonprem-workervcpu-zero-33 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-googlegke-vcpu-besteffort + product-id: openshift-openstackonprem-workervcpu-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-googlegke-vcpu-besteffort-4 + cron-job-name: openshift-openstackonprem-workervcpu-zero-33 spec: template: metadata: @@ -2921,27 +2897,21 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-googlegke-vcpu-besteffort + value: openshift-openstackonprem-workervcpu-zero - name: AR_QUERY - value: | - max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) - # Pull in the APPUiO managed info labels - * on(cluster_id) group_left(sales_order) appuio_managed_info{ - sales_order!="NONE", - sales_order!="TERMINATED", - cloud_provider="gcp", - distribution="gke", - vshn_service_level="best_effort", - } + value: query - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: - %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels - name: AR_UNIT_ID - value: uom_uom_49_440b0fa7 + value: '300' - name: AR_ORG_ID - value: appuio-managed-kubernetes-services-billing + value: foo-org image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -2956,25 +2926,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-googlegke-vcpu-guaranteed + product-id: openshift-vspherecsp-workervcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-googlegke-vcpu-guaranteed-5 - name: kubernetes-googlegke-vcpu-guaranteed-5 + name: openshift-vspherecsp-workervcpu-besteffort-34 + name: openshift-vspherecsp-workervcpu-besteffort-34 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-googlegke-vcpu-guaranteed + product-id: openshift-vspherecsp-workervcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-googlegke-vcpu-guaranteed-5 + cron-job-name: openshift-vspherecsp-workervcpu-besteffort-34 spec: template: metadata: @@ -3013,27 +2983,21 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-googlegke-vcpu-guaranteed + value: openshift-vspherecsp-workervcpu-besteffort - name: AR_QUERY - value: | - max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) - # Pull in the APPUiO managed info labels - * on(cluster_id) group_left(sales_order) appuio_managed_info{ - sales_order!="NONE", - sales_order!="TERMINATED", - cloud_provider="gcp", - distribution="gke", - vshn_service_level="guaranteed_availability", - } + value: query - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: - %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels - name: AR_UNIT_ID - value: uom_uom_49_440b0fa7 + value: '300' - name: AR_ORG_ID - value: appuio-managed-kubernetes-services-billing + value: foo-org image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -3048,25 +3012,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-azureaks-vcpu-besteffort + product-id: openshift-vspherecsp-workervcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-azureaks-vcpu-besteffort-6 - name: kubernetes-azureaks-vcpu-besteffort-6 + name: openshift-vspherecsp-workervcpu-guaranteed-35 + name: openshift-vspherecsp-workervcpu-guaranteed-35 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-azureaks-vcpu-besteffort + product-id: openshift-vspherecsp-workervcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-azureaks-vcpu-besteffort-6 + cron-job-name: openshift-vspherecsp-workervcpu-guaranteed-35 spec: template: metadata: @@ -3105,27 +3069,21 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-azureaks-vcpu-besteffort + value: openshift-vspherecsp-workervcpu-guaranteed - name: AR_QUERY - value: | - max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) - # Pull in the APPUiO managed info labels - * on(cluster_id) group_left(sales_order) appuio_managed_info{ - sales_order!="NONE", - sales_order!="TERMINATED", - cloud_provider="azure", - distribution="aks", - vshn_service_level="best_effort", - } + value: query - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: - %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels - name: AR_UNIT_ID - value: uom_uom_49_440b0fa7 + value: '300' - name: AR_ORG_ID - value: appuio-managed-kubernetes-services-billing + value: foo-org image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -3140,25 +3098,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-azureaks-vcpu-guaranteed + product-id: openshift-vspherecsp-workervcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-azureaks-vcpu-guaranteed-7 - name: kubernetes-azureaks-vcpu-guaranteed-7 + name: openshift-vspherecsp-workervcpu-premium-36 + name: openshift-vspherecsp-workervcpu-premium-36 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-azureaks-vcpu-guaranteed + product-id: openshift-vspherecsp-workervcpu-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-azureaks-vcpu-guaranteed-7 + cron-job-name: openshift-vspherecsp-workervcpu-premium-36 spec: template: metadata: @@ -3197,27 +3155,21 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-azureaks-vcpu-guaranteed + value: openshift-vspherecsp-workervcpu-premium - name: AR_QUERY - value: | - max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) - # Pull in the APPUiO managed info labels - * on(cluster_id) group_left(sales_order) appuio_managed_info{ - sales_order!="NONE", - sales_order!="TERMINATED", - cloud_provider="azure", - distribution="aks", - vshn_service_level="guaranteed_availability", - } + value: query - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: - %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels - name: AR_UNIT_ID - value: uom_uom_49_440b0fa7 + value: '300' - name: AR_ORG_ID - value: appuio-managed-kubernetes-services-billing + value: foo-org image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -3232,25 +3184,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-zero + product-id: openshift-vspherecsp-workervcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-hyperscaler-cluster-zero-0 - name: kubernetes-hyperscaler-cluster-zero-0 + name: openshift-vspherecsp-workervcpu-professional-37 + name: openshift-vspherecsp-workervcpu-professional-37 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-zero + product-id: openshift-vspherecsp-workervcpu-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-hyperscaler-cluster-zero-0 + cron-job-name: openshift-vspherecsp-workervcpu-professional-37 spec: template: metadata: @@ -3289,29 +3241,21 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-hyperscaler-cluster-zero + value: openshift-vspherecsp-workervcpu-professional - name: AR_QUERY - value: | - max_over_time( - group by(cluster_id, sales_order) ( - appuio_managed_info{ - distribution!="rke2", - distribution!="rancher", - sales_order!="TERMINATED", - sales_order!="NONE", - vshn_service_level="zero", - } - )[59m:1m] - ) + value: query - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: - %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels - name: AR_UNIT_ID - value: uom_uom_53_4a7e8f3e + value: '300' - name: AR_ORG_ID - value: appuio-managed-kubernetes-services-billing + value: foo-org image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -3326,25 +3270,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-standard + product-id: openshift-vspherecsp-workervcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-hyperscaler-cluster-standard-1 - name: kubernetes-hyperscaler-cluster-standard-1 + name: openshift-vspherecsp-workervcpu-standard-38 + name: openshift-vspherecsp-workervcpu-standard-38 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-standard + product-id: openshift-vspherecsp-workervcpu-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-hyperscaler-cluster-standard-1 + cron-job-name: openshift-vspherecsp-workervcpu-standard-38 spec: template: metadata: @@ -3383,27 +3327,1959 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-hyperscaler-cluster-standard + value: openshift-vspherecsp-workervcpu-standard - name: AR_QUERY - value: | - max_over_time( - group by(cluster_id, sales_order) ( - appuio_managed_info{ - distribution!="rke2", - distribution!="rancher", - sales_order!="TERMINATED", - sales_order!="NONE", - vshn_service_level="standard", - } - )[59m:1m] - ) + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: foo-org + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-vspherecsp-workervcpu-zero + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-vspherecsp-workervcpu-zero-39 + name: openshift-vspherecsp-workervcpu-zero-39 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-vspherecsp-workervcpu-zero + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-vspherecsp-workervcpu-zero-39 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-vspherecsp-workervcpu-zero + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: foo-org + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-vsphereonprem-workervcpu-besteffort-40 + name: openshift-vsphereonprem-workervcpu-besteffort-40 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-vsphereonprem-workervcpu-besteffort-40 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-vsphereonprem-workervcpu-besteffort + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: foo-org + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-vsphereonprem-workervcpu-guaranteed-41 + name: openshift-vsphereonprem-workervcpu-guaranteed-41 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-vsphereonprem-workervcpu-guaranteed-41 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-vsphereonprem-workervcpu-guaranteed + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: foo-org + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-premium + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-vsphereonprem-workervcpu-premium-42 + name: openshift-vsphereonprem-workervcpu-premium-42 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-premium + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-vsphereonprem-workervcpu-premium-42 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-vsphereonprem-workervcpu-premium + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: foo-org + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-professional + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-vsphereonprem-workervcpu-professional-43 + name: openshift-vsphereonprem-workervcpu-professional-43 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-professional + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-vsphereonprem-workervcpu-professional-43 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-vsphereonprem-workervcpu-professional + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: foo-org + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-standard + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-vsphereonprem-workervcpu-standard-44 + name: openshift-vsphereonprem-workervcpu-standard-44 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-standard + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-vsphereonprem-workervcpu-standard-44 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-vsphereonprem-workervcpu-standard + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: foo-org + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-zero + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-vsphereonprem-workervcpu-zero-45 + name: openshift-vsphereonprem-workervcpu-zero-45 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-vsphereonprem-workervcpu-zero + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-vsphereonprem-workervcpu-zero-45 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-vsphereonprem-workervcpu-zero + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: foo-org + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-xelon-workervcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-xelon-workervcpu-besteffort-46 + name: openshift-xelon-workervcpu-besteffort-46 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-xelon-workervcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-xelon-workervcpu-besteffort-46 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-xelon-workervcpu-besteffort + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: foo-org + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-xelon-workervcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-xelon-workervcpu-guaranteed-47 + name: openshift-xelon-workervcpu-guaranteed-47 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-xelon-workervcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-xelon-workervcpu-guaranteed-47 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-xelon-workervcpu-guaranteed + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: foo-org + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-xelon-workervcpu-premium + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-xelon-workervcpu-premium-48 + name: openshift-xelon-workervcpu-premium-48 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-xelon-workervcpu-premium + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-xelon-workervcpu-premium-48 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-xelon-workervcpu-premium + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: foo-org + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-xelon-workervcpu-professional + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-xelon-workervcpu-professional-49 + name: openshift-xelon-workervcpu-professional-49 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-xelon-workervcpu-professional + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-xelon-workervcpu-professional-49 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-xelon-workervcpu-professional + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: foo-org + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-xelon-workervcpu-standard + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-xelon-workervcpu-standard-50 + name: openshift-xelon-workervcpu-standard-50 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-xelon-workervcpu-standard + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-xelon-workervcpu-standard-50 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-xelon-workervcpu-standard + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: foo-org + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-xelon-workervcpu-zero + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-xelon-workervcpu-zero-51 + name: openshift-xelon-workervcpu-zero-51 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-xelon-workervcpu-zero + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-xelon-workervcpu-zero-51 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-xelon-workervcpu-zero + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: foo-org + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: openshift-worker-vcpu-cloudscale-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: openshift-worker-vcpu-cloudscale-besteffort-52 + name: openshift-worker-vcpu-cloudscale-besteffort-52 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: openshift-worker-vcpu-cloudscale-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: openshift-worker-vcpu-cloudscale-besteffort-52 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: openshift-worker-vcpu-cloudscale-besteffort + - name: AR_QUERY + value: query + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift + - Cluster: %(cluster_id)s" % labels' + - name: AR_ITEM_DESCRIPTION_JSONNET + value: local labels = std.extVar("labels"); "All Compute Resources" + % labels + - name: AR_UNIT_ID + value: '300' + - name: AR_ORG_ID + value: foo-org + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: kubernetes-awseks-vcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: kubernetes-awseks-vcpu-besteffort-0 + name: kubernetes-awseks-vcpu-besteffort-0 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: kubernetes-awseks-vcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: kubernetes-awseks-vcpu-besteffort-0 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: kubernetes-awseks-vcpu-besteffort + - name: AR_QUERY + value: | + max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + sales_order!="NONE", + sales_order!="TERMINATED", + cloud_provider="aws", + distribution="eks", + vshn_service_level="best_effort", + } + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: + %(cluster_id)s" % labels' + - name: AR_UNIT_ID + value: uom_uom_49_440b0fa7 + - name: AR_ORG_ID + value: appuio-managed-kubernetes-services-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: kubernetes-awseks-vcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: kubernetes-awseks-vcpu-guaranteed-1 + name: kubernetes-awseks-vcpu-guaranteed-1 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: kubernetes-awseks-vcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: kubernetes-awseks-vcpu-guaranteed-1 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: kubernetes-awseks-vcpu-guaranteed + - name: AR_QUERY + value: | + max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + sales_order!="NONE", + sales_order!="TERMINATED", + cloud_provider="aws", + distribution="eks", + vshn_service_level="guaranteed_availability", + } + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: + %(cluster_id)s" % labels' + - name: AR_UNIT_ID + value: uom_uom_49_440b0fa7 + - name: AR_ORG_ID + value: appuio-managed-kubernetes-services-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: kubernetes-azureaks-vcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: kubernetes-azureaks-vcpu-besteffort-2 + name: kubernetes-azureaks-vcpu-besteffort-2 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: kubernetes-azureaks-vcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: kubernetes-azureaks-vcpu-besteffort-2 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: kubernetes-azureaks-vcpu-besteffort + - name: AR_QUERY + value: | + max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + sales_order!="NONE", + sales_order!="TERMINATED", + cloud_provider="azure", + distribution="aks", + vshn_service_level="best_effort", + } + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: + %(cluster_id)s" % labels' + - name: AR_UNIT_ID + value: uom_uom_49_440b0fa7 + - name: AR_ORG_ID + value: appuio-managed-kubernetes-services-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: kubernetes-azureaks-vcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: kubernetes-azureaks-vcpu-guaranteed-3 + name: kubernetes-azureaks-vcpu-guaranteed-3 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: kubernetes-azureaks-vcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: kubernetes-azureaks-vcpu-guaranteed-3 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: kubernetes-azureaks-vcpu-guaranteed + - name: AR_QUERY + value: | + max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + sales_order!="NONE", + sales_order!="TERMINATED", + cloud_provider="azure", + distribution="aks", + vshn_service_level="guaranteed_availability", + } + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: + %(cluster_id)s" % labels' + - name: AR_UNIT_ID + value: uom_uom_49_440b0fa7 + - name: AR_ORG_ID + value: appuio-managed-kubernetes-services-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: kubernetes-exoscalesks-vcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: kubernetes-exoscalesks-vcpu-besteffort-4 + name: kubernetes-exoscalesks-vcpu-besteffort-4 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: kubernetes-exoscalesks-vcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: kubernetes-exoscalesks-vcpu-besteffort-4 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: kubernetes-exoscalesks-vcpu-besteffort + - name: AR_QUERY + value: | + max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + sales_order!="NONE", + sales_order!="TERMINATED", + cloud_provider="exoscale", + distribution="sks", + vshn_service_level="best_effort", + } + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: + %(cluster_id)s" % labels' + - name: AR_UNIT_ID + value: uom_uom_49_440b0fa7 + - name: AR_ORG_ID + value: appuio-managed-kubernetes-services-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: kubernetes-exoscalesks-vcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: kubernetes-exoscalesks-vcpu-guaranteed-5 + name: kubernetes-exoscalesks-vcpu-guaranteed-5 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: kubernetes-exoscalesks-vcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: kubernetes-exoscalesks-vcpu-guaranteed-5 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: kubernetes-exoscalesks-vcpu-guaranteed + - name: AR_QUERY + value: | + max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + sales_order!="NONE", + sales_order!="TERMINATED", + cloud_provider="exoscale", + distribution="sks", + vshn_service_level="guaranteed_availability", + } + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: + %(cluster_id)s" % labels' + - name: AR_UNIT_ID + value: uom_uom_49_440b0fa7 + - name: AR_ORG_ID + value: appuio-managed-kubernetes-services-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: kubernetes-googlegke-vcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: kubernetes-googlegke-vcpu-besteffort-6 + name: kubernetes-googlegke-vcpu-besteffort-6 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: kubernetes-googlegke-vcpu-besteffort + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: kubernetes-googlegke-vcpu-besteffort-6 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: kubernetes-googlegke-vcpu-besteffort + - name: AR_QUERY + value: | + max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + sales_order!="NONE", + sales_order!="TERMINATED", + cloud_provider="google", + distribution="gke", + vshn_service_level="best_effort", + } + - name: AR_INSTANCE_JSONNET + value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels + - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET + value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: + %(cluster_id)s" % labels' + - name: AR_UNIT_ID + value: uom_uom_49_440b0fa7 + - name: AR_ORG_ID + value: appuio-managed-kubernetes-services-billing + image: ghcr.io/appuio/appuio-reporting:v0.2.1 + name: backfill + resources: {} + initContainers: [] + restartPolicy: OnFailure + schedule: 15 * * * * + startingDeadlineSeconds: 180 + successfulJobsHistoryLimit: 3 + suspend: false +--- +apiVersion: batch/v1 +kind: CronJob +metadata: + annotations: + product-id: kubernetes-googlegke-vcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + name: kubernetes-googlegke-vcpu-guaranteed-7 + name: kubernetes-googlegke-vcpu-guaranteed-7 + namespace: appuio-reporting +spec: + failedJobsHistoryLimit: 768 + jobTemplate: + metadata: + annotations: + product-id: kubernetes-googlegke-vcpu-guaranteed + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + cron-job-name: kubernetes-googlegke-vcpu-guaranteed-7 + spec: + template: + metadata: + labels: + app.kubernetes.io/managed-by: commodore + app.kubernetes.io/name: appuio-reporting + app.kubernetes.io/part-of: syn + spec: + containers: + - args: + - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 + hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) + command: + - sh + - -c + env: + - name: AR_ODOO_OAUTH_TOKEN_URL + valueFrom: + secretKeyRef: + key: token_endpoint + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_ID + valueFrom: + secretKeyRef: + key: client_id + name: odoo-credentials + - name: AR_ODOO_OAUTH_CLIENT_SECRET + valueFrom: + secretKeyRef: + key: client_secret + name: odoo-credentials + - name: AR_ODOO_URL + - name: AR_PROM_URL + valueFrom: + secretKeyRef: + key: url + name: prom-url + - name: AR_PRODUCT_ID + value: kubernetes-googlegke-vcpu-guaranteed + - name: AR_QUERY + value: | + max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + sales_order!="NONE", + sales_order!="TERMINATED", + cloud_provider="google", + distribution="gke", + vshn_service_level="guaranteed_availability", + } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: %(cluster_id)s" % labels' - name: AR_UNIT_ID - value: uom_uom_53_4a7e8f3e + value: uom_uom_49_440b0fa7 - name: AR_ORG_ID value: appuio-managed-kubernetes-services-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 @@ -3420,25 +5296,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-professional + product-id: kubernetes-hyperscaler-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-hyperscaler-cluster-professional-2 - name: kubernetes-hyperscaler-cluster-professional-2 + name: kubernetes-hyperscaler-cluster-premium-0 + name: kubernetes-hyperscaler-cluster-premium-0 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-professional + product-id: kubernetes-hyperscaler-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-hyperscaler-cluster-professional-2 + cron-job-name: kubernetes-hyperscaler-cluster-premium-0 spec: template: metadata: @@ -3477,7 +5353,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-hyperscaler-cluster-professional + value: kubernetes-hyperscaler-cluster-premium - name: AR_QUERY value: | max_over_time( @@ -3487,7 +5363,7 @@ spec: distribution!="rancher", sales_order!="TERMINATED", sales_order!="NONE", - vshn_service_level="professional", + vshn_service_level="premium", } )[59m:1m] ) @@ -3514,25 +5390,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-premium + product-id: kubernetes-hyperscaler-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-hyperscaler-cluster-premium-3 - name: kubernetes-hyperscaler-cluster-premium-3 + name: kubernetes-hyperscaler-cluster-professional-1 + name: kubernetes-hyperscaler-cluster-professional-1 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-premium + product-id: kubernetes-hyperscaler-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-hyperscaler-cluster-premium-3 + cron-job-name: kubernetes-hyperscaler-cluster-professional-1 spec: template: metadata: @@ -3571,7 +5447,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-hyperscaler-cluster-premium + value: kubernetes-hyperscaler-cluster-professional - name: AR_QUERY value: | max_over_time( @@ -3581,7 +5457,7 @@ spec: distribution!="rancher", sales_order!="TERMINATED", sales_order!="NONE", - vshn_service_level="premium", + vshn_service_level="professional", } )[59m:1m] ) @@ -3608,25 +5484,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-zero + product-id: kubernetes-hyperscaler-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-hyperscaler-cluster-zero-0 - name: kubernetes-hyperscaler-cluster-zero-0 + name: kubernetes-hyperscaler-cluster-standard-2 + name: kubernetes-hyperscaler-cluster-standard-2 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-zero + product-id: kubernetes-hyperscaler-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-hyperscaler-cluster-zero-0 + cron-job-name: kubernetes-hyperscaler-cluster-standard-2 spec: template: metadata: @@ -3665,25 +5541,27 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-hyperscaler-cluster-zero + value: kubernetes-hyperscaler-cluster-standard - name: AR_QUERY value: | - max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) - # Pull in the APPUiO managed info labels - * on(cluster_id) group_left(sales_order) appuio_managed_info{ - distribution!="rke2", - distribution!="rancher", - sales_order!="TERMINATED", - sales_order!="NONE", - vshn_service_level="zero", - } + max_over_time( + group by(cluster_id, sales_order) ( + appuio_managed_info{ + distribution!="rke2", + distribution!="rancher", + sales_order!="TERMINATED", + sales_order!="NONE", + vshn_service_level="standard", + } + )[59m:1m] + ) - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: %(cluster_id)s" % labels' - name: AR_UNIT_ID - value: uom_uom_191_55730e52 + value: uom_uom_53_4a7e8f3e - name: AR_ORG_ID value: appuio-managed-kubernetes-services-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 @@ -3700,25 +5578,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-standard + product-id: kubernetes-hyperscaler-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-hyperscaler-cluster-standard-1 - name: kubernetes-hyperscaler-cluster-standard-1 + name: kubernetes-hyperscaler-cluster-zero-3 + name: kubernetes-hyperscaler-cluster-zero-3 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-standard + product-id: kubernetes-hyperscaler-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-hyperscaler-cluster-standard-1 + cron-job-name: kubernetes-hyperscaler-cluster-zero-3 spec: template: metadata: @@ -3757,25 +5635,27 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-hyperscaler-cluster-standard + value: kubernetes-hyperscaler-cluster-zero - name: AR_QUERY value: | - max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) - # Pull in the APPUiO managed info labels - * on(cluster_id) group_left(sales_order) appuio_managed_info{ - distribution!="rke2", - distribution!="rancher", - sales_order!="TERMINATED", - sales_order!="NONE", - vshn_service_level="standard", - } + max_over_time( + group by(cluster_id, sales_order) ( + appuio_managed_info{ + distribution!="rke2", + distribution!="rancher", + sales_order!="TERMINATED", + sales_order!="NONE", + vshn_service_level="zero", + } + )[59m:1m] + ) - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: %(cluster_id)s" % labels' - name: AR_UNIT_ID - value: uom_uom_191_55730e52 + value: uom_uom_53_4a7e8f3e - name: AR_ORG_ID value: appuio-managed-kubernetes-services-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 @@ -3792,25 +5672,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-professional + product-id: kubernetes-hyperscaler-node-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-hyperscaler-cluster-professional-2 - name: kubernetes-hyperscaler-cluster-professional-2 + name: kubernetes-hyperscaler-node-premium-0 + name: kubernetes-hyperscaler-node-premium-0 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-professional + product-id: kubernetes-hyperscaler-node-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-hyperscaler-cluster-professional-2 + cron-job-name: kubernetes-hyperscaler-node-premium-0 spec: template: metadata: @@ -3849,7 +5729,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-hyperscaler-cluster-professional + value: kubernetes-hyperscaler-node-premium - name: AR_QUERY value: | max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) @@ -3859,7 +5739,7 @@ spec: distribution!="rancher", sales_order!="TERMINATED", sales_order!="NONE", - vshn_service_level="professional", + vshn_service_level="premium", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -3884,25 +5764,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-premium + product-id: kubernetes-hyperscaler-node-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-hyperscaler-cluster-premium-3 - name: kubernetes-hyperscaler-cluster-premium-3 + name: kubernetes-hyperscaler-node-professional-1 + name: kubernetes-hyperscaler-node-professional-1 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-premium + product-id: kubernetes-hyperscaler-node-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-hyperscaler-cluster-premium-3 + cron-job-name: kubernetes-hyperscaler-node-professional-1 spec: template: metadata: @@ -3941,7 +5821,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-hyperscaler-cluster-premium + value: kubernetes-hyperscaler-node-professional - name: AR_QUERY value: | max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) @@ -3951,7 +5831,7 @@ spec: distribution!="rancher", sales_order!="TERMINATED", sales_order!="NONE", - vshn_service_level="premium", + vshn_service_level="professional", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -3976,25 +5856,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-cloudscale-zero + product-id: kubernetes-hyperscaler-node-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-cloudscale-zero-0 - name: openshift-clusters-cloudscale-zero-0 + name: kubernetes-hyperscaler-node-standard-2 + name: kubernetes-hyperscaler-node-standard-2 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-cloudscale-zero + product-id: kubernetes-hyperscaler-node-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-cloudscale-zero-0 + cron-job-name: kubernetes-hyperscaler-node-standard-2 spec: template: metadata: @@ -4033,28 +5913,27 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-cloudscale-zero + value: kubernetes-hyperscaler-node-standard - name: AR_QUERY value: | - # Calculates number of clusters per cluster. Always returns 1. - # Max values over one hour. - max_over_time( - # Use aggregation to drop labels of no interest. - group by(cluster_id, sales_order) ( - appuio_managed_info{ - cloud_provider="cloudscale", - vshn_service_level="zero"}, - )[59m:1m] - ) + max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + distribution!="rke2", + distribution!="rancher", + sales_order!="TERMINATED", + sales_order!="NONE", + vshn_service_level="standard", + } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift - - Cluster: %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: + %(cluster_id)s" % labels' - name: AR_UNIT_ID - value: uom_uom_53_4a7e8f3e + value: uom_uom_191_55730e52 - name: AR_ORG_ID - value: appuio-managed-openshift-billing + value: appuio-managed-kubernetes-services-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -4069,25 +5948,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-cloudscale-standard + product-id: kubernetes-hyperscaler-node-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-cloudscale-standard-1 - name: openshift-clusters-cloudscale-standard-1 + name: kubernetes-hyperscaler-node-zero-3 + name: kubernetes-hyperscaler-node-zero-3 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-cloudscale-standard + product-id: kubernetes-hyperscaler-node-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-cloudscale-standard-1 + cron-job-name: kubernetes-hyperscaler-node-zero-3 spec: template: metadata: @@ -4126,28 +6005,27 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-cloudscale-standard + value: kubernetes-hyperscaler-node-zero - name: AR_QUERY value: | - # Calculates number of clusters per cluster. Always returns 1. - # Max values over one hour. - max_over_time( - # Use aggregation to drop labels of no interest. - group by(cluster_id, sales_order) ( - appuio_managed_info{ - cloud_provider="cloudscale", - vshn_service_level="standard"}, - )[59m:1m] - ) + max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) + # Pull in the APPUiO managed info labels + * on(cluster_id) group_left(sales_order) appuio_managed_info{ + distribution!="rke2", + distribution!="rancher", + sales_order!="TERMINATED", + sales_order!="NONE", + vshn_service_level="zero", + } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift - - Cluster: %(cluster_id)s" % labels' + value: 'local labels = std.extVar("labels"); "APPUiO Managed - Cluster: + %(cluster_id)s" % labels' - name: AR_UNIT_ID - value: uom_uom_53_4a7e8f3e + value: uom_uom_191_55730e52 - name: AR_ORG_ID - value: appuio-managed-openshift-billing + value: appuio-managed-kubernetes-services-billing image: ghcr.io/appuio/appuio-reporting:v0.2.1 name: backfill resources: {} @@ -4162,25 +6040,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-cloudscale-professional + product-id: openshift-cloudscale-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-cloudscale-professional-2 - name: openshift-clusters-cloudscale-professional-2 + name: openshift-cloudscale-cluster-premium-0 + name: openshift-cloudscale-cluster-premium-0 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-cloudscale-professional + product-id: openshift-cloudscale-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-cloudscale-professional-2 + cron-job-name: openshift-cloudscale-cluster-premium-0 spec: template: metadata: @@ -4219,7 +6097,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-cloudscale-professional + value: openshift-cloudscale-cluster-premium - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -4228,8 +6106,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="cloudscale", - vshn_service_level="professional"}, + cloud_provider=~"cloudscale", + vshn_service_level="premium", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -4255,25 +6134,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-cloudscale-premium + product-id: openshift-cloudscale-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-cloudscale-premium-3 - name: openshift-clusters-cloudscale-premium-3 + name: openshift-cloudscale-cluster-professional-1 + name: openshift-cloudscale-cluster-professional-1 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-cloudscale-premium + product-id: openshift-cloudscale-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-cloudscale-premium-3 + cron-job-name: openshift-cloudscale-cluster-professional-1 spec: template: metadata: @@ -4312,7 +6191,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-cloudscale-premium + value: openshift-cloudscale-cluster-professional - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -4321,8 +6200,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="cloudscale", - vshn_service_level="premium"}, + cloud_provider=~"cloudscale", + vshn_service_level="professional", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -4348,25 +6228,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-exoscale-zero + product-id: openshift-cloudscale-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-exoscale-zero-4 - name: openshift-clusters-exoscale-zero-4 + name: openshift-cloudscale-cluster-standard-2 + name: openshift-cloudscale-cluster-standard-2 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-exoscale-zero + product-id: openshift-cloudscale-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-exoscale-zero-4 + cron-job-name: openshift-cloudscale-cluster-standard-2 spec: template: metadata: @@ -4405,7 +6285,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-exoscale-zero + value: openshift-cloudscale-cluster-standard - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -4414,8 +6294,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="exoscale", - vshn_service_level="zero"}, + cloud_provider=~"cloudscale", + vshn_service_level="standard", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -4441,25 +6322,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-exoscale-standard + product-id: openshift-cloudscale-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-exoscale-standard-5 - name: openshift-clusters-exoscale-standard-5 + name: openshift-cloudscale-cluster-zero-3 + name: openshift-cloudscale-cluster-zero-3 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-exoscale-standard + product-id: openshift-cloudscale-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-exoscale-standard-5 + cron-job-name: openshift-cloudscale-cluster-zero-3 spec: template: metadata: @@ -4498,7 +6379,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-exoscale-standard + value: openshift-cloudscale-cluster-zero - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -4507,8 +6388,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="exoscale", - vshn_service_level="standard"}, + cloud_provider=~"cloudscale", + vshn_service_level="zero", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -4534,25 +6416,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-exoscale-professional + product-id: openshift-exoscale-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-exoscale-professional-6 - name: openshift-clusters-exoscale-professional-6 + name: openshift-exoscale-cluster-premium-4 + name: openshift-exoscale-cluster-premium-4 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-exoscale-professional + product-id: openshift-exoscale-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-exoscale-professional-6 + cron-job-name: openshift-exoscale-cluster-premium-4 spec: template: metadata: @@ -4591,7 +6473,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-exoscale-professional + value: openshift-exoscale-cluster-premium - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -4600,8 +6482,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="exoscale", - vshn_service_level="professional"}, + cloud_provider=~"exoscale", + vshn_service_level="premium", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -4627,25 +6510,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-exoscale-premium + product-id: openshift-exoscale-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-exoscale-premium-7 - name: openshift-clusters-exoscale-premium-7 + name: openshift-exoscale-cluster-professional-5 + name: openshift-exoscale-cluster-professional-5 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-exoscale-premium + product-id: openshift-exoscale-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-exoscale-premium-7 + cron-job-name: openshift-exoscale-cluster-professional-5 spec: template: metadata: @@ -4684,7 +6567,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-exoscale-premium + value: openshift-exoscale-cluster-professional - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -4693,8 +6576,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="exoscale", - vshn_service_level="premium"}, + cloud_provider=~"exoscale", + vshn_service_level="professional", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -4720,25 +6604,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-vsphere-zero + product-id: openshift-exoscale-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-vsphere-zero-8 - name: openshift-clusters-vsphere-zero-8 + name: openshift-exoscale-cluster-standard-6 + name: openshift-exoscale-cluster-standard-6 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-vsphere-zero + product-id: openshift-exoscale-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-vsphere-zero-8 + cron-job-name: openshift-exoscale-cluster-standard-6 spec: template: metadata: @@ -4777,7 +6661,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-vsphere-zero + value: openshift-exoscale-cluster-standard - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -4786,8 +6670,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="vsphere", - vshn_service_level="zero"}, + cloud_provider=~"exoscale", + vshn_service_level="standard", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -4813,25 +6698,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-vsphere-standard + product-id: openshift-exoscale-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-vsphere-standard-9 - name: openshift-clusters-vsphere-standard-9 + name: openshift-exoscale-cluster-zero-7 + name: openshift-exoscale-cluster-zero-7 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-vsphere-standard + product-id: openshift-exoscale-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-vsphere-standard-9 + cron-job-name: openshift-exoscale-cluster-zero-7 spec: template: metadata: @@ -4870,7 +6755,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-vsphere-standard + value: openshift-exoscale-cluster-zero - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -4879,8 +6764,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="vsphere", - vshn_service_level="standard"}, + cloud_provider=~"exoscale", + vshn_service_level="zero", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -4906,25 +6792,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-vsphere-professional + product-id: openshift-onprem-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-vsphere-professional-10 - name: openshift-clusters-vsphere-professional-10 + name: openshift-onprem-cluster-premium-8 + name: openshift-onprem-cluster-premium-8 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-vsphere-professional + product-id: openshift-onprem-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-vsphere-professional-10 + cron-job-name: openshift-onprem-cluster-premium-8 spec: template: metadata: @@ -4963,7 +6849,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-vsphere-professional + value: openshift-onprem-cluster-premium - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -4972,8 +6858,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="vsphere", - vshn_service_level="professional"}, + cloud_provider=~"vsphere|none", + vshn_service_level="premium", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -4999,25 +6886,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-vsphere-premium + product-id: openshift-onprem-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-vsphere-premium-11 - name: openshift-clusters-vsphere-premium-11 + name: openshift-onprem-cluster-professional-9 + name: openshift-onprem-cluster-professional-9 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-vsphere-premium + product-id: openshift-onprem-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-vsphere-premium-11 + cron-job-name: openshift-onprem-cluster-professional-9 spec: template: metadata: @@ -5056,7 +6943,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-vsphere-premium + value: openshift-onprem-cluster-professional - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -5065,8 +6952,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="vsphere", - vshn_service_level="premium"}, + cloud_provider=~"vsphere|none", + vshn_service_level="professional", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -5092,25 +6980,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-openstack-zero + product-id: openshift-onprem-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-openstack-zero-12 - name: openshift-clusters-openstack-zero-12 + name: openshift-onprem-cluster-standard-10 + name: openshift-onprem-cluster-standard-10 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-openstack-zero + product-id: openshift-onprem-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-openstack-zero-12 + cron-job-name: openshift-onprem-cluster-standard-10 spec: template: metadata: @@ -5149,7 +7037,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-openstack-zero + value: openshift-onprem-cluster-standard - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -5158,8 +7046,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="openstack", - vshn_service_level="zero"}, + cloud_provider=~"vsphere|none", + vshn_service_level="standard", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -5185,25 +7074,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-openstack-standard + product-id: openshift-onprem-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-openstack-standard-13 - name: openshift-clusters-openstack-standard-13 + name: openshift-onprem-cluster-zero-11 + name: openshift-onprem-cluster-zero-11 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-openstack-standard + product-id: openshift-onprem-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-openstack-standard-13 + cron-job-name: openshift-onprem-cluster-zero-11 spec: template: metadata: @@ -5242,7 +7131,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-openstack-standard + value: openshift-onprem-cluster-zero - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -5251,8 +7140,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="openstack", - vshn_service_level="standard"}, + cloud_provider=~"vsphere|none", + vshn_service_level="zero", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -5278,25 +7168,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-openstack-professional + product-id: openshift-xelon-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-openstack-professional-14 - name: openshift-clusters-openstack-professional-14 + name: openshift-xelon-cluster-premium-12 + name: openshift-xelon-cluster-premium-12 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-openstack-professional + product-id: openshift-xelon-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-openstack-professional-14 + cron-job-name: openshift-xelon-cluster-premium-12 spec: template: metadata: @@ -5335,7 +7225,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-openstack-professional + value: openshift-xelon-cluster-premium - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -5344,8 +7234,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="openstack", - vshn_service_level="professional"}, + cloud_provider=~"xelon", + vshn_service_level="premium", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -5371,25 +7262,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-openstack-premium + product-id: openshift-xelon-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-openstack-premium-15 - name: openshift-clusters-openstack-premium-15 + name: openshift-xelon-cluster-professional-13 + name: openshift-xelon-cluster-professional-13 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-openstack-premium + product-id: openshift-xelon-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-openstack-premium-15 + cron-job-name: openshift-xelon-cluster-professional-13 spec: template: metadata: @@ -5428,7 +7319,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-openstack-premium + value: openshift-xelon-cluster-professional - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -5437,8 +7328,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="openstack", - vshn_service_level="premium"}, + cloud_provider=~"xelon", + vshn_service_level="professional", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -5464,25 +7356,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-vsphere-standard + product-id: openshift-xelon-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-vsphere-standard-16 - name: openshift-clusters-vsphere-standard-16 + name: openshift-xelon-cluster-standard-14 + name: openshift-xelon-cluster-standard-14 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-vsphere-standard + product-id: openshift-xelon-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-vsphere-standard-16 + cron-job-name: openshift-xelon-cluster-standard-14 spec: template: metadata: @@ -5521,7 +7413,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-vsphere-standard + value: openshift-xelon-cluster-standard - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -5530,8 +7422,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="xelon", - vshn_service_level="standard"}, + cloud_provider=~"xelon", + vshn_service_level="standard", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -5557,25 +7450,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-vsphere-professional + product-id: openshift-xelon-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-vsphere-professional-17 - name: openshift-clusters-vsphere-professional-17 + name: openshift-xelon-cluster-zero-15 + name: openshift-xelon-cluster-zero-15 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-vsphere-professional + product-id: openshift-xelon-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-vsphere-professional-17 + cron-job-name: openshift-xelon-cluster-zero-15 spec: template: metadata: @@ -5614,7 +7507,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-vsphere-professional + value: openshift-xelon-cluster-zero - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -5623,8 +7516,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="none", - vshn_service_level="professional"}, + cloud_provider=~"xelon", + vshn_service_level="zero", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -5650,25 +7544,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-iaas-cluster-zero + product-id: kubernetes-iaas-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-iaas-cluster-zero-0 - name: kubernetes-iaas-cluster-zero-0 + name: kubernetes-iaas-cluster-premium-0 + name: kubernetes-iaas-cluster-premium-0 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-iaas-cluster-zero + product-id: kubernetes-iaas-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-iaas-cluster-zero-0 + cron-job-name: kubernetes-iaas-cluster-premium-0 spec: template: metadata: @@ -5707,7 +7601,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-iaas-cluster-zero + value: kubernetes-iaas-cluster-premium - name: AR_QUERY value: | max_over_time( @@ -5716,7 +7610,7 @@ spec: sales_order!="TERMINATED", sales_order!="NONE", distribution=~"rancher|rke2", - vshn_service_level="zero", + vshn_service_level="premium", } )[59m:1m] ) @@ -5743,25 +7637,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-iaas-cluster-standard + product-id: kubernetes-iaas-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-iaas-cluster-standard-1 - name: kubernetes-iaas-cluster-standard-1 + name: kubernetes-iaas-cluster-professional-1 + name: kubernetes-iaas-cluster-professional-1 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-iaas-cluster-standard + product-id: kubernetes-iaas-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-iaas-cluster-standard-1 + cron-job-name: kubernetes-iaas-cluster-professional-1 spec: template: metadata: @@ -5800,7 +7694,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-iaas-cluster-standard + value: kubernetes-iaas-cluster-professional - name: AR_QUERY value: | max_over_time( @@ -5809,7 +7703,7 @@ spec: sales_order!="TERMINATED", sales_order!="NONE", distribution=~"rancher|rke2", - vshn_service_level="standard", + vshn_service_level="professional", } )[59m:1m] ) @@ -5836,25 +7730,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-iaas-cluster-professional + product-id: kubernetes-iaas-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-iaas-cluster-professional-2 - name: kubernetes-iaas-cluster-professional-2 + name: kubernetes-iaas-cluster-standard-2 + name: kubernetes-iaas-cluster-standard-2 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-iaas-cluster-professional + product-id: kubernetes-iaas-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-iaas-cluster-professional-2 + cron-job-name: kubernetes-iaas-cluster-standard-2 spec: template: metadata: @@ -5893,7 +7787,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-iaas-cluster-professional + value: kubernetes-iaas-cluster-standard - name: AR_QUERY value: | max_over_time( @@ -5902,7 +7796,7 @@ spec: sales_order!="TERMINATED", sales_order!="NONE", distribution=~"rancher|rke2", - vshn_service_level="professional", + vshn_service_level="standard", } )[59m:1m] ) @@ -5929,25 +7823,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-iaas-cluster-premium + product-id: kubernetes-iaas-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-iaas-cluster-premium-3 - name: kubernetes-iaas-cluster-premium-3 + name: kubernetes-iaas-cluster-zero-3 + name: kubernetes-iaas-cluster-zero-3 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-iaas-cluster-premium + product-id: kubernetes-iaas-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-iaas-cluster-premium-3 + cron-job-name: kubernetes-iaas-cluster-zero-3 spec: template: metadata: @@ -5986,7 +7880,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-iaas-cluster-premium + value: kubernetes-iaas-cluster-zero - name: AR_QUERY value: | max_over_time( @@ -5995,7 +7889,7 @@ spec: sales_order!="TERMINATED", sales_order!="NONE", distribution=~"rancher|rke2", - vshn_service_level="premium", + vshn_service_level="zero", } )[59m:1m] ) @@ -6022,25 +7916,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-iaas-node-zero + product-id: kubernetes-iaas-node-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-iaas-node-zero-0 - name: kubernetes-iaas-node-zero-0 + name: kubernetes-iaas-node-premium-0 + name: kubernetes-iaas-node-premium-0 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-iaas-node-zero + product-id: kubernetes-iaas-node-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-iaas-node-zero-0 + cron-job-name: kubernetes-iaas-node-premium-0 spec: template: metadata: @@ -6079,7 +7973,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-iaas-node-zero + value: kubernetes-iaas-node-premium - name: AR_QUERY value: | max_over_time( @@ -6092,7 +7986,7 @@ spec: sales_order!="TERMINATED", sales_order!="NONE", distribution=~"rke2|rancher", - vshn_service_level="zero", + vshn_service_level="premium", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -6117,25 +8011,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-iaas-node-standard + product-id: kubernetes-iaas-node-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-iaas-node-standard-1 - name: kubernetes-iaas-node-standard-1 + name: kubernetes-iaas-node-professional-1 + name: kubernetes-iaas-node-professional-1 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-iaas-node-standard + product-id: kubernetes-iaas-node-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-iaas-node-standard-1 + cron-job-name: kubernetes-iaas-node-professional-1 spec: template: metadata: @@ -6174,7 +8068,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-iaas-node-standard + value: kubernetes-iaas-node-professional - name: AR_QUERY value: | max_over_time( @@ -6187,7 +8081,7 @@ spec: sales_order!="TERMINATED", sales_order!="NONE", distribution=~"rke2|rancher", - vshn_service_level="standard", + vshn_service_level="professional", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -6212,25 +8106,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-iaas-node-professional + product-id: kubernetes-iaas-node-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-iaas-node-professional-2 - name: kubernetes-iaas-node-professional-2 + name: kubernetes-iaas-node-standard-2 + name: kubernetes-iaas-node-standard-2 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-iaas-node-professional + product-id: kubernetes-iaas-node-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-iaas-node-professional-2 + cron-job-name: kubernetes-iaas-node-standard-2 spec: template: metadata: @@ -6269,7 +8163,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-iaas-node-professional + value: kubernetes-iaas-node-standard - name: AR_QUERY value: | max_over_time( @@ -6282,7 +8176,7 @@ spec: sales_order!="TERMINATED", sales_order!="NONE", distribution=~"rke2|rancher", - vshn_service_level="professional", + vshn_service_level="standard", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -6307,25 +8201,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-iaas-node-premium + product-id: kubernetes-iaas-node-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-iaas-node-premium-3 - name: kubernetes-iaas-node-premium-3 + name: kubernetes-iaas-node-zero-3 + name: kubernetes-iaas-node-zero-3 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-iaas-node-premium + product-id: kubernetes-iaas-node-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-iaas-node-premium-3 + cron-job-name: kubernetes-iaas-node-zero-3 spec: template: metadata: @@ -6364,7 +8258,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-iaas-node-premium + value: kubernetes-iaas-node-zero - name: AR_QUERY value: | max_over_time( @@ -6377,7 +8271,7 @@ spec: sales_order!="TERMINATED", sales_order!="NONE", distribution=~"rke2|rancher", - vshn_service_level="premium", + vshn_service_level="zero", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels diff --git a/tests/golden/with-rules/appuio-reporting/appuio-reporting/11_backfill.yaml b/tests/golden/with-rules/appuio-reporting/appuio-reporting/11_backfill.yaml index 0de2908..2f3b6b7 100644 --- a/tests/golden/with-rules/appuio-reporting/appuio-reporting/11_backfill.yaml +++ b/tests/golden/with-rules/appuio-reporting/appuio-reporting/11_backfill.yaml @@ -558,25 +558,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-exoscalesks-vcpu-besteffort + product-id: kubernetes-azureaks-vcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-exoscalesks-vcpu-besteffort-2 - name: kubernetes-exoscalesks-vcpu-besteffort-2 + name: kubernetes-azureaks-vcpu-besteffort-2 + name: kubernetes-azureaks-vcpu-besteffort-2 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-exoscalesks-vcpu-besteffort + product-id: kubernetes-azureaks-vcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-exoscalesks-vcpu-besteffort-2 + cron-job-name: kubernetes-azureaks-vcpu-besteffort-2 spec: template: metadata: @@ -615,7 +615,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-exoscalesks-vcpu-besteffort + value: kubernetes-azureaks-vcpu-besteffort - name: AR_QUERY value: | max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) @@ -623,8 +623,8 @@ spec: * on(cluster_id) group_left(sales_order) appuio_managed_info{ sales_order!="NONE", sales_order!="TERMINATED", - cloud_provider="exoscale", - distribution="sks", + cloud_provider="azure", + distribution="aks", vshn_service_level="best_effort", } - name: AR_INSTANCE_JSONNET @@ -650,25 +650,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-exoscalesks-vcpu-guaranteed + product-id: kubernetes-azureaks-vcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-exoscalesks-vcpu-guaranteed-3 - name: kubernetes-exoscalesks-vcpu-guaranteed-3 + name: kubernetes-azureaks-vcpu-guaranteed-3 + name: kubernetes-azureaks-vcpu-guaranteed-3 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-exoscalesks-vcpu-guaranteed + product-id: kubernetes-azureaks-vcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-exoscalesks-vcpu-guaranteed-3 + cron-job-name: kubernetes-azureaks-vcpu-guaranteed-3 spec: template: metadata: @@ -707,7 +707,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-exoscalesks-vcpu-guaranteed + value: kubernetes-azureaks-vcpu-guaranteed - name: AR_QUERY value: | max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) @@ -715,8 +715,8 @@ spec: * on(cluster_id) group_left(sales_order) appuio_managed_info{ sales_order!="NONE", sales_order!="TERMINATED", - cloud_provider="exoscale", - distribution="sks", + cloud_provider="azure", + distribution="aks", vshn_service_level="guaranteed_availability", } - name: AR_INSTANCE_JSONNET @@ -742,25 +742,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-googlegke-vcpu-besteffort + product-id: kubernetes-exoscalesks-vcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-googlegke-vcpu-besteffort-4 - name: kubernetes-googlegke-vcpu-besteffort-4 + name: kubernetes-exoscalesks-vcpu-besteffort-4 + name: kubernetes-exoscalesks-vcpu-besteffort-4 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-googlegke-vcpu-besteffort + product-id: kubernetes-exoscalesks-vcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-googlegke-vcpu-besteffort-4 + cron-job-name: kubernetes-exoscalesks-vcpu-besteffort-4 spec: template: metadata: @@ -799,7 +799,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-googlegke-vcpu-besteffort + value: kubernetes-exoscalesks-vcpu-besteffort - name: AR_QUERY value: | max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) @@ -807,8 +807,8 @@ spec: * on(cluster_id) group_left(sales_order) appuio_managed_info{ sales_order!="NONE", sales_order!="TERMINATED", - cloud_provider="gcp", - distribution="gke", + cloud_provider="exoscale", + distribution="sks", vshn_service_level="best_effort", } - name: AR_INSTANCE_JSONNET @@ -834,25 +834,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-googlegke-vcpu-guaranteed + product-id: kubernetes-exoscalesks-vcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-googlegke-vcpu-guaranteed-5 - name: kubernetes-googlegke-vcpu-guaranteed-5 + name: kubernetes-exoscalesks-vcpu-guaranteed-5 + name: kubernetes-exoscalesks-vcpu-guaranteed-5 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-googlegke-vcpu-guaranteed + product-id: kubernetes-exoscalesks-vcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-googlegke-vcpu-guaranteed-5 + cron-job-name: kubernetes-exoscalesks-vcpu-guaranteed-5 spec: template: metadata: @@ -891,7 +891,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-googlegke-vcpu-guaranteed + value: kubernetes-exoscalesks-vcpu-guaranteed - name: AR_QUERY value: | max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) @@ -899,8 +899,8 @@ spec: * on(cluster_id) group_left(sales_order) appuio_managed_info{ sales_order!="NONE", sales_order!="TERMINATED", - cloud_provider="gcp", - distribution="gke", + cloud_provider="exoscale", + distribution="sks", vshn_service_level="guaranteed_availability", } - name: AR_INSTANCE_JSONNET @@ -926,25 +926,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-azureaks-vcpu-besteffort + product-id: kubernetes-googlegke-vcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-azureaks-vcpu-besteffort-6 - name: kubernetes-azureaks-vcpu-besteffort-6 + name: kubernetes-googlegke-vcpu-besteffort-6 + name: kubernetes-googlegke-vcpu-besteffort-6 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-azureaks-vcpu-besteffort + product-id: kubernetes-googlegke-vcpu-besteffort labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-azureaks-vcpu-besteffort-6 + cron-job-name: kubernetes-googlegke-vcpu-besteffort-6 spec: template: metadata: @@ -983,7 +983,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-azureaks-vcpu-besteffort + value: kubernetes-googlegke-vcpu-besteffort - name: AR_QUERY value: | max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) @@ -991,8 +991,8 @@ spec: * on(cluster_id) group_left(sales_order) appuio_managed_info{ sales_order!="NONE", sales_order!="TERMINATED", - cloud_provider="azure", - distribution="aks", + cloud_provider="google", + distribution="gke", vshn_service_level="best_effort", } - name: AR_INSTANCE_JSONNET @@ -1018,25 +1018,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-azureaks-vcpu-guaranteed + product-id: kubernetes-googlegke-vcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-azureaks-vcpu-guaranteed-7 - name: kubernetes-azureaks-vcpu-guaranteed-7 + name: kubernetes-googlegke-vcpu-guaranteed-7 + name: kubernetes-googlegke-vcpu-guaranteed-7 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-azureaks-vcpu-guaranteed + product-id: kubernetes-googlegke-vcpu-guaranteed labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-azureaks-vcpu-guaranteed-7 + cron-job-name: kubernetes-googlegke-vcpu-guaranteed-7 spec: template: metadata: @@ -1075,7 +1075,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-azureaks-vcpu-guaranteed + value: kubernetes-googlegke-vcpu-guaranteed - name: AR_QUERY value: | max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) @@ -1083,8 +1083,8 @@ spec: * on(cluster_id) group_left(sales_order) appuio_managed_info{ sales_order!="NONE", sales_order!="TERMINATED", - cloud_provider="azure", - distribution="aks", + cloud_provider="google", + distribution="gke", vshn_service_level="guaranteed_availability", } - name: AR_INSTANCE_JSONNET @@ -1110,25 +1110,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-zero + product-id: kubernetes-hyperscaler-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-hyperscaler-cluster-zero-0 - name: kubernetes-hyperscaler-cluster-zero-0 + name: kubernetes-hyperscaler-cluster-premium-0 + name: kubernetes-hyperscaler-cluster-premium-0 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-zero + product-id: kubernetes-hyperscaler-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-hyperscaler-cluster-zero-0 + cron-job-name: kubernetes-hyperscaler-cluster-premium-0 spec: template: metadata: @@ -1167,7 +1167,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-hyperscaler-cluster-zero + value: kubernetes-hyperscaler-cluster-premium - name: AR_QUERY value: | max_over_time( @@ -1177,7 +1177,7 @@ spec: distribution!="rancher", sales_order!="TERMINATED", sales_order!="NONE", - vshn_service_level="zero", + vshn_service_level="premium", } )[59m:1m] ) @@ -1204,25 +1204,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-standard + product-id: kubernetes-hyperscaler-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-hyperscaler-cluster-standard-1 - name: kubernetes-hyperscaler-cluster-standard-1 + name: kubernetes-hyperscaler-cluster-professional-1 + name: kubernetes-hyperscaler-cluster-professional-1 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-standard + product-id: kubernetes-hyperscaler-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-hyperscaler-cluster-standard-1 + cron-job-name: kubernetes-hyperscaler-cluster-professional-1 spec: template: metadata: @@ -1261,7 +1261,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-hyperscaler-cluster-standard + value: kubernetes-hyperscaler-cluster-professional - name: AR_QUERY value: | max_over_time( @@ -1271,7 +1271,7 @@ spec: distribution!="rancher", sales_order!="TERMINATED", sales_order!="NONE", - vshn_service_level="standard", + vshn_service_level="professional", } )[59m:1m] ) @@ -1298,25 +1298,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-professional + product-id: kubernetes-hyperscaler-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-hyperscaler-cluster-professional-2 - name: kubernetes-hyperscaler-cluster-professional-2 + name: kubernetes-hyperscaler-cluster-standard-2 + name: kubernetes-hyperscaler-cluster-standard-2 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-professional + product-id: kubernetes-hyperscaler-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-hyperscaler-cluster-professional-2 + cron-job-name: kubernetes-hyperscaler-cluster-standard-2 spec: template: metadata: @@ -1355,7 +1355,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-hyperscaler-cluster-professional + value: kubernetes-hyperscaler-cluster-standard - name: AR_QUERY value: | max_over_time( @@ -1365,7 +1365,7 @@ spec: distribution!="rancher", sales_order!="TERMINATED", sales_order!="NONE", - vshn_service_level="professional", + vshn_service_level="standard", } )[59m:1m] ) @@ -1392,25 +1392,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-premium + product-id: kubernetes-hyperscaler-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-hyperscaler-cluster-premium-3 - name: kubernetes-hyperscaler-cluster-premium-3 + name: kubernetes-hyperscaler-cluster-zero-3 + name: kubernetes-hyperscaler-cluster-zero-3 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-premium + product-id: kubernetes-hyperscaler-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-hyperscaler-cluster-premium-3 + cron-job-name: kubernetes-hyperscaler-cluster-zero-3 spec: template: metadata: @@ -1449,7 +1449,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-hyperscaler-cluster-premium + value: kubernetes-hyperscaler-cluster-zero - name: AR_QUERY value: | max_over_time( @@ -1459,7 +1459,7 @@ spec: distribution!="rancher", sales_order!="TERMINATED", sales_order!="NONE", - vshn_service_level="premium", + vshn_service_level="zero", } )[59m:1m] ) @@ -1486,25 +1486,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-zero + product-id: kubernetes-hyperscaler-node-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-hyperscaler-cluster-zero-0 - name: kubernetes-hyperscaler-cluster-zero-0 + name: kubernetes-hyperscaler-node-premium-0 + name: kubernetes-hyperscaler-node-premium-0 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-zero + product-id: kubernetes-hyperscaler-node-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-hyperscaler-cluster-zero-0 + cron-job-name: kubernetes-hyperscaler-node-premium-0 spec: template: metadata: @@ -1543,7 +1543,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-hyperscaler-cluster-zero + value: kubernetes-hyperscaler-node-premium - name: AR_QUERY value: | max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) @@ -1553,7 +1553,7 @@ spec: distribution!="rancher", sales_order!="TERMINATED", sales_order!="NONE", - vshn_service_level="zero", + vshn_service_level="premium", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -1578,25 +1578,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-standard + product-id: kubernetes-hyperscaler-node-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-hyperscaler-cluster-standard-1 - name: kubernetes-hyperscaler-cluster-standard-1 + name: kubernetes-hyperscaler-node-professional-1 + name: kubernetes-hyperscaler-node-professional-1 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-standard + product-id: kubernetes-hyperscaler-node-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-hyperscaler-cluster-standard-1 + cron-job-name: kubernetes-hyperscaler-node-professional-1 spec: template: metadata: @@ -1635,7 +1635,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-hyperscaler-cluster-standard + value: kubernetes-hyperscaler-node-professional - name: AR_QUERY value: | max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) @@ -1645,7 +1645,7 @@ spec: distribution!="rancher", sales_order!="TERMINATED", sales_order!="NONE", - vshn_service_level="standard", + vshn_service_level="professional", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -1670,25 +1670,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-professional + product-id: kubernetes-hyperscaler-node-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-hyperscaler-cluster-professional-2 - name: kubernetes-hyperscaler-cluster-professional-2 + name: kubernetes-hyperscaler-node-standard-2 + name: kubernetes-hyperscaler-node-standard-2 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-professional + product-id: kubernetes-hyperscaler-node-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-hyperscaler-cluster-professional-2 + cron-job-name: kubernetes-hyperscaler-node-standard-2 spec: template: metadata: @@ -1727,7 +1727,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-hyperscaler-cluster-professional + value: kubernetes-hyperscaler-node-standard - name: AR_QUERY value: | max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) @@ -1737,7 +1737,7 @@ spec: distribution!="rancher", sales_order!="TERMINATED", sales_order!="NONE", - vshn_service_level="professional", + vshn_service_level="standard", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -1762,25 +1762,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-premium + product-id: kubernetes-hyperscaler-node-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-hyperscaler-cluster-premium-3 - name: kubernetes-hyperscaler-cluster-premium-3 + name: kubernetes-hyperscaler-node-zero-3 + name: kubernetes-hyperscaler-node-zero-3 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-hyperscaler-cluster-premium + product-id: kubernetes-hyperscaler-node-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-hyperscaler-cluster-premium-3 + cron-job-name: kubernetes-hyperscaler-node-zero-3 spec: template: metadata: @@ -1819,7 +1819,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-hyperscaler-cluster-premium + value: kubernetes-hyperscaler-node-zero - name: AR_QUERY value: | max_over_time(sum by(cluster_id) (node_cpu_info)[59m:1m]) @@ -1829,7 +1829,7 @@ spec: distribution!="rancher", sales_order!="TERMINATED", sales_order!="NONE", - vshn_service_level="premium", + vshn_service_level="zero", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -1854,211 +1854,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-cloudscale-zero - labels: - app.kubernetes.io/managed-by: commodore - app.kubernetes.io/name: appuio-reporting - app.kubernetes.io/part-of: syn - name: openshift-clusters-cloudscale-zero-0 - name: openshift-clusters-cloudscale-zero-0 - namespace: appuio-reporting -spec: - failedJobsHistoryLimit: 768 - jobTemplate: - metadata: - annotations: - product-id: openshift-clusters-cloudscale-zero - labels: - app.kubernetes.io/managed-by: commodore - app.kubernetes.io/name: appuio-reporting - app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-cloudscale-zero-0 - spec: - template: - metadata: - labels: - app.kubernetes.io/managed-by: commodore - app.kubernetes.io/name: appuio-reporting - app.kubernetes.io/part-of: syn - spec: - containers: - - args: - - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 - hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) - command: - - sh - - -c - env: - - name: AR_ODOO_OAUTH_TOKEN_URL - valueFrom: - secretKeyRef: - key: token_endpoint - name: odoo-credentials - - name: AR_ODOO_OAUTH_CLIENT_ID - valueFrom: - secretKeyRef: - key: client_id - name: odoo-credentials - - name: AR_ODOO_OAUTH_CLIENT_SECRET - valueFrom: - secretKeyRef: - key: client_secret - name: odoo-credentials - - name: AR_ODOO_URL - - name: AR_PROM_URL - valueFrom: - secretKeyRef: - key: url - name: prom-url - - name: AR_PRODUCT_ID - value: openshift-clusters-cloudscale-zero - - name: AR_QUERY - value: | - # Calculates number of clusters per cluster. Always returns 1. - # Max values over one hour. - max_over_time( - # Use aggregation to drop labels of no interest. - group by(cluster_id, sales_order) ( - appuio_managed_info{ - cloud_provider="cloudscale", - vshn_service_level="zero"}, - )[59m:1m] - ) - - name: AR_INSTANCE_JSONNET - value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift - - Cluster: %(cluster_id)s" % labels' - - name: AR_UNIT_ID - value: uom_uom_53_4a7e8f3e - - name: AR_ORG_ID - value: appuio-managed-openshift-billing - image: ghcr.io/appuio/appuio-reporting:v0.2.1 - name: backfill - resources: {} - initContainers: [] - restartPolicy: OnFailure - schedule: 15 * * * * - startingDeadlineSeconds: 180 - successfulJobsHistoryLimit: 3 - suspend: false ---- -apiVersion: batch/v1 -kind: CronJob -metadata: - annotations: - product-id: openshift-clusters-cloudscale-standard - labels: - app.kubernetes.io/managed-by: commodore - app.kubernetes.io/name: appuio-reporting - app.kubernetes.io/part-of: syn - name: openshift-clusters-cloudscale-standard-1 - name: openshift-clusters-cloudscale-standard-1 - namespace: appuio-reporting -spec: - failedJobsHistoryLimit: 768 - jobTemplate: - metadata: - annotations: - product-id: openshift-clusters-cloudscale-standard - labels: - app.kubernetes.io/managed-by: commodore - app.kubernetes.io/name: appuio-reporting - app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-cloudscale-standard-1 - spec: - template: - metadata: - labels: - app.kubernetes.io/managed-by: commodore - app.kubernetes.io/name: appuio-reporting - app.kubernetes.io/part-of: syn - spec: - containers: - - args: - - appuio-reporting report --timerange 1h --begin=$(date -d "now -3 - hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u -Iseconds) - command: - - sh - - -c - env: - - name: AR_ODOO_OAUTH_TOKEN_URL - valueFrom: - secretKeyRef: - key: token_endpoint - name: odoo-credentials - - name: AR_ODOO_OAUTH_CLIENT_ID - valueFrom: - secretKeyRef: - key: client_id - name: odoo-credentials - - name: AR_ODOO_OAUTH_CLIENT_SECRET - valueFrom: - secretKeyRef: - key: client_secret - name: odoo-credentials - - name: AR_ODOO_URL - - name: AR_PROM_URL - valueFrom: - secretKeyRef: - key: url - name: prom-url - - name: AR_PRODUCT_ID - value: openshift-clusters-cloudscale-standard - - name: AR_QUERY - value: | - # Calculates number of clusters per cluster. Always returns 1. - # Max values over one hour. - max_over_time( - # Use aggregation to drop labels of no interest. - group by(cluster_id, sales_order) ( - appuio_managed_info{ - cloud_provider="cloudscale", - vshn_service_level="standard"}, - )[59m:1m] - ) - - name: AR_INSTANCE_JSONNET - value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels - - name: AR_ITEM_GROUP_DESCRIPTION_JSONNET - value: 'local labels = std.extVar("labels"); "APPUiO Managed OpenShift - - Cluster: %(cluster_id)s" % labels' - - name: AR_UNIT_ID - value: uom_uom_53_4a7e8f3e - - name: AR_ORG_ID - value: appuio-managed-openshift-billing - image: ghcr.io/appuio/appuio-reporting:v0.2.1 - name: backfill - resources: {} - initContainers: [] - restartPolicy: OnFailure - schedule: 15 * * * * - startingDeadlineSeconds: 180 - successfulJobsHistoryLimit: 3 - suspend: false ---- -apiVersion: batch/v1 -kind: CronJob -metadata: - annotations: - product-id: openshift-clusters-cloudscale-professional + product-id: openshift-cloudscale-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-cloudscale-professional-2 - name: openshift-clusters-cloudscale-professional-2 + name: openshift-cloudscale-cluster-premium-0 + name: openshift-cloudscale-cluster-premium-0 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-cloudscale-professional + product-id: openshift-cloudscale-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-cloudscale-professional-2 + cron-job-name: openshift-cloudscale-cluster-premium-0 spec: template: metadata: @@ -2097,7 +1911,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-cloudscale-professional + value: openshift-cloudscale-cluster-premium - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -2106,8 +1920,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="cloudscale", - vshn_service_level="professional"}, + cloud_provider=~"cloudscale", + vshn_service_level="premium", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -2133,25 +1948,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-cloudscale-premium + product-id: openshift-cloudscale-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-cloudscale-premium-3 - name: openshift-clusters-cloudscale-premium-3 + name: openshift-cloudscale-cluster-professional-1 + name: openshift-cloudscale-cluster-professional-1 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-cloudscale-premium + product-id: openshift-cloudscale-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-cloudscale-premium-3 + cron-job-name: openshift-cloudscale-cluster-professional-1 spec: template: metadata: @@ -2190,7 +2005,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-cloudscale-premium + value: openshift-cloudscale-cluster-professional - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -2199,8 +2014,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="cloudscale", - vshn_service_level="premium"}, + cloud_provider=~"cloudscale", + vshn_service_level="professional", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -2226,25 +2042,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-exoscale-zero + product-id: openshift-cloudscale-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-exoscale-zero-4 - name: openshift-clusters-exoscale-zero-4 + name: openshift-cloudscale-cluster-standard-2 + name: openshift-cloudscale-cluster-standard-2 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-exoscale-zero + product-id: openshift-cloudscale-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-exoscale-zero-4 + cron-job-name: openshift-cloudscale-cluster-standard-2 spec: template: metadata: @@ -2283,7 +2099,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-exoscale-zero + value: openshift-cloudscale-cluster-standard - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -2292,8 +2108,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="exoscale", - vshn_service_level="zero"}, + cloud_provider=~"cloudscale", + vshn_service_level="standard", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -2319,25 +2136,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-exoscale-standard + product-id: openshift-cloudscale-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-exoscale-standard-5 - name: openshift-clusters-exoscale-standard-5 + name: openshift-cloudscale-cluster-zero-3 + name: openshift-cloudscale-cluster-zero-3 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-exoscale-standard + product-id: openshift-cloudscale-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-exoscale-standard-5 + cron-job-name: openshift-cloudscale-cluster-zero-3 spec: template: metadata: @@ -2376,7 +2193,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-exoscale-standard + value: openshift-cloudscale-cluster-zero - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -2385,8 +2202,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="exoscale", - vshn_service_level="standard"}, + cloud_provider=~"cloudscale", + vshn_service_level="zero", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -2412,25 +2230,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-exoscale-professional + product-id: openshift-exoscale-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-exoscale-professional-6 - name: openshift-clusters-exoscale-professional-6 + name: openshift-exoscale-cluster-premium-4 + name: openshift-exoscale-cluster-premium-4 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-exoscale-professional + product-id: openshift-exoscale-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-exoscale-professional-6 + cron-job-name: openshift-exoscale-cluster-premium-4 spec: template: metadata: @@ -2469,7 +2287,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-exoscale-professional + value: openshift-exoscale-cluster-premium - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -2478,8 +2296,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="exoscale", - vshn_service_level="professional"}, + cloud_provider=~"exoscale", + vshn_service_level="premium", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -2505,25 +2324,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-exoscale-premium + product-id: openshift-exoscale-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-exoscale-premium-7 - name: openshift-clusters-exoscale-premium-7 + name: openshift-exoscale-cluster-professional-5 + name: openshift-exoscale-cluster-professional-5 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-exoscale-premium + product-id: openshift-exoscale-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-exoscale-premium-7 + cron-job-name: openshift-exoscale-cluster-professional-5 spec: template: metadata: @@ -2562,7 +2381,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-exoscale-premium + value: openshift-exoscale-cluster-professional - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -2571,8 +2390,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="exoscale", - vshn_service_level="premium"}, + cloud_provider=~"exoscale", + vshn_service_level="professional", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -2598,25 +2418,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-vsphere-zero + product-id: openshift-exoscale-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-vsphere-zero-8 - name: openshift-clusters-vsphere-zero-8 + name: openshift-exoscale-cluster-standard-6 + name: openshift-exoscale-cluster-standard-6 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-vsphere-zero + product-id: openshift-exoscale-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-vsphere-zero-8 + cron-job-name: openshift-exoscale-cluster-standard-6 spec: template: metadata: @@ -2655,7 +2475,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-vsphere-zero + value: openshift-exoscale-cluster-standard - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -2664,8 +2484,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="vsphere", - vshn_service_level="zero"}, + cloud_provider=~"exoscale", + vshn_service_level="standard", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -2691,25 +2512,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-vsphere-standard + product-id: openshift-exoscale-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-vsphere-standard-9 - name: openshift-clusters-vsphere-standard-9 + name: openshift-exoscale-cluster-zero-7 + name: openshift-exoscale-cluster-zero-7 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-vsphere-standard + product-id: openshift-exoscale-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-vsphere-standard-9 + cron-job-name: openshift-exoscale-cluster-zero-7 spec: template: metadata: @@ -2748,7 +2569,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-vsphere-standard + value: openshift-exoscale-cluster-zero - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -2757,8 +2578,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="vsphere", - vshn_service_level="standard"}, + cloud_provider=~"exoscale", + vshn_service_level="zero", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -2784,25 +2606,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-vsphere-professional + product-id: openshift-onprem-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-vsphere-professional-10 - name: openshift-clusters-vsphere-professional-10 + name: openshift-onprem-cluster-premium-8 + name: openshift-onprem-cluster-premium-8 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-vsphere-professional + product-id: openshift-onprem-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-vsphere-professional-10 + cron-job-name: openshift-onprem-cluster-premium-8 spec: template: metadata: @@ -2841,7 +2663,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-vsphere-professional + value: openshift-onprem-cluster-premium - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -2850,8 +2672,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="vsphere", - vshn_service_level="professional"}, + cloud_provider=~"vsphere|none", + vshn_service_level="premium", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -2877,25 +2700,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-vsphere-premium + product-id: openshift-onprem-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-vsphere-premium-11 - name: openshift-clusters-vsphere-premium-11 + name: openshift-onprem-cluster-professional-9 + name: openshift-onprem-cluster-professional-9 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-vsphere-premium + product-id: openshift-onprem-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-vsphere-premium-11 + cron-job-name: openshift-onprem-cluster-professional-9 spec: template: metadata: @@ -2934,7 +2757,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-vsphere-premium + value: openshift-onprem-cluster-professional - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -2943,8 +2766,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="vsphere", - vshn_service_level="premium"}, + cloud_provider=~"vsphere|none", + vshn_service_level="professional", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -2970,25 +2794,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-openstack-zero + product-id: openshift-onprem-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-openstack-zero-12 - name: openshift-clusters-openstack-zero-12 + name: openshift-onprem-cluster-standard-10 + name: openshift-onprem-cluster-standard-10 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-openstack-zero + product-id: openshift-onprem-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-openstack-zero-12 + cron-job-name: openshift-onprem-cluster-standard-10 spec: template: metadata: @@ -3027,7 +2851,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-openstack-zero + value: openshift-onprem-cluster-standard - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -3036,8 +2860,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="openstack", - vshn_service_level="zero"}, + cloud_provider=~"vsphere|none", + vshn_service_level="standard", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -3063,25 +2888,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-openstack-standard + product-id: openshift-onprem-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-openstack-standard-13 - name: openshift-clusters-openstack-standard-13 + name: openshift-onprem-cluster-zero-11 + name: openshift-onprem-cluster-zero-11 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-openstack-standard + product-id: openshift-onprem-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-openstack-standard-13 + cron-job-name: openshift-onprem-cluster-zero-11 spec: template: metadata: @@ -3120,7 +2945,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-openstack-standard + value: openshift-onprem-cluster-zero - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -3129,8 +2954,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="openstack", - vshn_service_level="standard"}, + cloud_provider=~"vsphere|none", + vshn_service_level="zero", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -3156,25 +2982,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-openstack-professional + product-id: openshift-xelon-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-openstack-professional-14 - name: openshift-clusters-openstack-professional-14 + name: openshift-xelon-cluster-premium-12 + name: openshift-xelon-cluster-premium-12 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-openstack-professional + product-id: openshift-xelon-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-openstack-professional-14 + cron-job-name: openshift-xelon-cluster-premium-12 spec: template: metadata: @@ -3213,7 +3039,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-openstack-professional + value: openshift-xelon-cluster-premium - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -3222,8 +3048,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="openstack", - vshn_service_level="professional"}, + cloud_provider=~"xelon", + vshn_service_level="premium", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -3249,25 +3076,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-openstack-premium + product-id: openshift-xelon-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-openstack-premium-15 - name: openshift-clusters-openstack-premium-15 + name: openshift-xelon-cluster-professional-13 + name: openshift-xelon-cluster-professional-13 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-openstack-premium + product-id: openshift-xelon-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-openstack-premium-15 + cron-job-name: openshift-xelon-cluster-professional-13 spec: template: metadata: @@ -3306,7 +3133,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-openstack-premium + value: openshift-xelon-cluster-professional - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -3315,8 +3142,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="openstack", - vshn_service_level="premium"}, + cloud_provider=~"xelon", + vshn_service_level="professional", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -3342,25 +3170,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-vsphere-standard + product-id: openshift-xelon-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-vsphere-standard-16 - name: openshift-clusters-vsphere-standard-16 + name: openshift-xelon-cluster-standard-14 + name: openshift-xelon-cluster-standard-14 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-vsphere-standard + product-id: openshift-xelon-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-vsphere-standard-16 + cron-job-name: openshift-xelon-cluster-standard-14 spec: template: metadata: @@ -3399,7 +3227,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-vsphere-standard + value: openshift-xelon-cluster-standard - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -3408,8 +3236,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="xelon", - vshn_service_level="standard"}, + cloud_provider=~"xelon", + vshn_service_level="standard", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -3435,25 +3264,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: openshift-clusters-vsphere-professional + product-id: openshift-xelon-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: openshift-clusters-vsphere-professional-17 - name: openshift-clusters-vsphere-professional-17 + name: openshift-xelon-cluster-zero-15 + name: openshift-xelon-cluster-zero-15 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: openshift-clusters-vsphere-professional + product-id: openshift-xelon-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: openshift-clusters-vsphere-professional-17 + cron-job-name: openshift-xelon-cluster-zero-15 spec: template: metadata: @@ -3492,7 +3321,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: openshift-clusters-vsphere-professional + value: openshift-xelon-cluster-zero - name: AR_QUERY value: | # Calculates number of clusters per cluster. Always returns 1. @@ -3501,8 +3330,9 @@ spec: # Use aggregation to drop labels of no interest. group by(cluster_id, sales_order) ( appuio_managed_info{ - cloud_provider="none", - vshn_service_level="professional"}, + cloud_provider=~"xelon", + vshn_service_level="zero", + } )[59m:1m] ) - name: AR_INSTANCE_JSONNET @@ -3528,25 +3358,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-iaas-cluster-zero + product-id: kubernetes-iaas-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-iaas-cluster-zero-0 - name: kubernetes-iaas-cluster-zero-0 + name: kubernetes-iaas-cluster-premium-0 + name: kubernetes-iaas-cluster-premium-0 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-iaas-cluster-zero + product-id: kubernetes-iaas-cluster-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-iaas-cluster-zero-0 + cron-job-name: kubernetes-iaas-cluster-premium-0 spec: template: metadata: @@ -3585,7 +3415,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-iaas-cluster-zero + value: kubernetes-iaas-cluster-premium - name: AR_QUERY value: | max_over_time( @@ -3594,7 +3424,7 @@ spec: sales_order!="TERMINATED", sales_order!="NONE", distribution=~"rancher|rke2", - vshn_service_level="zero", + vshn_service_level="premium", } )[59m:1m] ) @@ -3621,25 +3451,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-iaas-cluster-standard + product-id: kubernetes-iaas-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-iaas-cluster-standard-1 - name: kubernetes-iaas-cluster-standard-1 + name: kubernetes-iaas-cluster-professional-1 + name: kubernetes-iaas-cluster-professional-1 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-iaas-cluster-standard + product-id: kubernetes-iaas-cluster-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-iaas-cluster-standard-1 + cron-job-name: kubernetes-iaas-cluster-professional-1 spec: template: metadata: @@ -3678,7 +3508,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-iaas-cluster-standard + value: kubernetes-iaas-cluster-professional - name: AR_QUERY value: | max_over_time( @@ -3687,7 +3517,7 @@ spec: sales_order!="TERMINATED", sales_order!="NONE", distribution=~"rancher|rke2", - vshn_service_level="standard", + vshn_service_level="professional", } )[59m:1m] ) @@ -3714,25 +3544,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-iaas-cluster-professional + product-id: kubernetes-iaas-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-iaas-cluster-professional-2 - name: kubernetes-iaas-cluster-professional-2 + name: kubernetes-iaas-cluster-standard-2 + name: kubernetes-iaas-cluster-standard-2 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-iaas-cluster-professional + product-id: kubernetes-iaas-cluster-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-iaas-cluster-professional-2 + cron-job-name: kubernetes-iaas-cluster-standard-2 spec: template: metadata: @@ -3771,7 +3601,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-iaas-cluster-professional + value: kubernetes-iaas-cluster-standard - name: AR_QUERY value: | max_over_time( @@ -3780,7 +3610,7 @@ spec: sales_order!="TERMINATED", sales_order!="NONE", distribution=~"rancher|rke2", - vshn_service_level="professional", + vshn_service_level="standard", } )[59m:1m] ) @@ -3807,25 +3637,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-iaas-cluster-premium + product-id: kubernetes-iaas-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-iaas-cluster-premium-3 - name: kubernetes-iaas-cluster-premium-3 + name: kubernetes-iaas-cluster-zero-3 + name: kubernetes-iaas-cluster-zero-3 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-iaas-cluster-premium + product-id: kubernetes-iaas-cluster-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-iaas-cluster-premium-3 + cron-job-name: kubernetes-iaas-cluster-zero-3 spec: template: metadata: @@ -3864,7 +3694,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-iaas-cluster-premium + value: kubernetes-iaas-cluster-zero - name: AR_QUERY value: | max_over_time( @@ -3873,7 +3703,7 @@ spec: sales_order!="TERMINATED", sales_order!="NONE", distribution=~"rancher|rke2", - vshn_service_level="premium", + vshn_service_level="zero", } )[59m:1m] ) @@ -3900,25 +3730,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-iaas-node-zero + product-id: kubernetes-iaas-node-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-iaas-node-zero-0 - name: kubernetes-iaas-node-zero-0 + name: kubernetes-iaas-node-premium-0 + name: kubernetes-iaas-node-premium-0 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-iaas-node-zero + product-id: kubernetes-iaas-node-premium labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-iaas-node-zero-0 + cron-job-name: kubernetes-iaas-node-premium-0 spec: template: metadata: @@ -3957,7 +3787,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-iaas-node-zero + value: kubernetes-iaas-node-premium - name: AR_QUERY value: | max_over_time( @@ -3970,7 +3800,7 @@ spec: sales_order!="TERMINATED", sales_order!="NONE", distribution=~"rke2|rancher", - vshn_service_level="zero", + vshn_service_level="premium", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -3995,25 +3825,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-iaas-node-standard + product-id: kubernetes-iaas-node-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-iaas-node-standard-1 - name: kubernetes-iaas-node-standard-1 + name: kubernetes-iaas-node-professional-1 + name: kubernetes-iaas-node-professional-1 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-iaas-node-standard + product-id: kubernetes-iaas-node-professional labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-iaas-node-standard-1 + cron-job-name: kubernetes-iaas-node-professional-1 spec: template: metadata: @@ -4052,7 +3882,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-iaas-node-standard + value: kubernetes-iaas-node-professional - name: AR_QUERY value: | max_over_time( @@ -4065,7 +3895,7 @@ spec: sales_order!="TERMINATED", sales_order!="NONE", distribution=~"rke2|rancher", - vshn_service_level="standard", + vshn_service_level="professional", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -4090,25 +3920,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-iaas-node-professional + product-id: kubernetes-iaas-node-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-iaas-node-professional-2 - name: kubernetes-iaas-node-professional-2 + name: kubernetes-iaas-node-standard-2 + name: kubernetes-iaas-node-standard-2 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-iaas-node-professional + product-id: kubernetes-iaas-node-standard labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-iaas-node-professional-2 + cron-job-name: kubernetes-iaas-node-standard-2 spec: template: metadata: @@ -4147,7 +3977,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-iaas-node-professional + value: kubernetes-iaas-node-standard - name: AR_QUERY value: | max_over_time( @@ -4160,7 +3990,7 @@ spec: sales_order!="TERMINATED", sales_order!="NONE", distribution=~"rke2|rancher", - vshn_service_level="professional", + vshn_service_level="standard", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels @@ -4185,25 +4015,25 @@ apiVersion: batch/v1 kind: CronJob metadata: annotations: - product-id: kubernetes-iaas-node-premium + product-id: kubernetes-iaas-node-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - name: kubernetes-iaas-node-premium-3 - name: kubernetes-iaas-node-premium-3 + name: kubernetes-iaas-node-zero-3 + name: kubernetes-iaas-node-zero-3 namespace: appuio-reporting spec: failedJobsHistoryLimit: 768 jobTemplate: metadata: annotations: - product-id: kubernetes-iaas-node-premium + product-id: kubernetes-iaas-node-zero labels: app.kubernetes.io/managed-by: commodore app.kubernetes.io/name: appuio-reporting app.kubernetes.io/part-of: syn - cron-job-name: kubernetes-iaas-node-premium-3 + cron-job-name: kubernetes-iaas-node-zero-3 spec: template: metadata: @@ -4242,7 +4072,7 @@ spec: key: url name: prom-url - name: AR_PRODUCT_ID - value: kubernetes-iaas-node-premium + value: kubernetes-iaas-node-zero - name: AR_QUERY value: | max_over_time( @@ -4255,7 +4085,7 @@ spec: sales_order!="TERMINATED", sales_order!="NONE", distribution=~"rke2|rancher", - vshn_service_level="premium", + vshn_service_level="zero", } - name: AR_INSTANCE_JSONNET value: local labels = std.extVar("labels"); "%(cluster_id)s" % labels