Added CDN option to jureptool

configs/jureptool/config.yml

@@ -1,12 +1,13 @@
 # Copyright (c) 2023 Forschungszentrum Juelich GmbH.
-# This file is part of LLview. 
+# This file is part of LLview.
 #
 # This is an open source software distributed under the GPLv3 license. More information see the LICENSE file at the top level.
 #
 # Contributions must follow the Contributor License Agreement. More information see the CONTRIBUTING.md file at the top level.
 #
 # Contributors:
-#    Filipe Guimarães (Forschungszentrum Juelich GmbH) 
+#    Filipe Guimarães (Forschungszentrum Juelich GmbH)
+#    Matthias Lapu (CEA)
 
 # Timezone name (a list can be found in https://en.wikipedia.org/wiki/List_of_tz_database_time_zones)
 timezone: 'Europe/Berlin'
@@ -17,6 +18,17 @@ timezone: 'Europe/Berlin'
 # - removals can be done with: (string_to_remove)
 hostname: 'https://llview.fz-juelich.de/#system(-dc)[ ,_]#'
 
+# JURI uses Jureptool to create html and pdf reports
+# Jureptool relies on plotly and jquery to build the html pages
+# The required javascript files for plotly and jquery are located in:
+# JURI/js/ext, (https://github.com/FZJ-JSC/JURI/tree/main/js/ext)
+# Moreover, Content Delivery Network (CDN) can also be used
+# ex :
+# jquery_location: 'https://code.jquery.com/jquery-3.6.0.min.js'
+# plotly_location: 'https://cdn.plot.ly/plotly-latest.min.js'
+plotly_location: null
+jquery_location: null
+
 #Folder prefix to be added to items in plotlists file
 folder_prefix: '$LLVIEW_DATA/$LLVIEW_SYSTEMNAME/tmp/jobreport/data/'
 

jureptool/README.md

