diff --git a/.github/scripts/check_project_fos_precision/requirements.txt b/.github/scripts/check_project_fos_precision/requirements.txt index 96082b7ff..4fe64646f 100644 --- a/.github/scripts/check_project_fos_precision/requirements.txt +++ b/.github/scripts/check_project_fos_precision/requirements.txt @@ -9,4 +9,4 @@ PyYAML==6.0.1 requests==2.32.0 six==1.16.0 tzdata==2024.1 -urllib3==2.2.1 +urllib3==2.2.2 diff --git a/projects/GATech_Ramprasad.yaml b/projects/GATech_Ramprasad.yaml new file mode 100644 index 000000000..72c09fbb8 --- /dev/null +++ b/projects/GATech_Ramprasad.yaml @@ -0,0 +1,8 @@ +Department: Material Science +Description: 'Develop and apply computational and machine learning tools to accelerate + materials discovery. More information can be found here: https://ramprasad.mse.gatech.edu/' +FieldOfScience: Materials Science +FieldOfScienceID: 14.1801b +InstitutionID: https://osg-htc.org/iid/uvf22j6xjbtv +Organization: Georgia Institute of Technology +PIName: Rampi Ramprasad diff --git a/projects/Illinois_Goyal.yaml b/projects/Illinois_Goyal.yaml new file mode 100644 index 000000000..ab92d457a --- /dev/null +++ b/projects/Illinois_Goyal.yaml @@ -0,0 +1,8 @@ +Department: Computer Science +Description: Diverse set of projects focusing on vision models/LLMs primarily falling + under the umbrella terms of "machine unlearning" and "human-AI alignment" +FieldOfScience: Computer Science +FieldOfScienceID: '11.0701' +InstitutionID: https://osg-htc.org/iid/10izzs5e7v1r +Organization: University of Illinois Urbana-Champaign +PIName: Agam Goyal diff --git a/projects/UTA_Goplerud.yaml b/projects/UTA_Goplerud.yaml new file mode 100644 index 000000000..bdc08b73d --- /dev/null +++ b/projects/UTA_Goplerud.yaml @@ -0,0 +1,13 @@ +Department: Department of Government +Description: > + I create new methods to facilitate political science research by leveraging + the intersection of Bayesian methods and machine learning. My papers create new + methods to tackle a variety of common problems (heterogeneous effects, hierarchical + models, ideal point estimation) where existing methods have limitations that constrain + substantive researchers. My existing papers can be found on my website https://mgoplerud.com/ + as well as on pre-print servers such as arxiv. +FieldOfScience: Statistics +FieldOfScienceID: 27.0599b +InstitutionID: https://osg-htc.org/iid/6z0d22dz19io +Organization: University of Texas at Austin +PIName: Max Goplerud diff --git a/src/app.py b/src/app.py index 75e01bb40..30e7d4b25 100755 --- a/src/app.py +++ b/src/app.py @@ -867,10 +867,9 @@ def generate_project_yaml(): institution_short_names = {x[1]: x[0] for x in global_data.get_mappings().project_institution.items()} institutions = [] for institution in institution_api_data: - institutions.append((institution['id'], institution['name'], institution_short_names.get(institution['name'], ""))) + institutions.append((institution_short_names.get(institution['name'], ""), institution['name'])) def render_form(**kwargs): - institutions = list(global_data.get_mappings().project_institution.items()) session.pop("form_data", None) return render_template( diff --git a/src/templates/generate_project_yaml.html.j2 b/src/templates/generate_project_yaml.html.j2 index 4a63a3f9a..fb9926c80 100644 --- a/src/templates/generate_project_yaml.html.j2 +++ b/src/templates/generate_project_yaml.html.j2 @@ -152,7 +152,7 @@ Project YAML Generator function updateProjectName(){ project_name_node.readOnly = false - if(!(pi_institution_node.value in institutions) || !pi_last_name_node.value){ return } + if(!(pi_institution_node.value in institutions) || !institutions[pi_institution_node.value] || !pi_last_name_node.value){ return } let pi_institution = institutions[pi_institution_node.value] let pi_last_name = pi_last_name_node.value diff --git a/src/webapp/automerge_check.py b/src/webapp/automerge_check.py index 7cc9e491c..969d4d103 100755 --- a/src/webapp/automerge_check.py +++ b/src/webapp/automerge_check.py @@ -2,6 +2,7 @@ import collections import subprocess +import requests import stat import yaml import sys @@ -20,6 +21,7 @@ import xml.etree.ElementTree as et +INSTITUTIONS_API = "https://topology-institutions.osg-htc.org" # NOTE: throughout this program, git shas are of type str, while paths and # filenames are of type bytes. The motivation behind this is to handle @@ -122,19 +124,27 @@ def main(args): errors += check_resource_contacts(BASE_SHA, rg_fname, resources_affected, contacts) - if any( re.match(br'^projects/.*\.yaml', fname) for fname in modified ): + updated_projects = [fname for fname in modified if re.match(br'^projects/.*\.yaml', fname)] + if updated_projects: orgs_base = get_organizations_at_version(base) orgs_new = get_organizations_at_version(head) orgs_added = orgs_new - orgs_base for org in sorted(orgs_added): errors += ["New Organization '%s' requires OSG approval" % org] + invalid_institutions = get_invalid_institution_ids(head, updated_projects) + if invalid_institutions: + errors += [ + f"Unrecognized InstitutionID in project(s) {', '.join(invalid_institutions)}. " + f"See {INSTITUTIONS_API} for known ID list." + ] else: orgs_added = None + invalid_institutions = None print_errors(errors) return ( RC.ALL_CHECKS_PASS if len(errors) == 0 else RC.OUT_OF_DATE_ONLY if len(errors) == 1 and not up_to_date - else RC.ORGS_ADDED if orgs_added + else RC.ORGS_ADDED if orgs_added or invalid_institutions else RC.DT_MOD_ERRORS if len(DTs) > 0 else RC.CONTACT_ERROR if not contacts else RC.NON_DT_ERRORS ) @@ -212,6 +222,13 @@ def get_organizations_at_version(sha): if re.search(br'.\.yaml$', fname) ] return set( p.get("Organization") for p in projects ) +def get_invalid_institution_ids(sha, fnames): + valid_institutions = requests.get(f'{INSTITUTIONS_API}/api/institution_ids').json() + institution_ids = [i['id'] for i in valid_institutions] + projects = { fname : parse_yaml_at_version(sha, fname, {}) for fname in fnames } + return [fname.decode() for fname, yaml in projects.items() if not yaml.get("InstitutionID", "") in institution_ids] + + def commit_is_merged(sha_a, sha_b): args = ['git', 'merge-base', '--is-ancestor', sha_a, sha_b] ret, out = runcmd(args, stderr=_devnull) diff --git a/src/webapp/forms.py b/src/webapp/forms.py index b6a7d60f6..f45bb3b9f 100644 --- a/src/webapp/forms.py +++ b/src/webapp/forms.py @@ -200,7 +200,7 @@ def get_yaml(self, resources, service_names_by_resource) -> str: yaml = "" for index, resource in enumerate(resources): yaml += models.get_downtime_yaml( - id=dtid+index, + id_=dtid + index, start_datetime=self.get_start_datetime(), end_datetime=self.get_end_datetime(), created_datetime=created_datetime, @@ -293,7 +293,7 @@ def get_yaml(self) -> str: dtid = models._dtid(created_datetime) return models.get_downtime_yaml( - id=dtid, + id_=dtid, start_datetime=self.get_start_datetime(), end_datetime=self.get_end_datetime(), created_datetime=created_datetime, diff --git a/src/webapp/models.py b/src/webapp/models.py index 4573d7fe9..f7d511b04 100644 --- a/src/webapp/models.py +++ b/src/webapp/models.py @@ -203,10 +203,10 @@ def get_contact_db_data(self) -> Optional[ContactsData]: if ok: try: self.contacts_data.update(contacts_reader.get_contacts_data(self.contacts_file)) - except Exception: + except Exception as err: if self.strict: raise - log.exception("Failed to update contacts data") + log.exception("Failed to update contacts data (%s)", err) self.contacts_data.try_again() else: self.contacts_data.try_again() @@ -230,10 +230,10 @@ def get_comanage_data(self) -> Optional[ContactsData]: idmap = self.get_cilogon_ldap_id_map() data = ldap_data.cilogon_id_map_to_yaml_data(idmap) self.comanage_data.update(ContactsData(data)) - except Exception: + except Exception as err: if self.strict: raise - log.exception("Failed to update comanage data") + log.exception("Failed to update comanage data (%s)", err) self.comanage_data.try_again() return self.comanage_data.data @@ -255,10 +255,10 @@ def get_contacts_data(self) -> Optional[ContactsData]: yd2 = self.get_contact_db_data().yaml_data yd_merged = ldap_data.merge_yaml_data(yd1, yd2) self.merged_contacts_data.update(ContactsData(yd_merged)) - except Exception: + except Exception as err: if self.strict: raise - log.exception("Failed to update merged contacts data") + log.exception("Failed to update merged contacts data (%s)", err) self.merged_contacts_data.try_again() return self.merged_contacts_data.data @@ -279,10 +279,10 @@ def get_ligo_dn_list(self) -> Optional[List[str]]: ligo_ldap_pass = readfile(self.ligo_ldap_passfile, log) new_dn_list = ldap_data.get_ligo_ldap_dn_list(self.ligo_ldap_url, self.ligo_ldap_user, ligo_ldap_pass) self.ligo_dn_list.update(new_dn_list) - except Exception: + except Exception as err: if self.strict: raise - log.exception("Failed to update LIGO data") + log.exception("Failed to update LIGO data (%s)", err) self.ligo_dn_list.try_again() return self.ligo_dn_list.data @@ -296,10 +296,10 @@ def get_dns(self) -> Optional[Set]: contacts_data = self.get_contacts_data() try: self.dn_set.update(set(contacts_data.get_dns())) - except Exception: + except Exception as err: if self.strict: raise - log.exception("Failed to update DNs") + log.exception("Failed to update DNs (%s)", err) self.contacts_data.try_again() return self.dn_set.data @@ -324,10 +324,10 @@ def update_topology(self) -> None: log.debug("Updating topology RG data") self.topology.update(rg_reader.get_topology(self.topology_dir, self.get_contacts_data(), strict=self.strict)) log.debug("Updated topology RG data successfully") - except Exception: + except Exception as err: if self.strict: raise - log.exception("Failed to update topology RG data") + log.exception("Failed to update topology RG data (%s)", err) self.topology.try_again() else: self.topology.try_again() @@ -345,10 +345,10 @@ def get_vos_data(self) -> Optional[VOsData]: log.debug("Updating VOs") self.vos_data.update(vo_reader.get_vos_data(self.vos_dir, self.get_contacts_data(), strict=self.strict)) log.debug("Updated VOs successfully") - except Exception: + except Exception as err: if self.strict: raise - log.exception("Failed to update VOs") + log.exception("Failed to update VOs (%s)", err) self.vos_data.try_again() else: self.vos_data.try_again() @@ -368,10 +368,10 @@ def get_projects(self) -> Optional[Dict]: log.debug("Updating projects") self.projects.update(project_reader.get_projects(self.projects_dir, strict=self.strict)) log.debug("Updated projects successfully") - except Exception: + except Exception as err: if self.strict: raise - log.exception("Failed to update projects") + log.exception("Failed to update projects (%s)", err) self.projects.try_again() else: self.projects.try_again() @@ -393,10 +393,10 @@ def get_mappings(self, strict=None) -> Optional[mappings.Mappings]: log.debug("Updating mappings") self.mappings.update(mappings.get_mappings(indir=self.mappings_dir, strict=strict)) log.debug("Updated mappings successfully") - except Exception: + except Exception as err: if self.strict: raise - log.exception("Failed to update mappings") + log.exception("Failed to update mappings (%s)", err) self.mappings.try_again() else: self.mappings.try_again() @@ -412,7 +412,7 @@ def _dtid(created_datetime: datetime.datetime): return int((timestamp - dtid_offset) * multiplier) -def get_downtime_yaml(id: int, +def get_downtime_yaml(id_: int, start_datetime: datetime.datetime, end_datetime: datetime.datetime, created_datetime: datetime.datetime, @@ -428,8 +428,8 @@ def get_downtime_yaml(id: int, """ - def render(key, value): - return yaml.safe_dump({key: value}, default_flow_style=False).strip() + def render(key_, value_): + return yaml.safe_dump({key_: value_}, default_flow_style=False).strip() def indent(in_str, amount): spaces = ' ' * amount @@ -441,7 +441,7 @@ def indent(in_str, amount): result = "- " + render("Class", class_) for key, value in [ - ("ID", id), + ("ID", id_), ("Description", description), ("Severity", severity), ("StartTime", start_time_str), diff --git a/src/webapp/webhook_status_messages.py b/src/webapp/webhook_status_messages.py index 50e7c7726..b8f8f8d27 100644 --- a/src/webapp/webhook_status_messages.py +++ b/src/webapp/webhook_status_messages.py @@ -76,7 +76,7 @@ "Thank you for your pull request.\n" "\n" "Your [requested changes]({base_sha}...{head_sha}) add a new organization" - " to a project file; this requires manual review from OSG Staff.\n" + " or project ID to a project file; this requires manual review from OSG Staff.\n" "\n" "-- OSG-BOT :oncoming_police_car:\n" "\n" diff --git a/topology/American University of Beirut/HPC For Lebanon/HPC4L.yaml b/topology/American University of Beirut/HPC For Lebanon/HPC4L.yaml index f709a147e..5e162dcfa 100644 --- a/topology/American University of Beirut/HPC For Lebanon/HPC4L.yaml +++ b/topology/American University of Beirut/HPC For Lebanon/HPC4L.yaml @@ -2,7 +2,7 @@ GroupDescription: "HPC4L initiative (https://hpc4l-webpage.web.cern.ch/)" Production: true Resources: HPC4L-CE: - Active: false + Active: true ContactLists: Administrative Contact: Primary: @@ -33,7 +33,7 @@ Resources: StorageCapacityMax: 0 StorageCapacityMin: 0 HPC4L-SE: - Active: false + Active: true ContactLists: Administrative Contact: Primary: @@ -62,7 +62,7 @@ Resources: StorageCapacityMax: 8.2 StorageCapacityMin: 1 HPC4L-SE-2: - Active: false + Active: true ContactLists: Administrative Contact: Primary: @@ -91,7 +91,7 @@ Resources: StorageCapacityMax: 8.2 StorageCapacityMin: 1 HPC4L-Squid: - Active: false + Active: true ContactLists: Administrative Contact: Primary: diff --git a/topology/Compute Canada/ComputeCanada - Cedar/SITE.yaml b/topology/Compute Canada/ComputeCanada - Cedar/SITE.yaml index 823e7d400..f794e7f7b 100644 --- a/topology/Compute Canada/ComputeCanada - Cedar/SITE.yaml +++ b/topology/Compute Canada/ComputeCanada - Cedar/SITE.yaml @@ -1,18 +1,10 @@ -# LongName is the expanded name of the site LongName: Compute Canada Cedar Cluster -# Description is a brief description of your site Description: Cedar is a heterogeneous cluster suitable for a variety of workloads; it is located at Simon Fraser University. - -# If you have an up-to-date local git clone, fill ID with the output from `bin/next_site_id` -# Otherwise, leave it blank and we will fill in the appropriate value for you. ID: 10281 -AddressLine1: 2152 Hillside Road -City: Storrs - -Country: United States -State: CT -Zipcode: "06269-3046" - -Latitude: 41.8084 -Longitude: -72.2495 - +AddressLine1: 8888 University Drive +City: Burnaby +Country: Canada +State: BC +Zipcode: "V5A 1S66" +Latitude: 49.278639393188136 +Longitude: -122.91726450229353 diff --git a/topology/DIII-D National Fusion Facility/National Fusion Facility/FDP-OSDF.yaml b/topology/DIII-D National Fusion Facility/National Fusion Facility/FDP-OSDF.yaml new file mode 100644 index 000000000..63e0af773 --- /dev/null +++ b/topology/DIII-D National Fusion Facility/National Fusion Facility/FDP-OSDF.yaml @@ -0,0 +1,46 @@ +Production: true +SupportCenter: Self Supported +GroupDescription: Fusion Data Platform +Resources: + FDP_OSDF_CACHE: + Active: true + Description: FDP OSDF cache + ContactLists: + Administrative Contact: + Primary: + Name: Fabio Andrijauskas + ID: OSG1000162 + Security Contact: + Primary: + Name: Fabio Andrijauskas + ID: OSG1000162 + DN: /CN=fdp-d3d-cache.nationalresearchplatform.org + FQDN: fdp-d3d-cache.nationalresearchplatform.org + Services: + XRootD cache server: + Description: OSDF cache server for FDP project + Details: + endpoint_override: fdp-d3d-cache.nationalresearchplatform.org:8443 + auth_endpoint_override: fdp-d3d-cache.nationalresearchplatform.org:8443 + AllowedVOs: + - ANY + + FDP_OSDF_ORIGIN: + Active: false + Description: FDP OSDF origin + ContactLists: + Administrative Contact: + Primary: + Name: Fabio Andrijauskas + ID: OSG1000162 + Security Contact: + Primary: + Name: Fabio Andrijauskas + ID: OSG1000162 + DN: /CN=fdp-d3d-origin.nationalresearchplatform.org + FQDN: fdp-d3d-origin.nationalresearchplatform.org + Services: + XRootD cache server: + Description: OSDF origin server for FDP project + AllowedVOs: + - ANY diff --git a/topology/DIII-D National Fusion Facility/National Fusion Facility/SITE.yaml b/topology/DIII-D National Fusion Facility/National Fusion Facility/SITE.yaml new file mode 100644 index 000000000..495c22949 --- /dev/null +++ b/topology/DIII-D National Fusion Facility/National Fusion Facility/SITE.yaml @@ -0,0 +1,9 @@ +LongName: DIII-D National Fusion Facility +Description: Fusion Data Platform +AddressLine1: 3483 Dunhill St. +City: San Diego +Country: US +Latitude: 32.90246879605678 +Longitude: -117.2283010938664 +State: CA +Zipcode: 92121 \ No newline at end of file diff --git a/topology/Energy Sciences Network/Amsterdam/EsnetAmsterdam.yaml b/topology/Energy Sciences Network/Amsterdam/EsnetAmsterdam.yaml index f2ed868fd..b81bda81b 100644 --- a/topology/Energy Sciences Network/Amsterdam/EsnetAmsterdam.yaml +++ b/topology/Energy Sciences Network/Amsterdam/EsnetAmsterdam.yaml @@ -22,4 +22,4 @@ Resources: XRootD cache server: Description: ESnet Amsterdam Cache AllowedVOs: - - ANY \ No newline at end of file + - LIGO diff --git a/topology/Energy Sciences Network/Amsterdam/EsnetAmsterdam_downtime.yaml b/topology/Energy Sciences Network/Amsterdam/EsnetAmsterdam_downtime.yaml new file mode 100644 index 000000000..e98d4ea5d --- /dev/null +++ b/topology/Energy Sciences Network/Amsterdam/EsnetAmsterdam_downtime.yaml @@ -0,0 +1,11 @@ +- Class: UNSCHEDULED + ID: 1830524787 + Description: '#toPelican' + Severity: Outage + StartTime: Jun 10, 2024 08:00 +0000 + EndTime: Jun 15, 2024 06:59 +0000 + CreatedTime: Jun 10, 2024 20:47 +0000 + ResourceName: AMSTERDAM_ESNET_OSDF_CACHE + Services: + - XRootD cache server +# --------------------------------------------------------- diff --git a/topology/Energy Sciences Network/London/ESnetLondon.yaml b/topology/Energy Sciences Network/London/ESnetLondon.yaml index 934ded268..5fe582291 100644 --- a/topology/Energy Sciences Network/London/ESnetLondon.yaml +++ b/topology/Energy Sciences Network/London/ESnetLondon.yaml @@ -22,4 +22,4 @@ Resources: XRootD cache server: Description: Internet2 London Cache AllowedVOs: - - ANY + - LIGO diff --git a/topology/Fermi National Accelerator Laboratory/FermiGrid/FNAL_OSDF_downtime.yaml b/topology/Fermi National Accelerator Laboratory/FermiGrid/FNAL_OSDF_downtime.yaml new file mode 100644 index 000000000..f2bf32508 --- /dev/null +++ b/topology/Fermi National Accelerator Laboratory/FermiGrid/FNAL_OSDF_downtime.yaml @@ -0,0 +1,11 @@ +- Class: UNSCHEDULED + ID: 1831468972 + Description: Testing the pelican sw + Severity: Outage + StartTime: Jun 11, 2024 08:00 +0000 + EndTime: Jun 21, 2024 19:30 +0000 + CreatedTime: Jun 11, 2024 23:01 +0000 + ResourceName: FNAL_OSDF_ORIGIN + Services: + - XRootD origin server +# --------------------------------------------------------- diff --git a/topology/Institute of Physics ASCR/FZU/FZU_downtime.yaml b/topology/Institute of Physics ASCR/FZU/FZU_downtime.yaml index ac3d03e16..707d8f6c5 100644 --- a/topology/Institute of Physics ASCR/FZU/FZU_downtime.yaml +++ b/topology/Institute of Physics ASCR/FZU/FZU_downtime.yaml @@ -32,3 +32,75 @@ Services: - XRootD cache server # --------------------------------------------------------- +- Class: SCHEDULED + ID: 1837692118 + Description: See https://goc.egi.eu/portal/index.php?Page_Type=Downtime&id=35391 and + https://goc.egi.eu/portal/index.php?Page_Type=Downtime&id=35395 + Severity: Outage + StartTime: Jun 14, 2024 12:00 +0000 + EndTime: Jun 21, 2024 16:00 +0000 + CreatedTime: Jun 19, 2024 03:53 +0000 + ResourceName: FZU_OSG_CE1 + Services: + - CE +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1837692119 + Description: See https://goc.egi.eu/portal/index.php?Page_Type=Downtime&id=35391 and + https://goc.egi.eu/portal/index.php?Page_Type=Downtime&id=35395 + Severity: Outage + StartTime: Jun 14, 2024 12:00 +0000 + EndTime: Jun 21, 2024 16:00 +0000 + CreatedTime: Jun 19, 2024 03:53 +0000 + ResourceName: FZU_OSG_CE2 + Services: + - CE +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1837692120 + Description: See https://goc.egi.eu/portal/index.php?Page_Type=Downtime&id=35391 and + https://goc.egi.eu/portal/index.php?Page_Type=Downtime&id=35395 + Severity: Outage + StartTime: Jun 14, 2024 12:00 +0000 + EndTime: Jun 21, 2024 16:00 +0000 + CreatedTime: Jun 19, 2024 03:53 +0000 + ResourceName: FZU_OSG_CE3 + Services: + - CE +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1837692121 + Description: See https://goc.egi.eu/portal/index.php?Page_Type=Downtime&id=35391 and + https://goc.egi.eu/portal/index.php?Page_Type=Downtime&id=35395 + Severity: Outage + StartTime: Jun 14, 2024 12:00 +0000 + EndTime: Jun 21, 2024 16:00 +0000 + CreatedTime: Jun 19, 2024 03:53 +0000 + ResourceName: FZU_STASH + Services: + - XRootD cache server +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1837692122 + Description: See https://goc.egi.eu/portal/index.php?Page_Type=Downtime&id=35391 and + https://goc.egi.eu/portal/index.php?Page_Type=Downtime&id=35395 + Severity: Outage + StartTime: Jun 14, 2024 12:00 +0000 + EndTime: Jun 21, 2024 16:00 +0000 + CreatedTime: Jun 19, 2024 03:53 +0000 + ResourceName: perfSONAR_FZU_bandwidth + Services: + - net.perfSONAR.Bandwidth +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1837692123 + Description: See https://goc.egi.eu/portal/index.php?Page_Type=Downtime&id=35391 and + https://goc.egi.eu/portal/index.php?Page_Type=Downtime&id=35395 + Severity: Outage + StartTime: Jun 14, 2024 12:00 +0000 + EndTime: Jun 21, 2024 16:00 +0000 + CreatedTime: Jun 19, 2024 03:53 +0000 + ResourceName: perfSONAR_FZU_latency + Services: + - net.perfSONAR.Latency +# --------------------------------------------------------- diff --git a/topology/Internet2/Internet2Houston/I2HoustonInfrastructure_downtime.yaml b/topology/Internet2/Internet2Houston/I2HoustonInfrastructure_downtime.yaml index d36876069..feb66ae13 100644 --- a/topology/Internet2/Internet2Houston/I2HoustonInfrastructure_downtime.yaml +++ b/topology/Internet2/Internet2Houston/I2HoustonInfrastructure_downtime.yaml @@ -9,3 +9,14 @@ Services: - XRootD cache server # --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1830385994 + Description: HW issues + Severity: Outage + StartTime: Jun 10, 2024 08:01 +0000 + EndTime: Jun 21, 2024 19:30 +0000 + CreatedTime: Jun 10, 2024 16:56 +0000 + ResourceName: HOUSTON2_INTERNET2_OSDF_CACHE + Services: + - XRootD cache server +# --------------------------------------------------------- diff --git a/topology/Lehigh University/Lehigh - Hawk/Lehigh - Hawk_downtime.yaml b/topology/Lehigh University/Lehigh - Hawk/Lehigh - Hawk_downtime.yaml index 151fa610e..39d0b27d5 100644 --- a/topology/Lehigh University/Lehigh - Hawk/Lehigh - Hawk_downtime.yaml +++ b/topology/Lehigh University/Lehigh - Hawk/Lehigh - Hawk_downtime.yaml @@ -97,4 +97,15 @@ Services: - XRootD cache server # --------------------------------------------------------- +- Class: SCHEDULED + ID: 1830324854 + Description: Upgrade CE from CentOS 7 to Alma 9 and OSG from 3.6 to 23 + Severity: Outage + StartTime: Jun 12, 2024 13:00 +0000 + EndTime: Jun 13, 2024 16:00 +0000 + CreatedTime: Jun 10, 2024 15:14 +0000 + ResourceName: LEHIGH-HAWK-CE + Services: + - CE +# --------------------------------------------------------- diff --git a/topology/Massachusetts Green High Performance Computing Center/NRP/MGHPCCCachingInfrastructure.yaml b/topology/Massachusetts Green High Performance Computing Center/NRP/MGHPCCCachingInfrastructure.yaml index da4d1f9b2..714e0e383 100644 --- a/topology/Massachusetts Green High Performance Computing Center/NRP/MGHPCCCachingInfrastructure.yaml +++ b/topology/Massachusetts Green High Performance Computing Center/NRP/MGHPCCCachingInfrastructure.yaml @@ -4,7 +4,7 @@ GroupDescription: Caching infrastructure in MGHPCC GroupID: 1318 Resources: MGHPCC_NRP_OSDF_CACHE: - Active: true + Active: false Description: MGHPCC NRP OSDF Cache ID: 1348 ContactLists: diff --git a/topology/National Center for Atmospheric Research/NCAR-Wyoming Supercomputing Center/NCAR-OSDF.yaml b/topology/National Center for Atmospheric Research/NCAR-Wyoming Supercomputing Center/NCAR-OSDF.yaml index ffba18a83..0f9125536 100644 --- a/topology/National Center for Atmospheric Research/NCAR-Wyoming Supercomputing Center/NCAR-OSDF.yaml +++ b/topology/National Center for Atmospheric Research/NCAR-Wyoming Supercomputing Center/NCAR-OSDF.yaml @@ -29,3 +29,29 @@ Resources: auth_endpoint_override: ncar.nationalresearchplatform.org:8443 AllowedVOs: - ANY + + NCAR_OSDF_S3_ORIGIN: + Active: true + Description: NCAR OSDF S3 Origin + ContactLists: + Administrative Contact: + Primary: + Name: Fabio Andrijauskas + ID: OSG1000162 + Secondary: + Name: Diego Davila + ID: bc36e7fe84fffcb5cf195fe09cc42336f5cd5d1f + Security Contact: + Primary: + Name: Fabio Andrijauskas + ID: OSG1000162 + DN: /CN=ncar-s3-origin.nationalresearchplatform.org + FQDN: ncar-s3-origin.nationalresearchplatform.org + Services: + XRootD origin server: + Description: NCAR OSDF Origin + Details: + endpoint_override: ncar-s3-origin.nationalresearchplatform.org:8444 + auth_endpoint_override: ncar-s3-origin.nationalresearchplatform.org:8444 + AllowedVOs: + - ANY diff --git a/topology/Oral Roberts University/ORU - Computing Group/ORU-Titan.yaml b/topology/Oral Roberts University/ORU - Computing Group/ORU-Titan.yaml index ad9013855..5f8359912 100644 --- a/topology/Oral Roberts University/ORU - Computing Group/ORU-Titan.yaml +++ b/topology/Oral Roberts University/ORU - Computing Group/ORU-Titan.yaml @@ -26,53 +26,37 @@ Resources: # If you have an up-to-date local git clone, fill ID with the output from `bin/next_resource_id` # Otherwise, leave it blank and we will fill in the appropriate value for you. ID: 1462 - # ContactLists contain information about people to contact regarding this resource. - # The "ID" is a hash of their email address available at https://topology.opensciencegrid.org/miscuser/xml - # If you cannot find the contact above XML, please register the contact: - # https://opensciencegrid.org/docs/common/registration/#registering-contacts + ContactLists: - # Administrative Contacts are persons or groups of people (i.e., - # mailing lists) that are directly responsible for the - # maintenance of the resource Administrative Contact: Primary: Name: Jeffrey Michael Dost ID: 3a8eb6436a8b78ca50f7e93bb2a4d1f0141212ba - # Secondary: - # Name: - # ID: - # Tertiary: - # Name: - # ID: - - # Security Contact are persons or groups of people (i.e., - # mailing lists) that are responsible for handling security - # issues related to the resource Administrative Contact: Primary: Name: Jeffrey Michael Dost ID: 3a8eb6436a8b78ca50f7e93bb2a4d1f0141212ba - # Secondary: - # Name: - # ID: - # Tertiary: - # Name: - # ID: - - # Site contact (optional) are persons or groups of people (i.e., - # mailing lists) that are generally responsible for a site's - # relationship with the OSG (e.g., principal investigators, - # local administrator contact for OSG Hosted CEs) - # Site Contact: - # Primary: - # Name: - # ID: - # Secondary: - # Name: - # ID: - # Tertiary: - # Name: - # ID: + Local Executive Contact: + Primary: + Name: Stephen Wheat + ID: OSG1000693 + Secondary: + Name: Jan Heinrich Rolf Woerner + ID: OSG1000703 + Local Operational Contact: + Primary: + Name: Stephen Wheat + ID: OSG1000693 + Secondary: + Name: Jan Heinrich Rolf Woerner + ID: OSG1000703 + Local Security Contact: + Primary: + Name: Stephen Wheat + ID: OSG1000693 + Secondary: + Name: Jan Heinrich Rolf Woerner + ID: OSG1000703 # FQDN is the fully qualified domain name of the host running this resource FQDN: oru-titan-ce1.svc.opensciencegrid.org diff --git a/topology/Riga Technical University/RTU-CMS/RTU.yaml b/topology/Riga Technical University/RTU-CMS/RTU.yaml new file mode 100644 index 000000000..74d76e18b --- /dev/null +++ b/topology/Riga Technical University/RTU-CMS/RTU.yaml @@ -0,0 +1,307 @@ +# Production is true if the resources in this group will join the production OSG pool, +# and not the Integration Test Bed (ITB) pool. +Production: true +# SupportCenter is one of the support centers in topology/support-centers.yaml +SupportCenter: Self Supported + +# GroupDescription is a long description of the resource group; may be multiple lines. +GroupDescription: LV RTU CMS Tier2 HPC Cluster + +# Resources contains one or more resources in this +# ResourceGroup. A resource provides one or more services +Resources: + # Resource Name should be a short descriptor of the resource. + # e.g. the Center for High Throughput Computing's GlideinWMS Frontend is "CHTC-glidein2" + # Resource Names need to be unique across all resources in the OSG. + T2_LV_HPCNET-CE: + # Active is true if the resource is accepting requests, and false otherwise. + # When first registering a resource, set this to false. Set it to true when it's ready for production. + Active: false + # Description is a long description of the resource; may be multiple lines + Description: This is a ARC-CE for T2_LV_HPCNET. + # ContactLists contain information about people to contact regarding this resource. + # The "ID" is a hash of their email address available at https://topology.opensciencegrid.org/miscuser/xml + # If you cannot find the contact above XML, please register the contact: + # https://opensciencegrid.org/docs/common/registration/#registering-contacts + ContactLists: + # Administrative Contacts are persons or groups of people (i.e., + # mailing lists) that are directly responsible for the + # maintenance of the resource + Administrative Contact: + Primary: + Name: Igors Makarkins + ID: OSG1000678 + # Secondary: + # Name: + # ID: + # Tertiary: + # Name: + # ID: + + # Security Contact are persons or groups of people (i.e., + # mailing lists) that are responsible for handling security + # issues related to the resource + Security Contact: + Primary: + Name: Igors Makarkins + ID: OSG1000678 + # Secondary: + # Name: + # ID: + # Tertiary: + # Name: + # ID: + + # (OPTIONAL) Executive Contacts are persons or groups of + # people (i.e., mailing lists) are responsible for making policy + # decisions regarding the site's integration with the OSG resource + # Executive Contact: + # Primary: + # Name: + # ID: + # Secondary: + # Name: + # ID: + # Tertiary: + # Name: + # ID: + + # Local contacts are an optional set of persons or groups of + # people (i.e., mailing lists) if they are a different from the + # persons responsible for the resouce. For example, OSG Hosted + # CEs are operated by OSG Staff, who are separate from the local + # contacts that are responsible for running the site's scheduler + + # (OPTIONAL) Local Executive Contacts are persons or groups of + # people (i.e., mailing lists) are responsible for making policy + # decisions regarding the site's integration with the OSG resource + # Local Executive Contact: + # Primary: + # Name: + # ID: + # Secondary: + # Name: + # ID: + # Tertiary: + # Name: + # ID: + + # (OPTIONAL) Local Operaitonal Contacts are persons or groups of + # people (i.e., mailing lists) that are directly responsible for the + # maintenance of the site's integration with the OSG resource + # Local Operational Contact: + # Primary: + # Name: + # ID: + # Secondary: + # Name: + # ID: + # Tertiary: + # Name: + # ID: + + # (OPTIONAL) Local Security Contacts are persons or groups of + # mailing lists) that are responsible for handling security + # issues related to the site's integration with the OSG resource + # Local Security Contact: + # Primary: + # Name: + # ID: + # Secondary: + # Name: + # ID: + # Tertiary: + # Name: + # ID: + + # FQDN is the fully qualified domain name of the host running this resource + FQDN: ce-arc.tier2.hpc-net.lv + ### FQDNAliases (optional) are any other DNS aliases by which this host can be accessed + # FQDNAliases: + # - + # - + + ### DN (optional except for XCache resources) is the DN of the host cert of the resource + # in OpenSSL 1.0 format (i.e. /DC=org/DC=incommon/C=US/...) + # DN: + + # Services is one or more services provided by this resource; + # valid services are listed in topology/services.yaml with the format ": " + Services: + CE: + # Description is a brief description of the service + Description: Hosted ARC-CE + ### Details (optional) + # Details: + # # hidden + # hidden: false + # ### uri_override (optional, use if your service is on some non-standard URL) + # # uri_override: : + # ### sam_uri (optional) + # # sam_uri: htcondor://... + # ### endpoint (for perfSONAR services) + # # endpoint: + + # Other services if you have any + # : + # ... + + ### Tags (optional) is a list of tags associated with the resource. + ### Include the tag "CC*" if applicable for a CC* CE. + # Tags: + # - CC* + # - + + ### VOOwnership (optional) is the percentage of the resource owned by one or more VOs. + ### If part of the resource is not owned by the VO, do not list it. + ### The total percentage cannot exceed 100. + # VOOwnership: + # : + # : + + ### WLCGInformation (optional) is only for resources that are part of the WLCG + # WLCGInformation: + # APELNormalFactor: 0.0 + # HEPScore23Percentage: 0.0 + # AccountingName: + # HEPSPEC: 0 + # InteropAccounting: true + # InteropBDII: true + # InteropMonitoring: true + # KSI2KMax: 0 + # KSI2KMin: 0 + # StorageCapacityMax: 0 + # StorageCapacityMin: 0 + # TapeCapacity: 0 + + # Other resources if you have any... + # : + # ... + T2_LV_HPCNET-SQUID: + # Active is true if the resource is accepting requests, and false otherwise. + # When first registering a resource, set this to false. Set it to true when it's ready for production. + Active: false + # Description is a long description of the resource; may be multiple lines + Description: This is Frontier squid proxy for T2_LV_HPCNET. + # ContactLists contain information about people to contact regarding this resource. + # The "ID" is a hash of their email address available at https://topology.opensciencegrid.org/miscuser/xml + # If you cannot find the contact above XML, please register the contact: + # https://opensciencegrid.org/docs/common/registration/#registering-contacts + ContactLists: + # Administrative Contacts are persons or groups of people (i.e., + # mailing lists) that are directly responsible for the + # maintenance of the resource + Administrative Contact: + Primary: + Name: Igors Makarkins + ID: OSG1000678 + # Secondary: + # Name: + # ID: + # Tertiary: + # Name: + # ID: + + # Security Contact are persons or groups of people (i.e., + # mailing lists) that are responsible for handling security + # issues related to the resource + Security Contact: + Primary: + Name: Igors Makarkins + ID: OSG1000678 + # Secondary: + # Name: + # ID: + # Tertiary: + # Name: + # ID: + + # (OPTIONAL) Executive Contacts are persons or groups of + # people (i.e., mailing lists) are responsible for making policy + # decisions regarding the site's integration with the OSG resource + # Executive Contact: + # Primary: + # Name: + # ID: + # Secondary: + # Name: + # ID: + # Tertiary: + # Name: + # ID: + + # Local contacts are an optional set of persons or groups of + # people (i.e., mailing lists) if they are a different from the + # persons responsible for the resouce. For example, OSG Hosted + # CEs are operated by OSG Staff, who are separate from the local + # contacts that are responsible for running the site's scheduler + + # (OPTIONAL) Local Executive Contacts are persons or groups of + # people (i.e., mailing lists) are responsible for making policy + # decisions regarding the site's integration with the OSG resource + # Local Executive Contact: + # Primary: + # Name: + # ID: + # Secondary: + # Name: + # ID: + # Tertiary: + # Name: + # ID: + + # (OPTIONAL) Local Operaitonal Contacts are persons or groups of + # people (i.e., mailing lists) that are directly responsible for the + # maintenance of the site's integration with the OSG resource + # Local Operational Contact: + # Primary: + # Name: + # ID: + # Secondary: + # Name: + # ID: + # Tertiary: + # Name: + # ID: + + # (OPTIONAL) Local Security Contacts are persons or groups of + # mailing lists) that are responsible for handling security + # issues related to the site's integration with the OSG resource + # Local Security Contact: + # Primary: + # Name: + # ID: + # Secondary: + # Name: + # ID: + # Tertiary: + # Name: + # ID: + + # FQDN is the fully qualified domain name of the host running this resource + FQDN: squid.tier2.hpc-net.lv + ### FQDNAliases (optional) are any other DNS aliases by which this host can be accessed + # FQDNAliases: + # - + # - + + ### DN (optional except for XCache resources) is the DN of the host cert of the resource + # in OpenSSL 1.0 format (i.e. /DC=org/DC=incommon/C=US/...) + # DN: + + # Services is one or more services provided by this resource; + # valid services are listed in topology/services.yaml with the format ": " + Services: + Squid: + # Description is a brief description of the service + Description: Frontier squid proxy used by CVMFS clients on our cluster + ### Details (optional) + # Details: + # # hidden + # hidden: false + # ### uri_override (optional, use if your service is on some non-standard URL) + # # uri_override: : + # ### sam_uri (optional) + # # sam_uri: htcondor://... + # ### endpoint (for perfSONAR services) + # # endpoint: diff --git a/topology/UC Irvine/UCIT3/UCI-GPATLAS.yaml b/topology/UC Irvine/UCIT3/UCI-GPATLAS.yaml index 718212549..11f3458bb 100644 --- a/topology/UC Irvine/UCIT3/UCI-GPATLAS.yaml +++ b/topology/UC Irvine/UCIT3/UCI-GPATLAS.yaml @@ -16,7 +16,7 @@ Resources: Name: Diego Davila Site Contact: Primary: - ID: dbcd20edf55fb43c78b2e547a393898b42643d29 + ID: OSG1000711 Name: Nathan Crawford Description: SLATE deployed Hosted CE for the GPAtlas Cluster FQDN: hosted-ce40.opensciencegrid.org @@ -39,7 +39,7 @@ Resources: Name: Diego Davila Site Contact: Primary: - ID: dbcd20edf55fb43c78b2e547a393898b42643d29 + ID: OSG1000711 Name: Nathan Crawford Description: SLATE deployed Hosted CE for the GPAtlas Cluster FQDN: uci-gpatlas-ce1.svc.opensciencegrid.org diff --git a/topology/UC Irvine/UCIT3/University of California Irvine.yaml b/topology/UC Irvine/UCIT3/University of California Irvine.yaml index 5ff72b19c..87c00ca7e 100644 --- a/topology/UC Irvine/UCIT3/University of California Irvine.yaml +++ b/topology/UC Irvine/UCIT3/University of California Irvine.yaml @@ -1,7 +1,9 @@ -GroupDescription: UCI ATLAS Tier-3 -GroupID: 287 Production: true +SupportCenter: USATLAS +GroupDescription: UCI ATLAS Tier-3 + Resources: +#Archived Resources (inactive) UCI_ATLAS_GRIDFTP: ContactLists: Security Contact: @@ -12,19 +14,29 @@ Resources: Primary: ID: bb69da4f25103364b78eec103a2b084e289af8ee Name: Anyes Taffard - Active: true - Description: UCI gridftp + Local Operational Contact: + Primary: + ID: OSG1000711 + Name: Nathan Crawford + Active: false + Description: UCI gridftp and LHC @ UC glidein scheduler submit host. FQDN: gpatlas2.ps.uci.edu + DN: /DC=org/DC=incommon/C=US/ST=California/O=University of California, Irvine/CN=gpatlas2.ps.uci.edu ID: 441 Services: GridFtp: Description: GridFtp Storage Element Details: hidden: false + Submit Node: + Description: OS Pool access point + Tags: + - OSPool VOOwnership: ATLAS: 100 + UCLHC IRVINE SUBMIT HOST: - Active: true + Active: false ContactLists: Administrative Contact: Primary: @@ -40,27 +52,68 @@ Resources: Secondary: ID: 3a8eb6436a8b78ca50f7e93bb2a4d1f0141212ba Name: Jeffrey Michael Dost - Site Contact: + Local Operational Contact: Primary: - ID: dbcd20edf55fb43c78b2e547a393898b42643d29 + ID: OSG1000711 Name: Nathan Crawford - Description: LHC @ UC glidein scheduler submit host. This host is hosted at UCI - and managed via puppet at UCSD. + Description: LHC @ UC glidein scheduler submit host. FQDN: uclhc-1.ps.uci.edu - DN: /DC=org/DC=incommon/C=US/ST=California/L=Irvine/O=University of California, Irvine/OU=School of Physical Sciences/CN=uclhc-1.ps.uci.edu + DN: /DC=org/DC=incommon/C=US/ST=California/O=University of California, Irvine/CN=uclhc-1.ps.uci.edu ID: 778 Services: Submit Node: - Description: OSG Submission Node + Description: OS Pool access point Details: hidden: false Tags: - OSPool VOOwnership: ATLAS: 100 - + +#Active Resources + UCIT3-AP1: + Active: true + Description: UCI ATLAS Access Point 1. + ContactLists: + Administrative Contact: + Primary: + ID: bc36e7fe84fffcb5cf195fe09cc42336f5cd5d1f + Name: Diego Davila + Secondary: + ID: 3a8eb6436a8b78ca50f7e93bb2a4d1f0141212ba + Name: Jeffrey Michael Dost + Tertiary: + ID: OSG1000711 + Name: Nathan Crawford + Security Contact: + Primary: + ID: bc36e7fe84fffcb5cf195fe09cc42336f5cd5d1f + Name: Diego Davila + Secondary: + ID: 3a8eb6436a8b78ca50f7e93bb2a4d1f0141212ba + Name: Jeffrey Michael Dost + Tertiary: + ID: OSG1000711 + Name: Nathan Crawford + Local Operational Contact: + Primary: + ID: OSG1000711 + Name: Nathan Crawford + FQDN: uclhc-1.ps.uci.edu + DN: /DC=org/DC=incommon/C=US/ST=California/O=University of California, Irvine/CN=uclhc-1.ps.uci.edu + Services: + Submit Node: + Description: OS Pool access point + Details: + hidden: false + Tags: + - OSPool + VOOwnership: + ATLAS: 100 + UCIT3-AP2: Active: true + Description: UCI ATLAS Access Point 2. ContactLists: Administrative Contact: Primary: @@ -69,6 +122,9 @@ Resources: Secondary: ID: 3a8eb6436a8b78ca50f7e93bb2a4d1f0141212ba Name: Jeffrey Michael Dost + Tertiary: + ID: OSG1000711 + Name: Nathan Crawford Security Contact: Primary: ID: bc36e7fe84fffcb5cf195fe09cc42336f5cd5d1f @@ -76,15 +132,82 @@ Resources: Secondary: ID: 3a8eb6436a8b78ca50f7e93bb2a4d1f0141212ba Name: Jeffrey Michael Dost - Site Contact: + Local Operational Contact: Primary: - ID: dbcd20edf55fb43c78b2e547a393898b42643d29 + ID: OSG1000711 Name: Nathan Crawford - Description: LHC @ UC glidein scheduler submit host. This host is hosted at UCI - and managed via puppet at UCSD. FQDN: uclhc-2.ps.uci.edu - DN: /DC=org/DC=incommon/C=US/ST=California/L=Irvine/O=University of California, Irvine/OU=School of Physical Sciences/CN=uclhc-2.ps.uci.edu - ID: 1209 + DN: /DC=org/DC=incommon/C=US/ST=California/O=University of California, Irvine/CN=uclhc-2.ps.uci.edu + Services: + Submit Node: + Description: OS Pool access point + Tags: + - OSPool + VOOwnership: + ATLAS: 100 + + UCIT3-AP3: + Active: true + Description: UCI ATLAS Access Point 3. + ContactLists: + Administrative Contact: + Primary: + ID: bc36e7fe84fffcb5cf195fe09cc42336f5cd5d1f + Name: Diego Davila + Secondary: + ID: 3a8eb6436a8b78ca50f7e93bb2a4d1f0141212ba + Name: Jeffrey Michael Dost + Tertiary: + ID: OSG1000711 + Name: Nathan Crawford + Security Contact: + Primary: + ID: bc36e7fe84fffcb5cf195fe09cc42336f5cd5d1f + Name: Diego Davila + Secondary: + ID: 3a8eb6436a8b78ca50f7e93bb2a4d1f0141212ba + Name: Jeffrey Michael Dost + Local Operational Contact: + Primary: + ID: OSG1000711 + Name: Nathan Crawford + FQDN: gpatlas1.ps.uci.edu + DN: /DC=org/DC=incommon/C=US/ST=California/O=University of California, Irvine/CN=gpatlas1.ps.uci.edu + Services: + Submit Node: + Description: OS Pool access point + Tags: + - OSPool + VOOwnership: + ATLAS: 100 + + UCIT3-AP4: + Active: true + Description: UCI ATLAS Access Point 4. + ContactLists: + Administrative Contact: + Primary: + ID: bc36e7fe84fffcb5cf195fe09cc42336f5cd5d1f + Name: Diego Davila + Secondary: + ID: 3a8eb6436a8b78ca50f7e93bb2a4d1f0141212ba + Name: Jeffrey Michael Dost + Tertiary: + ID: OSG1000711 + Name: Nathan Crawford + Security Contact: + Primary: + ID: bc36e7fe84fffcb5cf195fe09cc42336f5cd5d1f + Name: Diego Davila + Secondary: + ID: 3a8eb6436a8b78ca50f7e93bb2a4d1f0141212ba + Name: Jeffrey Michael Dost + Local Operational Contact: + Primary: + ID: OSG1000711 + Name: Nathan Crawford + FQDN: gpatlas2.ps.uci.edu + DN: /DC=org/DC=incommon/C=US/ST=California/O=University of California, Irvine/CN=gpatlas2.ps.uci.edu Services: Submit Node: Description: OS Pool access point @@ -92,4 +215,3 @@ Resources: - OSPool VOOwnership: ATLAS: 100 -SupportCenter: USATLAS diff --git a/topology/University of California San Diego/San Diego Supercomputer Center/SDSC-NRP.yaml b/topology/University of California San Diego/San Diego Supercomputer Center/SDSC-NRP.yaml index 1180bc778..074016f48 100644 --- a/topology/University of California San Diego/San Diego Supercomputer Center/SDSC-NRP.yaml +++ b/topology/University of California San Diego/San Diego Supercomputer Center/SDSC-NRP.yaml @@ -51,34 +51,29 @@ Resources: AllowedVOs: - ANY - SDSC_NRP_OSDF_S3_ORIGIN: + SDSC_NRP_OSDF_XENON_ORIGIN: Active: true - Description: SDSC NRP OSDF S3 Origin + Description: SDSC NRP OSDF Xenon Origin ContactLists: Administrative Contact: Primary: Name: Fabio Andrijauskas ID: OSG1000162 - Secondary: - Name: Diego Davila - ID: bc36e7fe84fffcb5cf195fe09cc42336f5cd5d1f Security Contact: Primary: Name: Fabio Andrijauskas ID: OSG1000162 - DN: /CN=sdsc-s3-origin.nationalresearchplatform.org - FQDN: sdsc-s3-origin.nationalresearchplatform.org + DN: /CN=sdsc-xenon-origin.nationalresearchplatform.org + FQDN: sdsc-xenon-origin.nationalresearchplatform.org Services: XRootD origin server: - Description: SDSC NRP OSDF Origin - Details: - endpoint_override: sdsc-s3-origin.nationalresearchplatform.org:8444 - auth_endpoint_override: sdsc-s3-origin.nationalresearchplatform.org:8444 + Description: SDSC NRP OSDF Xenon Origin AllowedVOs: - ANY - SDSC_NRP_FDP_OSDF_CACHE: + + SDSC_NRP_OSDF_S3_ORIGIN: Active: true - Description: SDSC NRP OSDF FDP project cache + Description: SDSC NRP OSDF S3 Origin ContactLists: Administrative Contact: Primary: @@ -91,13 +86,14 @@ Resources: Primary: Name: Fabio Andrijauskas ID: OSG1000162 - DN: /CN=fdp-cache.nationalresearchplatform.org - FQDN: fdp-cache.nationalresearchplatform.org + DN: /CN=sdsc-s3-origin.nationalresearchplatform.org + FQDN: sdsc-s3-origin.nationalresearchplatform.org Services: - XRootD cache server: - Description: SDSC NRP FDP OSDF cache + XRootD origin server: + Description: SDSC NRP OSDF Origin Details: - endpoint_override: fdp-cache.nationalresearchplatform.org:8443 - auth_endpoint_override: fdp-cache.nationalresearchplatform.org:8443 + endpoint_override: sdsc-s3-origin.nationalresearchplatform.org:8444 + auth_endpoint_override: sdsc-s3-origin.nationalresearchplatform.org:8444 AllowedVOs: - ANY + diff --git a/topology/University of California San Diego/San Diego Supercomputer Center/SDSC-NRP_downtime.yaml b/topology/University of California San Diego/San Diego Supercomputer Center/SDSC-NRP_downtime.yaml index 430431ba7..641fc3907 100644 --- a/topology/University of California San Diego/San Diego Supercomputer Center/SDSC-NRP_downtime.yaml +++ b/topology/University of California San Diego/San Diego Supercomputer Center/SDSC-NRP_downtime.yaml @@ -64,3 +64,14 @@ Services: - XRootD origin server # --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1825239949 + Description: toPelican + Severity: Outage + StartTime: Jun 03, 2024 08:01 +0000 + EndTime: Jun 08, 2024 08:01 +0000 + CreatedTime: Jun 04, 2024 17:59 +0000 + ResourceName: SDSC_NRP_OSDF_ORIGIN + Services: + - XRootD origin server +# --------------------------------------------------------- diff --git a/topology/University of Chicago/MWT2 ATLAS UC/MWT2.yaml b/topology/University of Chicago/MWT2 ATLAS UC/MWT2.yaml index bc7babed3..5e6616250 100644 --- a/topology/University of Chicago/MWT2 ATLAS UC/MWT2.yaml +++ b/topology/University of Chicago/MWT2 ATLAS UC/MWT2.yaml @@ -756,12 +756,12 @@ Resources: ID: OSG1000064 Name: Ilija Vukotic Description: Varnish cache located at Starlight, Chicago, IL - FQDN: igrok-chcg.pacificwave.net + FQDN: starlight.varnish.atlas-ml.org Services: Squid: Description: Varnish based squid service for CVMFS at NRP Details: - uri_override: igrok-chcg.pacificwave.net:6081 + uri_override: starlight.varnish.atlas-ml.org:6082 Monitored: true VOOwnership: ATLAS: 100 diff --git a/topology/University of Missouri/Missouri ITRSS/Missouri-Rise.yaml b/topology/University of Missouri/Missouri ITRSS/Missouri-Rise.yaml new file mode 100644 index 000000000..89602d443 --- /dev/null +++ b/topology/University of Missouri/Missouri ITRSS/Missouri-Rise.yaml @@ -0,0 +1,27 @@ +Production: true +SupportCenter: Community Support Center +GroupDescription: Compute infrastructure + +Resources: + Missouri-Rise-Origin1-NRP: + Active: false + Description: MO NRP origin + ContactLists: + Administrative Contact: + Primary: + Name: Fabio Andrijauskas + ID: OSG1000162 + Secondary: + ID: bc36e7fe84fffcb5cf195fe09cc42336f5cd5d1f + Name: Diego Davila + Security Contact: + Primary: + Name: Fabio Andrijauskas + ID: OSG1000162 + DN: /CN=mo-origin.nationalresearchplatform.org + FQDN: mo-origin.nationalresearchplatform.org + Services: + XRootD origin server: + Description: MO NRP origin + AllowedVOs: + - ANY diff --git a/topology/University of Missouri/Missouri ITRSS/SITE.yaml b/topology/University of Missouri/Missouri ITRSS/SITE.yaml new file mode 100644 index 000000000..500a824ba --- /dev/null +++ b/topology/University of Missouri/Missouri ITRSS/SITE.yaml @@ -0,0 +1,7 @@ +City: Columbia +Country: United States +Description: Missouri ITRSS +Latitude: 38.9410516354836 +Longitude: -92.32573369440686 +State: MO +Zipcode: '65211' \ No newline at end of file diff --git a/topology/University of Nebraska/Nebraska-Lincoln/UNLCachingInfrastructure.yaml b/topology/University of Nebraska/Nebraska-Lincoln/UNLCachingInfrastructure.yaml index b40074f1c..55341281a 100644 --- a/topology/University of Nebraska/Nebraska-Lincoln/UNLCachingInfrastructure.yaml +++ b/topology/University of Nebraska/Nebraska-Lincoln/UNLCachingInfrastructure.yaml @@ -126,5 +126,8 @@ Resources: Services: XRootD cache server: Description: Nebraska NRP OSDF Cache + Details: + endpoint_override: unl-cache.nationalresearchplatform.org:8443 + auth_endpoint_override: unl-cache.nationalresearchplatform.org:8443 AllowedVOs: - ANY diff --git a/topology/University of Nebraska/Nebraska-Lincoln/UNLNRPOrigin_downtime.yaml b/topology/University of Nebraska/Nebraska-Lincoln/UNLNRPOrigin_downtime.yaml new file mode 100644 index 000000000..e3b5e94e6 --- /dev/null +++ b/topology/University of Nebraska/Nebraska-Lincoln/UNLNRPOrigin_downtime.yaml @@ -0,0 +1,11 @@ +- Class: UNSCHEDULED + ID: 1833154607 + Description: Testing OS + Severity: Outage + StartTime: Jun 12, 2024 19:30 +0000 + EndTime: Jun 21, 2024 19:30 +0000 + CreatedTime: Jun 13, 2024 21:51 +0000 + ResourceName: NEBRASKA_NRP_OSDF_ORIGIN + Services: + - XRootD origin server +# --------------------------------------------------------- diff --git a/topology/University of Texas Arlington/SWT2 ATLAS UTA/SWT2_CPB.yaml b/topology/University of Texas Arlington/SWT2 ATLAS UTA/SWT2_CPB.yaml index ad6a78cb6..e638ff293 100644 --- a/topology/University of Texas Arlington/SWT2 ATLAS UTA/SWT2_CPB.yaml +++ b/topology/University of Texas Arlington/SWT2 ATLAS UTA/SWT2_CPB.yaml @@ -34,7 +34,7 @@ Resources: VOOwnership: ATLAS: 100 WLCGInformation: - APELNormalFactor: 10.43 + APELNormalFactor: 12.52 AccountingName: US-SWT2 HEPSPEC: 102816 InteropAccounting: true @@ -73,7 +73,7 @@ Resources: VOOwnership: ATLAS: 100 WLCGInformation: - APELNormalFactor: 10.43 + APELNormalFactor: 12.52 AccountingName: US-SWT2 HEPSPEC: 102816 InteropAccounting: false @@ -264,4 +264,42 @@ Resources: endpoint: psuta01.atlas-swt2.org VOOwnership: ATLAS: 100 + SWT2_CPB_K8S: + Active: true + ContactLists: + Administrative Contact: + Primary: + ID: OSG1000710 + Name: Armen Vartapetian + Secondary: + ID: 85358c47f16fad2a915da157353581016788a30a + Name: Mark Sosebee + Security Contact: + Primary: + ID: OSG1000710 + Name: Armen Vartapetian + Secondary: + ID: 85358c47f16fad2a915da157353581016788a30a + Name: Mark Sosebee + Description: ATLAS Tier2 Kubernetes queue + FQDN: cpb-k8s.atlas-swt2.org # placeholder + Services: + Execution Endpoint: + Description: Container-based ATLAS PanDA pilots + Details: + hidden: false + VOOwnership: + ATLAS: 100 + WLCGInformation: + APELNormalFactor: 12.52 + AccountingName: US-SWT2 + HEPSPEC: 102816 + InteropAccounting: true + InteropBDII: true + InteropMonitoring: true + KSI2KMax: 2086 + KSI2KMin: 2086 + StorageCapacityMax: 5000 + StorageCapacityMin: 5000 + TapeCapacity: 0 SupportCenter: USATLAS diff --git a/topology/University of Wisconsin/CHTC/CHTC-OSDF_downtime.yaml b/topology/University of Wisconsin/CHTC/CHTC-OSDF_downtime.yaml index d2e15bbe6..e313d1629 100644 --- a/topology/University of Wisconsin/CHTC/CHTC-OSDF_downtime.yaml +++ b/topology/University of Wisconsin/CHTC/CHTC-OSDF_downtime.yaml @@ -186,3 +186,14 @@ Services: - XRootD cache server # --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1825261289 + Description: received complaints about overloading + Severity: Intermittent Outage + StartTime: Jun 04, 2024 18:35 +0000 + EndTime: Jul 06, 2024 18:35 +0000 + CreatedTime: Jun 04, 2024 18:35 +0000 + ResourceName: CHTC_STASHCACHE_CACHE + Services: + - XRootD cache server +# --------------------------------------------------------- diff --git a/topology/University of Wisconsin/CHTC/CHTC.yaml b/topology/University of Wisconsin/CHTC/CHTC.yaml index 9818d27f1..49b8d3e5e 100644 --- a/topology/University of Wisconsin/CHTC/CHTC.yaml +++ b/topology/University of Wisconsin/CHTC/CHTC.yaml @@ -45,7 +45,7 @@ Resources: VOOwnership: GLOW: 100 CHTC-submit-1: - Active: true + Active: false ContactLists: Administrative Contact: Primary: @@ -68,7 +68,7 @@ Resources: VOOwnership: GLOW: 100 CHTC-submit2: - Active: true + Active: false ContactLists: Administrative Contact: Primary: @@ -612,4 +612,52 @@ Resources: Tags: - OSPool + CHTC-ap2001: + Active: true + ContactLists: + Administrative Contact: + Primary: + ID: OSG1000015 + Name: Aaron Moate + Security Contact: + Primary: + ID: OSG1000015 + Name: Aaron Moate + Description: CHTC Access Point + FQDN: ap2001.chtc.wisc.edu + ID: 10370 + Services: + Submit Node: + Description: OS Pool access point + Details: + hidden: false + Tags: + - OSPool + VOOwnership: + GLOW: 100 + + CHTC-ap2002: + Active: true + ContactLists: + Administrative Contact: + Primary: + ID: OSG1000015 + Name: Aaron Moate + Security Contact: + Primary: + ID: OSG1000015 + Name: Aaron Moate + Description: CHTC Access Point + FQDN: ap2002.chtc.wisc.edu + ID: 10371 + Services: + Submit Node: + Description: OS Pool access point + Details: + hidden: false + Tags: + - OSPool + VOOwnership: + GLOW: 100 + SupportCenter: GLOW-TECH diff --git a/virtual-organizations/NRP.yaml b/virtual-organizations/NRP.yaml index 4010b14b3..f275f0b11 100644 --- a/virtual-organizations/NRP.yaml +++ b/virtual-organizations/NRP.yaml @@ -65,7 +65,7 @@ DataFederations: Authorizations: - PUBLIC - SciTokens: - Issuer: https://t.nationalresearchplatform.org/fdp + Issuer: https://t.nationalresearchplatform.org/fdp-d3d Base Path: /nrp/fdp/ Map Subject: False AllowedOrigins: @@ -101,3 +101,14 @@ DataFederations: - SDSC_NRP_OSDF_ORIGIN AllowedCaches: - ANY + - Path: /fdp-d3d + Authorizations: + - PUBLIC + - SciTokens: + Issuer: https://t.nationalresearchplatform.org/fdp-d3d + Base Path: /fdp-d3d + Map Subject: False + AllowedOrigins: + - FDP_OSDF_ORIGIN + AllowedCaches: + - ANY diff --git a/virtual-organizations/OSG.yaml b/virtual-organizations/OSG.yaml index aab350d30..0d0fd40cf 100644 --- a/virtual-organizations/OSG.yaml +++ b/virtual-organizations/OSG.yaml @@ -195,8 +195,8 @@ DataFederations: - Path: /ospool/ap40/data Authorizations: - SciTokens: - Issuer: https://ospool-ap2140.chtc.wisc.edu:8443 - Base Path: /ospool/ap40 + Issuer: https://osg-htc.org/ospool + Base Path: /ospool/ap40/data Map Subject: True AllowedOrigins: - CHTC-ap40 @@ -209,32 +209,36 @@ DataFederations: Issuer: https://ospool-ap2140.chtc.wisc.edu:8443 MaxScopeDepth: 4 - # SciTokens issuer for ap20 - - Path: /ospool/ap20/.well-known - Authorizations: - - PUBLIC - AllowedOrigins: - - UChicago_OSGConnect_ap20 - # Do not cache this: direct access only - AllowedCaches: [] + ### These scitokens issuers are intentionally unregistered: the xrootd + ### service serving them does not pull config from Topology, and the + ### data is not meant to be cached. - # SciTokens issuer for ap21 - - Path: /ospool/ap21/.well-known - Authorizations: - - PUBLIC - AllowedOrigins: - - UChicago_OSGConnect_ap21 - # Do not cache this: direct access only - AllowedCaches: [] + # # SciTokens issuer for ap20 + # - Path: /ospool/ap20/.well-known + # Authorizations: + # - PUBLIC + # AllowedOrigins: + # - UChicago_OSGConnect_ap20 + # # Do not cache this: direct access only + # AllowedCaches: [] - # SciTokens issuer for ap22 - - Path: /ospool/ap22/.well-known - Authorizations: - - PUBLIC - AllowedOrigins: - - UChicago_OSGConnect_ap22 - # Do not cache this: direct access only - AllowedCaches: [] + # # SciTokens issuer for ap21 + # - Path: /ospool/ap21/.well-known + # Authorizations: + # - PUBLIC + # AllowedOrigins: + # - UChicago_OSGConnect_ap21 + # # Do not cache this: direct access only + # AllowedCaches: [] + + # # SciTokens issuer for ap22 + # - Path: /ospool/ap22/.well-known + # Authorizations: + # - PUBLIC + # AllowedOrigins: + # - UChicago_OSGConnect_ap22 + # # Do not cache this: direct access only + # AllowedCaches: [] - Path: /ospool/uc-shared/project Authorizations: diff --git a/virtual-organizations/REPORTING_GROUPS.yaml b/virtual-organizations/REPORTING_GROUPS.yaml index 8b9fcbe89..1503d09de 100644 --- a/virtual-organizations/REPORTING_GROUPS.yaml +++ b/virtual-organizations/REPORTING_GROUPS.yaml @@ -141,7 +141,7 @@ atlas: Name: Joel Snow - ID: a688fe1904cfc91c2c5529eb898a13f9ebfbadbe Name: Xin Zhao - - ID: 4884a2d919bc5079022317a8403f84a117f2d25b + - ID: OSG1000710 Name: Armen Vartapetian FQANs: - GroupName: /atlas