new container endpoint,service, repo methods
This commit is contained in:
1 parent
d347e29a28
commit
8ccc7cbe9a
9 files changed
+195
-4
No files matched your search
@@ -1,5 +1,5 @@
|
||||
import CheckModel from "@/domain/checks/check.model.js";
|
||||
import { DockerStatsBucket } from "@/domain/checks/check.type.js";
|
||||
import { DockerContainerStatsBucket, DockerStatsBucket } from "@/domain/checks/check.type.js";
|
||||
import mongoose from "mongoose";
|
||||
|
||||
type DateRange = { start: Date; end: Date };
|
||||
@@ -52,3 +52,43 @@ export const getDockerLatestCheck = async (monitorId: string) =>
|
||||
.sort({ createdAt: -1 })
|
||||
.select("containers containerSummary createdAt")
|
||||
.lean();
|
||||
|
||||
export const getDockerContainerStats = async (
|
||||
monitorId: string,
|
||||
containerName: string,
|
||||
dates: DateRange,
|
||||
dateString: string
|
||||
): Promise<DockerContainerStatsBucket[]> =>
|
||||
CheckModel.aggregate<DockerContainerStatsBucket>([
|
||||
{
|
||||
$match: {
|
||||
"metadata.monitorId": new mongoose.Types.ObjectId(monitorId),
|
||||
"metadata.type": "docker",
|
||||
createdAt: { $gte: dates.start, $lte: dates.end },
|
||||
"containers.name": containerName,
|
||||
},
|
||||
},
|
||||
{ $unwind: "$containers" },
|
||||
{ $match: { "containers.name": containerName } },
|
||||
{
|
||||
$group: {
|
||||
_id: { $dateToString: { format: dateString, date: "$createdAt" } },
|
||||
avgCpuPct: { $avg: "$containers.cpuPct" },
|
||||
avgMemoryUsedBytes: { $avg: "$containers.memoryUsedBytes" },
|
||||
avgMemoryPct: { $avg: "$containers.memoryPct" },
|
||||
minRestartCount: { $min: "$containers.restartCount" },
|
||||
maxRestartCount: { $max: "$containers.restartCount" },
|
||||
},
|
||||
},
|
||||
{ $sort: { _id: 1 } },
|
||||
]);
|
||||
|
||||
export const getDockerContainerLatestCheck = async (monitorId: string, containerName: string) =>
|
||||
CheckModel.findOne({
|
||||
"metadata.monitorId": new mongoose.Types.ObjectId(monitorId),
|
||||
"metadata.type": "docker",
|
||||
"containers.name": containerName,
|
||||
})
|
||||
.sort({ createdAt: -1 })
|
||||
.select("containers createdAt")
|
||||
.lean();
|
||||
@@ -4,6 +4,7 @@ import type {
|
||||
ChecksSummary,
|
||||
DailyCheckBucket,
|
||||
DockerChecksResult,
|
||||
DockerContainerStats,
|
||||
HardwareChecksResult,
|
||||
PageSpeedChecksResult,
|
||||
UptimeChecksResult,
|
||||
@@ -40,6 +41,7 @@ export interface IChecksRepository {
|
||||
dateRange: DateRange,
|
||||
options?: { type?: MonitorType }
|
||||
): Promise<UptimeChecksResult | HardwareChecksResult | PageSpeedChecksResult | DockerChecksResult>;
|
||||
findDockerContainerChecks(monitorId: string, containerName: string, dateRange: DateRange): Promise<Omit<DockerContainerStats, "restartsInRange">>;
|
||||
findSummaryByTeamId(teamId: string, dateRange: DateRange): Promise<ChecksSummary>;
|
||||
findUnevaluatedByMonitorId(monitorId: string, since: number): Promise<Check[]>;
|
||||
getDailyStatusBuckets(monitorIds: string[], days: number, timezone: string): Promise<DailyCheckBucket[]>;
|
||||
|
||||
@@ -10,6 +10,7 @@ import type {
|
||||
CheckMemoryInfo,
|
||||
CheckMetadata,
|
||||
CheckNetworkInterfaceInfo,
|
||||
DockerContainerStats,
|
||||
GotTimings,
|
||||
HardwareCheckStats,
|
||||
} from "@/domain/checks/check.type.js";
|
||||
@@ -24,7 +25,14 @@ import { getHardwareUpChecks, getHardwareStats, getHardwareTotalChecks } from "@
|
||||
import { CheckFilter, DateRange } from "@/types/query.js";
|
||||
import { AppError } from "@/utils/AppError.js";
|
||||
import { NETWORK_ERROR } from "@/types/network.js";
|
||||
import { getDockerLatestCheck, getDockerStats, getDockerTotalChecks, getDockerUpChecks } from "@/domain/checks/check.docker.aggregation.js";
|
||||
import {
|
||||
getDockerContainerLatestCheck,
|
||||
getDockerContainerStats,
|
||||
getDockerLatestCheck,
|
||||
getDockerStats,
|
||||
getDockerTotalChecks,
|
||||
getDockerUpChecks,
|
||||
} from "@/domain/checks/check.docker.aggregation.js";
|
||||
|
||||
const SERVICE_NAME = "ChecksRepository";
|
||||
|
||||
@@ -311,6 +319,30 @@ class MongoChecksRepository implements IChecksRepository {
|
||||
return this.findUptimeDateRangeChecks(options?.type ?? "http", monitorObjectId, start, end, dateString);
|
||||
};
|
||||
|
||||
findDockerContainerChecks = async (
|
||||
monitorId: string,
|
||||
containerName: string,
|
||||
dateRange: DateRange
|
||||
): Promise<Omit<DockerContainerStats, "restartsInRange">> => {
|
||||
const dates = { start: getDateForRange(dateRange), end: new Date() };
|
||||
const dateString = getDateFormat(dateRange);
|
||||
const [aggregate, latestDoc] = await Promise.all([
|
||||
getDockerContainerStats(monitorId, containerName, dates, dateString),
|
||||
getDockerContainerLatestCheck(monitorId, containerName),
|
||||
]);
|
||||
const latestContainer = latestDoc?.containers?.find((c) => c.name === containerName);
|
||||
return {
|
||||
aggregate,
|
||||
latest:
|
||||
latestDoc && latestContainer
|
||||
? {
|
||||
container: latestContainer,
|
||||
checkedAt: toDateString(latestDoc.createdAt),
|
||||
}
|
||||
: null,
|
||||
};
|
||||
};
|
||||
|
||||
findSummaryByTeamId = async (teamId: string, dateRange: DateRange) => {
|
||||
const baseMatch = {
|
||||
"metadata.teamId": new mongoose.Types.ObjectId(teamId),
|
||||
|
||||
@@ -281,3 +281,21 @@ export interface DockerStats {
|
||||
export interface DockerChecksResult extends DockerStats {
|
||||
monitorType: "docker";
|
||||
}
|
||||
|
||||
export type DockerContainerStatsBucket = {
|
||||
_id: string;
|
||||
avgCpuPct: number | null;
|
||||
avgMemoryUsedBytes: number | null;
|
||||
avgMemoryPct: number | null;
|
||||
minRestartCount: number | null;
|
||||
maxRestartCount: number | null;
|
||||
};
|
||||
|
||||
export interface DockerContainerStats {
|
||||
aggregate: DockerContainerStatsBucket[];
|
||||
restartsInRange: number;
|
||||
latest: {
|
||||
container: DockerContainerInfo;
|
||||
checkedAt: string;
|
||||
} | null;
|
||||
}
|
||||
Reference in new issue
Block a user