@oneuptime/common 10.0.55 → 10.0.57

package/Types/Monitor/DockerMetricCatalog.ts

@@ -0,0 +1,226 @@
+import MetricsAggregationType from "../Metrics/MetricsAggregationType";
+
+export type DockerMetricCategory =
+  | "CPU"
+  | "Memory"
+  | "Network"
+  | "BlockIO"
+  | "Container";
+
+export interface DockerMetricDefinition {
+  id: string;
+  friendlyName: string;
+  description: string;
+  metricName: string;
+  category: DockerMetricCategory;
+  defaultAggregation: MetricsAggregationType;
+  unit?: string;
+}
+
+const dockerMetricCatalog: Array<DockerMetricDefinition> = [
+  // CPU Metrics
+  {
+    id: "container-cpu-usage-total",
+    friendlyName: "Container CPU Usage (Total)",
+    description: "Total CPU time consumed by the container",
+    metricName: "container.cpu.usage.total",
+    category: "CPU",
+    defaultAggregation: MetricsAggregationType.Avg,
+    unit: "ns",
+  },
+  {
+    id: "container-cpu-utilization",
+    friendlyName: "Container CPU Utilization",
+    description:
+      "CPU utilization of the container as a percentage (100% = 1 full CPU core)",
+    metricName: "container.cpu.utilization",
+    category: "CPU",
+    defaultAggregation: MetricsAggregationType.Avg,
+    unit: "%",
+  },
+  {
+    id: "container-cpu-usage-percpu",
+    friendlyName: "Container CPU Usage (Per Core)",
+    description: "Per-core CPU usage of the container",
+    metricName: "container.cpu.usage.percpu",
+    category: "CPU",
+    defaultAggregation: MetricsAggregationType.Avg,
+    unit: "ns",
+  },
+  {
+    id: "container-cpu-throttled-time",
+    friendlyName: "Container CPU Throttled Time",
+    description: "Total time the container CPU has been throttled",
+    metricName: "container.cpu.throttling_data.throttled_time",
+    category: "CPU",
+    defaultAggregation: MetricsAggregationType.Sum,
+    unit: "ns",
+  },
+
+  // Memory Metrics
+  {
+    id: "container-memory-usage-total",
+    friendlyName: "Container Memory Usage",
+    description: "Total memory usage of the container",
+    metricName: "container.memory.usage.total",
+    category: "Memory",
+    defaultAggregation: MetricsAggregationType.Avg,
+    unit: "bytes",
+  },
+  {
+    id: "container-memory-usage-limit",
+    friendlyName: "Container Memory Limit",
+    description: "Memory limit configured for the container",
+    metricName: "container.memory.usage.limit",
+    category: "Memory",
+    defaultAggregation: MetricsAggregationType.Max,
+    unit: "bytes",
+  },
+  {
+    id: "container-memory-percent",
+    friendlyName: "Container Memory Percent",
+    description:
+      "Memory usage as a percentage of the container limit or host total",
+    metricName: "container.memory.percent",
+    category: "Memory",
+    defaultAggregation: MetricsAggregationType.Avg,
+    unit: "%",
+  },
+  {
+    id: "container-memory-rss",
+    friendlyName: "Container Memory RSS",
+    description: "Resident set size (non-swapped physical memory) used",
+    metricName: "container.memory.rss",
+    category: "Memory",
+    defaultAggregation: MetricsAggregationType.Avg,
+    unit: "bytes",
+  },
+  {
+    id: "container-memory-cache",
+    friendlyName: "Container Memory Cache",
+    description: "Amount of memory used as page cache",
+    metricName: "container.memory.cache",
+    category: "Memory",
+    defaultAggregation: MetricsAggregationType.Avg,
+    unit: "bytes",
+  },
+
+  // Network Metrics
+  {
+    id: "container-network-rx-bytes",
+    friendlyName: "Container Network Received",
+    description: "Bytes received over the network by the container",
+    metricName: "container.network.io.usage.rx_bytes",
+    category: "Network",
+    defaultAggregation: MetricsAggregationType.Sum,
+    unit: "bytes",
+  },
+  {
+    id: "container-network-tx-bytes",
+    friendlyName: "Container Network Transmitted",
+    description: "Bytes transmitted over the network by the container",
+    metricName: "container.network.io.usage.tx_bytes",
+    category: "Network",
+    defaultAggregation: MetricsAggregationType.Sum,
+    unit: "bytes",
+  },
+  {
+    id: "container-network-rx-packets",
+    friendlyName: "Container Network Packets Received",
+    description: "Packets received over the network by the container",
+    metricName: "container.network.io.usage.rx_packets",
+    category: "Network",
+    defaultAggregation: MetricsAggregationType.Sum,
+    unit: "count",
+  },
+  {
+    id: "container-network-tx-packets",
+    friendlyName: "Container Network Packets Transmitted",
+    description: "Packets transmitted over the network by the container",
+    metricName: "container.network.io.usage.tx_packets",
+    category: "Network",
+    defaultAggregation: MetricsAggregationType.Sum,
+    unit: "count",
+  },
+
+  // Block I/O Metrics
+  {
+    id: "container-blockio-read",
+    friendlyName: "Container Block I/O Read",
+    description: "Bytes read from block devices by the container",
+    metricName: "container.blockio.io_service_bytes_recursive.read",
+    category: "BlockIO",
+    defaultAggregation: MetricsAggregationType.Sum,
+    unit: "bytes",
+  },
+  {
+    id: "container-blockio-write",
+    friendlyName: "Container Block I/O Write",
+    description: "Bytes written to block devices by the container",
+    metricName: "container.blockio.io_service_bytes_recursive.write",
+    category: "BlockIO",
+    defaultAggregation: MetricsAggregationType.Sum,
+    unit: "bytes",
+  },
+
+  // Container Info Metrics
+  {
+    id: "container-uptime",
+    friendlyName: "Container Uptime",
+    description: "How long the container has been running",
+    metricName: "container.uptime",
+    category: "Container",
+    defaultAggregation: MetricsAggregationType.Max,
+    unit: "seconds",
+  },
+  {
+    id: "container-restarts",
+    friendlyName: "Container Restarts",
+    description: "Number of times the container has restarted",
+    metricName: "container.restarts",
+    category: "Container",
+    defaultAggregation: MetricsAggregationType.Max,
+    unit: "count",
+  },
+  {
+    id: "container-pids-count",
+    friendlyName: "Container Process Count",
+    description: "Number of processes running inside the container",
+    metricName: "container.pids.count",
+    category: "Container",
+    defaultAggregation: MetricsAggregationType.Avg,
+    unit: "count",
+  },
+];
+
+export function getAllDockerMetrics(): Array<DockerMetricDefinition> {
+  return dockerMetricCatalog;
+}
+
+export function getDockerMetricsByCategory(
+  category: DockerMetricCategory,
+): Array<DockerMetricDefinition> {
+  return dockerMetricCatalog.filter((m: DockerMetricDefinition) => {
+    return m.category === category;
+  });
+}
+
+export function getDockerMetricById(
+  id: string,
+): DockerMetricDefinition | undefined {
+  return dockerMetricCatalog.find((m: DockerMetricDefinition) => {
+    return m.id === id;
+  });
+}
+
+export function getDockerMetricByMetricName(
+  metricName: string,
+): DockerMetricDefinition | undefined {
+  return dockerMetricCatalog.find((m: DockerMetricDefinition) => {
+    return m.metricName === metricName;
+  });
+}
+
+export function getAllDockerMetricCategories(): Array<DockerMetricCategory> {
+  return ["CPU", "Memory", "Network", "BlockIO", "Container"];
+}

