@oneuptime/common 14.0.8 → 14.0.9

package/build/dist/Server/Services/IncidentSeverityService.js

@@ -10,9 +10,11 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 import logger from "../Utils/Logger";
 import QueryHelper from "../Types/Database/QueryHelper";
 import DatabaseService from "./DatabaseService";
+import TeamComplianceSettingService from "./TeamComplianceSettingService";
 import SortOrder from "../../Types/BaseDatabase/SortOrder";
 import LIMIT_MAX from "../../Types/Database/LimitMax";
 import BadDataException from "../../Types/Exception/BadDataException";
+import { ComplianceSeverityKind } from "../../Types/Team/ComplianceRule";
 import Model from "../../Models/DatabaseModels/IncidentSeverity";
 import Queue, { QueueName } from "../Infrastructure/Queue";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
@@ -97,27 +99,41 @@ export class Service extends DatabaseService {
         if (!deleteBy.query._id && !deleteBy.props.isRoot) {
             throw new BadDataException("_id should be present when deleting incident states. Please try the delete with objectId");
         }
-        let incidentSeverity = null;
-        if (!deleteBy.props.isRoot) {
-            incidentSeverity = await this.findOneBy({
-                query: deleteBy.query,
-                props: {
-                    isRoot: true,
-                },
-                select: {
-                    order: true,
-                    projectId: true,
-                },
-            });
-        }
+        /*
+         * The severities this delete is about to remove, read while the team
+         * compliance rules scoped to them still say so: the join rows cascade
+         * away with the severity. See TeamComplianceSettingService.
+         */
+        const severities = await this.findBy({
+            query: deleteBy.query,
+            select: {
+                _id: true,
+                order: true,
+                projectId: true,
+            },
+            limit: deleteBy.limit,
+            skip: deleteBy.skip,
+            props: {
+                isRoot: true,
+            },
+        });
+        const carryForward = {
+            // Only a signed-in delete re-ranks the severities that remain.
+            incidentSeverity: deleteBy.props.isRoot ? null : severities[0] || null,
+            complianceSettingIds: await TeamComplianceSettingService.getRulesScopedToAnyOf({
+                severityKind: ComplianceSeverityKind.Incident,
+                severities: severities,
+            }),
+        };
         return {
             deleteBy,
-            carryForward: incidentSeverity,
+            carryForward: carryForward,
         };
     }
     async onDeleteSuccess(onDelete, _itemIdsBeforeDelete) {
         const deleteBy = onDelete.deleteBy;
-        const incidentSeverity = onDelete.carryForward;
+        const carryForward = onDelete.carryForward || null;
+        const incidentSeverity = (carryForward === null || carryForward === void 0 ? void 0 : carryForward.incidentSeverity) || null;
         if (!deleteBy.props.isRoot && incidentSeverity) {
             if (incidentSeverity &&
                 incidentSeverity.order &&
@@ -125,6 +141,26 @@ export class Service extends DatabaseService {
                 await this.rearrangeOrder(incidentSeverity.order, incidentSeverity.projectId, false);
             }
         }
+        /*
+         * The severity is gone, so a compliance rule that was scoped only to it
+         * (and to severities other deletes have already removed) now reads as a
+         * rule for every incident severity. Pause and mark it instead; a rule with
+         * another severity left is left alone. The delete has already happened,
+         * so a failure here is logged rather than reported as a failed delete.
+         */
+        const complianceSettingIds = (carryForward === null || carryForward === void 0 ? void 0 : carryForward.complianceSettingIds) || [];
+        if (complianceSettingIds.length > 0) {
+            try {
+                await TeamComplianceSettingService.pauseRulesLeftWithoutSeverities({
+                    severityKind: ComplianceSeverityKind.Incident,
+                    settingIds: complianceSettingIds,
+                });
+            }
+            catch (err) {
+                logger.error("Could not pause the team compliance rules left without a severity by an incident severity delete. They now check every incident severity until they are edited.");
+                logger.error(err);
+            }
+        }
         return {
             deleteBy: deleteBy,
             carryForward: null,

package/build/dist/Server/Services/IncidentSeverityService.js.map

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

package/build/dist/Server/Services/KubernetesAiAgentJobService.js

@@ -0,0 +1,158 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+import PostgresAppInstance from "../Infrastructure/PostgresDatabase";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
+import RunnerJob from "../../Models/DatabaseModels/RunnerJob";
+import BadDataException from "../../Types/Exception/BadDataException";
+import ObjectID from "../../Types/ObjectID";
+import RunbookStepType from "../../Types/Runbook/RunbookStepType";
+import RunnerJobOrigin, { AI_COMMAND_JOB_ORIGINS, } from "../../Types/Runbook/RunnerJobOrigin";
+import RunnerJobStatus from "../../Types/Runbook/RunnerJobStatus";
+/*
+ * The lease a claim grants: the same as a Runner's (RunnerJobService's
+ * DEFAULT_LEASE_MS), because the job heartbeat and result a claim leads to
+ * go through RunnerJobService unchanged. The agent heartbeats the job every
+ * 10 seconds while it runs; if it goes quiet for this long, the job times
+ * out as lease_expired.
+ */
+export const KUBERNETES_AI_AGENT_JOB_LEASE_MS = 30000;
+/*
+ * dataSource.query answers with rows for a SELECT and with [rows, affected]
+ * for an UPDATE ... RETURNING, depending on the driver path. Accept both.
+ * (The same helper RunnerJobService keeps privately.)
+ */
+function unwrapRows(result) {
+    if (Array.isArray(result)) {
+        if (result.length === 2 &&
+            Array.isArray(result[0]) &&
+            typeof result[1] === "number") {
+            return result[0];
+        }
+        return result;
+    }
+    return [];
+}
+/*
+ * The Kubernetes AI agent's side of the kubectl job queue.
+ *
+ * The agent is not a Runner, but its work is ordinary RunnerJob rows — the
+ * lease, heartbeat, result, redaction and history all stay RunnerJob's. The
+ * one thing that differs is WHICH rows it may claim: only kubectl jobs an AI
+ * run composed (AI_COMMAND_JOB_ORIGINS) that the enqueue chokepoint targeted
+ * at this agent (RunnerJob.targetKubernetesAiAgentId). A runbook step, a
+ * Bash or SSH command, or a job for any other target can never be leased by
+ * the agent pod, whatever it asks for.
+ *
+ * A claim writes the agent's id into assignedAgentId (a column without a
+ * foreign key), so RunnerJobService.heartbeatJob and submitResult — which
+ * key on it — serve the agent exactly as they serve a Runner.
+ */
+export class Service {
+    /*
+     * Atomically claim the oldest pending kubectl job targeted at this agent,
+     * in its project: FOR UPDATE SKIP LOCKED, so two claims (a restarted pod
+     * overlapping its predecessor) never lease the same row.
+     */
+    async claimNextJob(data) {
+        var _a;
+        const dataSource = PostgresAppInstance.getDataSource();
+        if (!dataSource) {
+            throw new BadDataException("Database is not connected");
+        }
+        const leaseMs = (_a = data.leaseMs) !== null && _a !== void 0 ? _a : KUBERNETES_AI_AGENT_JOB_LEASE_MS;
+        const sql = `
+      WITH claimed AS (
+        SELECT "_id" FROM "RunnerJob"
+        WHERE "projectId" = $1::uuid
+          AND "status" = $2
+          AND "targetKubernetesAiAgentId" = $3::uuid
+          AND "stepType" = $6
+          AND "origin" = ANY($7::text[])
+          AND "claimDeadlineAt" > NOW()
+          AND "deletedAt" IS NULL
+        ORDER BY "createdAt" ASC
+        LIMIT 1
+        FOR UPDATE SKIP LOCKED
+      )
+      UPDATE "RunnerJob" j
+      SET "status" = $4,
+          "assignedAgentId" = $3::uuid,
+          "claimedAt" = NOW(),
+          "leaseExpiresAt" = NOW() + ($5 || ' milliseconds')::interval,
+          "updatedAt" = NOW(),
+          "version" = j."version" + 1
+      FROM claimed
+      WHERE j."_id" = claimed."_id"
+      RETURNING j."_id", j."projectId", j."origin", j."aiRunId",
+                j."autoRemediationSuggestionId", j."kubernetesClusterId",
+                j."stepId", j."stepType", j."targetKubernetesAiAgentId",
+                j."payload", j."timeoutInMs", j."status", j."claimedAt",
+                j."leaseExpiresAt";
+    `;
+        const rows = unwrapRows(await dataSource.query(sql, [
+            data.projectId.toString(),
+            RunnerJobStatus.Pending,
+            data.kubernetesAiAgentId.toString(),
+            RunnerJobStatus.Claimed,
+            leaseMs.toString(),
+            RunbookStepType.Kubectl,
+            AI_COMMAND_JOB_ORIGINS,
+        ]));
+        if (!rows || rows.length === 0) {
+            return null;
+        }
+        return Service.toClaimedJob({
+            row: rows[0],
+            kubernetesAiAgentId: data.kubernetesAiAgentId,
+        });
+    }
+    // The claimed row as a RunnerJob, the way RunnerJobService.claimNextJob builds it.
+    static toClaimedJob(data) {
+        const r = data.row;
+        const job = new RunnerJob();
+        job._id = String(r["_id"]);
+        job.projectId = new ObjectID(String(r["projectId"]));
+        job.origin =
+            r["origin"] || RunnerJobOrigin.AiInvestigation;
+        if (r["aiRunId"]) {
+            job.aiRunId = new ObjectID(String(r["aiRunId"]));
+        }
+        if (r["autoRemediationSuggestionId"]) {
+            job.autoRemediationSuggestionId = new ObjectID(String(r["autoRemediationSuggestionId"]));
+        }
+        if (r["kubernetesClusterId"]) {
+            job.kubernetesClusterId = new ObjectID(String(r["kubernetesClusterId"]));
+        }
+        job.stepId = String(r["stepId"]);
+        job.stepType = r["stepType"];
+        job.targetKubernetesAiAgentId = new ObjectID(String(r["targetKubernetesAiAgentId"] || data.kubernetesAiAgentId));
+        if (r["payload"] && typeof r["payload"] === "object") {
+            job.payload = r["payload"];
+        }
+        job.timeoutInMs = Number(r["timeoutInMs"]);
+        job.status = r["status"];
+        if (r["claimedAt"]) {
+            job.claimedAt = new Date(String(r["claimedAt"]));
+        }
+        if (r["leaseExpiresAt"]) {
+            job.leaseExpiresAt = new Date(String(r["leaseExpiresAt"]));
+        }
+        job.assignedAgentId = data.kubernetesAiAgentId;
+        return job;
+    }
+}
+__decorate([
+    CaptureSpan(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], Service.prototype, "claimNextJob", null);
+export default new Service();
+//# sourceMappingURL=KubernetesAiAgentJobService.js.map

package/build/dist/Server/Services/KubernetesAiAgentJobService.js.map

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