fix(xo-server-backup-reports): don't take into account ignored tasks (#5770)
This commit is contained in:
parent
f56a5a3de1
commit
6d0f479f81
@ -27,3 +27,5 @@
|
||||
> - major: if the change breaks compatibility
|
||||
>
|
||||
> In case of conflict, the highest (lowest in previous list) `$version` wins.
|
||||
|
||||
- xo-server-backup-reports patch
|
||||
|
@ -385,12 +385,10 @@ class BackupReportsXoPlugin {
|
||||
let globalTransferSize = 0
|
||||
let nFailures = 0
|
||||
let nSkipped = 0
|
||||
let nSuccesses = 0
|
||||
let nInterrupted = 0
|
||||
for (const taskLog of log.tasks) {
|
||||
if (!force && taskLog.status === 'success' && reportWhen === 'failure') {
|
||||
continue
|
||||
}
|
||||
|
||||
for (const taskLog of log.tasks) {
|
||||
const { type, id } = taskLog.data ?? {}
|
||||
if (taskLog.message === 'get SR record' || taskLog.message === 'get remote adapter') {
|
||||
++nFailures
|
||||
@ -428,6 +426,11 @@ class BackupReportsXoPlugin {
|
||||
continue
|
||||
}
|
||||
|
||||
if (!force && taskLog.status === 'success' && reportWhen === 'failure') {
|
||||
++nSuccesses
|
||||
continue
|
||||
}
|
||||
|
||||
let vm
|
||||
try {
|
||||
vm = xo.getObject(id)
|
||||
@ -562,13 +565,14 @@ class BackupReportsXoPlugin {
|
||||
interruptedVmsText.push(...text, ...subText)
|
||||
nagiosText.push(`[(Interrupted) ${vm !== undefined ? vm.name_label : 'undefined'}]`)
|
||||
} else {
|
||||
++nSuccesses
|
||||
successfulVmsText.push(...text, ...subText)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const nTasks = log.tasks.length
|
||||
const nSuccesses = nTasks - nFailures - nSkipped - nInterrupted
|
||||
const nVmTasks = nSuccesses + nFailures + nSkipped + nInterrupted
|
||||
|
||||
const markdown = [
|
||||
`## Global status: ${log.status}`,
|
||||
'',
|
||||
@ -576,7 +580,7 @@ class BackupReportsXoPlugin {
|
||||
`- **Run ID**: ${log.id}`,
|
||||
`- **mode**: ${mode}`,
|
||||
...getTemporalDataMarkdown(log.end, log.start, formatDate),
|
||||
`- **Successes**: ${nSuccesses} / ${nTasks}`,
|
||||
`- **Successes**: ${nSuccesses} / ${nVmTasks}`,
|
||||
globalTransferSize !== 0 && `- **Transfer size**: ${formatSize(globalTransferSize)}`,
|
||||
globalMergeSize !== 0 && `- **Merge size**: ${formatSize(globalMergeSize)}`,
|
||||
...getWarningsMarkdown(log.warnings),
|
||||
|
Loading…
Reference in New Issue
Block a user