Merge branch 'master' into patch-100

opensciencegrid · Jun 27, 2024 · 7300344 · 7300344
2 parents 2684107 + f47a63e
commit 7300344
Show file tree

Hide file tree

Showing 5 changed files with 225 additions and 19 deletions.
diff --git a/src/templates/iframe.html.j2 b/src/templates/iframe.html.j2
@@ -307,8 +307,8 @@ will want to adjust the Map.data which populates the select input and legend.
             this.isCompute = this.calcIsCompute();
             this.isStorage = this.calcIsStorage()
             this.isNetwork = this.calcIsNetwork();
-            this.isOSDFCache = this.calcIsOSDFCache();
-            this.isOSDFOrigin = this.calcIsOSDFOrigin();
+            this.isCache = this.calcIsCache();
+            this.isOrigin = this.calcIsOrigin();
         }
 
         calcIsEDU () {
@@ -327,12 +327,12 @@ will want to adjust the Map.data which populates the select input and legend.
             return this.services.some(({Name: name}) => network_services.has(name))
         }
 
-        calcIsOSDFCache () {
-            return this.services.some(({Name: name}) => name === "XRootD cache server")
+        calcIsCache () {
+            return this.services.some(({Name: name}) => name === "XRootD cache server" || name === "Pelican cache")
         }
 
-        calcIsOSDFOrigin () {
-            return this.services.some(({Name: name}) => name === "XRootD origin server")
+        calcIsOrigin () {
+            return this.services.some(({Name: name}) => name === "XRootD origin server" || name === "Pelican origin")
         }
     }
 
@@ -390,11 +390,11 @@ will want to adjust the Map.data which populates the select input and legend.
                 }
 
             } else if(view === "OpenScienceDataFederation") {
-                if (this.isOSDFOrigin && this.isOSDFCache) {
+                if (this.isOrigin && this.isCache) {
                     icon = cacheAndOriginIcon
-                } else if (this.isOSDFOrigin) {
+                } else if (this.isOrigin) {
                     icon = originIcon
-                } else if (this.isOSDFCache) {
+                } else if (this.isCache) {
                     icon = cacheIcon
                 }
 
@@ -493,7 +493,7 @@ will want to adjust the Map.data which populates the select input and legend.
             } else if(view === "CCStar"){
                 return resource.isCCStar
             } else if(view === "OpenScienceDataFederation") {
-                return resource.isOSDFCache || resource.isOSDFOrigin
+                return resource.isCache || resource.isOrigin
             } else if(view === "OSPool"){
                 return this.resourceIsInOSPool(resource)
             }
@@ -522,12 +522,12 @@ will want to adjust the Map.data which populates the select input and legend.
             return Object.values(this.resources).some(x => x.isNetwork)
         }
 
