diff --git a/Makefile b/Makefile index e78dd47..f3e5b3a 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,7 @@ installdir=build/goslmailer-$(version) # list of files to include in build bins=$(notdir $(bindirs)) readme=README.md -templates=templates/adaptive_card_template.json templates/telegramTemplate.html +templates=templates/adaptive_card_template.json templates/telegramTemplate.html templates/matrix_template.md config=cmd/goslmailer/goslmailer.conf.annotated_example cmd/gobler/gobler.conf # can be replaced with go test ./... construct diff --git a/VERSION b/VERSION index a4b6ac3..b1d18bc 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.2.0 +v2.3.0 diff --git a/images/matrix.png b/images/matrix.png index 4fb99da..933012c 100644 Binary files a/images/matrix.png and b/images/matrix.png differ diff --git a/templates/matrix_template.md b/templates/matrix_template.md new file mode 100644 index 0000000..fb030c5 --- /dev/null +++ b/templates/matrix_template.md @@ -0,0 +1,47 @@ +--- + +## {{ .Job.MailSubject }} ({{ .Job.SlurmEnvironment.SLURM_JOB_NAME }}) {{ .Job.SlurmEnvironment.SLURM_JOB_MAIL_TYPE }} +Created {{ .Created }} +{{ if ne .Job.PrunedMessageCount 0 }} +WARNING: Rate limiting triggered. {{ .Job.PrunedMessageCount }} additonal notificiations have been suppressed +{{ end }} + +#### Details + +- **Job Name** : {{ .Job.SlurmEnvironment.SLURM_JOB_NAME }} +- **Job ID** : {{ .Job.SlurmEnvironment.SLURM_JOB_ID }} +- **User** : {{ .Job.JobStats.User }} +- **Partition** : {{ .Job.JobStats.Partition }} +- **Nodes Used** : {{ .Job.JobStats.NodeList }} +- **Cores** : {{ .Job.JobStats.Ncpus }} +- **Job state** : {{ .Job.SlurmEnvironment.SLURM_JOB_STATE }} +{{- if ne .Job.SlurmEnvironment.SLURM_JOB_STATE "RUNNING" }} +- **Exit Code** : {{ .Job.SlurmEnvironment.SLURM_JOB_EXIT_CODE_MAX }} +{{- end }} +- **Submit** : {{ .Job.JobStats.Submittime }} +- **Start** : {{ .Job.JobStats.Starttime }} +{{- if ne .Job.SlurmEnvironment.SLURM_JOB_STATE "RUNNING" }} +- **End** : {{ .Job.JobStats.Endtime }} +{{- end }} +- **Res. Walltime** : {{ .Job.JobStats.WalltimeStr }} +{{- if ne .Job.SlurmEnvironment.SLURM_JOB_MAIL_TYPE "Began" }} +- **Used Walltime** : {{ .Job.SlurmEnvironment.SLURM_JOB_RUN_TIME }} +{{- if ne .Job.SlurmEnvironment.SLURM_JOB_STATE "RUNNING" }} +- **Used CPU time** : {{ .Job.JobStats.TotalCPUStr }} +- **% User (Comp)** : {{ printf "%5.2f%%" .Job.JobStats.CalcUserComputePercentage }} +- **% System (I/O)** : {{ printf "%5.2f%%" .Job.JobStats.CalcSystemComputePercentage }} +{{- end }} +{{- end }} +- **Memory Requested** : {{ .Job.JobStats.ReqMem | humanBytes }} +{{- if ne .Job.SlurmEnvironment.SLURM_JOB_MAIL_TYPE "Began" }} +- **Max Memory Used** : {{ .Job.JobStats.MaxRSS | humanBytes }} +- **Max Disk Write** : {{ .Job.JobStats.MaxDiskWrite | humanBytes }} +- **Max Disk Read** : {{ .Job.JobStats.MaxDiskRead | humanBytes }} +{{- end }} + +{{- range .Job.Hints }} +- {{ . }} + +{{- end }} + +---