diff --git a/Application.cfc b/Application.cfc index 7ab697e..9c5bf38 100644 --- a/Application.cfc +++ b/Application.cfc @@ -76,7 +76,7 @@ - + diff --git a/cloud_capacity.cfm b/cloud_capacity.cfm index 46d8258..3ddbc13 100644 --- a/cloud_capacity.cfm +++ b/cloud_capacity.cfm @@ -31,13 +31,13 @@ usage as ( select "Cluster" as cluster ,count("UUID_VM") as vms ,sum("VM_vCPU_count") as vm_cores -,(sum("VM_vCPU_count"*"VDC_CPU_Speed")) as vm_ghz -,(sum("VM_CPU_Reserv_GHz")) as vm_ghz_reserved -,(sum("VM_vCPU_count"*"VDC_CPU_Speed"*"VM_CPU_Reserv_perc"/100)) as vm_ghz_reserved_c -,(sum("VM_vCPU_count"*"VDC_CPU_Speed"*(case when "VM_CPU_Reserv_perc" IS null then 20 when "VM_CPU_Reserv_perc"<=20 then 20 else "VM_CPU_Reserv_perc" end)/100)) as vm_ghz_promised +,sum("VM_vCPU_count"*"VDC_CPU_Speed") as vm_ghz +,sum("VM_CPU_Reserv_GHz") as vm_ghz_reserved +,sum("VM_vCPU_count"*"VDC_CPU_Speed"*"VM_CPU_Reserv_perc"/100) as vm_ghz_reserved_c +,sum("VM_vCPU_count"*"VDC_CPU_Speed"*(case when "VM_CPU_Reserv_perc" IS null then 20 when "VM_CPU_Reserv_perc"<=20 then 20 else "VM_CPU_Reserv_perc" end)/100) as vm_ghz_promised -- promised - зарезервированные ГГц, если включить минимальное согласованное резервирование -,(sum("VM_RAM_Allocated")) as vm_ram_alloc -,(sum("VM_RAM_Used")) as vm_ram_used +,sum("VM_RAM_Allocated") as vm_ram_alloc +,sum("VM_RAM_Used") as vm_ram_used ,sum("VM_CPU_Used_AVG") as vm_ghz_usage from vmreports.compute where ts=(select max(ts) from vmreports.compute) @@ -99,7 +99,7 @@ select h.ghz_in_service h.host_ghz_usage u.vm_ghz_usage - h.ghz + h.ghz h.ram_in_service h.cpu_usage_perc c.hosts @@ -113,7 +113,7 @@ select u.vm_ram_used round((u.vm_ram_alloc/c.ram)::numeric,2)*100 as GB_alloc_perc round((u.vm_ram_used/c.ram)::numeric,2)*100 as GB_usage_perc - round((u.vm_cores/c.cores)::numeric,1) as oversubscription + round((u.vm_cores/c.cores)::numeric,1) as oversubscription u.vm_cores u.vms u.vm_ghz_usage/h.ghz_in_service*100 as vm_cpu_usage_perc @@ -130,6 +130,9 @@ order by @@ -168,8 +173,64 @@ from qRead VM: #dateFormat(ts_compute,"YYYY-MM-DD")# #timeFormat(ts_compute,"HH:MM")# Хосты: #dateFormat(ts_host,"YYYY-MM-DD")# #timeFormat(ts_host,"HH:MM")# - - + +

Свободно

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
RAM GBCPU GHz (текущий резерв)Ядра (текущий резерв | 20%)Ядра (текущий резерв | 50%)Ядра (текущий резерв | 80%)CPU GHz (жесткий резерв)Ядра (жесткий резерв | 20%)Ядра (жесткий резерв | 50%)Ядра (жесткий резерв | 80%)ВМ размещено
#cluster_v1##cluster_v2##commercial_name##numberFormat(ghz,".0")##hosts_total##numberFormat(RAM_Capacity-vm_ram_alloc,"0")##numberFormat(GHz_Capacity-vm_ghz_reserved,".0")##numberFormat((GHz_Capacity-vm_ghz_reserved)/ghz/0.2,"0")##numberFormat((GHz_Capacity-vm_ghz_reserved)/ghz/0.5,"0")##numberFormat((GHz_Capacity-vm_ghz_reserved)/ghz/0.8,"0")##numberFormat(GHz_Capacity-vm_ghz_promised,".0")##numberFormat((GHz_Capacity-vm_ghz_promised)/ghz/0.2,"0")##numberFormat((GHz_Capacity-vm_ghz_promised)/ghz/0.5,"0")##numberFormat((GHz_Capacity-vm_ghz_promised)/ghz/0.8,"0")##vms#
+Жесткий резерв - если включим минимальное резервирование 20% + +

Использование

- - - + + + - - + + + - - @@ -212,7 +272,7 @@ from qRead ВМ шт. - Средн. ВМ core | GB + Средняя ВМ @@ -225,18 +285,17 @@ from qRead #numberFormat(ghz,".0")# #hosts_total# #hosts_ha# - #hosts_in_maintenance# - #hosts_in_service# - #numberFormat(ram_in_service,"0")# - #cores_in_service# - #numberFormat(ghz_in_service,".0")# - #numberFormat(host_ghz_usage,".0")# + #hosts_in_maintenance# + #hosts# + + #numberFormat(host_ghz_usage,".0")# #numberFormat(vm_ghz_usage,".0")# - #numberFormat(cpu_usage_perc,"0")# - #numberFormat(vm_cpu_usage_perc,"0")# - #oversubscription# - - #hosts# + #numberFormat(cpu_usage_perc,"0")# + #numberFormat(vm_cpu_usage_perc,"0")# + #oversubscription# #Cores_Capacity# #numberFormat(GHz_Capacity,".0")# #numberFormat(vm_ghz_reserved,".0")# @@ -249,27 +308,26 @@ from qRead #numberFormat(GB_alloc_perc,"0")# #numberFormat(GB_usage_perc,"0")# #vms# - #numberFormat(vm_cores/vms,".0")# #numberFormat(vm_ram_alloc/vms,".0")# + #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")# GB - Итого + Итого + #numberFormat(ghz,".0")# #hosts_total# - #hosts_ha# - - - + #hosts_ha# + #hosts_in_maintenance# + #hosts# + + #numberFormat(host_ghz_usage,".0")# + #numberFormat(vm_ghz_usage,".0")# - #numberFormat(vm_cores/cores_in_service,".0")# - - + #numberFormat(vm_cores/cores_in_service,".0")# #numberFormat(GHz_Capacity,".0")# #numberFormat(vm_ghz_reserved,".0")# @@ -282,7 +340,14 @@ from qRead #numberFormat(vm_ram_alloc/ram_in_service*100,"0")# #numberFormat(vm_ram_used/ram_in_service*100,"0")# #vms# - #numberFormat(vm_cores/vms,".0")# #numberFormat(vm_ram_alloc/vms,".0")# + + + #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")# GB + +