Nrp update

.github/workflows/deploy-production-same-repo.yml

@@ -43,6 +43,14 @@ jobs:
           ruby-version: 3.4
           bundler-cache: true
 
+      - uses: actions/setup-node@v6
+        with:
+          node-version: 24
+          cache: 'npm'
+
+      - name: Download Backup Data
+        run: npm run backup
+
       - name: Build and Deploy
         run: |
           # Build the production version of website

Gemfile.lock

@@ -311,4 +311,4 @@ DEPENDENCIES
   jekyll-sitemap
 
 BUNDLED WITH
-   2.7.1
+  4.0.1

_services/nrp.html

@@ -46,27 +46,170 @@ <h1>
                 <a href="https://path-cc.io">PATh</a> and <a href="https://nationalresearchplatform.org/">National Research Platform (NRP)</a> collaborate and share a common mission to build open cyberinfrastructure and expand services for scientific research affiliated with US academic institutions. Both projects are supported by the National Science Foundation (NSF)'s Office of Advanced Cyberinfrastructure (OAC) award.
             </p>
 
-            <h4 class="mt-4">NRP contributes to PATh by:</h4>
+            <h2 class="mt-4">NRP contributes to PATh by:</h2>
             <ul class="text-start mt-3">
                 <li class="mb-2">Increasing PATh's overall computing capacity by contributing to the <a href="https://osg-htc.org/services/open_science_pool.html">OSPool</a>, a pool of shared computing capacity accessible to researchers affiliated with a US academic institution.</li>
                 <li class="mb-2">Sharing their global Kubernetes infrastructure, which manages the deployment of PATh services.</li>
                 <li class="mb-2">Making it easier for institutions to contribute capacity to the <a href="https://osg-htc.org/services/open_science_pool.html">OSPool</a> due to the system infrastructure that NRP can run on a contributing institution's behalf.</li>
                 <li class="mb-2">Providing access for its community to PATh's <a href="https://osg-htc.org/services/osdf.html">Open Science Data Federation (OSDF)</a> and <a href="https://pelicanplatform.org/">Pelican</a> services for data access and staging.</li>
             </ul>
