Merge branch 'hotfix' of https://github.com/ClusterCockpit/cc-backend into hotfix

tools/archive-migration/main.go

@@ -23,6 +23,8 @@ import (
 const Version = 1
 
 var ar FsArchive
+var srcPath string
+var dstPath string
 
 func loadJobData(filename string) (*JobData, error) {
 
@@ -243,17 +245,65 @@ func deepCopyClusterConfig(co *Cluster) schema.Cluster {
 	return cn
 }
 
+func convertJob(job *JobMeta) {
+	// check if source data is available, otherwise skip job
+	src_data_path := getPath(job, srcPath, "data.json")
+	info, err := os.Stat(src_data_path)
+	if err != nil {
+		log.Fatal(err)
+	}
+	if info.Size() == 0 {
+		fmt.Printf("Skip path %s, filesize is 0 Bytes.", src_data_path)
+		return
+	}
+
+	path := getPath(job, dstPath, "meta.json")
+	err = os.MkdirAll(filepath.Dir(path), 0750)
+	if err != nil {
+		log.Fatal(err)
+	}
+	f, err := os.Create(path)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	jmn := deepCopyJobMeta(job)
+	if err = EncodeJobMeta(f, &jmn); err != nil {
+		log.Fatal(err)
+	}
+	if err = f.Close(); err != nil {
+		log.Fatal(err)
+	}
+
+	f, err = os.Create(getPath(job, dstPath, "data.json"))
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	var jd *JobData
+	jd, err = loadJobData(src_data_path)
+	if err != nil {
+		log.Fatal(err)
+	}
+	jdn := deepCopyJobData(jd, job.Cluster, job.SubCluster)
+	if err := EncodeJobData(f, jdn); err != nil {
+		log.Fatal(err)
+	}
+	if err := f.Close(); err != nil {
+		log.Fatal(err)
+	}
+}
+
 func main() {
 	var flagLogLevel, flagConfigFile string
-	var flagLogDateTime bool
+	var flagLogDateTime, debug bool
-	var srcPath string
-	var dstPath string
 
 	flag.BoolVar(&flagLogDateTime, "logdate", false, "Set this flag to add date and time to log messages")
+	flag.BoolVar(&debug, "debug", false, "Set this flag to force sequential execution for debugging")
 	flag.StringVar(&flagLogLevel, "loglevel", "warn", "Sets the logging level: `[debug,info,warn (default),err,fatal,crit]`")
 	flag.StringVar(&flagConfigFile, "config", "./config.json", "Specify alternative path to `config.json`")
-	flag.StringVar(&srcPath, "s", "./var/job-archive", "Specify the source job archive path")
+	flag.StringVar(&srcPath, "src", "./var/job-archive", "Specify the source job archive path")
-	flag.StringVar(&dstPath, "d", "./var/job-archive-new", "Specify the destination job archive path")
+	flag.StringVar(&dstPath, "dst", "./var/job-archive-new", "Specify the destination job archive path")
 	flag.Parse()
 
 	if _, err := os.Stat(filepath.Join(srcPath, "version.txt")); !errors.Is(err, os.ErrNotExist) {
@@ -302,49 +352,19 @@ func main() {
 	var wg sync.WaitGroup
 
 	for job := range ar.Iter() {
-		// fmt.Printf("Job %d\n", job.JobID)
+		if debug {
+			fmt.Printf("Job %d\n", job.JobID)
+			convertJob(job)
+		} else {
 			job := job
 			wg.Add(1)
 
 			go func() {
 				defer wg.Done()
-			path := getPath(job, dstPath, "meta.json")
+				convertJob(job)
-			err = os.MkdirAll(filepath.Dir(path), 0750)
-			if err != nil {
-				log.Fatal(err)
-			}
-			f, err := os.Create(path)
-			if err != nil {
-				log.Fatal(err)
-			}
-
-			jmn := deepCopyJobMeta(job)
-			if err = EncodeJobMeta(f, &jmn); err != nil {
-				log.Fatal(err)
-			}
-			if err = f.Close(); err != nil {
-				log.Fatal(err)
-			}
-
-			f, err = os.Create(getPath(job, dstPath, "data.json"))
-			if err != nil {
-				log.Fatal(err)
-			}
-
-			var jd *JobData
-			jd, err = loadJobData(getPath(job, srcPath, "data.json"))
-			if err != nil {
-				log.Fatal(err)
-			}
-			jdn := deepCopyJobData(jd, job.Cluster, job.SubCluster)
-			if err := EncodeJobData(f, jdn); err != nil {
-				log.Fatal(err)
-			}
-			if err := f.Close(); err != nil {
-				log.Fatal(err)
-			}
 			}()
 		}
+	}
 
 	wg.Wait()
 	os.WriteFile(filepath.Join(dstPath, "version.txt"), []byte(fmt.Sprintf("%d", Version)), 0644)

web/templates/home.tmpl

@@ -9,8 +9,8 @@
                     <th>Running Jobs</th>
                     <th>Total Jobs</th>
                     {{if .User.HasRole .Roles.admin}}
+                        <th>Status View</th>
                         <th>System View</th>
-                        <th>Analysis View</th>
                     {{end}}
                 </tr>
             </thead>
@@ -21,8 +21,8 @@
                             <td>{{.ID}}</td>
                             <td><a href="/monitoring/jobs/?cluster={{.ID}}&state=running">{{.RunningJobs}} jobs</a></td>
                             <td><a href="/monitoring/jobs/?cluster={{.ID}}">{{.TotalJobs}} jobs</a></td>
+                            <td><a href="/monitoring/status/{{.ID}}">Status View</a></td>
                             <td><a href="/monitoring/systems/{{.ID}}">System View</a></td>
-                            <td><a href="/monitoring/analysis/{{.ID}}">Analysis View</a></td>
                         </tr>
                     {{end}}
                 {{else}}

web/web.go

@@ -9,6 +9,7 @@ import (
 	"html/template"
 	"io/fs"
 	"net/http"
+	"os"
 	"strings"
 
 	"github.com/ClusterCockpit/cc-backend/internal/auth"
@@ -46,6 +47,23 @@ func init() {
 			return nil
 		}
 
+		if path == "templates/imprint.tmpl" {
+			if _, err := os.Stat("./var/imprint.tmpl"); err == nil {
+				log.Info("overwrite imprint.tmpl with local file")
+				templates[strings.TrimPrefix(path, "templates/")] =
+					template.Must(template.Must(base.Clone()).ParseFiles("./var/imprint.tmpl"))
+				return nil
+			}
+		}
+		if path == "templates/privacy.tmpl" {
+			if _, err := os.Stat("./var/privacy.tmpl"); err == nil {
+				log.Info("overwrite privacy.tmpl with local file")
+				templates[strings.TrimPrefix(path, "templates/")] =
+					template.Must(template.Must(base.Clone()).ParseFiles("./var/privacy.tmpl"))
+				return nil
+			}
+		}
+
 		templates[strings.TrimPrefix(path, "templates/")] = template.Must(template.Must(base.Clone()).ParseFS(templateFiles, path))
 		return nil
 	}); err != nil {