package/Types/Monitor/MonitorStep.ts

@@ -44,6 +44,9 @@ import MonitorStepExternalStatusPageMonitor, {
 import MonitorStepKubernetesMonitor, {
   MonitorStepKubernetesMonitorUtil,
 } from "./MonitorStepKubernetesMonitor";
+import MonitorStepDockerMonitor, {
+  MonitorStepDockerMonitorUtil,
+} from "./MonitorStepDockerMonitor";
 import Zod, { ZodSchema } from "../../Utils/Schema/Zod";
 
 export interface MonitorStepType {
@@ -102,6 +105,9 @@ export interface MonitorStepType {
 
   // Kubernetes monitor
   kubernetesMonitor?: MonitorStepKubernetesMonitor | undefined;
+
+  // Docker monitor
+  dockerMonitor?: MonitorStepDockerMonitor | undefined;
 }
 
 export default class MonitorStep extends DatabaseProperty {
@@ -133,6 +139,7 @@ export default class MonitorStep extends DatabaseProperty {
       domainMonitor: undefined,
       externalStatusPageMonitor: undefined,
       kubernetesMonitor: undefined,
+      dockerMonitor: undefined,
     };
   }
 
@@ -169,6 +176,7 @@ export default class MonitorStep extends DatabaseProperty {
       domainMonitor: undefined,
       externalStatusPageMonitor: undefined,
       kubernetesMonitor: undefined,
+      dockerMonitor: undefined,
     };
 
     return monitorStep;
@@ -297,6 +305,13 @@ export default class MonitorStep extends DatabaseProperty {
     return this;
   }
 
+  public setDockerMonitor(
+    dockerMonitor: MonitorStepDockerMonitor,
+  ): MonitorStep {
+    this.data!.dockerMonitor = dockerMonitor;
+    return this;
+  }
+
   public setCustomCode(customCode: string): MonitorStep {
     this.data!.customCode = customCode;
     return this;
@@ -326,6 +341,7 @@ export default class MonitorStep extends DatabaseProperty {
         logMonitor: undefined,
         exceptionMonitor: undefined,
         kubernetesMonitor: undefined,
+        dockerMonitor: undefined,
       },
     };
   }
@@ -446,6 +462,16 @@ export default class MonitorStep extends DatabaseProperty {
       }
     }
 
