From 6c952ca443521bfd8986f6850de95af804c85cbe Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 1 Jul 2026 20:59:45 +0300 Subject: [PATCH] 056 bugfix vms_on --- Application.cfc | 4 +-- cloud_capacity.cfm | 71 ++++++++++++++++++++++++++++++++-------------- 2 files changed, 51 insertions(+), 24 deletions(-) diff --git a/Application.cfc b/Application.cfc index d5ec009..5dda269 100644 --- a/Application.cfc +++ b/Application.cfc @@ -75,8 +75,8 @@ - s - + + diff --git a/cloud_capacity.cfm b/cloud_capacity.cfm index 80eb101..fa34724 100644 --- a/cloud_capacity.cfm +++ b/cloud_capacity.cfm @@ -191,21 +191,21 @@ select coalesce(u.vm_ram_used,0) as vm_ram_used coalesce(round((u.vm_ram_alloc/h.gb_provisioned)::numeric,2)*100,0) as GB_alloc_perc coalesce(round((u.vm_ram_used/h.gb_provisioned)::numeric,2)*100,0) as GB_usage_perc - coalesce(round((u.vm_cores/h.cores)::numeric,1),0) as oversubscription + coalesce(round((u.vm_cores/h.cores)::numeric,1),0) as oversubscription coalesce(u.vm_cores,0) as vm_cores coalesce(u.vm_cores_on,0) as vm_cores_on coalesce(u.vms,0) as vms coalesce(u.vms_on,0) as vms_on coalesce(u.vm_ghz_usage/h.ghz_in_service*100,0) as vm_cpu_usage_perc - gb_per_core + coalesce(h.gb_per_core,0) as gb_per_core - s.total - s.usable - s.used - s.effective_free + coalesce(s.total,0) as total + coalesce(s.usable,0) as usable + coalesce(s.used,0) as used + coalesce(s.effective_free,0) as effective_free - u.disk_allocated - u.disk_used + coalesce(u.disk_allocated,0) as disk_allocated + coalesce(u.disk_used,0) as disk_used from cluster_stat h @@ -230,12 +230,14 @@ select ,sum(gb_provisioned) as gb_provisioned ,sum(cores_in_service) as cores_in_service ,sum(vm_cores) as vm_cores + ,sum(vm_cores_on) as vm_cores_on ,sum(vm_ghz_usage) as vm_ghz_usage ,sum(vm_ghz_reserved) as vm_ghz_reserved ,sum(vm_ghz_promised) as vm_ghz_promised ,sum(vm_ram_alloc) as vm_ram_alloc ,sum(vm_ram_used) as vm_ram_used ,sum(vms) as vms + ,sum(vms_on) as vms_on ,sum(cores*ghz)/sum(cores) as ghz ,sum(disk_allocated) as disk_allocated ,sum(disk_used) as disk_used @@ -400,15 +402,32 @@ from qRead #numberFormat(GB_alloc_perc,"0")# #numberFormat(GB_usage_perc,"0")# #vms# - + + + #numberFormat(vm_cores/vms,".0")# ?  core + + + #numberFormat(vm_ghz_usage/vms_on,".0")# ?  GHz + + + #numberFormat(vm_ghz_usage/vm_cores_on/ghz*100,"0")# ? % + + + #numberFormat(vm_ram_alloc/vms,".0")# ? (#numberFormat(vm_ram_used/vms_on,".0")#?) GB + + + #numberFormat(disk_allocated/vms,".0")#(#numberFormat(disk_used/vms,".0")#) ?  GB + + + Итого @@ -440,24 +459,32 @@ from qRead #numberFormat(vm_ram_used/ram_in_service*100,"0")# #vms# - - #numberFormat(vm_cores/vms,".0")# core - #numberFormat(vm_ghz_usage/vms,".0")# GHz - #numberFormat(vm_ghz_usage/vm_cores/ghz*100,"0")#% - #numberFormat(vm_ram_alloc/vms,".0")#(#numberFormat(vm_ram_used/vms,".0")#) GB - #numberFormat(disk_allocated/vms,".0")#(#numberFormat(disk_used/vms,".0")#) GB - + + #numberFormat(vm_cores/vms,".0")# ?  core + + + #numberFormat(vm_ghz_usage/vms_on,".0")# ?  GHz + + + #numberFormat(vm_ghz_usage/vm_cores_on/ghz*100,"0")# ? % + + + #numberFormat(vm_ram_alloc/vms,".0")# ? (#numberFormat(vm_ram_used/vms_on,".0")#?) GB + + + #numberFormat(disk_allocated/vms,".0")#(#numberFormat(disk_used/vms,".0")#) ?  GB + - + Пока выводим избыточный набор колонок для контроля. Кроме того, еще не выбрали, какие колонки удобнее и релевантнее
* CPU GHz provision rate % - отношение зарезервированной частоты (с учетом 20% резерва по умолчанию) к наличной частоте процессоров
-* Для средней ВМ указана аллоцированная память, а в скобках - используемая, далее аллоцированное дисковое пространство, в скобках используемое. Диск считается без разделения по политикам (2do) +* Для средней ВМ указана аллоцированная память, в скобках - используемая, далее аллоцированное дисковое пространство, в скобках используемое. Диск считается без разделения по политикам (2do). ГГц на ВМ, процент загрузки ядер (** проверить), используемая память - считается по включенным ВМ. Количество ядер, аллоцированная память и диск - по всем ВМ