From a35f5a3ba20ef4560da58f983acbc0a0ac4c8b7b Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 7 Apr 2026 10:35:46 +0300 Subject: [PATCH] 039 cpu usage fix sockets discarded --- Application.cfc | 2 +- cloud_capacity.cfm | 33 ++++++++++++++++----------------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/Application.cfc b/Application.cfc index 3485898..7ab697e 100644 --- a/Application.cfc +++ b/Application.cfc @@ -76,7 +76,7 @@ - + diff --git a/cloud_capacity.cfm b/cloud_capacity.cfm index 17eebcc..46d8258 100644 --- a/cloud_capacity.cfm +++ b/cloud_capacity.cfm @@ -19,7 +19,7 @@ capacity as ( select "Cluster" as cluster, count(*) as hosts, sum(cores) as cores, round(sum(ghz)::numeric,1) as ghz, round(sum(ram)) as ram from ( select "Cluster", "Host" - , avg("Host_CPU_Cores"*"Host_CPU_Sockets") as cores, avg("Host_CPU_Cores"*"Host_CPU_Sockets"*"Host_CPU_Speed") as ghz, avg("Host_RAM"*.85) as ram + , avg("Host_CPU_Cores") as cores, avg("Host_CPU_Cores"*"Host_CPU_Speed") as ghz, avg("Host_RAM"*.85) as ram from vmreports.compute where ts=(select max(ts) from vmreports.compute) group by "Cluster","Host" @@ -52,13 +52,13 @@ SELECT ,COUNT(*)-1 as hosts_ha /*не вполне корректно, хосты разного размера, отказ по-разному влияет*/ ,sum(CASE WHEN "Maintenance"='inMaintenance' THEN 1 ELSE 0 END) as hosts_in_maintenance ,sum(CASE WHEN "Maintenance"='notInMaintenance' THEN 1 ELSE 0 END) as hosts_in_service -,sum("CPU_Cores"*"CPU_Sockets") as cores -,sum(CASE WHEN "Maintenance"='notInMaintenance' THEN "CPU_Cores"*"CPU_Sockets" ELSE 0 END) as cores_in_service -,sum(CASE WHEN "Maintenance"='notInMaintenance' THEN "CPU_Cores"*"CPU_Sockets"*"CPU_Speed" ELSE 0 END) as ghz_in_service +,sum("CPU_Cores") as cores +,sum(CASE WHEN "Maintenance"='notInMaintenance' THEN "CPU_Cores" ELSE 0 END) as cores_in_service +,sum(CASE WHEN "Maintenance"='notInMaintenance' THEN "CPU_Cores"*"CPU_Speed" ELSE 0 END) as ghz_in_service ,sum("CPU_Used_AVG") as host_ghz_usage ,(sum(CASE WHEN "Maintenance"='notInMaintenance' THEN "RAM_Total" ELSE 0 END)) as ram_in_service ,(avg(CASE WHEN "Maintenance"='notInMaintenance' THEN "CPU_Speed" ELSE 0 END)) as ghz -,CASE WHEN sum("CPU_Cores"*"CPU_Sockets"*"CPU_Speed") > 0 THEN sum("CPU_Used_AVG")/sum("CPU_Cores"*"CPU_Sockets"*"CPU_Speed")*100 ELSE NULL END as cpu_usage_perc +,CASE WHEN sum("CPU_Cores"*"CPU_Speed") > 0 THEN sum("CPU_Used_AVG")/sum("CPU_Cores"*"CPU_Speed")*100 ELSE NULL END as cpu_usage_perc FROM vmreports.host h LEFT OUTER JOIN ( SELECT hi."Cluster", STRING_AGG(DISTINCT hi."Model" || ' [' || (hi.cnt::text) || '] ',', ') as models @@ -190,12 +190,11 @@ from qRead + - - - + @@ -227,14 +226,14 @@ from qRead #hosts_total# #hosts_ha# #hosts_in_maintenance# - #hosts_in_service# + #hosts_in_service# + #numberFormat(ram_in_service,"0")# #cores_in_service# #numberFormat(ghz_in_service,".0")# - #numberFormat(host_ghz_usage,".0")# - #numberFormat(vm_ghz_usage,".0")# - #numberFormat(ram_in_service,"0")# - #numberFormat(cpu_usage_perc,"0")# - #numberFormat(vm_cpu_usage_perc,"0")# + #numberFormat(host_ghz_usage,".0")# + #numberFormat(vm_ghz_usage,".0")# + #numberFormat(cpu_usage_perc,"0")# + #numberFormat(vm_cpu_usage_perc,"0")# #oversubscription# #hosts# @@ -260,12 +259,12 @@ from qRead #hosts_ha# - + + #numberFormat(ram_in_service,"0")# #cores_in_service# #numberFormat(ghz_in_service,".0")# - - #numberFormat(ram_in_service,"0")# + #numberFormat(vm_cores/cores_in_service,".0")#