diff --git a/cloud_capacity.cfm b/cloud_capacity.cfm index e6aa61f..4f1b79c 100644 --- a/cloud_capacity.cfm +++ b/cloud_capacity.cfm @@ -146,6 +146,12 @@ cluster_naming (cluster,commercial_name) AS (VALUES ,('cl05-1c','msk1, AMD Raphael 4,5 ГГц') ,('cl06-vsan','msk1, Intel Ice Lake 2,8 ГГц') ,('cl07-vsan','msk1, AMD Genoa 4,0 ГГц') +), + +vsan as ( +SELECT "ClusterNew" as cluster_v2, "Total" as total, "Usable" as usable, "Used" as used, "EffectiveFree" as effective_free +FROM vmreports.vsan_storage +WHERE ts=(SELECT max(ts) FROM vmreports.vsan_storage) ) @@ -187,10 +193,16 @@ select 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 + + s.total + s.usable + s.used + s.effective_free from cluster_stat h left outer join usage u on (h.cluster=u.cluster) left outer join cluster_naming n on (h.cluster=n.cluster) +left outer join vsan s on (h.cluster_v2=s.cluster_v2) where 1=1 order by @@ -251,7 +263,7 @@ from qRead - Свободно + Свободно ВМ размещено @@ -262,7 +274,9 @@ from qRead CPU GHz (текущий резерв) Ядра 20% (текущий резерв) Ядра 50% (текущий резерв) - Ядра 80% (текущий резерв) + Ядра 80% (текущий резерв) + + vSAN GB @@ -284,6 +298,8 @@ from qRead err" style="font-size:130%">#safeNumberFormat((ghz_provisioned-vm_ghz_reserved)/ghz/0.5,"0")# err" style="font-size:130%">#safeNumberFormat((ghz_provisioned-vm_ghz_reserved)/ghz/0.8,"0")# + #safeNumberFormat(effective_free,"0")# + - - - #WZ# + + #WZ#  #Name# #UUID_VM# #Organization#