Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(xo-server-perf-alert): fix no writable SRs being monitored #8113

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

fix(xo-server-perf-alert): fix no writable SRs being monitored #8113

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f5ec8be
fix(xo-server-perf-alert): fix no writable SRs being monitored
MelissaFrncJrg Nov 6, 2024
ef4ba0f
changes after review
MelissaFrncJrg Nov 7, 2024
84ad0e2
Update CHANGELOG.unreleased.md
MelissaFrncJrg Nov 8, 2024
603b40e
changes after review
MelissaFrncJrg Nov 8, 2024
31d911f
Merge branch 'master' into perf-alert/fixUnwritableSRs
MathieuRA Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.unreleased.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

> Users must be able to say: “I had this issue, happy to know it's fixed”

- [Plugins/Perf-alert] Fix unwritable SRs being monitored (https://xcp-ng.org/forum/topic/9619/performance-alert-plugin-not-handling-removable-srs-correctly) (PR [#8113](https://github.com/vatesfr/xen-orchestra/pull/8113))
MelissaFrncJrg marked this conversation as resolved.
Show resolved Hide resolved

### Packages to release

> When modifying a package, add it here with its release type.
Expand All @@ -35,6 +37,7 @@

- @xen-orchestra/web patch
- @xen-orchestra/web-core minor
- xo-server-perf-alert minor
- xo-web minor

<!--packages-end-->
5 changes: 5 additions & 0 deletions packages/xo-server-perf-alert/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,6 +446,7 @@ ${monitorBodies.join('\n')}`
const lcObjectType = objectType.toLowerCase()
const alarmId = `${lcObjectType}|${definition.variableName}|${definition.alarmTriggerLevel}`
const typeFunction = TYPE_FUNCTION_MAP[lcObjectType][definition.variableName]
const isSrWritable = sr => sr !== undefined && sr.content_type !== 'iso' && sr.size > 0
const parseData = (result, uuid) => {
const parsedLegend = result.meta.legend.map((l, index) => {
const [operation, type, uuid, name] = l.split(':')
Expand Down Expand Up @@ -511,6 +512,10 @@ ${monitorBodies.join('\n')}`
return false
}

if (objectType === 'SR' && !isSrWritable(obj)) {
return false
}

return true
})
: definition.uuids,
Expand Down
Loading