@@ -35,7 +35,7 @@ Options that can be passed via SLURM `--comment` flag:
 
 ### Usage:
 ```
-usage: main.py [-h] [--daemon] [--demo] [--nomove] [--nohtml] [--gzip] [--plotlyjs PLOTLYJS] [--maxjobs MAXJOBS] [--maxsec MAXSEC] [--shutdown SHUTDOWN [SHUTDOWN ...]]
+usage: main.py [-h] [--daemon] [--demo] [--nomove] [--nohtml] [--gzip] [--maxjobs MAXJOBS] [--maxsec MAXSEC] [--shutdown SHUTDOWN [SHUTDOWN ...]]
                [--nprocs NPROCS] [--loglevel LOGLEVEL] [--logprefix LOGPREFIX] [--configfolder CONFIGFOLDER] [--outfolder OUTFOLDER] [--semail SEMAIL] [--remail REMAIL]
                file [file ...]
 
@@ -51,7 +51,6 @@ optional arguments:
   --nomove              Don't copy files to final location
   --nohtml              Deactivate generation of HTML
   --gzip                Compress HTML using gzip
-  --plotlyjs PLOTLYJS   Location of the 'plotly.min.js' file (default: 'cdn')
   --maxjobs MAXJOBS     Maximum number of jobs to process (default: MAXJOBS=10000)
   --maxsec MAXSEC       Filter date range with maximum seconds range (default: no filter)
   --shutdown SHUTDOWN [SHUTDOWN ...]
@@ -96,3 +95,180 @@ rm -fr ~/.cache/matplotlib
 (on MacOs, matplotlib's cache folder is `~/.matplotlib`.)
 
 
+### Expected file
+
+JuRepTool uses `.json` to create PDF and HTML. The expected `.json` files are as follows:
+
+```json
+{
+  "cpu": {
+    "currentwatts_avg": null,
+    "currentwatts_max": null,
+    "currentwatts_min": null,
+    "load_avg": null,
+    "load_max": null,
+    "load_min": null,
+    "usage_avg": null,
+    "usage_max": null,
+    "usage_min": null,
+    "used_cores_avg": null,
+    "used_cores_logic_avg": null,
+    "used_cores_logic_max": null,
+    "used_cores_logic_min": null,
+    "used_cores_max": null,
+    "used_cores_min": null,
+    "used_cores_phys_avg": null,
+    "used_cores_phys_max": null,
+    "used_cores_phys_min": null,
+    "used_mem_avg": null,
+    "used_mem_max": null,
+    "used_mem_min": null
+  },
+
+  "fabric": {
+    "mbin_avg": null,
+    "mbin_max": null,
+    "mbin_min": null,
+    "mbout_avg": null,
+    "mbout_max": null,
+    "mbout_min": null,
+    "pckin_avg": null,
+    "pckin_max": null,
+    "pckin_min": null,
+    "pckout_avg": null,
+    "pckout_max": null,
+    "pckout_min": null
+  },
+
+  "files": {
+    "coreusagenodefile": "",
+    "fabricnodefile": "",
+    "fsallnodefile": "",
+    "fsfastdatanodefile": "",
+    "fshomenodefile": "",
+    "fsprojectnodefile": "",
+    "fsscratchnodefile": "",
+    "gpunodefile": "",
+    "htmlfile": "",
+    "jmcfile": "",
+    "loadmemnodefile": "",
+    "pdffile": ""
+  },
+
+  "fs": {
+    "fs_all_Mbr_sum": null,
+    "fs_all_MbrR_max": null,
+    "fs_all_Mbw_sum": null,
+    "fs_all_MbwR_max": null,
+    "fs_all_ocR_max": null,
+
+    "fs_fastdata_Mbr_sum": null,
+    "fs_fastdata_MbrR_max": null,
+    "fs_fastdata_Mbw_sum": null,
+    "fs_fastdata_MbwR_max": null,
+    "fs_fastdata_ocR_max": null,
+
+    "fs_home_Mbr_sum": null,
+    "fs_home_MbrR_max": null,
+    "fs_home_Mbw_sum": null,
+    "fs_home_MbwR_max": null,
+    "fs_home_ocR_max": null,
+
+    "fs_project_Mbr_sum": null,
+    "fs_project_MbrR_max": null,
+    "fs_project_Mbw_sum": null,
+    "fs_project_MbwR_max": null,
+    "fs_project_ocR_max": null,
+
+    "fs_scratch_Mbr_sum": null,
+    "fs_scratch_MbrR_max": null,
+    "fs_scratch_Mbw_sum": null,
+    "fs_scratch_MbwR_max": null,
+    "fs_scratch_ocR_max": null
+  },
+
+  "gpu": {
+    "gpu_active_avg": null,
+    "gpu_clk_max": null,
+    "gpu_memu_avg": null,
+    "gpu_memu_max": null,
+    "gpu_memur_avg": null,
+    "gpu_pu_avg": null,
+    "gpu_pu_max": null,
+    "gpu_sclk_max": null,
+    "gpu_temp_avg": null,
+    "gpu_temp_max": null,
+    "gpu_util_avg": null,
+    "gpulist": "",
+    "gpuspec": ""
+  },
+
+  "IC": {
+    "icgroupmap": ""
+  },
+
+  "jmc": {
+    "descs": "",
+    "maximums": "",
+    "minimums": "",
+    "names": "",
+    "numvars": 0
+  },
+
+  "job": {
+    "account": "",
+    "command": "",
+    "comment": "",
+    "endedhm": "",
+    "estendtime": "",
+    "finished": null,
+    "jobid": "",
+    "lastupdate": "",
+    "lastupdatets": null,
+    "name": "",
+    "nodelist": "",
+    "numgpus": null,
+    "numnodes": null,
+    "owner": "",
+    "queue": "",
+    "queuedate": "",
+    "runtime": null,
+    "runtimehm": "",
+    "runtimeperc": null,
+    "starttime": "",
+    "system": "",
+    "updatetime": "",
+    "waittime": "",
+    "wallh": null,
+    "wallhm": ""
+  },
+
+  "num_datapoints": {
+    "cores_ndps": null,
+    "fa_ndps": null,
+    "fs_all_ndps": null,
+    "fs_fastdata_ndps": null,
+    "fs_home_ndps": null,
+    "fs_project_ndps": null,
+    "fs_scratch_ndps": null,
+    "gpu_ndps": null,
+    "jmc_ndps": null,
+    "ld_ndps": null
+  },
+
+  "rc": {
+    "errmsgnodes": "",
+    "errmsgs": "",
+    "max_rc": null,
+    "nsteps": null,
+    "numerrnodes": null,
+    "nummsgs": null,
+    "rc_rc": null,
+    "rc_signr": null,
+    "rc_state": "",
+    "rc_wallh": null,
+    "stepspec": ""
+  }
+}
+
+```