diff --git a/app/components/charts/fileChart.tsx b/app/components/charts/fileChart.tsx index 978345e0..36299890 100644 --- a/app/components/charts/fileChart.tsx +++ b/app/components/charts/fileChart.tsx @@ -180,16 +180,16 @@ export const FileChart = ({ url }: { url: string }) => { a: number, e: { maxSize?: number | null; - currentSize?: number | null; - usedSize?: number | null; + used?: number | null; + free?: number | null; }, ) => Math.max( Number(a), Math.max( Number(e.maxSize) || 0, - Number(e.currentSize) || 0, - Number(e.usedSize) || 0, + Number(e.used) || 0, + (Number(e.used) || 0) + (Number(e.free) || 0), ), ), 0, diff --git a/app/notifications/checks/monitors/sqlFiles.tsx b/app/notifications/checks/monitors/sqlFiles.tsx index 774d3a4e..f2f1d52a 100644 --- a/app/notifications/checks/monitors/sqlFiles.tsx +++ b/app/notifications/checks/monitors/sqlFiles.tsx @@ -60,9 +60,10 @@ async function allClear({ ); return Logger({ - message: `Free space now below limit of ${monitor.sqlFileSizePercentFreeValue}%`, + message: `[${database.name} file ${file.fileName}] Free space now below limit of ${monitor.sqlFileSizePercentFreeValue}%`, type: "success", monitor, + database, file, }); } @@ -129,7 +130,7 @@ export default async function sqlFilePercentFreeNotifier({ percFree < (monitor.sqlFileSizePercentFreeValue || 0) ) { // alert for fixed file size - message = `(Growth disabled) Percentage of free space (${Math.round( + message = `[${database.name} file ${file.fileName}] (Growth disabled) Percentage of free space (${Math.round( percFree, )}%) is less than the limit of ${ monitor.sqlFileSizePercentFreeValue @@ -140,7 +141,7 @@ export default async function sqlFilePercentFreeNotifier({ percFreeMax < (monitor.sqlFileSizePercentFreeValue || 0) ) { // alert for max file size - message = `(Max file size) Percentage of free space (${Math.round( + message = `[${database.name} file ${file.fileName}] (Max file size) Percentage of free space (${Math.round( percFreeMax, )}%) is less than the limit of ${ monitor.sqlFileSizePercentFreeValue