From 2e0b71cf3f346d67a03d39d4f162ddc10bfd4946 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 15 Apr 2026 14:07:39 +0300 Subject: [PATCH] tests found --- Application.cfc | 2 +- additional_agreement_ls.cfm | 9 ++++--- cloud_capacity.cfm | 19 +++++++++----- contract.cfm | 17 ++++-------- contract_ls.cfm | 2 +- contragent.cfm | 10 ++++--- contragent_ls.cfm | 2 +- contragent_rpt.cfm | 52 +++---------------------------------- crm2cloud.cfm | 21 +++++++-------- deal_ls.cfm | 2 +- vm_ls.cfm | 44 ++++++++++++++++--------------- 11 files changed, 69 insertions(+), 111 deletions(-) diff --git a/Application.cfc b/Application.cfc index 9df0a52..61ba102 100644 --- a/Application.cfc +++ b/Application.cfc @@ -76,7 +76,7 @@ - + diff --git a/additional_agreement_ls.cfm b/additional_agreement_ls.cfm index a01f12a..213c24f 100644 --- a/additional_agreement_ls.cfm +++ b/additional_agreement_ls.cfm @@ -113,7 +113,8 @@ select count(*) as cnt from elma.additional_agreements d where 1=1 - #contragent# + #contragent# + @@ -136,9 +137,9 @@ select count(*) as cnt from elma.additional_agreements d where 1=1 - - - + + + diff --git a/cloud_capacity.cfm b/cloud_capacity.cfm index d8e6142..264582a 100644 --- a/cloud_capacity.cfm +++ b/cloud_capacity.cfm @@ -60,6 +60,8 @@ SELECT ,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 +,max("CPUtoVM") as ghz_subtract_ha +,max("RAMtoVM") as gb_subtract_ha ,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 ( @@ -107,8 +109,8 @@ select h.cores as Cores_Capacity - h.ghz_provisioned as GHz_Provisioned - h.gb_provisioned as GB_Provisioned + h.ghz_provisioned - CASE WHEN hosts_in_maintenance > 0 THEN 0 ELSE h.ghz_subtract_ha END as GHz_Provisioned + h.gb_provisioned - CASE WHEN hosts_in_maintenance > 0 THEN 0 ELSE h.gb_subtract_ha END as GB_Provisioned u.vm_ghz_reserved u.vm_ghz_promised round((u.vm_ghz_promised/h.ghz_provisioned)::numeric,2)*100 as GHz_provision_rate @@ -185,7 +187,8 @@ from qRead - RAM GB + RAM GB by alloc + RAM GB by usage CPU GHz (текущий резерв) Ядра 20% (текущий резерв) @@ -211,6 +214,7 @@ from qRead #hosts_total# #numberFormat(gb_provisioned-vm_ram_alloc,"0")# + #numberFormat(gb_provisioned-vm_ram_used,"0")# #numberFormat(ghz_provisioned-vm_ghz_reserved,".0")# #numberFormat((ghz_provisioned-vm_ghz_reserved)/ghz/0.2,"0")# @@ -228,7 +232,8 @@ from qRead Жесткий резерв - если включим минимальное резервирование 20%
-Доступная память указана по выделенному объему (используется меньше, доступно больше) +Доступная память указана по выделенному объему (используется меньше, доступно больше)
+Емкость HA вычитается из Capacity, если нет хостов в Maintenance, в противном случае вычитается ресурс хостов в Maintenance. За объем для HA принимается размер наибольшего хоста в кластере по каждому ресурсу (поэтому при выводе в Maintenance расчетная емкость может временно увеличиться)

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

