From b484f79b31c8c0f2b964761a652c05c53ebefcef Mon Sep 17 00:00:00 2001 From: Cannon Lock Date: Fri, 24 Feb 2023 11:15:45 -0600 Subject: [PATCH 1/2] Update to filter by GRACC Sites over Facilities --- src/templates/iframe.html.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/templates/iframe.html.j2 b/src/templates/iframe.html.j2 index 86204b28b..8abfd0296 100644 --- a/src/templates/iframe.html.j2 +++ b/src/templates/iframe.html.j2 @@ -195,7 +195,7 @@ will want to adjust the Map.data which populates the select input and legend. const compute_services = new Set(["CE", "Submit Node", "Connect", "GUMS Server", "Glidein factory", "VOMS Server", "Execution Endpoint"]); const storage_services = new Set(["Squid", "SRMv2", "XRootD cache server", "GridFtp", "XRootD component", "XRootD origin server", "SRMv1", "LFC", "Apache Server", "FTS"]); const network_services = new Set(["net.perfSONAR.Bandwidth", "net.perfSONAR.Latency"]); - const ospool_facilities = new Set(['American Museum of Natural History', 'Arizona State University', 'Brookhaven National Laboratory', 'California Institute of Technology', 'Cinvestav', 'Clarkson University', 'Clemson University', 'Cybera', 'Fermi National Accelerator Laboratory', 'Florida State University', 'Georgia Institute of Technology', 'Georgia State University', 'Great Plains Network', 'IN2P3', 'INFN-T1', 'Illinois Institute of Technology', 'Indiana University', 'Kansas State University', 'Lancium', 'Lehigh University', 'Louisiana State University', 'Louisiana State University Health Sciences Center', 'New Mexico State University', 'Nikhef', 'North Dakota State University', 'Old Dominion University', 'Purdue University', 'Rice University', 'SURFsara', 'Southern Illinois University Edwardsville', 'Syracuse University', 'The College of New Jersey', 'Tufts University', 'Universidade Estadual Paulista', 'University of California San Diego', 'University of Chicago', 'University of Colorado', 'University of Connecticut', 'University of Illinois at Urbana Champaign', 'University of Michigan', 'University of Mississippi', 'University of Nebraska', 'University of Notre Dame', 'University of Oklahoma', 'University of Puerto Rico - Mayaguez', 'University of South Florida', 'University of Southern California', 'University of Tennessee Chattanooga', 'University of Texas at Austin', 'University of Utah', 'University of Wisconsin', 'Villanova University', 'Wayne State University', 'West Texas A&M University']) + const ospool_sites = new Set(['SU ITS', 'Lancium', 'San Diego Supercomputer Center', 'UNL-PATH', 'UConn-HPC', 'WISC-PATH', 'FermiGrid', 'MWT2 ATLAS UC', 'Pervasive Technology Institute', 'GLOW', 'AMNH', 'UColorado_HEP', 'Purdue Geddes', 'Lehigh - Hawk', 'GP-ARGO', 'NWICG_NDCMS', 'University of Washington Research Computing', 'UConn-OSG', 'Nebraska-Omaha', 'Texas Advanced Computing Center', 'BNL ATLAS Tier1', 'FSU_HNPGRID', 'SYRA-PATH', 'AGLT2', 'UTC - Epyc', 'AUGIE UC', 'New Mexico State Discovery', 'University of Colorado Denver', 'University of Alabama', 'SIUE - CC', 'FNAL USCMS Tier1', 'Rhodes-HPC', 'South Dakota State University', 'Wichita State University', 'Arkansas State University', 'South Dakota School of Mines and Technology', 'Oral Roberts University', 'University of Arkansas', 'Emporia State University', 'University of Arkansas for Medical Sciences', 'University of South Dakota', 'University of Kansas', 'Langston University', 'Clarkson - ACRES', 'Kansas State University', 'Dakota State University', 'UA Little Rock ITS', 'Louisiana State University Health Sciences Center', 'TCNJ - ELSA', 'Creighton University', 'CU - Research Computing', 'FANDM-ITS', 'Missouri University of Science and Technology', 'WTAMU_HPC', 'ASU Research Computing', 'Georgia Tech', 'Clemson-Palmetto', 'Rice-CRC', 'Center for Advanced Research Computing', 'Lafayette College', 'UIUC-ICC-SPT', 'WSU - GRID_ce2', 'Nebraska-Lincoln', 'Oklahoma State University', 'Nebraska-CMS', 'UPRM_HEP', 'ODU - Ubuntu', 'Doane University', 'Cameron University', 'Beocat', 'PDX-OIT', 'cinvestav', 'GSU - ACIDS', 'CHTC', 'Information Sciences Institute', 'Purdue Anvil', 'SPRACE', 'INFN-T1', 'Cybera - Edmonton', 'University of South Florida', 'Maine-ACG', 'Southeast Missouri State University', 'FIU-IRCC', 'LSU - Deep Bayou', 'UCR - HPCC', 'ND_CAML', 'Caltech CMS Tier2', 'Utah-SLATE-Lonepeak', 'UMissHEP', 'IIT - Illinois Institute of Technology', 'NCSU - HPC', 'Utah-SLATE-Notchpeak', 'Utah-SLATE-Kingspeak', 'Tufts - Cluster', 'FNAL HPC']) const iconConfig = { iconSize: [36,36], @@ -427,7 +427,7 @@ will want to adjust the Map.data which populates the select input and legend. get isOSPool(){ if( !this._isOSPool ){ - this._isOSPool = ospool_facilities.has(this.facilityName ) + this._isOSPool = ospool_sites.has(this.siteName) } return this._isOSPool } From 1220d68d74b669d36bc76e874aa210cb867836c1 Mon Sep 17 00:00:00 2001 From: Cannon Lock Date: Fri, 24 Feb 2023 11:27:30 -0600 Subject: [PATCH 2/2] Update to the sites list --- src/templates/iframe.html.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/templates/iframe.html.j2 b/src/templates/iframe.html.j2 index 8abfd0296..325ed31c8 100644 --- a/src/templates/iframe.html.j2 +++ b/src/templates/iframe.html.j2 @@ -195,7 +195,7 @@ will want to adjust the Map.data which populates the select input and legend. const compute_services = new Set(["CE", "Submit Node", "Connect", "GUMS Server", "Glidein factory", "VOMS Server", "Execution Endpoint"]); const storage_services = new Set(["Squid", "SRMv2", "XRootD cache server", "GridFtp", "XRootD component", "XRootD origin server", "SRMv1", "LFC", "Apache Server", "FTS"]); const network_services = new Set(["net.perfSONAR.Bandwidth", "net.perfSONAR.Latency"]); - const ospool_sites = new Set(['SU ITS', 'Lancium', 'San Diego Supercomputer Center', 'UNL-PATH', 'UConn-HPC', 'WISC-PATH', 'FermiGrid', 'MWT2 ATLAS UC', 'Pervasive Technology Institute', 'GLOW', 'AMNH', 'UColorado_HEP', 'Purdue Geddes', 'Lehigh - Hawk', 'GP-ARGO', 'NWICG_NDCMS', 'University of Washington Research Computing', 'UConn-OSG', 'Nebraska-Omaha', 'Texas Advanced Computing Center', 'BNL ATLAS Tier1', 'FSU_HNPGRID', 'SYRA-PATH', 'AGLT2', 'UTC - Epyc', 'AUGIE UC', 'New Mexico State Discovery', 'University of Colorado Denver', 'University of Alabama', 'SIUE - CC', 'FNAL USCMS Tier1', 'Rhodes-HPC', 'South Dakota State University', 'Wichita State University', 'Arkansas State University', 'South Dakota School of Mines and Technology', 'Oral Roberts University', 'University of Arkansas', 'Emporia State University', 'University of Arkansas for Medical Sciences', 'University of South Dakota', 'University of Kansas', 'Langston University', 'Clarkson - ACRES', 'Kansas State University', 'Dakota State University', 'UA Little Rock ITS', 'Louisiana State University Health Sciences Center', 'TCNJ - ELSA', 'Creighton University', 'CU - Research Computing', 'FANDM-ITS', 'Missouri University of Science and Technology', 'WTAMU_HPC', 'ASU Research Computing', 'Georgia Tech', 'Clemson-Palmetto', 'Rice-CRC', 'Center for Advanced Research Computing', 'Lafayette College', 'UIUC-ICC-SPT', 'WSU - GRID_ce2', 'Nebraska-Lincoln', 'Oklahoma State University', 'Nebraska-CMS', 'UPRM_HEP', 'ODU - Ubuntu', 'Doane University', 'Cameron University', 'Beocat', 'PDX-OIT', 'cinvestav', 'GSU - ACIDS', 'CHTC', 'Information Sciences Institute', 'Purdue Anvil', 'SPRACE', 'INFN-T1', 'Cybera - Edmonton', 'University of South Florida', 'Maine-ACG', 'Southeast Missouri State University', 'FIU-IRCC', 'LSU - Deep Bayou', 'UCR - HPCC', 'ND_CAML', 'Caltech CMS Tier2', 'Utah-SLATE-Lonepeak', 'UMissHEP', 'IIT - Illinois Institute of Technology', 'NCSU - HPC', 'Utah-SLATE-Notchpeak', 'Utah-SLATE-Kingspeak', 'Tufts - Cluster', 'FNAL HPC']) + const ospool_sites = new Set(['AGLT2', 'AMNH', 'ASU Research Computing', 'AUGIE UC', 'Arkansas State University', 'BNL ATLAS Tier1', 'Beocat', 'CHTC', 'CU - Research Computing', 'Caltech CMS Tier2', 'Cameron University', 'Center for Advanced Research Computing', 'Clarkson - ACRES', 'Clemson-Palmetto', 'Creighton University', 'Cybera - Edmonton', 'Dakota State University', 'Doane University', 'Emporia State University', 'FANDM-ITS', 'FIU-IRCC', 'FNAL HPC', 'FNAL USCMS Tier1', 'FSU_HNPGRID', 'FermiGrid', 'GLOW', 'GP-ARGO', 'GSU - ACIDS', 'Georgia Tech', 'IIT - Illinois Institute of Technology', 'Information Sciences Institute', 'Kansas State University', 'LSU - Deep Bayou', 'Lafayette College', 'Lancium', 'Langston University', 'Lehigh - Hawk', 'Louisiana State University Health Sciences Center', 'MWT2 ATLAS UC', 'Maine-ACG', 'Missouri University of Science and Technology', 'NCSU - HPC', 'ND_CAML', 'NWICG_NDCMS', 'Nebraska-CMS', 'Nebraska-Lincoln', 'Nebraska-Omaha', 'New Mexico State Discovery', 'ODU - Ubuntu', 'Oklahoma State University', 'Oral Roberts University', 'PDX-OIT', 'Pervasive Technology Institute', 'Purdue Anvil', 'Purdue Geddes', 'Rhodes-HPC', 'Rice-CRC', 'SIUE - CC', 'SPRACE', 'SU ITS', 'SYRA-PATH', 'San Diego Supercomputer Center', 'South Dakota School of Mines and Technology', 'South Dakota State University', 'Southeast Missouri State University', 'TCNJ - ELSA', 'Texas Advanced Computing Center', 'Tufts - Cluster', 'UA Little Rock ITS', 'UCR - HPCC', 'UColorado_HEP', 'UConn-HPC', 'UConn-OSG', 'UMissHEP', 'UNL-PATH', 'UPRM_HEP', 'UTC - Epyc', 'University of Alabama', 'University of Arkansas', 'University of Arkansas for Medical Sciences', 'University of Colorado Denver', 'University of Kansas', 'University of South Dakota', 'University of South Florida', 'University of Washington Research Computing', 'Unmapped resource: FIU-PATH-BACKFILL', 'Unmapped resource: NMSU-Discovery', 'Utah-SLATE-Kingspeak', 'Utah-SLATE-Lonepeak', 'Utah-SLATE-Notchpeak', 'WISC-PATH', 'WSU - GRID_ce2', 'WTAMU_HPC', 'Wichita State University', 'cinvestav']) const iconConfig = { iconSize: [36,36],