-        get isOSDFCache() {
-            return Object.values(this.resources).some(x => x.isOSDFCache)
+        get isCache() {
+            return Object.values(this.resources).some(x => x.isCache)
         }
 
-        get isOSDFOrigin(){
-            return Object.values(this.resources).some(x => x.isOSDFOrigin)
+        get isOrigin(){
+            return Object.values(this.resources).some(x => x.isOrigin)
         }
 
         get isOSPool () {

diff --git a/topology/Brookhaven National Laboratory/BNL ATLAS Tier1/BNL-ATLAS.yaml b/topology/Brookhaven National Laboratory/BNL ATLAS Tier1/BNL-ATLAS.yaml
@@ -2,6 +2,45 @@ GroupDescription: This site is the ATLAS Tier 1 Facility at Brookhaven National
 GroupID: 235
 Production: true
 Resources:
+  BNL_ATLAS_01:
+    Active: false
+    ContactLists:
+      Administrative Contact:
+        Primary:
+          ID: 1e47726bf41f2128059de31cf7bc9c8d5dcadad6
+          Name: BNL Atlas Tier 1 support
+        Secondary:
+          ID: OSG1000638
+          Name: Ivan Glushkov
+      Security Contact:
+        Primary:
+          Name: BNL Atlas Tier 1 support
+          ID: 1e47726bf41f2128059de31cf7bc9c8d5dcadad6
+        Secondary:
+          Name: Robert Hancock
+          ID: OSG1000212
+    Description: moved under the resource group BNL_LCG2. This will set the stage
+      for unified site availability with WLCG.
+    FQDN: gridgk01.sdcc.bnl.gov
+    Services:
+      CE:
+        Description: Compute Element
+        Details:
+          hidden: false
+          sam_uri: htcondor://gridgk01.sdcc.bnl.gov
+    VOOwnership:
+      ATLAS: 100
+    WLCGInformation:
+      APELNormalFactor: 12.69
+      AccountingName: BNL_ATLAS_1
+      HEPSPEC: 287779
+      InteropAccounting: true
+      InteropBDII: true
+      InteropMonitoring: true
+      KSI2KMax: 15500
+      KSI2KMin: 15500
+      StorageCapacityMax: 0
+      StorageCapacityMin: 0
   BNL_ATLAS_1:
     Active: true
     ContactLists:
@@ -42,8 +81,46 @@ Resources:
       KSI2KMin: 15500
       StorageCapacityMax: 0
       StorageCapacityMin: 0
+  BNL_ATLAS_02:
+    Active: false
+    ContactLists:
+      Administrative Contact:
+        Primary:
+          ID: 1e47726bf41f2128059de31cf7bc9c8d5dcadad6
+          Name: BNL Atlas Tier 1 support
+        Secondary:
+          ID: OSG1000638
+          Name: Ivan Glushkov
+      Security Contact:
+        Primary:
+          Name: BNL Atlas Tier 1 support
+          ID: 1e47726bf41f2128059de31cf7bc9c8d5dcadad6
+        Secondary:
+          Name: Robert Hancock
+          ID: OSG1000212
+    Description: change resource groupname to BNL-LCG2
+    FQDN: gridgk02.sdcc.bnl.gov
+    Services:
+      CE:
+        Description: Compute Element
+        Details:
+          hidden: false
+          sam_uri: htcondor://gridgk02.sdcc.bnl.gov
+    VOOwnership:
+      ATLAS: 100
+    WLCGInformation:
+      APELNormalFactor: 12.69
+      AccountingName: BNL_ATLAS_1
+      HEPSPEC: 0
+      InteropAccounting: true
+      InteropBDII: true
+      InteropMonitoring: true
+      KSI2KMax: 0
+      KSI2KMin: 0
+      StorageCapacityMax: 0
+      StorageCapacityMin: 0
   BNL_ATLAS_2:
-    Active: true
+    Active: false
     ContactLists:
       Administrative Contact:
         Primary:
@@ -81,6 +158,45 @@ Resources:
       KSI2KMin: 0
       StorageCapacityMax: 0
       StorageCapacityMin: 0
+  BNL_ATLAS_03:
+    Active: false
+    ContactLists:
+      Administrative Contact:
+        Primary:
+          ID: 1e47726bf41f2128059de31cf7bc9c8d5dcadad6
+          Name: BNL Atlas Tier 1 support
+        Secondary:
+          ID: OSG1000638
+          Name: Ivan Glushkov
+      Security Contact:
+        Primary:
+          Name: BNL Atlas Tier 1 support
+          ID: 1e47726bf41f2128059de31cf7bc9c8d5dcadad6
+        Secondary:
+          Name: Robert Hancock
+          ID: OSG1000212
+    Description: An OSG CE resource at BNL, mainly serving USATLAS production jobs,
+      not open to general OSG users.
+    FQDN: gridgk03.sdcc.bnl.gov
+    Services:
+      CE:
+        Description: Compute Element
+        Details:
+          hidden: false
+          sam_uri: htcondor://gridgk03.sdcc.bnl.gov
+    VOOwnership:
+      ATLAS: 100
+    WLCGInformation:
+      APELNormalFactor: 12.69
+      AccountingName: BNL_ATLAS_1
+      HEPSPEC: 0
+      InteropAccounting: true
+      InteropBDII: true
+      InteropMonitoring: true
+      KSI2KMax: 0
+      KSI2KMin: 0
+      StorageCapacityMax: 0
+      StorageCapacityMin: 0
   BNL_ATLAS_3:
     Active: true
     ContactLists:
@@ -121,6 +237,45 @@ Resources:
       KSI2KMin: 0
       StorageCapacityMax: 0
       StorageCapacityMin: 0
+  BNL_ATLAS_04:
+    Active: false
+    ContactLists:
+      Administrative Contact:
+        Primary:
+          ID: 1e47726bf41f2128059de31cf7bc9c8d5dcadad6
+          Name: BNL Atlas Tier 1 support
+        Secondary:
+          ID: OSG1000638
+          Name: Ivan Glushkov
+      Security Contact:
+        Primary:
+          Name: BNL Atlas Tier 1 support
+          ID: 1e47726bf41f2128059de31cf7bc9c8d5dcadad6
+        Secondary:
+          Name: Robert Hancock
+          ID: OSG1000212
+    Description: This is just another gatekeeper, sharing the same backend resources
+      with the other BNL_ATLAS_X gatekeepers.
+    FQDN: gridgk04.sdcc.bnl.gov
+    Services:
+      CE:
+        Description: Compute Element
+        Details:
+          hidden: false
+          sam_uri: htcondor://gridgk04.sdcc.bnl.gov
+    VOOwnership:
+      ATLAS: 100
+    WLCGInformation:
+      APELNormalFactor: 12.69
+      AccountingName: BNL_ATLAS_1
+      HEPSPEC: 0
+      InteropAccounting: true
+      InteropBDII: true
+      InteropMonitoring: true
+      KSI2KMax: 0
+      KSI2KMin: 0
+      StorageCapacityMax: 0
+      StorageCapacityMin: 0
   BNL_ATLAS_4:
     Active: true
     ContactLists:
@@ -161,8 +316,47 @@ Resources:
       KSI2KMin: 0
       StorageCapacityMax: 0
       StorageCapacityMin: 0
-  BNL_ATLAS_6:
+  BNL_ATLAS_06:
     Active: true
+    ContactLists:
+      Administrative Contact:
+        Primary:
+          ID: 1e47726bf41f2128059de31cf7bc9c8d5dcadad6
+          Name: BNL Atlas Tier 1 support
+        Secondary:
+          ID: OSG1000638
+          Name: Ivan Glushkov
+      Security Contact:
+        Primary:
+          Name: BNL Atlas Tier 1 support
+          ID: 1e47726bf41f2128059de31cf7bc9c8d5dcadad6
+        Secondary:
+          Name: Robert Hancock
+          ID: OSG1000212
+    Description: An OSG CE resource at BNL, mainly serving USATLAS production jobs,
+      not open to general OSG users.
+    FQDN: gridgk06.sdcc.bnl.gov
+    Services:
+      CE:
+        Description: Compute Element
+        Details:
+          hidden: false
+          sam_uri: htcondor://gridgk06.sdcc.bnl.gov
+    VOOwnership:
+      ATLAS: 100
+    WLCGInformation:
+      APELNormalFactor: 12.69
+      AccountingName: BNL_ATLAS_1
+      HEPSPEC: 0
+      InteropAccounting: true
+      InteropBDII: true
+      InteropMonitoring: true
+      KSI2KMax: 0
+      KSI2KMin: 0
+      StorageCapacityMax: 0
+      StorageCapacityMin: 0
+  BNL_ATLAS_6:
+    Active: false
     ContactLists:
       Administrative Contact:
         Primary:

diff --git a/topology/Universidade do Estado do Rio de Janeiro/T2_BR_UERJ/UERJ_downtime.yaml b/topology/Universidade do Estado do Rio de Janeiro/T2_BR_UERJ/UERJ_downtime.yaml
@@ -1456,4 +1456,15 @@
   Services:
   - Squid
 # ---------------------------------------------------------
+- Class: UNSCHEDULED
+  ID: 1844303261
+  Description: We need to make adjustments to one of our CEs
+  Severity: Outage
+  StartTime: Jun 26, 2024 19:00 +0000
+  EndTime: Jun 28, 2024 20:00 +0000
+  CreatedTime: Jun 26, 2024 19:32 +0000
+  ResourceName: UERJ_CE
+  Services:
+  - CE
+# ---------------------------------------------------------
 
diff --git a/topology/University of Oklahoma/OU ATLAS/OU_OSCER_ATLAS_downtime.yaml b/topology/University of Oklahoma/OU ATLAS/OU_OSCER_ATLAS_downtime.yaml
@@ -761,7 +761,7 @@
   Description: OSCER cluster maintenance
   Severity: Outage
   StartTime: Jun 26, 2024 13:00 +0000
-  EndTime: Jun 27, 2024 04:00 +0000
+  EndTime: Jun 27, 2024 03:00 +0000
   CreatedTime: Jun 24, 2024 17:22 +0000
   ResourceName: OU_OSCER_ATLAS
   Services:
@@ -773,7 +773,7 @@
   Description: OSCER cluster maintenance
   Severity: Outage
   StartTime: Jun 26, 2024 13:00 +0000
-  EndTime: Jun 27, 2024 04:00 +0000
+  EndTime: Jun 27, 2024 03:00 +0000
   CreatedTime: Jun 24, 2024 17:22 +0000
   ResourceName: OU_OSCER_ATLAS_SE
   Services:
@@ -785,7 +785,7 @@
   Description: OSCER cluster maintenance
   Severity: Outage
   StartTime: Jun 26, 2024 13:00 +0000
-  EndTime: Jun 27, 2024 04:00 +0000
+  EndTime: Jun 27, 2024 03:00 +0000
   CreatedTime: Jun 24, 2024 17:22 +0000
   ResourceName: OU_OSCER_ATLAS_SLATE_SQUID
   Services:

diff --git a/virtual-organizations/OSG.yaml b/virtual-organizations/OSG.yaml
@@ -58,6 +58,7 @@ OASIS:
   - http://hcc-cvmfs-repo.unl.edu:8000/cvmfs/singularity.opensciencegrid.org
   - http://hcc-cvmfs-repo.unl.edu:8000/cvmfs/scitokens.osgstorage.org
   - http://hcc-cvmfs-repo.unl.edu:8000/cvmfs/sdsc-nrp-osdf-origin.osgstorage.org
+  - http://hcc-cvmfs-repo.unl.edu:8000/cvmfs/public.uc.osgstorage.org
   - http://osg-cvmfs.grid.uchicago.edu:8000/cvmfs/veritas.opensciencegrid.org
   - http://osg-cvmfs.grid.uchicago.edu:8000/cvmfs/nexo.opensciencegrid.org
   - http://osg-cvmfs.grid.uchicago.edu:8000/cvmfs/connect.opensciencegrid.org