remove server side normalization
This commit is contained in:
1 parent
093553f9ba
commit
8a608961e6
7 files changed
+3
-118
No files matched your search
@@ -25,7 +25,6 @@ export const getMonitorByIdQueryValidation = z.object({
|
||||
limit: z.coerce.number().optional(),
|
||||
dateRange: z.enum(DateRanges).optional(),
|
||||
numToDisplay: z.coerce.number().optional(),
|
||||
normalize: booleanCoercion.optional(),
|
||||
continent: z.union([z.enum(GeoContinents), z.array(z.enum(GeoContinents))]).optional(),
|
||||
});
|
||||
|
||||
|
||||
@@ -168,10 +168,6 @@ export interface HasResponseTime {
|
||||
responseTime: number;
|
||||
}
|
||||
|
||||
export type NormalizedCheck<T extends HasResponseTime = Check> = T & {
|
||||
originalResponseTime: number;
|
||||
};
|
||||
|
||||
export type CheckSnapshot = Omit<Check, "metadata" | "updatedAt">;
|
||||
|
||||
export interface HardwareDiskStats {
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
import { NormalizeData } from "@/utils/dataUtils.js";
|
||||
import { type Monitor } from "@/domain/monitors/monitor.type.js";
|
||||
import type {
|
||||
MonitorType,
|
||||
@@ -364,7 +363,7 @@ export class MonitorService implements IMonitorService {
|
||||
const monitorsWithChecks = monitors.map((monitor: Monitor) => {
|
||||
const rawChecks = monitor.recentChecks ?? [];
|
||||
const isSnapshotType = snapshotOnlyRequest || snapshotTypes.includes(monitor.type);
|
||||
const checks = isSnapshotType ? rawChecks.slice(0, 1) : NormalizeData(rawChecks, 10, 100);
|
||||
const checks = isSnapshotType ? rawChecks.slice(0, 1) : rawChecks;
|
||||
monitor.recentChecks = checks;
|
||||
return monitor;
|
||||
});
|
||||
|
||||
@@ -10,7 +10,6 @@ import {
|
||||
import { AppError } from "@/utils/AppError.js";
|
||||
import { normalizeStatusPageDomain } from "@/utils/statusPageDomain.js";
|
||||
import { Monitor } from "@/domain/monitors/monitor.type.js";
|
||||
import { NormalizeData } from "@/utils/dataUtils.js";
|
||||
|
||||
export interface IStatusPageService {
|
||||
createStatusPage(userId: string, teamId: string, image: Express.Multer.File | undefined, data: Partial<StatusPage>): Promise<StatusPage>;
|
||||
@@ -79,7 +78,6 @@ export class StatusPageService implements IStatusPageService {
|
||||
status: monitor.status,
|
||||
uptimePercentage: monitor.uptimePercentage,
|
||||
recentChecks: monitor.recentChecks,
|
||||
checks: NormalizeData(monitor.recentChecks, 10, 100),
|
||||
};
|
||||
|
||||
if (showURL) {
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import type { Monitor } from "@/domain/monitors/monitor.type.js";
|
||||
import type { NormalizedCheck, CheckSnapshot } from "@/domain/checks/check.type.js";
|
||||
export const StatusPageTypes = ["uptime", "infrastructure"] as const;
|
||||
export type StatusPageType = (typeof StatusPageTypes)[number];
|
||||
|
||||
@@ -48,7 +47,7 @@ export interface StatusPage {
|
||||
}
|
||||
|
||||
export type PublicStatusPageMonitor = Pick<Monitor, "id" | "name" | "type" | "status" | "uptimePercentage" | "recentChecks"> &
|
||||
Partial<Pick<Monitor, "url" | "port">> & { checks: NormalizedCheck<CheckSnapshot>[] };
|
||||
Partial<Pick<Monitor, "url" | "port">>;
|
||||
|
||||
export interface PublicStatusPagePayload {
|
||||
statusPage: StatusPage;
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
import type { HasResponseTime, NormalizedCheck } from "@/domain/checks/check.type.js";
|
||||
import { type DateRange } from "@/types/query.js";
|
||||
|
||||
export const getDateForRange = (dateRange: DateRange): Date => {
|
||||
@@ -32,32 +31,3 @@ export const getDateFormat = (dateRange: DateRange): string => {
|
||||
};
|
||||
return formatLookup[dateRange];
|
||||
};
|
||||
|
||||
const percentileBy = <T>(arr: T[], percentile: number, value: (item: T) => number): number => {
|
||||
const sorted = arr.slice().sort((a, b) => value(a) - value(b));
|
||||
const index = (percentile / 100) * (sorted.length - 1);
|
||||
const lower = Math.floor(index);
|
||||
const upper = lower + 1;
|
||||
const weight = index % 1;
|
||||
if (upper >= sorted.length) return value(sorted[lower]!);
|
||||
return value(sorted[lower]!) * (1 - weight) + value(sorted[upper]!) * weight;
|
||||
};
|
||||
|
||||
const rescale = (raw: number, min: number, max: number, rangeMin: number, rangeMax: number): number => {
|
||||
const scaled = rangeMin + ((raw - min) * (rangeMax - rangeMin)) / (max - min);
|
||||
return Math.max(rangeMin, Math.min(rangeMax, scaled));
|
||||
};
|
||||
|
||||
export const NormalizeData = <T extends HasResponseTime>(checks: T[], rangeMin: number, rangeMax: number): NormalizedCheck<T>[] => {
|
||||
const original = (check: T) => (typeof check.responseTime === "number" ? check.responseTime : 0);
|
||||
if (checks.length <= 1) {
|
||||
return checks.map((check) => ({ ...check, originalResponseTime: original(check) }));
|
||||
}
|
||||
const min = percentileBy(checks, 0, (c) => c.responseTime);
|
||||
const max = percentileBy(checks, 95, (c) => c.responseTime);
|
||||
return checks.map((check) => ({
|
||||
...check,
|
||||
responseTime: rescale(check.responseTime, min, max, rangeMin, rangeMax),
|
||||
originalResponseTime: original(check),
|
||||
}));
|
||||
};
|
||||
Reference in new issue
Block a user