fix(truenas): report actual memory usage and pool free space (#6017)
This commit is contained in:
1 parent
52df56b19d
commit
f69e545d64
2 files changed
+16
-8
No files matched your search
@@ -132,8 +132,9 @@ const happyResponder = (method: string) => {
|
|||||||
aggregations: emptyAggregations(),
|
aggregations: emptyAggregations(),
|
||||||
start: 0,
|
start: 0,
|
||||||
end: 1,
|
end: 1,
|
||||||
legend: [],
|
// The "memory" graph reports available (free) memory: legend is ["time", "available"].
|
||||||
data: [[1000, 8_000_000_000]],
|
legend: ["time", "available"],
|
||||||
|
data: [[1000, 6_000_000_000]],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "cputemp",
|
name: "cputemp",
|
||||||
@@ -194,15 +195,17 @@ describe("TrueNasIntegration", () => {
|
|||||||
version: "TrueNAS-SCALE-24.10",
|
version: "TrueNAS-SCALE-24.10",
|
||||||
cpuModelName: "Intel Xeon",
|
cpuModelName: "Intel Xeon",
|
||||||
cpuTemp: 45,
|
cpuTemp: 45,
|
||||||
memAvailableInBytes: 16_000_000_000,
|
// physmem (16 GB) minus the reported available 6 GB leaves 10 GB used.
|
||||||
memUsedInBytes: 8_000_000_000,
|
memAvailableInBytes: 6_000_000_000,
|
||||||
|
memUsedInBytes: 10_000_000_000,
|
||||||
uptime: 3600,
|
uptime: 3600,
|
||||||
rebootRequired: false,
|
rebootRequired: false,
|
||||||
availablePkgUpdates: 0,
|
availablePkgUpdates: 0,
|
||||||
loadAverage: null,
|
loadAverage: null,
|
||||||
gpu: [],
|
gpu: [],
|
||||||
network: { up: 20_000, down: 10_000 },
|
network: { up: 20_000, down: 10_000 },
|
||||||
fileSystem: [{ deviceName: "tank", available: "1000", used: "500", percentage: 50 }],
|
// `available` is the free space left on the pool (free = 500), not its total size.
|
||||||
|
fileSystem: [{ deviceName: "tank", available: "500", used: "500", percentage: 50 }],
|
||||||
smart: [{ deviceName: "tank", healthy: true, overallStatus: "ONLINE", temperature: null }],
|
smart: [{ deviceName: "tank", healthy: true, overallStatus: "ONLINE", temperature: null }],
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -37,14 +37,19 @@ export class TrueNasIntegration extends Integration implements ISystemHealthMoni
|
|||||||
const upload = this.extractNetworkTrafficData(netdata, 2); // Index 2 is "sent"
|
const upload = this.extractNetworkTrafficData(netdata, 2); // Index 2 is "sent"
|
||||||
const download = this.extractNetworkTrafficData(netdata, 1); // Index 1 is "received"
|
const download = this.extractNetworkTrafficData(netdata, 1); // Index 1 is "received"
|
||||||
|
|
||||||
|
// The "memory" reporting graph reports available (free) memory, its legend is ["time", "available"].
|
||||||
|
// Used memory is therefore the physical total minus what is still available (clamped against timing skew).
|
||||||
|
const memAvailableInBytes = memoryData[1] ?? 0; // Index 0 is the UNIX timestamp, Index 1 is available bytes
|
||||||
|
const memUsedInBytes = Math.max(systemInformation.physmem - memAvailableInBytes, 0);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
cpuUtilization: cpuData.reduce((acc, item) => acc + (item > 100 ? 0 : item), 0) / cpuData.length,
|
cpuUtilization: cpuData.reduce((acc, item) => acc + (item > 100 ? 0 : item), 0) / cpuData.length,
|
||||||
cpuTemp: Math.max(...cpuTempData.filter((_item, index) => index > 0)),
|
cpuTemp: Math.max(...cpuTempData.filter((_item, index) => index > 0)),
|
||||||
memAvailableInBytes: systemInformation.physmem,
|
memAvailableInBytes,
|
||||||
memUsedInBytes: memoryData[1] ?? 0, // Index 0 is UNIX timestamp, Index 1 is free space in bytes
|
memUsedInBytes,
|
||||||
fileSystem: datasets.map((dataset) => ({
|
fileSystem: datasets.map((dataset) => ({
|
||||||
deviceName: dataset.name,
|
deviceName: dataset.name,
|
||||||
available: `${dataset.size}`, // TODO: can we use number instead of string here?
|
available: `${dataset.free}`, // free space left on the pool
|
||||||
used: `${dataset.allocated}`,
|
used: `${dataset.allocated}`,
|
||||||
percentage: (dataset.allocated / dataset.size) * 100,
|
percentage: (dataset.allocated / dataset.size) * 100,
|
||||||
})),
|
})),
|
||||||
|
|||||||
Reference in new issue
Block a user