@@ -306,7 +311,7 @@ from qRead #numberFormat(GB_alloc_perc,"0")# #numberFormat(GB_usage_perc,"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")# GB + #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 @@ -342,7 +347,7 @@ from qRead #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(vm_ram_alloc/vms,".0")#(#numberFormat(vm_ram_used/vms,".0")#) GB @@ -354,7 +359,7 @@ from qRead
* CPU GHz provision rate % - отношение зарезервированной частоты (с учетом 20% резерва по умолчанию) к наличной частоте процессоров
-* Расхождения в оценке объема RAM частично связаны с разной оценкой затрат памяти на собственные нужды гипервизора +* Для средней ВМ указана аллоцированная память, а в скобках - используемая
#additional_agreement# diff --git a/contract_ls.cfm b/contract_ls.cfm index 3f29827..86c8ec0 100644 --- a/contract_ls.cfm +++ b/contract_ls.cfm @@ -103,7 +103,7 @@ select count(*) as cnt from elma.aggrements d where 1=1 - #contragent# + #contragent# diff --git a/contragent.cfm b/contragent.cfm index 80c1479..a019e2e 100644 --- a/contragent.cfm +++ b/contragent.cfm @@ -177,7 +177,8 @@ left outer join elma.additional_agreements a on (a.__id=ANY(siv.additional_agreement)) where d._companies= AND siv.is_actual - AND a.is_actual + --AND a.is_actual + AND s.probability_pc > 0 order by version::int @@ -206,7 +207,8 @@ __index date_nop date_end - is_easy + is_easy + Вер.% additional_agreement @@ -252,9 +254,9 @@ #date_accept# #__index# #dateFormat(date_nop,'YYYY-MM-DD')# - #dateFormat(date_end,'YYYY-MM-DD')# + #dateFormat(date_end,'YYYY-MM-DD')# #is_easy# - + #probability_pc# #additional_agreement# diff --git a/contragent_ls.cfm b/contragent_ls.cfm index fb44e6b..295830a 100644 --- a/contragent_ls.cfm +++ b/contragent_ls.cfm @@ -96,7 +96,7 @@ select count(*) as cnt from elma.companies where 1=1 - #__name# + #__name# diff --git a/contragent_rpt.cfm b/contragent_rpt.cfm index abe7ae7..224c6a2 100644 --- a/contragent_rpt.cfm +++ b/contragent_rpt.cfm @@ -156,60 +156,14 @@ left outer join elma.additional_agreements a on (a.__id=ANY(siv.additional_agreement)) where d._companies= AND siv.is_actual - AND a.is_actual - AND date_nop <= CURRENT_TIMESTAMP + --AND a.is_actual + --AND date_nop <= CURRENT_TIMESTAMP AND COALESCE(date_end,CURRENT_TIMESTAMP) >= CURRENT_TIMESTAMP ORDER BY __index --, version::int - -

Услуги по данным CRM (версии строк спецификации, только актуальные на сегодня)

