@oneuptime/common 10.5.31 → 10.5.33

package/Models/DatabaseModels/TraceSavedView.ts

@@ -0,0 +1,334 @@
+import Project from "./Project";
+import User from "./User";
+import BaseModel from "./DatabaseBaseModel/DatabaseBaseModel";
+import Route from "../../Types/API/Route";
+import TelemetrySavedViewState from "../../Types/Telemetry/TelemetrySavedViewState";
+import ColumnAccessControl from "../../Types/Database/AccessControl/ColumnAccessControl";
+import TableAccessControl from "../../Types/Database/AccessControl/TableAccessControl";
+import TableBillingAccessControl from "../../Types/Database/AccessControl/TableBillingAccessControl";
+import ColumnLength from "../../Types/Database/ColumnLength";
+import ColumnType from "../../Types/Database/ColumnType";
+import CrudApiEndpoint from "../../Types/Database/CrudApiEndpoint";
+import EnableDocumentation from "../../Types/Database/EnableDocumentation";
+import TableColumn from "../../Types/Database/TableColumn";
+import TableColumnType from "../../Types/Database/TableColumnType";
+import TableMetadata from "../../Types/Database/TableMetadata";
+import TenantColumn from "../../Types/Database/TenantColumn";
+import IconProp from "../../Types/Icon/IconProp";
+import ObjectID from "../../Types/ObjectID";
+import Permission from "../../Types/Permission";
+import { PlanType } from "../../Types/Billing/SubscriptionPlan";
+import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
+
+@EnableDocumentation()
+@TableBillingAccessControl({
+  create: PlanType.Free,
+  read: PlanType.Free,
+  update: PlanType.Free,
+  delete: PlanType.Free,
+})
+@TenantColumn("projectId")
+@CrudApiEndpoint(new Route("/trace-saved-view"))
+@Entity({
+  name: "TraceSavedView",
+})
+@TableMetadata({
+  tableName: "TraceSavedView",
+  singularName: "Trace Saved View",
+  pluralName: "Trace Saved Views",
+  icon: IconProp.Window,
+  tableDescription:
+    "Save and reuse traces explorer views, including the current search, filters, time range, and page size.",
+})
+@TableAccessControl({
+  create: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+  ],
+  read: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+    Permission.Viewer,
+  ],
+  delete: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+  ],
+  update: [
+    Permission.ProjectOwner,
+    Permission.ProjectAdmin,
+    Permission.ProjectMember,
+  ],
+})
+export default class TraceSavedView extends BaseModel {
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "projectId",
+    type: TableColumnType.Entity,
+    modelType: Project,
+    title: "Project",
+    description: "Relation to the project this saved trace view belongs to.",
+  })
+  @ManyToOne(
+    () => {
+      return Project;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "projectId" })
+  public project?: Project = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: true,
+    canReadOnRelationQuery: true,
+    title: "Project ID",
+    description: "ID of the project this saved trace view belongs to.",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: false,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public projectId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+    ],
+  })
+  @TableColumn({
+    required: true,
+    type: TableColumnType.Name,
+    canReadOnRelationQuery: true,
+    title: "Name",
+    description: "Friendly name for this saved trace view.",
+  })
+  @Column({
+    nullable: false,
+    type: ColumnType.Name,
+    length: ColumnLength.Name,
+  })
+  public name?: string = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "createdByUserId",
+    type: TableColumnType.Entity,
+    modelType: User,
+    title: "Created By User",
+    description: "Relation to the user who created this saved trace view.",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "createdByUserId" })
+  public createdByUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Created By User ID",
+    description: "ID of the user who created this saved trace view.",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public createdByUserId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "deletedByUserId",
+    type: TableColumnType.Entity,
+    modelType: User,
+    title: "Deleted By User",
+    description: "Relation to the user who deleted this saved trace view.",
+  })
+  @ManyToOne(
+    () => {
+      return User;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "SET NULL",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "deletedByUserId" })
+  public deletedByUser?: User = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Deleted By User ID",
+    description: "ID of the user who deleted this saved trace view.",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public deletedByUserId?: ObjectID = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+    ],
+  })
+  @TableColumn({
+    title: "Query",
+    required: true,
+    type: TableColumnType.JSON,
+    canReadOnRelationQuery: true,
+    description:
+      "Serialized traces explorer view state (search, filters, time range, page size) for this saved view.",
+  })
+  @Column({
+    type: ColumnType.JSON,
+    nullable: false,
+  })
+  public query?: TelemetrySavedViewState = undefined;
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+    ],
+  })
+  @Index()
+  @TableColumn({
+    required: true,
+    type: TableColumnType.Boolean,
+    canReadOnRelationQuery: true,
+    title: "Is Default",
+    description: "Whether this saved trace view should be applied by default.",
+    defaultValue: false,
+  })
+  @Column({
+    nullable: false,
+    type: ColumnType.Boolean,
+    default: false,
+  })
+  public isDefault?: boolean = undefined;
+}