-
-            <p class="mt-4">
-                The below projects used NRP resources on the <a href="https://osg-htc.org/services/open_science_pool.html">OSPool</a> to advance their research in the past year and ran more than 100 jobs.
-                To run your own research on the OSPool sign up now on the <a href="https://portal.osg-htc.org">OSG Portal</a>.
-            </p>
+        </div>
+    </div>
+</div>
+<div class="container-xxl mb-3">
+    <div class="row justify-content-center">
+        <div class="col-12 col-lg-8 col-md-10">
+            <h3 class="">
+                Totals
+            </h3>
+            <p>OSPool usage of NRP Contributions.</p>
+        </div>
+        <div class="col-12 col-xl-10 col-lg-10 col-md-12">
+            <div class="row g-4">
+                <!-- Month Card -->
+                <div class="col-12 col-md-4">
+                    <div class="card h-100">
+                        <div class="card-header">Month</div>
+                        <div class="card-body">
+                            <div class="mb-3 d-flex flex-row justify-content-between">
+                                <h4 class="fw-semibold my-auto"><i class="bi bi-cpu"></i> CPU</h4>
+                                <div class="d-flex align-items-end flex-column">
+                                    <h4 id="card-cpu-month" class="text-primary mb-0">Loading</h4>
+                                    <span class="fs-7 text-nowrap">Core Hours</span>
+                                </div>
+                            </div>
+                            <div class="mb-3 d-none">
+                                <span class="fw-semibold">Memory:</span>
+                                <span id="card-memory-month">[Memory Placeholder]</span>
+                            </div>
+                            <div class="d-flex flex-row justify-content-between">
+                                <h4 class="fw-semibold my-auto"><i class="bi bi-gpu-card"></i> GPU</h4>
+                                <div class="d-flex align-items-end flex-column">
+                                    <h4 id="card-nvidia_com_gpu-month" class="text-primary mb-0">Loading</h4>
+                                    <span class="fs-7 text-nowrap">Hours</span>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <!-- Week Card -->
+                <div class="col-12 col-md-4">
+                    <div class="card h-100">
+                        <div class="card-header">Week</div>
+                        <div class="card-body">
+                            <div class="mb-3 d-flex flex-row justify-content-between">
+                                <h4 class="fw-semibold my-auto"><i class="bi bi-cpu"></i> CPU</h4>
+                                <div class="d-flex align-items-end flex-column">
+                                    <h4 id="card-cpu-week" class="text-primary mb-0">Loading</h4>
+                                    <span class="fs-7 text-nowrap">Core Hours</span>
+                                </div>
+                            </div>
+                            <div class="mb-3 d-none">
+                                <span class="fw-semibold">Memory:</span>
+                                <span id="card-memory-week">[Memory Placeholder]</span>
+                            </div>
+                            <div class="d-flex flex-row justify-content-between">
+                                <h4 class="fw-semibold my-auto"><i class="bi bi-gpu-card"></i> GPU</h4>
+                                <div class="d-flex align-items-end flex-column">
+                                    <h4 id="card-nvidia_com_gpu-week" class="text-primary mb-0">Loading</h4>
+                                    <span class="fs-7 text-nowrap">Hours</span>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <!-- Day Card -->
+                <div class="col-12 col-md-4">
+                    <div class="card h-100">
+                        <div class="card-header">Day</div>
+                        <div class="card-body">
+                            <div class="mb-3 d-flex flex-row justify-content-between">
+                                <h4 class="fw-semibold my-auto"><i class="bi bi-cpu"></i> CPU</h4>
+                                <div class="d-flex align-items-end flex-column">
+                                    <h4 id="card-cpu-day" class="text-primary mb-0">Loading</h4>
+                                    <span class="fs-7 text-nowrap">Core Hours</span>
+                                </div>
+                            </div>
+                            <div class="mb-3 d-none">
+                                <span class="fw-semibold">Memory:</span>
+                                <span id="card-memory-day">[Memory Placeholder]</span>
+                            </div>
+                            <div class="d-flex flex-row justify-content-between">
+                                <h4 class="fw-semibold my-auto"><i class="bi bi-gpu-card"></i> GPU</h4>
+                                <div class="d-flex align-items-end flex-column">
+                                    <h4 id="card-nvidia_com_gpu-day" class="text-primary mb-0">Loading</h4>
+                                    <span class="fs-7 text-nowrap">Hours</span>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<div class="container-xxl mt-3">
+    <div class="row justify-content-center">
+        <div class="col-12 col-lg-8 col-md-10">
+            <h3 class="">
+                NRP Contribution use by Project
+            </h3>
+            <p>Project usage of NRP resource contributions last year.</p>
+        </div>
+    </div>
+</div>
+<div class="container-xxl">
+    <div class="row g-4 justify-content-center">
+        <div class="col-12 col-md-4">
+            <div class="card h-100">
+                <div class="card-header">LIGO</div>
+                <div class="card-body">
+                    <div class="mb-3 d-flex flex-row justify-content-between">
+                        <h4 class="fw-semibold my-auto"><i class="bi bi-cpu"></i> CPU</h4>
+                        <div class="d-flex align-items-end flex-column">
+                            <h4 id="card-ligo-cpu" class="text-primary mb-0">Loading</h4>
+                            <span class="fs-7 text-nowrap">Core Hours</span>
+                        </div>
+                    </div>
+                    <div class="d-flex flex-row justify-content-between">
+                        <h4 class="fw-semibold my-auto"><i class="bi bi-gpu-card"></i> GPU</h4>
+                        <div class="d-flex align-items-end flex-column">
+                            <h4 id="card-ligo-nvidia_com_gpu" class="text-primary mb-0">Loading</h4>
+                            <span class="fs-7 text-nowrap">Hours</span>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="col-12 col-md-4">
+            <div class="card h-100">
+                <div class="card-header">IceCube</div>
+                <div class="card-body">
+                    <div class="mb-3 d-flex flex-row justify-content-between">
+                        <h4 class="fw-semibold my-auto"><i class="bi bi-cpu"></i> CPU</h4>
+                        <div class="d-flex align-items-end flex-column">
+                            <h4 id="card-icecube-cpu" class="text-primary mb-0">Loading</h4>
+                            <span class="fs-7 text-nowrap">Core Hours</span>
+                        </div>
+                    </div>
+                    <div class="d-flex flex-row justify-content-between">
+                        <h4 class="fw-semibold my-auto"><i class="bi bi-gpu-card"></i> GPU</h4>
+                        <div class="d-flex align-items-end flex-column">
+                            <h4 id="card-icecube-nvidia_com_gpu" class="text-primary mb-0">Loading</h4>
+                            <span class="fs-7 text-nowrap">Hours</span>
+                        </div>
+                    </div>
+                </div>
+            </div>
         </div>
     </div>
 </div>
 <div class="container-xxl">
     <div class="alert alert-danger" style="display: none" id="error" role="alert"></div>
 </div>
