mirror of
https://github.com/fosrl/pangolin.git
synced 2026-07-11 00:12:09 +02:00
Compare commits
13 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| cb0fe867ee | |||
| d4138e2141 | |||
| 09d5d9082e | |||
| 5cb316f4e9 | |||
| 6b6c9cf4d8 | |||
| 05617c63c0 | |||
| d4c52bbf2f | |||
| 87f50bf0cc | |||
| 2c66da1b19 | |||
| ab19955502 | |||
| 1db9dcec81 | |||
| 49c2d3163e | |||
| 45b9e13a13 |
+2
-2
@@ -1,5 +1,5 @@
|
|||||||
# FROM node:24-slim AS base
|
# FROM node:24-slim AS base
|
||||||
FROM public.ecr.aws/docker/library/node:24-slim AS base
|
FROM public.ecr.aws/docker/library/node:26-slim AS base
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
@@ -33,7 +33,7 @@ FROM base AS builder
|
|||||||
RUN npm ci --omit=dev
|
RUN npm ci --omit=dev
|
||||||
|
|
||||||
# FROM node:24-slim AS runner
|
# FROM node:24-slim AS runner
|
||||||
FROM public.ecr.aws/docker/library/node:24-slim AS runner
|
FROM public.ecr.aws/docker/library/node:26-slim AS runner
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
FROM node:24-alpine
|
FROM node:26-alpine
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ services:
|
|||||||
- 80:80 # Port for traefik because of the network_mode
|
- 80:80 # Port for traefik because of the network_mode
|
||||||
|
|
||||||
traefik:
|
traefik:
|
||||||
image: traefik:v3.6
|
image: traefik:v3.7
|
||||||
container_name: traefik
|
container_name: traefik
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
network_mode: service:gerbil # Ports appear on the gerbil service
|
network_mode: service:gerbil # Ports appear on the gerbil service
|
||||||
|
|||||||
@@ -50,7 +50,7 @@ services:
|
|||||||
- 80:80{{end}}
|
- 80:80{{end}}
|
||||||
|
|
||||||
traefik:
|
traefik:
|
||||||
image: docker.io/traefik:v3.6
|
image: docker.io/traefik:v3.7
|
||||||
container_name: traefik
|
container_name: traefik
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
{{if .InstallGerbil}}network_mode: service:gerbil # Ports appear on the gerbil service{{end}}{{if not .InstallGerbil}}
|
{{if .InstallGerbil}}network_mode: service:gerbil # Ports appear on the gerbil service{{end}}{{if not .InstallGerbil}}
|
||||||
|
|||||||
@@ -1397,7 +1397,6 @@
|
|||||||
"createOrgUser": "Create Org User",
|
"createOrgUser": "Create Org User",
|
||||||
"actionUpdateOrg": "Update Organization",
|
"actionUpdateOrg": "Update Organization",
|
||||||
"actionRemoveInvitation": "Remove Invitation",
|
"actionRemoveInvitation": "Remove Invitation",
|
||||||
"actionRemoveUserRole": "Remove User Role",
|
|
||||||
"actionUpdateUser": "Update User",
|
"actionUpdateUser": "Update User",
|
||||||
"actionGetUser": "Get User",
|
"actionGetUser": "Get User",
|
||||||
"actionGetOrgUser": "Get Organization User",
|
"actionGetOrgUser": "Get Organization User",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { z } from "zod";
|
import { z } from "zod";
|
||||||
import { db, logsDb, statusHistory } from "@server/db";
|
import { db, logsDb, statusHistory } from "@server/db";
|
||||||
import { and, eq, gte, lt, asc, desc, inArray } from "drizzle-orm";
|
import { and, eq, gte, lt, asc, desc } from "drizzle-orm";
|
||||||
import { regionalCache as cache } from "#dynamic/lib/cache";
|
import { regionalCache as cache } from "#dynamic/lib/cache";
|
||||||
|
|
||||||
const STATUS_HISTORY_CACHE_TTL = 60; // seconds
|
const STATUS_HISTORY_CACHE_TTL = 60; // seconds
|
||||||
@@ -273,81 +273,3 @@ export function computeBuckets(
|
|||||||
|
|
||||||
return { buckets, totalDowntime };
|
return { buckets, totalDowntime };
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface BatchedStatusHistoryResponse {
|
|
||||||
entityType: string;
|
|
||||||
entityIds: number[];
|
|
||||||
days: StatusHistoryDayBucket[];
|
|
||||||
overallUptimePercent: number;
|
|
||||||
totalDowntimeSeconds: number;
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function getBatchedStatusHistory(
|
|
||||||
entityType: string,
|
|
||||||
entityIds: number[],
|
|
||||||
days: number
|
|
||||||
): Promise<BatchedStatusHistoryResponse> {
|
|
||||||
// const cacheKey = statusHistoryCacheKey(entityType, entityId, days);
|
|
||||||
// const cached = await cache.get<StatusHistoryResponse>(cacheKey);
|
|
||||||
// if (cached !== undefined) {
|
|
||||||
// return cached;
|
|
||||||
// }
|
|
||||||
|
|
||||||
// Anchor to UTC midnight so the query window aligns with stable calendar days
|
|
||||||
const utcToday = new Date();
|
|
||||||
utcToday.setUTCHours(0, 0, 0, 0);
|
|
||||||
const todayMidnightSec = Math.floor(utcToday.getTime() / 1000);
|
|
||||||
const startSec = todayMidnightSec - days * 86400;
|
|
||||||
|
|
||||||
const events = await logsDb
|
|
||||||
.select()
|
|
||||||
.from(statusHistory)
|
|
||||||
.where(
|
|
||||||
and(
|
|
||||||
eq(statusHistory.entityType, entityType),
|
|
||||||
inArray(statusHistory.entityId, entityIds),
|
|
||||||
gte(statusHistory.timestamp, startSec)
|
|
||||||
)
|
|
||||||
)
|
|
||||||
.orderBy(asc(statusHistory.timestamp));
|
|
||||||
|
|
||||||
// Fetch the last known state before the window so that entities that
|
|
||||||
// haven't changed status recently still show the correct status rather
|
|
||||||
// than appearing as "no_data".
|
|
||||||
const [lastKnownEvent] = await logsDb
|
|
||||||
.select()
|
|
||||||
.from(statusHistory)
|
|
||||||
.where(
|
|
||||||
and(
|
|
||||||
eq(statusHistory.entityType, entityType),
|
|
||||||
inArray(statusHistory.entityId, entityIds),
|
|
||||||
lt(statusHistory.timestamp, startSec)
|
|
||||||
)
|
|
||||||
)
|
|
||||||
.orderBy(desc(statusHistory.timestamp))
|
|
||||||
.limit(1);
|
|
||||||
|
|
||||||
const priorStatus = lastKnownEvent?.status ?? null;
|
|
||||||
|
|
||||||
const { buckets, totalDowntime } = computeBuckets(
|
|
||||||
events,
|
|
||||||
days,
|
|
||||||
priorStatus
|
|
||||||
);
|
|
||||||
const totalWindow = days * 86400;
|
|
||||||
const overallUptime =
|
|
||||||
totalWindow > 0
|
|
||||||
? Math.max(0, ((totalWindow - totalDowntime) / totalWindow) * 100)
|
|
||||||
: 100;
|
|
||||||
|
|
||||||
const result: BatchedStatusHistoryResponse = {
|
|
||||||
entityType,
|
|
||||||
entityIds,
|
|
||||||
days: buckets,
|
|
||||||
overallUptimePercent: Math.round(overallUptime * 100) / 100,
|
|
||||||
totalDowntimeSeconds: totalDowntime
|
|
||||||
};
|
|
||||||
|
|
||||||
// await cache.set(cacheKey, result, STATUS_HISTORY_CACHE_TTL);
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,62 +0,0 @@
|
|||||||
import { Request, Response, NextFunction } from "express";
|
|
||||||
import { z } from "zod";
|
|
||||||
import response from "@server/lib/response";
|
|
||||||
import HttpCode from "@server/types/HttpCode";
|
|
||||||
import createHttpError from "http-errors";
|
|
||||||
import logger from "@server/logger";
|
|
||||||
import { fromError } from "zod-validation-error";
|
|
||||||
import {
|
|
||||||
getCachedStatusHistory,
|
|
||||||
statusHistoryQuerySchema,
|
|
||||||
StatusHistoryResponse
|
|
||||||
} from "@server/lib/statusHistory";
|
|
||||||
|
|
||||||
const siteParamsSchema = z.object({
|
|
||||||
siteId: z.string().transform((v) => parseInt(v, 10))
|
|
||||||
});
|
|
||||||
|
|
||||||
export async function getBatchedSiteStatusHistory(
|
|
||||||
req: Request,
|
|
||||||
res: Response,
|
|
||||||
next: NextFunction
|
|
||||||
): Promise<any> {
|
|
||||||
try {
|
|
||||||
const parsedParams = siteParamsSchema.safeParse(req.params);
|
|
||||||
if (!parsedParams.success) {
|
|
||||||
return next(
|
|
||||||
createHttpError(
|
|
||||||
HttpCode.BAD_REQUEST,
|
|
||||||
fromError(parsedParams.error).toString()
|
|
||||||
)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
const parsedQuery = statusHistoryQuerySchema.safeParse(req.query);
|
|
||||||
if (!parsedQuery.success) {
|
|
||||||
return next(
|
|
||||||
createHttpError(
|
|
||||||
HttpCode.BAD_REQUEST,
|
|
||||||
fromError(parsedQuery.error).toString()
|
|
||||||
)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
const entityType = "site";
|
|
||||||
const entityId = parsedParams.data.siteId;
|
|
||||||
const { days } = parsedQuery.data;
|
|
||||||
|
|
||||||
const data = await getCachedStatusHistory(entityType, entityId, days);
|
|
||||||
|
|
||||||
return response<StatusHistoryResponse>(res, {
|
|
||||||
data,
|
|
||||||
success: true,
|
|
||||||
error: false,
|
|
||||||
message: "Status history retrieved successfully",
|
|
||||||
status: HttpCode.OK
|
|
||||||
});
|
|
||||||
} catch (error) {
|
|
||||||
logger.error(error);
|
|
||||||
return next(
|
|
||||||
createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred")
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -640,28 +640,6 @@ export const orgQueries = {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
batchedSiteStatusHistory: ({
|
|
||||||
siteIds,
|
|
||||||
days = 90
|
|
||||||
}: {
|
|
||||||
siteIds: number[];
|
|
||||||
days?: number;
|
|
||||||
}) =>
|
|
||||||
queryOptions({
|
|
||||||
queryKey: [
|
|
||||||
"SITE_STATUS_HISTORY",
|
|
||||||
"BATCHED",
|
|
||||||
siteIds,
|
|
||||||
days
|
|
||||||
] as const,
|
|
||||||
queryFn: async ({ signal, meta }) => {
|
|
||||||
// TODO
|
|
||||||
// const res = await meta!.api.get<
|
|
||||||
// AxiosResponse<StatusHistoryResponse>
|
|
||||||
// >(`/site/${siteId}/status-history?days=${days}`, { signal });
|
|
||||||
// return res.data.data;
|
|
||||||
}
|
|
||||||
}),
|
|
||||||
siteStatusHistory: ({
|
siteStatusHistory: ({
|
||||||
siteId,
|
siteId,
|
||||||
days = 90
|
days = 90
|
||||||
|
|||||||
Reference in New Issue
Block a user