feat(xo-server,xo-web): don't backup VMs with xo:no-bak tag
This commit is contained in:
committed by
Julien Fontanet
parent
9d0b7242f0
commit
87a9fbe237
@@ -10,6 +10,7 @@
|
|||||||
- [VM/Disks] Display task information when importing VDIs (PR [#7197](https://github.com/vatesfr/xen-orchestra/pull/7197))
|
- [VM/Disks] Display task information when importing VDIs (PR [#7197](https://github.com/vatesfr/xen-orchestra/pull/7197))
|
||||||
- [REST API] Support VM import using the XVA format
|
- [REST API] Support VM import using the XVA format
|
||||||
- [Task] Show the related SR on the Garbage Collector Task ( vdi coalescing) (PR [#7189](https://github.com/vatesfr/xen-orchestra/pull/7189))
|
- [Task] Show the related SR on the Garbage Collector Task ( vdi coalescing) (PR [#7189](https://github.com/vatesfr/xen-orchestra/pull/7189))
|
||||||
|
- [Backup] Don't backup VM with tag xo:no-bak (PR [#7173](https://github.com/vatesfr/xen-orchestra/pull/7173))
|
||||||
|
|
||||||
### Bug fixes
|
### Bug fixes
|
||||||
|
|
||||||
|
|||||||
@@ -129,7 +129,9 @@ export default class BackupNg {
|
|||||||
isMatchingVm(obj) &&
|
isMatchingVm(obj) &&
|
||||||
// don't match replicated VMs created by this very job otherwise
|
// don't match replicated VMs created by this very job otherwise
|
||||||
// they will be replicated again and again
|
// they will be replicated again and again
|
||||||
!('start' in obj.blockedOperations && obj.other['xo:backup:job'] === job.id)
|
!('start' in obj.blockedOperations && obj.other['xo:backup:job'] === job.id) &&
|
||||||
|
// handle xo:no-bak and xo:no-bak=reason tags. For example : VMs from Health Check
|
||||||
|
!obj.tags.some(t => t.split('=', 1)[0] === 'xo:no-bak')
|
||||||
})(),
|
})(),
|
||||||
})
|
})
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -572,6 +572,8 @@ const messages = {
|
|||||||
editBackupSmartNotResidentOn: 'Not resident on',
|
editBackupSmartNotResidentOn: 'Not resident on',
|
||||||
editBackupSmartPools: 'Pools',
|
editBackupSmartPools: 'Pools',
|
||||||
editBackupSmartTags: 'Tags',
|
editBackupSmartTags: 'Tags',
|
||||||
|
editBackupSmartTagsInfo:
|
||||||
|
"VMs with tags in the form of <b>xo:no-bak</b> or <b>xo:no-bak=Reason</b>won't be included in any backup.For example, ephemeral VMs created by health check have this tag",
|
||||||
sampleOfMatchingVms: 'Sample of matching VMs',
|
sampleOfMatchingVms: 'Sample of matching VMs',
|
||||||
backupReplicatedVmsInfo:
|
backupReplicatedVmsInfo:
|
||||||
'Replicated VMs (VMs with Continuous Replication or Disaster Recovery tag) must be excluded!',
|
'Replicated VMs (VMs with Continuous Replication or Disaster Recovery tag) must be excluded!',
|
||||||
|
|||||||
@@ -97,7 +97,12 @@ const SmartBackup = decorate([
|
|||||||
</label>
|
</label>
|
||||||
<SelectPool multi onChange={effects.setPoolNotValues} value={state.pools.notValues} />
|
<SelectPool multi onChange={effects.setPoolNotValues} value={state.pools.notValues} />
|
||||||
</FormGroup>
|
</FormGroup>
|
||||||
<h3>{_('editBackupSmartTags')}</h3>
|
<h3>
|
||||||
|
{_('editBackupSmartTags')}
|
||||||
|
<Tooltip content={_('editBackupSmartTagsInfo')}>
|
||||||
|
<Icon icon='info' />
|
||||||
|
</Tooltip>{' '}
|
||||||
|
</h3>
|
||||||
<hr />
|
<hr />
|
||||||
<FormGroup>
|
<FormGroup>
|
||||||
<label>
|
<label>
|
||||||
|
|||||||
Reference in New Issue
Block a user