@@ -227,6 +181,7 @@ Модель оплаты Дата НОУ date_end + Вер.% Дополнительное соглашение @@ -270,6 +225,7 @@ #__index# ---> #dateFormat(date_nop,'YYYY-MM-DD')# #dateFormat(date_end,'YYYY-MM-DD')# + #additional_agreement# (#status_id# #status#) diff --git a/crm2cloud.cfm b/crm2cloud.cfm index a06f0ab..9290676 100644 --- a/crm2cloud.cfm +++ b/crm2cloud.cfm @@ -60,15 +60,15 @@ WITH AND siv."__deletedAt" IS NULL and d."__deletedAt" IS NULL and a."__deletedAt" IS NULL - and a.is_actual + --and a.is_actual and siv.type IN (2,3) ), component as ( SELECT - price*cnt*(100.0-COALESCE(discount,0))/100.0 as cost , - price , - cnt , + -- price*cnt*(100.0-COALESCE(discount,0))/100.0 as cost , + -- price , + cnt , code , __id FROM @@ -93,8 +93,7 @@ WITH ) t WHERE t.dt_from = t.running_min_dt - AND t.dt_to > CURRENT_TIMESTAMP - OR t.dt_to IS NULL + AND ( t.dt_to > CURRENT_TIMESTAMP OR t.dt_to IS NULL ) ), alloc as ( @@ -129,7 +128,7 @@ WITH z.__id as company_uid, round(sum(c.cnt*o.cnt)) as quantity , count(*) as lines , - STRING_AGG( distinct c.code,', ' order by c.code) as codes + STRING_AGG(distinct c.code,', ' order by c.code) as codes FROM stair o JOIN elma.companies z on o._companies=z.__id @@ -153,7 +152,7 @@ WITH z.__id as company_uid, round(sum(c.cnt*o.cnt)) as quantity , count(*) as lines , - STRING_AGG(c.code,', ' order by c.code) as codes + STRING_AGG(distinct c.code,', ' order by c.code) as codes FROM stair o JOIN @@ -161,8 +160,8 @@ WITH LEFT JOIN component c on c.__id = o.param_id --LEFT JOIN component c on (c.__id = ANY (o.params)) WHERE - c.code SIMILAR TO 'iaas.(ngc|dcp).%.vcpu%-_' - --(c.code LIKE 'iaas.ngc.%.vcpu%-_' OR c.code LIKE 'iaas.dcp.%.vcpu%-_') + --c.code SIMILAR TO 'iaas.(ngc|dcp).%.vcpu%-_' + (c.code LIKE 'iaas.ngc.%.vcpu%-_' OR c.code LIKE 'iaas.dcp.%.vcpu%-_') AND c.cnt <> 0 AND o.cnt <> 0 GROUP BY @@ -178,7 +177,7 @@ WITH z.__id as company_uid, round(sum(c.cnt*o.cnt)) as quantity , count(*) as lines , - STRING_AGG(c.code,', ' order by c.code) as codes + STRING_AGG(distinct c.code,', ' order by c.code) as codes FROM stair o JOIN elma.companies z on (o._companies=z.__id) diff --git a/deal_ls.cfm b/deal_ls.cfm index 8ee759c..eee927e 100644 --- a/deal_ls.cfm +++ b/deal_ls.cfm @@ -157,7 +157,7 @@ select count(*) as cnt from elma.deals d where 1=1 - #contragent# + #contragent# diff --git a/vm_ls.cfm b/vm_ls.cfm index 0455d41..13130b8 100644 --- a/vm_ls.cfm +++ b/vm_ls.cfm @@ -10,7 +10,7 @@ - + select "Name", "Object_UUID", "UUID_VM", "VDC", "Organization_UUID", "Organization", "WZ", "Cluster", "Host", "Host_Model", "CPU_Model", "Host_CPU_Cores", "Host_CPU_Sockets", "Host_CPU_Speed", "Host_RAM", @@ -18,10 +18,12 @@ select "Name", "Object_UUID", "UUID_VM", "VDC_CPU_Reserv", "VDC_CPU_Speed", "VM_vCPU_count", "VM_CPU_Used", "VM_CPU_Used_AVG", "VM_CPU_Reserv_GHz", "VM_CPU_Reserv_perc", "VM_RAM_Allocated", "VM_RAM_Used", -"VM_is_ON" -from vmreports.compute -where ts=(select max(ts) from vmreports.compute) -order by "WZ" +"VM_is_ON", +k.__id as company_uid +from vmreports.compute c +left outer join elma.companies k ON (lower(k.id_klienta)=lower(c."WZ")) +where c.ts=(select max(ts) from vmreports.compute) +--order by "WZ" @@ -67,12 +69,13 @@ S3 операции и трафик: #dateFormat(qS3OpsTrfAge.dt_load,'YYYY-M +#qVM.recordCount# - - - + + + @@ -83,8 +86,8 @@ S3 операции и трафик: #dateFormat(qS3OpsTrfAge.dt_load,'YYYY-M - - + + @@ -111,14 +114,14 @@ S3 операции и трафик: #dateFormat(qS3OpsTrfAge.dt_load,'YYYY-M - + - - + + @@ -128,19 +131,18 @@ S3 операции и трафик: #dateFormat(qS3OpsTrfAge.dt_load,'YYYY-M - - - + + + - - - - + + + - +
WZИмяУникальное имяWZИмяУникальное имя OrganizationCluster HostHost ModelCPU ModelHost ModelCPU Model Host CPU Cores Host CPU Sockets Host CPU Speed GHz
#WZ##WZ# #Name# #UUID_VM# #Organization# #VDC##VDC_CPU_Reserv##VDC_CPU_Speed##round(VDC_CPU_Reserv,3)##round(VDC_CPU_Speed,3)# #qVM.Cluster##Host_CPU_Cores# #Host_CPU_Sockets# #round(Host_CPU_Speed,3)##Host_RAM##Host_CPU_Used##Host_CPU_Used_Avg##round(Host_RAM)##round(Host_CPU_Used,1)##round(Host_CPU_Used_Avg,1)# #VM_vCPU_count##VM_CPU_Used##VM_CPU_Used_AVG##VM_CPU_Reserv_GHz##VM_CPU_Reserv_GHz##round(VM_CPU_Used,1)##round(VM_CPU_Used_AVG,1)##round(VM_CPU_Reserv_GHz,1)# #VM_CPU_Reserv_perc# #VM_RAM_Allocated##VM_RAM_Used##round(VM_RAM_Used)# #VM_is_ON#