+    if (monitorType === MonitorType.Docker) {
+      if (!value.data.dockerMonitor) {
+        return "Docker monitor configuration is required";
+      }
+
+      if (!value.data.dockerMonitor.hostIdentifier) {
+        return "Docker host is required";
+      }
+    }
+
     return null;
   }
 
@@ -513,6 +539,9 @@ export default class MonitorStep extends DatabaseProperty {
                 this.data.kubernetesMonitor,
               )
             : undefined,
+          dockerMonitor: this.data.dockerMonitor
+            ? MonitorStepDockerMonitorUtil.toJSON(this.data.dockerMonitor)
+            : undefined,
         },
       });
     }
@@ -633,6 +662,9 @@ export default class MonitorStep extends DatabaseProperty {
       kubernetesMonitor: json["kubernetesMonitor"]
         ? (json["kubernetesMonitor"] as JSONObject)
         : undefined,
+      dockerMonitor: json["dockerMonitor"]
+        ? (json["dockerMonitor"] as JSONObject)
+        : undefined,
     }) as any;
 
     return monitorStep;
@@ -663,6 +695,7 @@ export default class MonitorStep extends DatabaseProperty {
         domainMonitor: Zod.any().optional(),
         externalStatusPageMonitor: Zod.any().optional(),
         kubernetesMonitor: Zod.any().optional(),
+        dockerMonitor: Zod.any().optional(),
       }).openapi({
         type: "object",
         example: {

package/Types/Monitor/MonitorStepDockerMonitor.ts

@@ -0,0 +1,38 @@
+import { JSONObject } from "../JSON";
+import MetricsViewConfig from "../Metrics/MetricsViewConfig";
+import RollingTime from "../RollingTime/RollingTime";
+
+export interface DockerContainerFilters {
+  containerName?: string | undefined;
+  containerImage?: string | undefined;
+  hostName?: string | undefined;
+}
+
+export default interface MonitorStepDockerMonitor {
+  hostIdentifier: string;
+  containerFilters: DockerContainerFilters;
+  metricViewConfig: MetricsViewConfig;
+  rollingTime: RollingTime;
+}
+
+export class MonitorStepDockerMonitorUtil {
+  public static getDefault(): MonitorStepDockerMonitor {
+    return {
+      hostIdentifier: "",
+      containerFilters: {},
+      metricViewConfig: {
+        queryConfigs: [],
+        formulaConfigs: [],
+      },
+      rollingTime: RollingTime.Past1Minute,
+    };
+  }
+
+  public static fromJSON(json: JSONObject): MonitorStepDockerMonitor {
+    return json as any as MonitorStepDockerMonitor;
+  }
+
+  public static toJSON(monitor: MonitorStepDockerMonitor): JSONObject {
+    return monitor as any as JSONObject;
+  }
+}

package/Types/Monitor/MonitorType.ts

@@ -7,6 +7,7 @@ enum MonitorType {
   API = "API",
   Ping = "Ping",
   Kubernetes = "Kubernetes",
+  Docker = "Docker",
   IP = "IP",
   IncomingRequest = "Incoming Request",
   IncomingEmail = "Incoming Email",
@@ -88,6 +89,10 @@ export class MonitorTypeHelper {
         label: "Kubernetes",
         monitorTypes: [MonitorType.Kubernetes],
       },
+      {
+        label: "Docker",
+        monitorTypes: [MonitorType.Docker],
+      },
       {
         label: "Telemetry",
         monitorTypes: [
@@ -112,7 +117,8 @@ export class MonitorTypeHelper {
       monitorType === MonitorType.Traces ||
       monitorType === MonitorType.Exceptions ||
       monitorType === MonitorType.Profiles ||
-      monitorType === MonitorType.Kubernetes
+      monitorType === MonitorType.Kubernetes ||
+      monitorType === MonitorType.Docker
     );
   }
 
@@ -157,6 +163,13 @@ export class MonitorTypeHelper {
           "This monitor type lets you monitor Kubernetes clusters, workloads, nodes, and pods.",
         icon: IconProp.Cube,
       },
+      {
+        monitorType: MonitorType.Docker,
+        title: "Docker Container",
+        description:
+          "This monitor type lets you monitor Docker containers — CPU, memory, network, restarts, and lifecycle events.",
+        icon: IconProp.Cube,
+      },
       {
         monitorType: MonitorType.IP,
         title: "IP",
@@ -349,6 +362,7 @@ export class MonitorTypeHelper {
       MonitorType.Domain,
       MonitorType.ExternalStatusPage,
       MonitorType.Kubernetes,
+      MonitorType.Docker,
     ];
   }
 

package/Types/Permission.ts

@@ -722,6 +722,11 @@ enum Permission {
   EditKubernetesCluster = "EditKubernetesCluster",
   ReadKubernetesCluster = "ReadKubernetesCluster",
 
+  CreateDockerHost = "CreateDockerHost",
+  DeleteDockerHost = "DeleteDockerHost",
+  EditDockerHost = "EditDockerHost",
+  ReadDockerHost = "ReadDockerHost",
+
   CreateService = "CreateService",
   DeleteService = "DeleteService",
   EditService = "EditService",
@@ -4458,6 +4463,39 @@ export class PermissionHelper {
         group: PermissionGroup.Telemetry,
       },
 
+      {
+        permission: Permission.CreateDockerHost,
+        title: "Create Docker Host",
+        description: "This permission can create Docker Host in this project.",
+        isAssignableToTenant: true,
+        isAccessControlPermission: true,
+        group: PermissionGroup.Telemetry,
+      },
+      {
+        permission: Permission.DeleteDockerHost,
+        title: "Delete Docker Host",
+        description: "This permission can delete Docker Host of this project.",
+        isAssignableToTenant: true,
+        isAccessControlPermission: false,
+        group: PermissionGroup.Telemetry,
+      },
+      {
+        permission: Permission.EditDockerHost,
+        title: "Edit Docker Host",
+        description: "This permission can edit Docker Host of this project.",
+        isAssignableToTenant: true,
+        isAccessControlPermission: false,
+        group: PermissionGroup.Telemetry,
+      },
+      {
+        permission: Permission.ReadDockerHost,
+        title: "Read Docker Host",
+        description: "This permission can read Docker Host of this project.",
+        isAssignableToTenant: true,
+        isAccessControlPermission: false,
+        group: PermissionGroup.Telemetry,
+      },
+
       {
         permission: Permission.CreateService,
         title: "Create Service",

package/UI/Components/Icon/Icon.tsx

@@ -2784,6 +2784,93 @@ const Icon: FunctionComponent<ComponentProps> = ({
         {spokes}
       </>,
     );
+  } else if (icon === IconProp.Docker) {
+    // Docker whale — stack of containers on top of a whale curve, matching the official logo
+    return getSvgWrapper(
+      <>
+        {/* Container stack — bottom row (4 boxes) */}
+        <rect
+          x="3"
+          y="10"
+          width="3"
+          height="3"
+          rx="0.3"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+        />
+        <rect
+          x="6.5"
+          y="10"
+          width="3"
+          height="3"
+          rx="0.3"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+        />
+        <rect
+          x="10"
+          y="10"
+          width="3"
+          height="3"
+          rx="0.3"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+        />
+        <rect
+          x="13.5"
+          y="10"
+          width="3"
+          height="3"
+          rx="0.3"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+        />
+        {/* Container stack — middle row (3 boxes) */}
+        <rect
+          x="6.5"
+          y="6.5"
+          width="3"
+          height="3"
+          rx="0.3"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+        />
+        <rect
+          x="10"
+          y="6.5"
+          width="3"
+          height="3"
+          rx="0.3"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+        />
+        <rect
+          x="13.5"
+          y="6.5"
+          width="3"
+          height="3"
+          rx="0.3"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+        />
+        {/* Container stack — top row (1 box) */}
+        <rect
+          x="10"
+          y="3"
+          width="3"
+          height="3"
+          rx="0.3"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+        />
+        {/* Whale curve carrying the containers */}
+        <path
+          strokeLinecap="round"
+          strokeLinejoin="round"
+          d="M2 14c1 2.5 3.5 4 7 4 5.5 0 9.5-2.5 11-7 1 0.2 2.2 0 3-0.7"
+        />
+      </>,
+    );
   } else if (icon === IconProp.Gauge) {
     // Gauge/speedometer icon — semicircular meter with needle
     return getSvgWrapper(