From d896f1fac0bb84c36d19d16dfaf21e36e7db2fa7 Mon Sep 17 00:00:00 2001 From: Matthew Westphall Date: Wed, 5 Nov 2025 11:22:32 -0600 Subject: [PATCH] HTCONDOR-3375: Compute BCUs from startd ad rather than machine --- .../ganglia.d/ce_dashboards/51_ce_dashboard_metrics | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/opensciencegrid/ospool-ganglia/ganglia.d/ce_dashboards/51_ce_dashboard_metrics b/opensciencegrid/ospool-ganglia/ganglia.d/ce_dashboards/51_ce_dashboard_metrics index 9d0914cd..5914f718 100644 --- a/opensciencegrid/ospool-ganglia/ganglia.d/ce_dashboards/51_ce_dashboard_metrics +++ b/opensciencegrid/ospool-ganglia/ganglia.d/ce_dashboards/51_ce_dashboard_metrics @@ -18,19 +18,19 @@ Aggregate = "SUM"; Name = "BcusInUse"; Desc = "Number of 1core-4GB-4GB Basic Computing Units provisioned"; - Value = floor(min({totalslotcpus,totalslotmemory/1024/4,totalslotdisk/1024/1024/4}))-(PartitionableSlot=?=True * floor(min({cpus,Memory/1024/4,Disk/1024/1024/4}))); + Value = min({TotalInUseCpus,TotalInUseMemory/1024/4,TotalInUseDisk/1024/1024/4}); Units = "Basic Computing Units"; - Requirements = PartitionableSlot=?=True || (SlotType=?="Static" && State=?="Claimed"); - TargetType = "Machine"; + Requirements = true; + TargetType = "Startd"; ] [ Aggregate = "SUM"; Name = "BcusNotInUse"; Desc = "Number of 1core-4GB-4GB Basic Computing Units not provisioned"; - Value = floor(min({cpus,Memory/1024/4,Disk/1024/1024/4})); + Value = min({TotalCpus,TotalMemory/1024/4,TotalDisk/1024/1024/4}) - min({TotalInUseCpus,TotalInUseMemory/1024/4,TotalInUseDisk/1024/1024/4}); Units = "Basic Computing Units"; - Requirements = PartitionableSlot=?=True || (SlotType=?="Static" && State=!="Claimed"); - TargetType = "Machine"; + Requirements = true; + TargetType = "Startd"; ] [ Aggregate = "SUM";