@oneuptime/common 11.3.28 → 11.4.1

package/build/dist/Server/Utils/AI/Toolbox/SentinelActionTools.js

@@ -0,0 +1,451 @@
+import Incident from "../../../../Models/DatabaseModels/Incident";
+import IncidentPublicNote from "../../../../Models/DatabaseModels/IncidentPublicNote";
+import Runbook from "../../../../Models/DatabaseModels/Runbook";
+import BadDataException from "../../../../Types/Exception/BadDataException";
+import SortOrder from "../../../../Types/BaseDatabase/SortOrder";
+import OneUptimeDate from "../../../../Types/Date";
+import UserNotificationEventType from "../../../../Types/UserNotification/UserNotificationEventType";
+import { AIChatCitationTargetType } from "../../../../Types/AI/AIChatTypes";
+import IncidentService from "../../../Services/IncidentService";
+import IncidentSeverityService from "../../../Services/IncidentSeverityService";
+import IncidentPublicNoteService from "../../../Services/IncidentPublicNoteService";
+import OnCallDutyPolicyService from "../../../Services/OnCallDutyPolicyService";
+import RunbookService from "../../../Services/RunbookService";
+import RunbookRuleEngineService from "../../../Services/RunbookRuleEngineService";
+import ToolResultSerializer from "./Serializer";
+import WidgetBuilder from "./WidgetBuilder";
+import { ToolArgs, } from "./ToolTypes";
+/*
+ * Sentinel "action belt" — Phase 0.
+ *
+ * Mutating tools that let the copilot OPERATE the platform (not just answer
+ * questions), each a thin wrapper over an already-RBAC-tested service method.
+ * They are gated twice: by the tool's requiredPermissions (RBAC) and by the
+ * conversation's permission mode (approval / auto-run / hidden in read-only).
+ * The acting user is always ctx.props.userId — never a tool argument.
+ *
+ * Permissions are resolved lazily (not at module load) because this module is
+ * pulled in through the service import graph before the model classes are fully
+ * wired up — calling a model method at import time throws a circular-dependency
+ * TypeError. By the time a tool executes, every module is loaded.
+ */
+let cachedIncidentUpdatePermissions = null;
+const resolveIncidentUpdatePermissions = () => {
+    if (!cachedIncidentUpdatePermissions) {
+        cachedIncidentUpdatePermissions = new Incident().getUpdatePermissions();
+    }
+    return cachedIncidentUpdatePermissions;
+};
+let cachedPublicNoteCreatePermissions = null;
+const resolvePublicNoteCreatePermissions = () => {
+    if (!cachedPublicNoteCreatePermissions) {
+        cachedPublicNoteCreatePermissions =
+            new IncidentPublicNote().getCreatePermissions();
+    }
+    return cachedPublicNoteCreatePermissions;
+};
+let cachedRunbookUpdatePermissions = null;
+const resolveRunbookUpdatePermissions = () => {
+    if (!cachedRunbookUpdatePermissions) {
+        cachedRunbookUpdatePermissions = new Runbook().getUpdatePermissions();
+    }
+    return cachedRunbookUpdatePermissions;
+};
+/*
+ * ---------------------------------------------------------------------------
+ * page_on_call_policy — escalate an incident to its responders.
+ * ---------------------------------------------------------------------------
+ */
+export const PageOnCallPolicyTool = {
+    name: "page_on_call_policy",
+    description: "Page (trigger) an on-call duty policy so its responders are notified about an incident. Provide the on-call policy id and the incident id it relates to. Use query tools to find the on-call policy id and incident id first. This notifies real people — only do it when clearly asked.",
+    inputSchema: {
+        type: "object",
+        properties: {
+            onCallDutyPolicyId: {
+                type: "string",
+                description: "The on-call duty policy's ID to trigger (required).",
+            },
+            incidentId: {
+                type: "string",
+                description: "The incident's ID this page relates to (required). Find it with query_incidents first.",
+            },
+        },
+        required: ["onCallDutyPolicyId", "incidentId"],
+    },
+    get requiredPermissions() {
+        return resolveIncidentUpdatePermissions();
+    },
+    isMutation: true,
+    buildActionTitle: (args) => {
+        return `Page on-call policy ${ToolArgs.getString(args, "onCallDutyPolicyId") || ""}`.trim();
+    },
+    execute: async (args, ctx) => {
+        var _a;
+        const policyId = ToolArgs.getObjectID(args, "onCallDutyPolicyId");
+        if (!policyId) {
+            throw new BadDataException("onCallDutyPolicyId is required. Use query tools to find it first.");
+        }
+        const incidentId = ToolArgs.getObjectID(args, "incidentId");
+        if (!incidentId) {
+            throw new BadDataException("incidentId is required. Use query_incidents to find it first.");
+        }
+        // Visibility checks under the user's RBAC (execution runs as root inside the service).
+        const policy = await OnCallDutyPolicyService.findOneById({
+            id: policyId,
+            select: { _id: true, name: true },
+            props: ctx.props,
+        });
+        if (!policy) {
+            throw new BadDataException("On-call duty policy not found (or you do not have access to it).");
+        }
+        const incident = await IncidentService.findOneById({
+            id: incidentId,
+            select: { _id: true, incidentNumber: true, title: true },
+            props: ctx.props,
+        });
+        if (!incident) {
+            throw new BadDataException("Incident not found (or you do not have access to it).");
+        }
+        await OnCallDutyPolicyService.executePolicy(policyId, {
+            triggeredByIncidentId: incidentId,
+            userNotificationEventType: UserNotificationEventType.IncidentCreated,
+        });
+        const incidentIdString = incidentId.toString();
+        const serialized = ToolResultSerializer.serializeRows([
+            {
+                onCallPolicy: policy.name,
+                incidentNumber: incident.incidentNumber,
+                incidentTitle: incident.title,
+            },
+        ]);
+        return {
+            dataForLlm: `Paged on-call policy "${policy.name}" for incident #${incident.incidentNumber} ("${incident.title}"). Responders are being notified.\n${serialized.text}`,
+            rowCount: 1,
+            citationLabel: `Paged "${policy.name}" for incident #${incident.incidentNumber}`,
+            citationTarget: {
+                type: AIChatCitationTargetType.IncidentView,
+                params: { incidentId: incidentIdString },
+            },
+            redactionCount: serialized.redactionCount,
+            isTruncated: false,
+            widget: WidgetBuilder.resourceCard({
+                title: "On-call paged",
+                resourceType: "OnCallDutyPolicy",
+                heading: policy.name || "On-call policy",
+                subheading: `Incident #${incident.incidentNumber}`,
+                fields: [
+                    { label: "Policy", value: policy.name || "—" },
+                    { label: "Incident", value: `#${(_a = incident.incidentNumber) !== null && _a !== void 0 ? _a : ""}` },
+                ],
+                link: {
+                    type: AIChatCitationTargetType.IncidentView,
+                    params: { incidentId: incidentIdString },
+                },
+            }),
+        };
+    },
+};
+/*
+ * ---------------------------------------------------------------------------
+ * run_runbook — start an automated runbook.
+ * ---------------------------------------------------------------------------
+ */
+export const RunRunbookTool = {
+    name: "run_runbook",
+    description: "Start (execute) a runbook by its id, optionally linked to an incident. Use this to run a predefined remediation or diagnostic automation. Find the runbook id with query tools first.",
+    inputSchema: {
+        type: "object",
+        properties: {
+            runbookId: {
+                type: "string",
+                description: "The runbook's ID to execute (required).",
+            },
+            incidentId: {
+                type: "string",
+                description: "Optional incident ID to link this runbook execution to. Find it with query_incidents first.",
+            },
+        },
+        required: ["runbookId"],
+    },
+    get requiredPermissions() {
+        return resolveRunbookUpdatePermissions();
+    },
+    isMutation: true,
+    buildActionTitle: (args) => {
+        return `Run runbook ${ToolArgs.getString(args, "runbookId") || ""}`.trim();
+    },
+    execute: async (args, ctx) => {
+        var _a;
+        const runbookId = ToolArgs.getObjectID(args, "runbookId");
+        if (!runbookId) {
+            throw new BadDataException("runbookId is required. Use query tools to find it first.");
+        }
+        const userId = ctx.props.userId;
+        if (!userId) {
+            throw new BadDataException("No authenticated user in context; cannot run a runbook.");
+        }
+        const incidentId = ToolArgs.getObjectID(args, "incidentId");
+        // Visibility check under the user's RBAC.
+        const runbook = await RunbookService.findOneById({
+            id: runbookId,
+            select: { _id: true, name: true },
+            props: ctx.props,
+        });
+        if (!runbook) {
+            throw new BadDataException("Runbook not found (or you do not have access to it).");
+        }
+        const execution = await RunbookRuleEngineService.startRunbookFor({
+            projectId: ctx.projectId,
+            runbookId: runbookId,
+            linkage: incidentId ? { incidentId: incidentId } : {},
+            triggeredByUserId: userId,
+        });
+        if (!execution) {
+            throw new BadDataException(`Runbook "${runbook.name}" could not be started. It may be disabled, empty, or not part of this project.`);
+        }
+        const serialized = ToolResultSerializer.serializeRows([
+            {
+                runbook: runbook.name,
+                executionId: (_a = execution.id) === null || _a === void 0 ? void 0 : _a.toString(),
+            },
+        ]);
+        const result = {
+            dataForLlm: `Started runbook "${runbook.name}". Execution is scheduled.\n${serialized.text}`,
+            rowCount: 1,
+            citationLabel: `Started runbook "${runbook.name}"`,
+            redactionCount: serialized.redactionCount,
+            isTruncated: false,
+            widget: WidgetBuilder.resourceCard({
+                title: "Runbook started",
+                resourceType: "Runbook",
+                heading: runbook.name || "Runbook",
+                subheading: "Execution scheduled",
+                fields: [{ label: "Runbook", value: runbook.name || "—" }],
+            }),
+        };
+        if (incidentId) {
+            result.citationTarget = {
+                type: AIChatCitationTargetType.IncidentView,
+                params: { incidentId: incidentId.toString() },
+            };
+        }
+        return result;
+    },
+};
+/*
+ * ---------------------------------------------------------------------------
+ * post_incident_status_update — customer-facing update on an incident.
+ * ---------------------------------------------------------------------------
+ */
+export const PostIncidentStatusUpdateTool = {
+    name: "post_incident_status_update",
+    description: "Post a customer-facing status update (public note) on an incident. It appears on the status page and, by default, notifies subscribers. Provide the incident id and the update text.",
+    inputSchema: {
+        type: "object",
+        properties: {
+            incidentId: {
+                type: "string",
+                description: "The incident's ID (required).",
+            },
+            note: {
+                type: "string",
+                description: "The customer-facing update text in markdown (required).",
+            },
+            notifySubscribers: {
+                type: "boolean",
+                description: "Whether to notify status page subscribers. Defaults to true.",
+            },
+        },
+        required: ["incidentId", "note"],
+    },
+    get requiredPermissions() {
+        return resolvePublicNoteCreatePermissions();
+    },
+    isMutation: true,
+    buildActionTitle: (args) => {
+        return `Post public status update on incident ${ToolArgs.getString(args, "incidentId") || ""}`.trim();
+    },
+    execute: async (args, ctx) => {
+        var _a;
+        const incidentId = ToolArgs.getObjectID(args, "incidentId");
+        if (!incidentId) {
+            throw new BadDataException("incidentId is required. Use query_incidents to find it first.");
+        }
+        const note = ToolArgs.getString(args, "note");
+        if (!note) {
+            throw new BadDataException("note is required (the update text).");
+        }
+        const userId = ctx.props.userId;
+        if (!userId) {
+            throw new BadDataException("No authenticated user in context; cannot post a status update.");
+        }
+        const notifySubscribers = (_a = ToolArgs.getBoolean(args, "notifySubscribers")) !== null && _a !== void 0 ? _a : true;
+        const incident = await IncidentService.findOneById({
+            id: incidentId,
+            select: { _id: true, incidentNumber: true, title: true },
+            props: ctx.props,
+        });
+        if (!incident) {
+            throw new BadDataException("Incident not found (or you do not have access to it).");
+        }
+        const publicNote = new IncidentPublicNote();
+        publicNote.incidentId = incidentId;
+        publicNote.projectId = ctx.projectId;
+        publicNote.note = note;
+        publicNote.postedAt = OneUptimeDate.getCurrentDate();
+        publicNote.createdByUserId = userId;
+        publicNote.shouldStatusPageSubscribersBeNotifiedOnNoteCreated =
+            notifySubscribers;
+        await IncidentPublicNoteService.create({
+            data: publicNote,
+            props: ctx.props,
+        });
+        const incidentIdString = incidentId.toString();
+        const serialized = ToolResultSerializer.serializeRows([
+            {
+                incidentNumber: incident.incidentNumber,
+                notifySubscribers: notifySubscribers,
+            },
+        ]);
+        return {
+            dataForLlm: `Posted a public status update on incident #${incident.incidentNumber}${notifySubscribers ? " and notified subscribers" : ""}.\n${serialized.text}`,
+            rowCount: 1,
+            citationLabel: `Status update on incident #${incident.incidentNumber}`,
+            citationTarget: {
+                type: AIChatCitationTargetType.IncidentView,
+                params: { incidentId: incidentIdString },
+            },
+            redactionCount: serialized.redactionCount,
+            isTruncated: false,
+            widget: WidgetBuilder.resourceCard({
+                title: "Status update posted",
+                resourceType: "Incident",
+                heading: `#${incident.incidentNumber} · ${incident.title}`,
+                subheading: notifySubscribers
+                    ? "Subscribers notified"
+                    : "Subscribers not notified",
+                fields: [
+                    {
+                        label: "Update",
+                        value: note.length > 200 ? `${note.substring(0, 200)}…` : note,
+                    },
+                ],
+                link: {
+                    type: AIChatCitationTargetType.IncidentView,
+                    params: { incidentId: incidentIdString },
+                },
+            }),
+        };
+    },
+};
+/*
+ * ---------------------------------------------------------------------------
+ * change_incident_severity — re-classify an incident.
+ * ---------------------------------------------------------------------------
+ */
+export const ChangeIncidentSeverityTool = {
+    name: "change_incident_severity",
+    description: "Change the severity of an existing incident. Provide the incident id and the new severity name (must match an existing incident severity in this project, e.g. 'SEV1', 'Critical').",
+    inputSchema: {
+        type: "object",
+        properties: {
+            incidentId: {
+                type: "string",
+                description: "The incident's ID (required).",
+            },
+            severityName: {
+                type: "string",
+                description: "Name of an existing incident severity (required).",
+            },
+        },
+        required: ["incidentId", "severityName"],
+    },
+    get requiredPermissions() {
+        return resolveIncidentUpdatePermissions();
+    },
+    isMutation: true,
+    buildActionTitle: (args) => {
+        return `Change incident ${ToolArgs.getString(args, "incidentId") || ""} severity to ${ToolArgs.getString(args, "severityName") || ""}`.trim();
+    },
+    execute: async (args, ctx) => {
+        var _a;
+        const incidentId = ToolArgs.getObjectID(args, "incidentId");
+        if (!incidentId) {
+            throw new BadDataException("incidentId is required. Use query_incidents to find it first.");
+        }
+        const severityName = ToolArgs.getString(args, "severityName");
+        if (!severityName) {
+            throw new BadDataException("severityName is required.");
+        }
+        const incident = await IncidentService.findOneById({
+            id: incidentId,
+            select: { _id: true, incidentNumber: true, title: true },
+            props: ctx.props,
+        });
+        if (!incident) {
+            throw new BadDataException("Incident not found (or you do not have access to it).");
+        }
+        const severities = await IncidentSeverityService.findBy({
+            query: {},
+            select: { _id: true, name: true, order: true },
+            sort: { order: SortOrder.Ascending },
+            limit: 50,
+            skip: 0,
+            props: ctx.props,
+        });
+        const severity = severities.find((item) => {
+            var _a;
+            return ((_a = item.name) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === severityName.toLowerCase();
+        });
+        if (!severity) {
+            const available = severities
+                .map((s) => {
+                return s.name;
+            })
+                .filter(Boolean)
+                .join(", ");
+            throw new BadDataException(`No incident severity named "${severityName}". Available severities: ${available || "none configured"}.`);
+        }
+        await IncidentService.updateOneById({
+            id: incidentId,
+            data: {
+                incidentSeverityId: severity.id,
+            },
+            props: ctx.props,
+        });
+        const incidentIdString = incidentId.toString();
+        const serialized = ToolResultSerializer.serializeRows([
+            {
+                incidentNumber: incident.incidentNumber,
+                newSeverity: severity.name,
+            },
+        ]);
+        return {
+            dataForLlm: `Changed incident #${incident.incidentNumber} severity to ${severity.name}.\n${serialized.text}`,
+            rowCount: 1,
+            citationLabel: `Incident #${incident.incidentNumber} → ${severity.name}`,
+            citationTarget: {
+                type: AIChatCitationTargetType.IncidentView,
+                params: { incidentId: incidentIdString },
+            },
+            redactionCount: serialized.redactionCount,
+            isTruncated: false,
+            widget: WidgetBuilder.resourceCard({
+                title: "Severity changed",
+                resourceType: "Incident",
+                heading: `#${incident.incidentNumber} · ${incident.title}`,
+                subheading: `Severity: ${severity.name}`,
+                fields: [
+                    { label: "Number", value: `#${(_a = incident.incidentNumber) !== null && _a !== void 0 ? _a : ""}` },
+                    { label: "New severity", value: severity.name || "—" },
+                ],
+                link: {
+                    type: AIChatCitationTargetType.IncidentView,
+                    params: { incidentId: incidentIdString },
+                },
+            }),
+        };
+    },
+};
+//# sourceMappingURL=SentinelActionTools.js.map

package/build/dist/Server/Utils/AI/Toolbox/SentinelActionTools.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SentinelActionTools.js","sourceRoot":"","sources":["../../../../../../Server/Utils/AI/Toolbox/SentinelActionTools.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,4CAA4C,CAAC;AAElE,OAAO,kBAAkB,MAAM,sDAAsD,CAAC;AACtF,OAAO,OAAO,MAAM,2CAA2C,CAAC;AAMhE,OAAO,gBAAgB,MAAM,8CAA8C,CAAC;AAC5E,OAAO,SAAS,MAAM,0CAA0C,CAAC;AACjE,OAAO,aAAa,MAAM,wBAAwB,CAAC;AACnD,OAAO,yBAAyB,MAAM,8DAA8D,CAAC;AACrG,OAAO,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AAC5E,OAAO,eAAe,MAAM,mCAAmC,CAAC;AAChE,OAAO,uBAAuB,MAAM,2CAA2C,CAAC;AAChF,OAAO,yBAAyB,MAAM,6CAA6C,CAAC;AACpF,OAAO,uBAAuB,MAAM,2CAA2C,CAAC;AAChF,OAAO,cAAc,MAAM,kCAAkC,CAAC;AAC9D,OAAO,wBAAwB,MAAM,4CAA4C,CAAC;AAClF,OAAO,oBAA0C,MAAM,cAAc,CAAC;AACtE,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAEL,QAAQ,GAGT,MAAM,aAAa,CAAC;AAErB;;;;;;;;;;;;;GAaG;AAEH,IAAI,+BAA+B,GAA6B,IAAI,CAAC;AACrE,MAAM,gCAAgC,GACpC,GAAsB,EAAE;IACtB,IAAI,CAAC,+BAA+B,EAAE,CAAC;QACrC,+BAA+B,GAAG,IAAI,QAAQ,EAAE,CAAC,oBAAoB,EAAE,CAAC;IAC1E,CAAC;IACD,OAAO,+BAA+B,CAAC;AACzC,CAAC,CAAC;AAEJ,IAAI,iCAAiC,GAA6B,IAAI,CAAC;AACvE,MAAM,kCAAkC,GACtC,GAAsB,EAAE;IACtB,IAAI,CAAC,iCAAiC,EAAE,CAAC;QACvC,iCAAiC;YAC/B,IAAI,kBAAkB,EAAE,CAAC,oBAAoB,EAAE,CAAC;IACpD,CAAC;IACD,OAAO,iCAAiC,CAAC;AAC3C,CAAC,CAAC;AAEJ,IAAI,8BAA8B,GAA6B,IAAI,CAAC;AACpE,MAAM,+BAA+B,GACnC,GAAsB,EAAE;IACtB,IAAI,CAAC,8BAA8B,EAAE,CAAC;QACpC,8BAA8B,GAAG,IAAI,OAAO,EAAE,CAAC,oBAAoB,EAAE,CAAC;IACxE,CAAC;IACD,OAAO,8BAA8B,CAAC;AACxC,CAAC,CAAC;AAEJ;;;;GAIG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAsB;IACrD,IAAI,EAAE,qBAAqB;IAC3B,WAAW,EACT,0RAA0R;IAC5R,WAAW,EAAE;QACX,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACV,kBAAkB,EAAE;gBAClB,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE,qDAAqD;aACnE;YACD,UAAU,EAAE;gBACV,IAAI,EAAE,QAAQ;gBACd,WAAW,EACT,wFAAwF;aAC3F;SACF;QACD,QAAQ,EAAE,CAAC,oBAAoB,EAAE,YAAY,CAAC;KAC/C;IACD,IAAI,mBAAmB;QACrB,OAAO,gCAAgC,EAAE,CAAC;IAC5C,CAAC;IACD,UAAU,EAAE,IAAI;IAChB,gBAAgB,EAAE,CAAC,IAAgB,EAAU,EAAE;QAC7C,OAAO,uBAAuB,QAAQ,CAAC,SAAS,CAAC,IAAI,EAAE,oBAAoB,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC;IAC9F,CAAC;IACD,OAAO,EAAE,KAAK,EACZ,IAAgB,EAChB,GAAgB,EACc,EAAE;;QAChC,MAAM,QAAQ,GAAyB,QAAQ,CAAC,WAAW,CACzD,IAAI,EACJ,oBAAoB,CACrB,CAAC;QACF,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,gBAAgB,CACxB,mEAAmE,CACpE,CAAC;QACJ,CAAC;QAED,MAAM,UAAU,GAAyB,QAAQ,CAAC,WAAW,CAC3D,IAAI,EACJ,YAAY,CACb,CAAC;QACF,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,gBAAgB,CACxB,+DAA+D,CAChE,CAAC;QACJ,CAAC;QAED,uFAAuF;QACvF,MAAM,MAAM,GACV,MAAM,uBAAuB,CAAC,WAAW,CAAC;YACxC,EAAE,EAAE,QAAQ;YACZ,MAAM,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE;YACjC,KAAK,EAAE,GAAG,CAAC,KAAK;SACjB,CAAC,CAAC;QACL,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,gBAAgB,CACxB,kEAAkE,CACnE,CAAC;QACJ,CAAC;QAED,MAAM,QAAQ,GAAoB,MAAM,eAAe,CAAC,WAAW,CAAC;YAClE,EAAE,EAAE,UAAU;YACd,MAAM,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE;YACxD,KAAK,EAAE,GAAG,CAAC,KAAK;SACjB,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,gBAAgB,CACxB,uDAAuD,CACxD,CAAC;QACJ,CAAC;QAED,MAAM,uBAAuB,CAAC,aAAa,CAAC,QAAQ,EAAE;YACpD,qBAAqB,EAAE,UAAU;YACjC,yBAAyB,EAAE,yBAAyB,CAAC,eAAe;SACrE,CAAC,CAAC;QAEH,MAAM,gBAAgB,GAAW,UAAU,CAAC,QAAQ,EAAE,CAAC;QAEvD,MAAM,UAAU,GAAqB,oBAAoB,CAAC,aAAa,CAAC;YACtE;gBACE,YAAY,EAAE,MAAM,CAAC,IAAI;gBACzB,cAAc,EAAE,QAAQ,CAAC,cAAc;gBACvC,aAAa,EAAE,QAAQ,CAAC,KAAK;aAC9B;SACF,CAAC,CAAC;QAEH,OAAO;YACL,UAAU,EAAE,yBAAyB,MAAM,CAAC,IAAI,mBAAmB,QAAQ,CAAC,cAAc,MAAM,QAAQ,CAAC,KAAK,uCAAuC,UAAU,CAAC,IAAI,EAAE;YACtK,QAAQ,EAAE,CAAC;YACX,aAAa,EAAE,UAAU,MAAM,CAAC,IAAI,mBAAmB,QAAQ,CAAC,cAAc,EAAE;YAChF,cAAc,EAAE;gBACd,IAAI,EAAE,wBAAwB,CAAC,YAAY;gBAC3C,MAAM,EAAE,EAAE,UAAU,EAAE,gBAAgB,EAAE;aACzC;YACD,cAAc,EAAE,UAAU,CAAC,cAAc;YACzC,WAAW,EAAE,KAAK;YAClB,MAAM,EAAE,aAAa,CAAC,YAAY,CAAC;gBACjC,KAAK,EAAE,eAAe;gBACtB,YAAY,EAAE,kBAAkB;gBAChC,OAAO,EAAE,MAAM,CAAC,IAAI,IAAI,gBAAgB;gBACxC,UAAU,EAAE,aAAa,QAAQ,CAAC,cAAc,EAAE;gBAClD,MAAM,EAAE;oBACN,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,IAAI,IAAI,GAAG,EAAE;oBAC9C,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,IAAI,MAAA,QAAQ,CAAC,cAAc,mCAAI,EAAE,EAAE,EAAE;iBAClE;gBACD,IAAI,EAAE;oBACJ,IAAI,EAAE,wBAAwB,CAAC,YAAY;oBAC3C,MAAM,EAAE,EAAE,UAAU,EAAE,gBAAgB,EAAE;iBACzC;aACF,CAAC;SACH,CAAC;IACJ,CAAC;CACF,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,cAAc,GAAsB;IAC/C,IAAI,EAAE,aAAa;IACnB,WAAW,EACT,uLAAuL;IACzL,WAAW,EAAE;QACX,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACV,SAAS,EAAE;gBACT,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE,yCAAyC;aACvD;YACD,UAAU,EAAE;gBACV,IAAI,EAAE,QAAQ;gBACd,WAAW,EACT,6FAA6F;aAChG;SACF;QACD,QAAQ,EAAE,CAAC,WAAW,CAAC;KACxB;IACD,IAAI,mBAAmB;QACrB,OAAO,+BAA+B,EAAE,CAAC;IAC3C,CAAC;IACD,UAAU,EAAE,IAAI;IAChB,gBAAgB,EAAE,CAAC,IAAgB,EAAU,EAAE;QAC7C,OAAO,eAAe,QAAQ,CAAC,SAAS,CAAC,IAAI,EAAE,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC;IAC7E,CAAC;IACD,OAAO,EAAE,KAAK,EACZ,IAAgB,EAChB,GAAgB,EACc,EAAE;;QAChC,MAAM,SAAS,GAAyB,QAAQ,CAAC,WAAW,CAC1D,IAAI,EACJ,WAAW,CACZ,CAAC;QACF,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,IAAI,gBAAgB,CACxB,0DAA0D,CAC3D,CAAC;QACJ,CAAC;QAED,MAAM,MAAM,GAAyB,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC;QACtD,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,gBAAgB,CACxB,yDAAyD,CAC1D,CAAC;QACJ,CAAC;QAED,MAAM,UAAU,GAAyB,QAAQ,CAAC,WAAW,CAC3D,IAAI,EACJ,YAAY,CACb,CAAC;QAEF,0CAA0C;QAC1C,MAAM,OAAO,GAAmB,MAAM,cAAc,CAAC,WAAW,CAAC;YAC/D,EAAE,EAAE,SAAS;YACb,MAAM,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE;YACjC,KAAK,EAAE,GAAG,CAAC,KAAK;SACjB,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,gBAAgB,CACxB,sDAAsD,CACvD,CAAC;QACJ,CAAC;QAED,MAAM,SAAS,GACb,MAAM,wBAAwB,CAAC,eAAe,CAAC;YAC7C,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,SAAS,EAAE,SAAS;YACpB,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE;YACrD,iBAAiB,EAAE,MAAM;SAC1B,CAAC,CAAC;QAEL,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,IAAI,gBAAgB,CACxB,YAAY,OAAO,CAAC,IAAI,iFAAiF,CAC1G,CAAC;QACJ,CAAC;QAED,MAAM,UAAU,GAAqB,oBAAoB,CAAC,aAAa,CAAC;YACtE;gBACE,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,WAAW,EAAE,MAAA,SAAS,CAAC,EAAE,0CAAE,QAAQ,EAAE;aACtC;SACF,CAAC,CAAC;QAEH,MAAM,MAAM,GAAwB;YAClC,UAAU,EAAE,oBAAoB,OAAO,CAAC,IAAI,+BAA+B,UAAU,CAAC,IAAI,EAAE;YAC5F,QAAQ,EAAE,CAAC;YACX,aAAa,EAAE,oBAAoB,OAAO,CAAC,IAAI,GAAG;YAClD,cAAc,EAAE,UAAU,CAAC,cAAc;YACzC,WAAW,EAAE,KAAK;YAClB,MAAM,EAAE,aAAa,CAAC,YAAY,CAAC;gBACjC,KAAK,EAAE,iBAAiB;gBACxB,YAAY,EAAE,SAAS;gBACvB,OAAO,EAAE,OAAO,CAAC,IAAI,IAAI,SAAS;gBAClC,UAAU,EAAE,qBAAqB;gBACjC,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,CAAC,IAAI,IAAI,GAAG,EAAE,CAAC;aAC3D,CAAC;SACH,CAAC;QAEF,IAAI,UAAU,EAAE,CAAC;YACf,MAAM,CAAC,cAAc,GAAG;gBACtB,IAAI,EAAE,wBAAwB,CAAC,YAAY;gBAC3C,MAAM,EAAE,EAAE,UAAU,EAAE,UAAU,CAAC,QAAQ,EAAE,EAAE;aAC9C,CAAC;QACJ,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;CACF,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,4BAA4B,GAAsB;IAC7D,IAAI,EAAE,6BAA6B;IACnC,WAAW,EACT,sLAAsL;IACxL,WAAW,EAAE;QACX,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACV,UAAU,EAAE;gBACV,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE,+BAA+B;aAC7C;YACD,IAAI,EAAE;gBACJ,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE,yDAAyD;aACvE;YACD,iBAAiB,EAAE;gBACjB,IAAI,EAAE,SAAS;gBACf,WAAW,EACT,8DAA8D;aACjE;SACF;QACD,QAAQ,EAAE,CAAC,YAAY,EAAE,MAAM,CAAC;KACjC;IACD,IAAI,mBAAmB;QACrB,OAAO,kCAAkC,EAAE,CAAC;IAC9C,CAAC;IACD,UAAU,EAAE,IAAI;IAChB,gBAAgB,EAAE,CAAC,IAAgB,EAAU,EAAE;QAC7C,OAAO,yCAAyC,QAAQ,CAAC,SAAS,CAAC,IAAI,EAAE,YAAY,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC;IACxG,CAAC;IACD,OAAO,EAAE,KAAK,EACZ,IAAgB,EAChB,GAAgB,EACc,EAAE;;QAChC,MAAM,UAAU,GAAyB,QAAQ,CAAC,WAAW,CAC3D,IAAI,EACJ,YAAY,CACb,CAAC;QACF,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,gBAAgB,CACxB,+DAA+D,CAChE,CAAC;QACJ,CAAC;QAED,MAAM,IAAI,GAAuB,QAAQ,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAClE,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,IAAI,gBAAgB,CAAC,qCAAqC,CAAC,CAAC;QACpE,CAAC;QAED,MAAM,MAAM,GAAyB,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC;QACtD,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,gBAAgB,CACxB,gEAAgE,CACjE,CAAC;QACJ,CAAC;QAED,MAAM,iBAAiB,GACrB,MAAA,QAAQ,CAAC,UAAU,CAAC,IAAI,EAAE,mBAAmB,CAAC,mCAAI,IAAI,CAAC;QAEzD,MAAM,QAAQ,GAAoB,MAAM,eAAe,CAAC,WAAW,CAAC;YAClE,EAAE,EAAE,UAAU;YACd,MAAM,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE;YACxD,KAAK,EAAE,GAAG,CAAC,KAAK;SACjB,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,gBAAgB,CACxB,uDAAuD,CACxD,CAAC;QACJ,CAAC;QAED,MAAM,UAAU,GAAuB,IAAI,kBAAkB,EAAE,CAAC;QAChE,UAAU,CAAC,UAAU,GAAG,UAAU,CAAC;QACnC,UAAU,CAAC,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC;QACrC,UAAU,CAAC,IAAI,GAAG,IAAI,CAAC;QACvB,UAAU,CAAC,QAAQ,GAAG,aAAa,CAAC,cAAc,EAAE,CAAC;QACrD,UAAU,CAAC,eAAe,GAAG,MAAM,CAAC;QACpC,UAAU,CAAC,kDAAkD;YAC3D,iBAAiB,CAAC;QAEpB,MAAM,yBAAyB,CAAC,MAAM,CAAC;YACrC,IAAI,EAAE,UAAU;YAChB,KAAK,EAAE,GAAG,CAAC,KAAK;SACjB,CAAC,CAAC;QAEH,MAAM,gBAAgB,GAAW,UAAU,CAAC,QAAQ,EAAE,CAAC;QAEvD,MAAM,UAAU,GAAqB,oBAAoB,CAAC,aAAa,CAAC;YACtE;gBACE,cAAc,EAAE,QAAQ,CAAC,cAAc;gBACvC,iBAAiB,EAAE,iBAAiB;aACrC;SACF,CAAC,CAAC;QAEH,OAAO;YACL,UAAU,EAAE,8CAA8C,QAAQ,CAAC,cAAc,GAC/E,iBAAiB,CAAC,CAAC,CAAC,2BAA2B,CAAC,CAAC,CAAC,EACpD,MAAM,UAAU,CAAC,IAAI,EAAE;YACvB,QAAQ,EAAE,CAAC;YACX,aAAa,EAAE,8BAA8B,QAAQ,CAAC,cAAc,EAAE;YACtE,cAAc,EAAE;gBACd,IAAI,EAAE,wBAAwB,CAAC,YAAY;gBAC3C,MAAM,EAAE,EAAE,UAAU,EAAE,gBAAgB,EAAE;aACzC;YACD,cAAc,EAAE,UAAU,CAAC,cAAc;YACzC,WAAW,EAAE,KAAK;YAClB,MAAM,EAAE,aAAa,CAAC,YAAY,CAAC;gBACjC,KAAK,EAAE,sBAAsB;gBAC7B,YAAY,EAAE,UAAU;gBACxB,OAAO,EAAE,IAAI,QAAQ,CAAC,cAAc,MAAM,QAAQ,CAAC,KAAK,EAAE;gBAC1D,UAAU,EAAE,iBAAiB;oBAC3B,CAAC,CAAC,sBAAsB;oBACxB,CAAC,CAAC,0BAA0B;gBAC9B,MAAM,EAAE;oBACN;wBACE,KAAK,EAAE,QAAQ;wBACf,KAAK,EAAE,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI;qBAC/D;iBACF;gBACD,IAAI,EAAE;oBACJ,IAAI,EAAE,wBAAwB,CAAC,YAAY;oBAC3C,MAAM,EAAE,EAAE,UAAU,EAAE,gBAAgB,EAAE;iBACzC;aACF,CAAC;SACH,CAAC;IACJ,CAAC;CACF,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,0BAA0B,GAAsB;IAC3D,IAAI,EAAE,0BAA0B;IAChC,WAAW,EACT,qLAAqL;IACvL,WAAW,EAAE;QACX,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACV,UAAU,EAAE;gBACV,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE,+BAA+B;aAC7C;YACD,YAAY,EAAE;gBACZ,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE,mDAAmD;aACjE;SACF;QACD,QAAQ,EAAE,CAAC,YAAY,EAAE,cAAc,CAAC;KACzC;IACD,IAAI,mBAAmB;QACrB,OAAO,gCAAgC,EAAE,CAAC;IAC5C,CAAC;IACD,UAAU,EAAE,IAAI;IAChB,gBAAgB,EAAE,CAAC,IAAgB,EAAU,EAAE;QAC7C,OAAO,mBAAmB,QAAQ,CAAC,SAAS,CAAC,IAAI,EAAE,YAAY,CAAC,IAAI,EAAE,gBAAgB,QAAQ,CAAC,SAAS,CAAC,IAAI,EAAE,cAAc,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC;IAChJ,CAAC;IACD,OAAO,EAAE,KAAK,EACZ,IAAgB,EAChB,GAAgB,EACc,EAAE;;QAChC,MAAM,UAAU,GAAyB,QAAQ,CAAC,WAAW,CAC3D,IAAI,EACJ,YAAY,CACb,CAAC;QACF,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,gBAAgB,CACxB,+DAA+D,CAChE,CAAC;QACJ,CAAC;QAED,MAAM,YAAY,GAAuB,QAAQ,CAAC,SAAS,CACzD,IAAI,EACJ,cAAc,CACf,CAAC;QACF,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,MAAM,IAAI,gBAAgB,CAAC,2BAA2B,CAAC,CAAC;QAC1D,CAAC;QAED,MAAM,QAAQ,GAAoB,MAAM,eAAe,CAAC,WAAW,CAAC;YAClE,EAAE,EAAE,UAAU;YACd,MAAM,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE;YACxD,KAAK,EAAE,GAAG,CAAC,KAAK;SACjB,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,gBAAgB,CACxB,uDAAuD,CACxD,CAAC;QACJ,CAAC;QAED,MAAM,UAAU,GACd,MAAM,uBAAuB,CAAC,MAAM,CAAC;YACnC,KAAK,EAAE,EAAE;YACT,MAAM,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE;YAC9C,IAAI,EAAE,EAAE,KAAK,EAAE,SAAS,CAAC,SAAS,EAAE;YACpC,KAAK,EAAE,EAAE;YACT,IAAI,EAAE,CAAC;YACP,KAAK,EAAE,GAAG,CAAC,KAAK;SACjB,CAAC,CAAC;QAEL,MAAM,QAAQ,GAAiC,UAAU,CAAC,IAAI,CAC5D,CAAC,IAAsB,EAAE,EAAE;;YACzB,OAAO,CAAA,MAAA,IAAI,CAAC,IAAI,0CAAE,WAAW,EAAE,MAAK,YAAY,CAAC,WAAW,EAAE,CAAC;QACjE,CAAC,CACF,CAAC;QAEF,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,SAAS,GAAW,UAAU;iBACjC,GAAG,CAAC,CAAC,CAAmB,EAAE,EAAE;gBAC3B,OAAO,CAAC,CAAC,IAAI,CAAC;YAChB,CAAC,CAAC;iBACD,MAAM,CAAC,OAAO,CAAC;iBACf,IAAI,CAAC,IAAI,CAAC,CAAC;YACd,MAAM,IAAI,gBAAgB,CACxB,+BAA+B,YAAY,4BAA4B,SAAS,IAAI,iBAAiB,GAAG,CACzG,CAAC;QACJ,CAAC;QAED,MAAM,eAAe,CAAC,aAAa,CAAC;YAClC,EAAE,EAAE,UAAU;YACd,IAAI,EAAE;gBACJ,kBAAkB,EAAE,QAAQ,CAAC,EAAG;aACjC;YACD,KAAK,EAAE,GAAG,CAAC,KAAK;SACjB,CAAC,CAAC;QAEH,MAAM,gBAAgB,GAAW,UAAU,CAAC,QAAQ,EAAE,CAAC;QAEvD,MAAM,UAAU,GAAqB,oBAAoB,CAAC,aAAa,CAAC;YACtE;gBACE,cAAc,EAAE,QAAQ,CAAC,cAAc;gBACvC,WAAW,EAAE,QAAQ,CAAC,IAAI;aAC3B;SACF,CAAC,CAAC;QAEH,OAAO;YACL,UAAU,EAAE,qBAAqB,QAAQ,CAAC,cAAc,gBAAgB,QAAQ,CAAC,IAAI,MAAM,UAAU,CAAC,IAAI,EAAE;YAC5G,QAAQ,EAAE,CAAC;YACX,aAAa,EAAE,aAAa,QAAQ,CAAC,cAAc,MAAM,QAAQ,CAAC,IAAI,EAAE;YACxE,cAAc,EAAE;gBACd,IAAI,EAAE,wBAAwB,CAAC,YAAY;gBAC3C,MAAM,EAAE,EAAE,UAAU,EAAE,gBAAgB,EAAE;aACzC;YACD,cAAc,EAAE,UAAU,CAAC,cAAc;YACzC,WAAW,EAAE,KAAK;YAClB,MAAM,EAAE,aAAa,CAAC,YAAY,CAAC;gBACjC,KAAK,EAAE,kBAAkB;gBACzB,YAAY,EAAE,UAAU;gBACxB,OAAO,EAAE,IAAI,QAAQ,CAAC,cAAc,MAAM,QAAQ,CAAC,KAAK,EAAE;gBAC1D,UAAU,EAAE,aAAa,QAAQ,CAAC,IAAI,EAAE;gBACxC,MAAM,EAAE;oBACN,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,MAAA,QAAQ,CAAC,cAAc,mCAAI,EAAE,EAAE,EAAE;oBAC/D,EAAE,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,QAAQ,CAAC,IAAI,IAAI,GAAG,EAAE;iBACvD;gBACD,IAAI,EAAE;oBACJ,IAAI,EAAE,wBAAwB,CAAC,YAAY;oBAC3C,MAAM,EAAE,EAAE,UAAU,EAAE,gBAAgB,EAAE;iBACzC;aACF,CAAC;SACH,CAAC;IACJ,CAAC;CACF,CAAC"}

package/build/dist/Server/Utils/Monitor/Criteria/APIRequestCriteria.js

@@ -16,6 +16,7 @@ import logger from "../../Logger";
 export default class APIRequestCriteria {
     static async isMonitorInstanceCriteriaFilterMet(input) {
         // Server Monitoring Checks
+        var _a, _b;
         let threshold = input.criteriaFilter.value;
         let overTimeValue = undefined;
         if (input.criteriaFilter.evaluateOverTime &&
@@ -65,6 +66,34 @@ export default class APIRequestCriteria {
                 criteriaFilter: input.criteriaFilter,
             });
         }
+        // check packet loss (Ping/IP monitors with multi-packet checks)
+        if (input.criteriaFilter.checkOn === CheckOn.PacketLossPercent) {
+            const packetLossPercent = (_a = input.dataToProcess.pingResponse) === null || _a === void 0 ? void 0 : _a.packetLossPercent;
+            const value = overTimeValue || packetLossPercent;
+            if (value === undefined) {
+                return null;
+            }
+            threshold = CompareCriteria.convertToNumber(threshold);
+            return CompareCriteria.compareCriteriaNumbers({
+                value: value,
+                threshold: threshold,
+                criteriaFilter: input.criteriaFilter,
+            });
+        }
+        // check jitter (Ping/IP monitors with multi-packet checks)
+        if (input.criteriaFilter.checkOn === CheckOn.Jitter) {
+            const jitterInMs = (_b = input.dataToProcess.pingResponse) === null || _b === void 0 ? void 0 : _b.jitterInMs;
+            const value = overTimeValue || jitterInMs;
+            if (value === undefined) {
+                return null;
+            }
+            threshold = CompareCriteria.convertToNumber(threshold);
+            return CompareCriteria.compareCriteriaNumbers({
+                value: value,
+                threshold: threshold,
+                criteriaFilter: input.criteriaFilter,
+            });
+        }
         //check response code
         if (input.criteriaFilter.checkOn === CheckOn.ResponseStatusCode &&
             input.dataToProcess.responseCode) {

package/build/dist/Server/Utils/Monitor/Criteria/APIRequestCriteria.js.map

@@ -1 +1 @@
-{"version":3,"file":"APIRequestCriteria.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Monitor/Criteria/APIRequestCriteria.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"APIRequestCriteria.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Monitor/Criteria/APIRequestCriteria.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Utils/Monitor/MonitorMetricUtil.js

@@ -703,6 +703,86 @@ class MonitorMetricUtil {
             metricType.unit = "ms";
             metricNameServiceNameMap[MonitorMetricType.ResponseTime] = metricType;
         }
+        if (data.dataToProcess.httpTimings) {
+            const httpTimings = data.dataToProcess.httpTimings;
+            const extraAttributes = {
+                probeId: data.dataToProcess.probeId.toString(),
+            };
+            const phaseMetrics = [
+                {
+                    metricName: MonitorMetricType.DnsLookupTime,
+                    value: httpTimings.dnsLookupInMs,
+                    description: "DNS lookup time for this monitor",
+                },
+                {
+                    metricName: MonitorMetricType.TcpConnectTime,
+                    value: httpTimings.tcpConnectInMs,
+                    description: "TCP connect time for this monitor",
+                },
+                {
+                    metricName: MonitorMetricType.TlsHandshakeTime,
+                    value: httpTimings.tlsHandshakeInMs,
+                    description: "TLS handshake time for this monitor",
+                },
+                {
+                    metricName: MonitorMetricType.TimeToFirstByte,
+                    value: httpTimings.timeToFirstByteInMs,
+                    description: "Time to first byte for this monitor",
+                },
+                {
+                    metricName: MonitorMetricType.DownloadTime,
+                    value: httpTimings.downloadInMs,
+                    description: "Response download time for this monitor",
+                },
+            ];
+            for (const phaseMetric of phaseMetrics) {
+                await this.pushMonitorMetric({
+                    projectId: data.projectId,
+                    monitorId: data.monitorId,
+                    monitorName: data.monitorName,
+                    probeName: data.probeName,
+                    metricName: phaseMetric.metricName,
+                    value: phaseMetric.value,
+                    description: phaseMetric.description,
+                    unit: "ms",
+                    extraAttributes: extraAttributes,
+                    metricRows: metricRows,
+                    metricNameServiceNameMap: metricNameServiceNameMap,
+                });
+            }
+        }
+        if (data.dataToProcess.pingResponse) {
+            const pingResponse = data.dataToProcess.pingResponse;
+            const extraAttributes = {
+                probeId: data.dataToProcess.probeId.toString(),
+            };
+            await this.pushMonitorMetric({
+                projectId: data.projectId,
+                monitorId: data.monitorId,
+                monitorName: data.monitorName,
+                probeName: data.probeName,
+                metricName: MonitorMetricType.PacketLossPercent,
+                value: pingResponse.packetLossPercent,
+                description: CheckOn.PacketLossPercent + " for this monitor",
+                unit: "%",
+                extraAttributes: extraAttributes,
+                metricRows: metricRows,
+                metricNameServiceNameMap: metricNameServiceNameMap,
+            });
+            await this.pushMonitorMetric({
+                projectId: data.projectId,
+                monitorId: data.monitorId,
+                monitorName: data.monitorName,
+                probeName: data.probeName,
+                metricName: MonitorMetricType.Jitter,
+                value: pingResponse.jitterInMs,
+                description: CheckOn.Jitter + " for this monitor",
+                unit: "ms",
+                extraAttributes: extraAttributes,
+                metricRows: metricRows,
+                metricNameServiceNameMap: metricNameServiceNameMap,
+            });
+        }
         if (data.dataToProcess.isOnline !== undefined) {
             const extraAttributes = {
                 probeId: data.dataToProcess.probeId.toString(),
@@ -835,8 +915,12 @@ class MonitorMetricUtil {
         });
     }
 }
-// Default retention in days if GlobalConfig is not set
-MonitorMetricUtil.DEFAULT_RETENTION_DAYS = 1;
+/*
+ * Default retention in days if GlobalConfig is not set. 30 days keeps
+ * enough history for trend analysis and evaluate-over-time criteria;
+ * one day made week-over-week charts impossible out of the box.
+ */
+MonitorMetricUtil.DEFAULT_RETENTION_DAYS = 30;
 // Cached retention value to avoid querying GlobalConfig on every monitor check
 MonitorMetricUtil.cachedRetentionDays = null;
 MonitorMetricUtil.lastCacheRefresh = null;