package/Server/API/KubernetesResourceAPI.ts

@@ -143,19 +143,24 @@ export default class KubernetesResourceAPI extends BaseAPI<
 
   /*
    * Translate a service-layer Map of aggregates into a JSON dict
-   * { name: { cpuPercent, memoryBytes } } suitable for the wire.
-   * memoryBytes is stringified so values past 2 GiB don't overflow
-   * client-side number parsing in the JSON path; the UI parses it
-   * back to a number for rendering.
+   * { name: { cpuPercent, memoryBytes, memoryPercent } } suitable for
+   * the wire. memoryBytes is stringified so values past 2 GiB don't
+   * overflow client-side number parsing in the JSON path; the UI parses
+   * it back to a number for rendering. memoryPercent is the summed
+   * per-pod "% of node allocatable memory" (parallel to cpuPercent).
    */
   private mapAggregatesToJson(
-    aggregates: Map<string, { cpuPercent: number; memoryBytes: number }>,
+    aggregates: Map<
+      string,
+      { cpuPercent: number; memoryBytes: number; memoryPercent: number }
+    >,
   ): JSONObject {
     const out: JSONObject = {};
     for (const [name, value] of aggregates.entries()) {
       out[name] = {
         cpuPercent: value.cpuPercent,
         memoryBytes: value.memoryBytes.toString(),
+        memoryPercent: value.memoryPercent,
       };
     }
     return out;
@@ -169,8 +174,10 @@ export default class KubernetesResourceAPI extends BaseAPI<
       await this.resolveClusterForRequest(req);
 
     const staleAfter: Date = new Date(Date.now() - 15 * 60 * 1000);
-    const aggregates: Map<string, { cpuPercent: number; memoryBytes: number }> =
-      await this.service.getLatestMetricsByNamespace({
+    const aggregates: Map<
+      string,
+      { cpuPercent: number; memoryBytes: number; memoryPercent: number }
+    > = await this.service.getLatestMetricsByNamespace({
         projectId,
         kubernetesClusterId,
         staleAfter,
@@ -210,8 +217,10 @@ export default class KubernetesResourceAPI extends BaseAPI<
       await this.resolveClusterForRequest(req);
 
     const staleAfter: Date = new Date(Date.now() - 15 * 60 * 1000);
-    const aggregates: Map<string, { cpuPercent: number; memoryBytes: number }> =
-      await this.service.getLatestMetricsByOwner({
+    const aggregates: Map<
+      string,
+      { cpuPercent: number; memoryBytes: number; memoryPercent: number }
+    > = await this.service.getLatestMetricsByOwner({
         projectId,
         kubernetesClusterId,
         ownerKind,

package/Server/Infrastructure/Postgres/SchemaMigrations/1780645560183-AddMetricAndTraceSavedView.ts

@@ -0,0 +1,81 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class AddMetricAndTraceSavedView1780645560183
+  implements MigrationInterface
+{
+  public name = "AddMetricAndTraceSavedView1780645560183";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `CREATE TABLE "MetricSavedView" ("_id" uuid NOT NULL DEFAULT uuid_generate_v4(), "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "updatedAt" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "deletedAt" TIMESTAMP WITH TIME ZONE, "version" integer NOT NULL, "projectId" uuid NOT NULL, "name" character varying(50) NOT NULL, "createdByUserId" uuid, "deletedByUserId" uuid, "query" jsonb NOT NULL, "isDefault" boolean NOT NULL DEFAULT false, CONSTRAINT "PK_c039adf718ddfc387e2f9182cd6" PRIMARY KEY ("_id"))`,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_1ca87e6c282970f623562035f2" ON "MetricSavedView" ("projectId") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_c68db47974161dff86906b987d" ON "MetricSavedView" ("isDefault") `,
+    );
+    await queryRunner.query(
+      `CREATE TABLE "TraceSavedView" ("_id" uuid NOT NULL DEFAULT uuid_generate_v4(), "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "updatedAt" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "deletedAt" TIMESTAMP WITH TIME ZONE, "version" integer NOT NULL, "projectId" uuid NOT NULL, "name" character varying(50) NOT NULL, "createdByUserId" uuid, "deletedByUserId" uuid, "query" jsonb NOT NULL, "isDefault" boolean NOT NULL DEFAULT false, CONSTRAINT "PK_087d7140b86556085f9aebe8ee5" PRIMARY KEY ("_id"))`,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_a5ab6a338198ce0171d7e9e767" ON "TraceSavedView" ("projectId") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_24f5967407b37b1601e8aa95cd" ON "TraceSavedView" ("isDefault") `,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "MetricSavedView" ADD CONSTRAINT "FK_1ca87e6c282970f623562035f2b" FOREIGN KEY ("projectId") REFERENCES "Project"("_id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "MetricSavedView" ADD CONSTRAINT "FK_5d6c800c0070ca19e75e664b46b" FOREIGN KEY ("createdByUserId") REFERENCES "User"("_id") ON DELETE SET NULL ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "MetricSavedView" ADD CONSTRAINT "FK_84e306d0d03a2a4721fe767464d" FOREIGN KEY ("deletedByUserId") REFERENCES "User"("_id") ON DELETE SET NULL ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TraceSavedView" ADD CONSTRAINT "FK_a5ab6a338198ce0171d7e9e767b" FOREIGN KEY ("projectId") REFERENCES "Project"("_id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TraceSavedView" ADD CONSTRAINT "FK_e22965c32f7cb0e154d2fa76d24" FOREIGN KEY ("createdByUserId") REFERENCES "User"("_id") ON DELETE SET NULL ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TraceSavedView" ADD CONSTRAINT "FK_e98727a618620d359fc766c95fc" FOREIGN KEY ("deletedByUserId") REFERENCES "User"("_id") ON DELETE SET NULL ON UPDATE NO ACTION`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "TraceSavedView" DROP CONSTRAINT "FK_e98727a618620d359fc766c95fc"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TraceSavedView" DROP CONSTRAINT "FK_e22965c32f7cb0e154d2fa76d24"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "TraceSavedView" DROP CONSTRAINT "FK_a5ab6a338198ce0171d7e9e767b"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "MetricSavedView" DROP CONSTRAINT "FK_84e306d0d03a2a4721fe767464d"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "MetricSavedView" DROP CONSTRAINT "FK_5d6c800c0070ca19e75e664b46b"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "MetricSavedView" DROP CONSTRAINT "FK_1ca87e6c282970f623562035f2b"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_24f5967407b37b1601e8aa95cd"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_a5ab6a338198ce0171d7e9e767"`,
+    );
+    await queryRunner.query(`DROP TABLE "TraceSavedView"`);
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_c68db47974161dff86906b987d"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_1ca87e6c282970f623562035f2"`,
+    );
+    await queryRunner.query(`DROP TABLE "MetricSavedView"`);
+  }
+}

package/Server/Infrastructure/Postgres/SchemaMigrations/1780651429467-AddKubernetesLatestMemoryPercent.ts

@@ -0,0 +1,19 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class AddKubernetesLatestMemoryPercent1780651429467
+  implements MigrationInterface
+{
+  public name = "AddKubernetesLatestMemoryPercent1780651429467";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "KubernetesResource" ADD "latestMemoryPercent" numeric`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "KubernetesResource" DROP COLUMN "latestMemoryPercent"`,
+    );
+  }
+}

package/Server/Infrastructure/Postgres/SchemaMigrations/Index.ts

@@ -365,6 +365,8 @@ import { MigrationName1780381124553 } from "./1780381124553-MigrationName";
 import { MigrationName1780382837019 } from "./1780382837019-MigrationName";
 import { MigrationName1780387560604 } from "./1780387560604-MigrationName";
 import { MigrationName1780388219225 } from "./1780388219225-MigrationName";
+import { AddMetricAndTraceSavedView1780645560183 } from "./1780645560183-AddMetricAndTraceSavedView";
+import { AddKubernetesLatestMemoryPercent1780651429467 } from "./1780651429467-AddKubernetesLatestMemoryPercent";
 
 export default [
   InitialMigration,
@@ -734,4 +736,6 @@ export default [
   MigrationName1780382837019,
   MigrationName1780387560604,
   MigrationName1780388219225,
+  AddMetricAndTraceSavedView1780645560183,
+  AddKubernetesLatestMemoryPercent1780651429467,
 ];

package/Server/Services/KubernetesResourceService.ts

@@ -46,6 +46,7 @@ export interface ResourceLatestMetric {
   name: string;
   cpuPercent: number | null;
   memoryBytes: number | null;
+  memoryPercent: number | null;
   observedAt: Date;
   /*
    * Optional Pod controller lineage. Read from
@@ -447,7 +448,7 @@ export class Service extends DatabaseService<Model> {
 
       for (const m of chunk) {
         valueFragments.push(
-          `($${paramIndex++}, $${paramIndex++}, $${paramIndex++}, $${paramIndex++}::numeric, $${paramIndex++}::bigint, $${paramIndex++}::timestamptz, $${paramIndex++}, $${paramIndex++})`,
+          `($${paramIndex++}, $${paramIndex++}, $${paramIndex++}, $${paramIndex++}::numeric, $${paramIndex++}::bigint, $${paramIndex++}::numeric, $${paramIndex++}::timestamptz, $${paramIndex++}, $${paramIndex++})`,
         );
         params.push(
           m.kind,
@@ -459,6 +460,9 @@ export class Service extends DatabaseService<Model> {
           m.memoryBytes !== null && m.memoryBytes !== undefined
             ? Math.trunc(m.memoryBytes).toString()
             : null,
+          m.memoryPercent !== null && m.memoryPercent !== undefined
+            ? m.memoryPercent
+            : null,
           m.observedAt,
           m.controllerDeploymentName ?? null,
           m.controllerCronJobName ?? null,
@@ -470,12 +474,13 @@ export class Service extends DatabaseService<Model> {
         SET
           "latestCpuPercent" = COALESCE(v."cpu", k."latestCpuPercent"),
           "latestMemoryBytes" = COALESCE(v."mem", k."latestMemoryBytes"),
+          "latestMemoryPercent" = COALESCE(v."memPct", k."latestMemoryPercent"),
           "metricsUpdatedAt" = v."observedAt",
           "controllerDeploymentName" = COALESCE(v."deployName", k."controllerDeploymentName"),
           "controllerCronJobName" = COALESCE(v."cronName", k."controllerCronJobName"),
           "updatedAt" = now()
         FROM (VALUES ${valueFragments.join(", ")})
-          AS v("kind", "ns", "name", "cpu", "mem", "observedAt", "deployName", "cronName")
+          AS v("kind", "ns", "name", "cpu", "mem", "memPct", "observedAt", "deployName", "cronName")
         WHERE
           k."projectId" = $1
           AND k."kubernetesClusterId" = $2
@@ -744,15 +749,22 @@ export class Service extends DatabaseService<Model> {
     projectId: ObjectID;
     kubernetesClusterId: ObjectID;
     staleAfter: Date;
-  }): Promise<Map<string, { cpuPercent: number; memoryBytes: number }>> {
+  }): Promise<
+    Map<
+      string,
+      { cpuPercent: number; memoryBytes: number; memoryPercent: number }
+    >
+  > {
     const rows: Array<{
       namespaceKey: string;
       cpu: string | null;
       mem: string | null;
+      memPct: string | null;
     }> = await this.getRepository().manager.query(
       `SELECT "namespaceKey",
               SUM("latestCpuPercent")::text AS cpu,
-              SUM("latestMemoryBytes")::text AS mem
+              SUM("latestMemoryBytes")::text AS mem,
+              SUM("latestMemoryPercent")::text AS "memPct"
        FROM "KubernetesResource"
        WHERE "projectId" = $1
          AND "kubernetesClusterId" = $2
@@ -768,12 +780,15 @@ export class Service extends DatabaseService<Model> {
       ],
     );
 
-    const out: Map<string, { cpuPercent: number; memoryBytes: number }> =
-      new Map();
+    const out: Map<
+      string,
+      { cpuPercent: number; memoryBytes: number; memoryPercent: number }
+    > = new Map();
     for (const row of rows) {
       out.set(row.namespaceKey || "", {
         cpuPercent: row.cpu ? parseFloat(row.cpu) || 0 : 0,
         memoryBytes: row.mem ? parseInt(row.mem, 10) || 0 : 0,
+        memoryPercent: row.memPct ? parseFloat(row.memPct) || 0 : 0,
       });
     }
     return out;
@@ -800,11 +815,17 @@ export class Service extends DatabaseService<Model> {
     kubernetesClusterId: ObjectID;
     ownerKind: string;
     staleAfter: Date;
-  }): Promise<Map<string, { cpuPercent: number; memoryBytes: number }>> {
+  }): Promise<
+    Map<
+      string,
+      { cpuPercent: number; memoryBytes: number; memoryPercent: number }
+    >
+  > {
     let rows: Array<{
       ownerName: string;
       cpu: string | null;
       mem: string | null;
+      memPct: string | null;
     }>;
 
     if (data.ownerKind === "Deployment" || data.ownerKind === "CronJob") {
@@ -816,7 +837,8 @@ export class Service extends DatabaseService<Model> {
         `SELECT
            "${column}" AS "ownerName",
            SUM("latestCpuPercent")::text AS cpu,
-           SUM("latestMemoryBytes")::text AS mem
+           SUM("latestMemoryBytes")::text AS mem,
+           SUM("latestMemoryPercent")::text AS "memPct"
          FROM "KubernetesResource"
          WHERE "projectId" = $1
            AND "kubernetesClusterId" = $2
@@ -837,7 +859,8 @@ export class Service extends DatabaseService<Model> {
         `SELECT
            (owner->>'name') AS "ownerName",
            SUM("latestCpuPercent")::text AS cpu,
-           SUM("latestMemoryBytes")::text AS mem
+           SUM("latestMemoryBytes")::text AS mem,
+           SUM("latestMemoryPercent")::text AS "memPct"
          FROM "KubernetesResource",
               jsonb_array_elements("ownerReferences"->'items') AS owner
          WHERE "projectId" = $1
@@ -858,8 +881,10 @@ export class Service extends DatabaseService<Model> {
       );
     }
 
-    const out: Map<string, { cpuPercent: number; memoryBytes: number }> =
-      new Map();
+    const out: Map<
+      string,
+      { cpuPercent: number; memoryBytes: number; memoryPercent: number }
+    > = new Map();
     for (const row of rows) {
       if (!row.ownerName) {
         continue;
@@ -867,6 +892,7 @@ export class Service extends DatabaseService<Model> {
       out.set(row.ownerName, {
         cpuPercent: row.cpu ? parseFloat(row.cpu) || 0 : 0,
         memoryBytes: row.mem ? parseInt(row.mem, 10) || 0 : 0,
+        memoryPercent: row.memPct ? parseFloat(row.memPct) || 0 : 0,
       });
     }
     return out;