Skip to content

CE Dashboard fix to correctly record info for sites with static slots #249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matyasselmeci merged 2 commits into from
May 22, 2025
Merged

CE Dashboard fix to correctly record info for sites with static slots #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f030546
Make BCU stats work with static slots on CE Dashboard.
tannenba Mar 27, 2025
2e504f8
Reduce logging level of gangliad for CE Dashboard.
tannenba Mar 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion opensciencegrid/ospool-ganglia/51-ganglia-ce-dashboards.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ GANGLIAD_CE.CONDOR_HOST = chtc-spark-ce1.svc.opensciencegrid.org
GANGLIAD_CE.COLLECTOR_HOST = chtc-spark-ce1.svc.opensciencegrid.org:9619
GANGLIAD_CE.GANGLIAD_LOG = $(GANGLIAD_LOG).ce
GANGLIAD_CE.GANGLIAD_METRICS_CONFIG_DIR = $(GANGLIAD_METRICS_CONFIG_DIR)/ce_dashboards
GANGLIAD_CE.GANGLIAD_DEBUG = D_FULLDEBUG
# GANGLIAD_CE.GANGLIAD_DEBUG = D_FULLDEBUG

# Enable reset metrics functionality, which first appears in
# HTCSS version 23.6.x. This functionality is critical to keeping
Expand Down
6 changes: 3 additions & 3 deletions opensciencegrid/ospool-ganglia/ganglia.d/ce_dashboards/51_ce_dashboard_metrics
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
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}))-floor(min({cpus,Memory/1024/4,Disk/1024/1024/4}));
Value = floor(min({totalslotcpus,totalslotmemory/1024/4,totalslotdisk/1024/1024/4}))-(PartitionableSlot=?=True * floor(min({cpus,Memory/1024/4,Disk/1024/1024/4})));
Units = "Basic Computing Units";
Requirements = PartitionableSlot=?=True;
Requirements = PartitionableSlot=?=True || (SlotType=?="Static" && State=?="Claimed");
TargetType = "Machine";
]
[
Expand All @@ -29,7 +29,7 @@
Desc = "Number of 1core-4GB-4GB Basic Computing Units not provisioned";
Value = floor(min({cpus,Memory/1024/4,Disk/1024/1024/4}));
Units = "Basic Computing Units";
Requirements = PartitionableSlot=?=True;
Requirements = PartitionableSlot=?=True || (SlotType=?="Static" && State=!="Claimed");
TargetType = "Machine";
]
[
Expand Down
Loading