diff --git a/Application.cfc b/Application.cfc index 236d218..5afaaa7 100644 --- a/Application.cfc +++ b/Application.cfc @@ -99,7 +99,7 @@ - + diff --git a/payg.cfm b/payg.cfm index c8dacd2..927ca7f 100644 --- a/payg.cfm +++ b/payg.cfm @@ -76,11 +76,17 @@ group by tenant.wzcode, vdc.name order by tenant.wzcode, vdc.name; - + + + + + + select max(capacity_resource.timestamp) as dt_load from ngcloud_ru.capacity_resource + select 'WZ'||to_char(tenant.wzcode,'FM00000') as wz, vdc.name as vdc_name, @@ -112,7 +118,11 @@ select max(capacity_storage.timestamp) as dt_load from ngcloud_ru.capacity_storage - + + + + + + + + + + + select max(timestamp_addition) as dt_load from s3billing.bucket_stat @@ -221,10 +236,16 @@ select group by user_info.name, bucket_info.placement_id order by user_info.name, bucket_info.placement_id; + + + + + + select max(time) as dt_load from s3billing.usage_bucket_by_user - + select wz, code || '.vcpu-m' as code, core_h as raw_metric, core_h as metric, core_h as chargeable_metric from qComputing