-<div class="container-xxl mb-3">
+<div class="container-xxl my-3">
     <div class="row justify-content-center">
-        <div class="col-12 col-xl-8 col-lg-8 col-md-10">
+        <div class="col-12 col-xl-10 col-lg-10 col-md-12">
             <div id="wrapper" class="overflow-auto"></div>
         </div>
     </div>

assets/css/style.scss

@@ -339,3 +339,7 @@ main {
   // not collapsed, hide gradient
   display: none;
 }
+
+.fs-7 {
+  font-size: 0.875rem !important;
+}

assets/data/backups/placeholder.txt

@@ -0,0 +1 @@
+Used to hold the directory structure for backups.

assets/js/backup.js

@@ -3,9 +3,9 @@
 
 import {generateHash} from './util.js';
 import {
-    getProjects, getInstitutionOverview, getProjectOverview, getLatestOSPoolOverview,
-    getInstitutionsOverview
+    getProjects, getProjectOverview
 } from './adstash.mjs';
+import {getNrpPrometheusData, updateTotals} from "./nrp.mjs";
 
 const BACKUP_DIRECTORY = '/assets/data/backups/'
 
@@ -26,34 +26,29 @@ const backupMap = async () => {
       function: fetchForBackup,
       args: ["https://topology.opensciencegrid.org/miscproject/json"],
     },
-    {
-      function: fetchForBackup,
-      args: ["https://osg-htc.org/ospool-data/data/daily_reports/latest.json"],
-    },
-    {
-      function: getLatestOSPoolOverview
-    },
     {
       function: getProjects,
     },
-    {
-      function: getInstitutions,
-    },
-    {
-      function: getInstitutionsOverview
-    },
+      {
+          function: updateTotals,
+        args: [[
+            {timespan: 1, cardSuffix: 'day'},
+            {timespan: 7, cardSuffix: 'week'},
+            {timespan: 30, cardSuffix: 'month'}
+        ]]
+      },
     ...(
       Object.values(await getProjects()).map( project => ({
         function: getProjectOverview,
         args: [project.projectName],
       }) )
     ),
-    ...(
-      Object.values(await getInstitutions()).map( institution => ({
-        function: getInstitutionOverview,
-        args: [institution.institutionName],
-      }) )
-    ),
+      ...(
+          ['icecube', 'ligo'].map(org => ({
+            function: getNrpPrometheusData,
+            args: [365, `%22osg-${org}%22`]
+          }))
+      )
   ]
 }
 

assets/js/nrp.mjs

@@ -0,0 +1,16 @@
+export const updateTotals = async (timeConfigs) => {
+    // Fetch all data in parallel
+    return await Promise.all(timeConfigs.map(cfg => getNrpPrometheusData(cfg.timespan, "~%22osg-opportunistic|icecube-ml|osg-icecube|osg-ligo|osg-nrao%22")));
+}
+
+export const getNrpPrometheusData = async (timespan, namespaceFilter=null) => {
+    const currentTimestamp = Math.floor(Date.now() / 1000)
+    const response = await fetch(`https://thanos.nrp-nautilus.io/api/v1/query?query=sum%20by(resource)%20(sum_over_time(namespace_used_resources{namespace=${namespaceFilter}}[${timespan}d:1h]@${currentTimestamp}))&dedup=true&partial_response=false`)
+    const data = await response.json()
+    return data['data']['result'].reduce((acc, item) => {
+        return {
+            ...acc,
+            [item['metric']['resource']]: item['value'][1]
+        }
+    }, {})
+}