@oneuptime/common 11.0.2 → 11.0.4

package/Types/Podman/PodmanInventoryExtractor.ts

@@ -0,0 +1,343 @@
+import OneUptimeDate from "../Date";
+import { JSONObject } from "../JSON";
+import { ParsedPodmanResource } from "../../Server/Services/PodmanResourceService";
+
+/*
+ * ------------------------------------------------------------------
+ *                     PodmanInventoryExtractor
+ * ------------------------------------------------------------------
+ *
+ * Parses a single inventory log record emitted by the OneUptime
+ * Podman Agent's snapshot script. The script polls the local Podman
+ * daemon every 5 minutes for containers / images / networks /
+ * volumes and emits one JSON object per line into a log file that
+ * the OTel filelog receiver forwards as an OTLP log.
+ *
+ * The agreed wire format is a JSON envelope:
+ *
+ *   {
+ *     "kind":  "Container" | "Image" | "Network" | "Volume",
+ *     "data":  { ...native podman payload... }
+ *   }
+ *
+ * The kind discriminator is set as a log record attribute by the
+ * agent's filelog operator chain, but we also keep it inside the
+ * envelope so the parser can sanity-check.
+ *
+ * Each kind has a small dedicated parser that pulls out the fields
+ * we promote to first-class columns on `PodmanResource` (name,
+ * containerId, imageName, state, labels, creation timestamp). The
+ * full payload is *not* persisted — it lives on the original log
+ * record in ClickHouse if a user ever needs the raw blob.
+ *
+ * ------------------------------------------------------------------
+ */
+
+export const INVENTORY_KIND_ATTRIBUTE: string = "oneuptime.podman.kind";
+
+export const INVENTORIED_PODMAN_KINDS: ReadonlyArray<string> = [
+  "Container",
+  "Image",
+  "Network",
+  "Volume",
+];
+
+const INVENTORIED_KIND_SET: Set<string> = new Set(
+  INVENTORIED_PODMAN_KINDS.map((k: string) => {
+    return k.toLowerCase();
+  }),
+);
+
+export function isInventoriedPodmanKind(kind: string): boolean {
+  return INVENTORIED_KIND_SET.has(kind.toLowerCase());
+}
+
+/*
+ * Map a kind in any common form (lowercase plural, lowercase
+ * singular, or PascalCase) to the canonical PascalCase kind we store
+ * in the database. Returns null for anything we don't model.
+ */
+export function canonicalPodmanKind(raw: string): string | null {
+  const trimmed: string = (raw || "").trim().toLowerCase();
+  if (!trimmed) {
+    return null;
+  }
+  const map: Record<string, string> = {
+    container: "Container",
+    containers: "Container",
+    image: "Image",
+    images: "Image",
+    network: "Network",
+    networks: "Network",
+    volume: "Volume",
+    volumes: "Volume",
+  };
+  return map[trimmed] || null;
+}
+
+function parseLogBody(logBody: string): JSONObject | null {
+  try {
+    const parsed: unknown = JSON.parse(logBody);
+    if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+      return parsed as JSONObject;
+    }
+    return null;
+  } catch {
+    return null;
+  }
+}
+
+function readString(obj: JSONObject, key: string): string | null {
+  const v: unknown = obj[key];
+  if (typeof v === "string" && v.trim().length > 0) {
+    return v.trim();
+  }
+  return null;
+}
+
+function readJSONObject(obj: JSONObject, key: string): JSONObject | null {
+  const v: unknown = obj[key];
+  if (v && typeof v === "object" && !Array.isArray(v)) {
+    return v as JSONObject;
+  }
+  return null;
+}
+
+function parseTimestamp(raw: string | null): Date | null {
+  if (!raw) {
+    return null;
+  }
+  try {
+    const d: Date = OneUptimeDate.fromString(raw);
+    if (isNaN(d.getTime())) {
+      return null;
+    }
+    return d;
+  } catch {
+    return null;
+  }
+}
+
+/*
+ * Container shape emitted by `podman container ls --format json` plus
+ * a few enrichments the agent script adds:
+ *   { Id, Names, Image, State, Status, CreatedAt, Labels }
+ *
+ * Names from the Podman CLI is a slash-prefixed comma-joined string
+ * ("/web,/web-1"). We strip the leading slash and take the first
+ * entry — that's what `docker_stats` reports as `container.name` in
+ * metric attributes, so the row keys stay consistent across paths.
+ */
+function parseContainer(
+  data: JSONObject,
+  lastSeenAt: Date,
+): ParsedPodmanResource | null {
+  const rawNames: string | null = readString(data, "Names");
+  const rawName: string | null = readString(data, "Name");
+  const namesField: string = rawNames || rawName || "";
+  const firstName: string = namesField
+    .split(",")
+    .map((n: string) => {
+      return n.trim().replace(/^\//, "");
+    })
+    .filter((n: string) => {
+      return n.length > 0;
+    })[0]!;
+
+  if (!firstName) {
+    return null;
+  }
+
+  const idRaw: string | null = readString(data, "Id");
+  const containerId: string | null = idRaw ? idRaw.substring(0, 12) : null;
+  const imageName: string | null = readString(data, "Image");
+  const state: string | null = readString(data, "State");
+  const labels: JSONObject | null = readJSONObject(data, "Labels");
+  const created: Date | null = parseTimestamp(readString(data, "CreatedAt"));
+
+  return {
+    kind: "Container",
+    name: firstName,
+    containerId,
+    imageName,
+    state: state ? state.toLowerCase() : null,
+    labels,
+    resourceCreationTimestamp: created,
+    lastSeenAt,
+  };
+}
+
+/*
+ * Image shape from `podman image ls --format json`:
+ *   { ID, Repository, Tag, CreatedAt, Labels }
+ *
+ * Name = Repository:Tag (matches what container.image.name emits).
+ * Skip dangling images (Repository=<none> with no tag) — they would
+ * collide on the unique key and are noise in a list view.
+ */
+function parseImage(
+  data: JSONObject,
+  lastSeenAt: Date,
+): ParsedPodmanResource | null {
+  const repository: string | null = readString(data, "Repository");
+  const tag: string | null = readString(data, "Tag");
+  const explicitName: string | null = readString(data, "Name");
+
+  let name: string | null = explicitName;
+  if (!name && repository && repository !== "<none>") {
+    name = tag && tag !== "<none>" ? `${repository}:${tag}` : repository;
+  }
+
+  if (!name) {
+    return null;
+  }
+
+  const idRaw: string | null = readString(data, "ID") || readString(data, "Id");
+  const containerId: string | null = idRaw
+    ? idRaw.replace(/^sha256:/, "").substring(0, 12)
+    : null;
+  const labels: JSONObject | null = readJSONObject(data, "Labels");
+  const created: Date | null = parseTimestamp(readString(data, "CreatedAt"));
+
+  return {
+    kind: "Image",
+    name,
+    containerId,
+    imageName: null,
+    state: null,
+    labels,
+    resourceCreationTimestamp: created,
+    lastSeenAt,
+  };
+}
+
+/*
+ * Network shape from `podman network ls --format json`:
+ *   { ID, Name, Driver, Scope, CreatedAt, Labels }
+ */
+function parseNetwork(
+  data: JSONObject,
+  lastSeenAt: Date,
+): ParsedPodmanResource | null {
+  const name: string | null = readString(data, "Name");
+  if (!name) {
+    return null;
+  }
+  const idRaw: string | null = readString(data, "ID") || readString(data, "Id");
+  const driver: string | null = readString(data, "Driver");
+  const scope: string | null = readString(data, "Scope");
+  const labels: JSONObject | null = readJSONObject(data, "Labels");
+  const created: Date | null = parseTimestamp(readString(data, "CreatedAt"));
+
+  /*
+   * Driver and scope are surfaced in the State column in the widget
+   * (e.g. "bridge / local"). Encoded as "driver/scope" so we don't
+   * need a new column on the table.
+   */
+  const stateParts: Array<string> = [];
+  if (driver) {
+    stateParts.push(driver);
+  }
+  if (scope) {
+    stateParts.push(scope);
+  }
+
+  return {
+    kind: "Network",
+    name,
+    containerId: idRaw ? idRaw.substring(0, 12) : null,
+    imageName: null,
+    state: stateParts.length > 0 ? stateParts.join("/") : null,
+    labels,
+    resourceCreationTimestamp: created,
+    lastSeenAt,
+  };
+}
+
+/*
+ * Volume shape from `podman volume ls --format json`:
+ *   { Name, Driver, Mountpoint, Scope, Labels, CreatedAt }
+ */
+function parseVolume(
+  data: JSONObject,
+  lastSeenAt: Date,
+): ParsedPodmanResource | null {
+  const name: string | null = readString(data, "Name");
+  if (!name) {
+    return null;
+  }
+  const driver: string | null = readString(data, "Driver");
+  const scope: string | null = readString(data, "Scope");
+  const labels: JSONObject | null = readJSONObject(data, "Labels");
+  const created: Date | null = parseTimestamp(readString(data, "CreatedAt"));
+
+  const stateParts: Array<string> = [];
+  if (driver) {
+    stateParts.push(driver);
+  }
+  if (scope) {
+    stateParts.push(scope);
+  }
+
+  return {
+    kind: "Volume",
+    name,
+    containerId: null,
+    imageName: null,
+    state: stateParts.length > 0 ? stateParts.join("/") : null,
+    labels,
+    resourceCreationTimestamp: created,
+    lastSeenAt,
+  };
+}
+
+export interface ExtractedPodmanInventoryRecord {
+  resource: ParsedPodmanResource;
+}
+
+/**
+ * Parse a single inventory log line. Returns null when the body is
+ * malformed or the kind is not modeled — callers should swallow nulls
+ * silently rather than fail the whole batch.
+ */
+export function extractPodmanInventoryResource(data: {
+  kind: string;
+  logBody: string;
+  lastSeenAt: Date;
+}): ExtractedPodmanInventoryRecord | null {
+  const canonical: string | null = canonicalPodmanKind(data.kind);
+  if (!canonical) {
+    return null;
+  }
+
+  const body: JSONObject | null = parseLogBody(data.logBody);
+  if (!body) {
+    return null;
+  }
+
+  /*
+   * The agent wraps the native podman payload in `{ kind, data }`.
+   * Older snapshot lines or test inputs may be the raw payload — we
+   * accept either by pulling `data` if present, else using the body
+   * directly.
+   */
+  const inner: JSONObject =
+    (readJSONObject(body, "data") as JSONObject) || body;
+
+  let parsed: ParsedPodmanResource | null = null;
+  if (canonical === "Container") {
+    parsed = parseContainer(inner, data.lastSeenAt);
+  } else if (canonical === "Image") {
+    parsed = parseImage(inner, data.lastSeenAt);
+  } else if (canonical === "Network") {
+    parsed = parseNetwork(inner, data.lastSeenAt);
+  } else if (canonical === "Volume") {
+    parsed = parseVolume(inner, data.lastSeenAt);
+  }
+
+  if (!parsed) {
+    return null;
+  }
+
+  return { resource: parsed };
+}

package/Types/SSO/SsoProviderType.ts

@@ -0,0 +1,8 @@
+enum SsoProviderType {
+  ProjectSSO = "ProjectSSO",
+  ProjectOIDC = "ProjectOIDC",
+  GlobalSSO = "GlobalSSO",
+  GlobalOIDC = "GlobalOIDC",
+}
+
+export default SsoProviderType;

package/Types/Telemetry/EntityType.ts

@@ -38,6 +38,18 @@ enum EntityType {
   ProxmoxNode = "proxmox.node",
   ProxmoxGuest = "proxmox.guest",
   CephCluster = "ceph.cluster",
+  /*
+   * Docker Swarm types are OneUptime-defined (no upstream semconv
+   * exists) but follow the same dotted naming convention. The
+   * identifying attributes (`docker.swarm.cluster.name`,
+   * `docker.swarm.node.id`, `docker.swarm.service.id`) are stamped by
+   * the OneUptime Docker Swarm agent's collector config / inventory
+   * poller.
+   */
+  DockerSwarmCluster = "docker.swarm.cluster",
+  DockerSwarmNode = "docker.swarm.node",
+  DockerSwarmService = "docker.swarm.service",
+  DockerSwarmTask = "docker.swarm.task",
   TelemetrySdk = "telemetry.sdk",
 }
 

package/Types/Telemetry/ServiceType.ts

@@ -13,9 +13,11 @@ enum ServiceType {
   Incident = "Incident",
   Host = "Host",
   DockerHost = "DockerHost",
+  PodmanHost = "PodmanHost",
   KubernetesCluster = "KubernetesCluster",
   ProxmoxCluster = "ProxmoxCluster",
   CephCluster = "CephCluster",
+  DockerSwarmCluster = "DockerSwarmCluster",
   ServerlessFunction = "ServerlessFunction",
   CloudResource = "CloudResource",
   RealUserMonitor = "RealUserMonitor",

package/UI/Components/Accordion/Accordion.tsx

@@ -60,7 +60,9 @@ const Accordion: FunctionComponent<ComponentProps> = (
     className = "-ml-5 -mr-5 p-5 mt-1";
   }
 
-  const accordionId: string = `accordion-content-${React.useId()}`;
+  const generatedId: string = React.useId();
+  const accordionId: string = `accordion-content-${generatedId}`;
+  const accordionTitleId: string = `accordion-title-${generatedId}`;
 
   const handleKeyDown: (event: React.KeyboardEvent) => void = (
     event: React.KeyboardEvent,
@@ -84,6 +86,7 @@ const Accordion: FunctionComponent<ComponentProps> = (
           tabIndex={0}
           aria-expanded={isOpen}
           aria-controls={accordionId}
+          aria-labelledby={props.title ? accordionTitleId : undefined}
           onClick={() => {
             setIsOpen(!isOpen);
           }}
@@ -121,6 +124,7 @@ const Accordion: FunctionComponent<ComponentProps> = (
                 }`}
               >
                 <div
+                  id={accordionTitleId}
                   className={`text-gray-900 leading-snug ${props.titleClassName || ""}`}
                 >
                   {props.title}

package/UI/Components/CardSelect/CardSelect.tsx

@@ -30,6 +30,7 @@ export interface ComponentProps {
   error?: string | undefined;
   tabIndex?: number | undefined;
   dataTestId?: string | undefined;
+  ariaLabelledby?: string | undefined;
   // Force single-column (1 item per row). Default: responsive 1/2/3 grid.
   singleColumn?: boolean | undefined;
 }
@@ -67,7 +68,11 @@ const CardSelect: FunctionComponent<ComponentProps> = (
 
   return (
     <div data-testid={props.dataTestId}>
-      <div role="radiogroup" aria-label="Select an option">
+      <div
+        role="radiogroup"
+        aria-label="Select an option"
+        aria-labelledby={props.ariaLabelledby}
+      >
         {groups.map((group: RenderGroup, groupIndex: number) => {
           return (
             <div key={groupIndex} className={groupIndex > 0 ? "mt-8" : ""}>

package/UI/Components/CategoryCheckbox/Index.tsx

@@ -19,6 +19,7 @@ export interface CategoryCheckboxProps
   initialValue?: undefined | Array<CategoryCheckboxValue | BaseModel>;
   error?: string | undefined;
   dataTestId?: string | undefined;
+  ariaLabelledby?: string | undefined;
 }
 
 const CategoryCheckbox: FunctionComponent<CategoryCheckboxProps> = (
@@ -152,7 +153,7 @@ const CategoryCheckbox: FunctionComponent<CategoryCheckboxProps> = (
   };
 
   return (
-    <div>
+    <div role="group" aria-labelledby={props.ariaLabelledby}>
       {getCategory(undefined, categories.length === 0)}
       {categories.map((category: CheckboxCategory, i: number) => {
         return (

package/UI/Components/CodeEditor/CodeEditor.tsx

@@ -25,6 +25,7 @@ export interface ComponentProps {
   value?: string | undefined;
   showLineNumbers?: boolean | undefined;
   disableSpellCheck?: boolean | undefined;
+  ariaLabelledby?: string | undefined;
 }
 
 const CodeEditor: FunctionComponent<ComponentProps> = (
@@ -119,6 +120,7 @@ const CodeEditor: FunctionComponent<ComponentProps> = (
   return (
     <div
       data-testid={props.dataTestId}
+      aria-labelledby={props.ariaLabelledby}
       onClick={() => {
         if (props.onClick) {
           props.onClick();

package/UI/Components/CollapsibleSection/CollapsibleSection.tsx

@@ -46,6 +46,9 @@ const CollapsibleSection: FunctionComponent<ComponentProps> = (
 
   const variant: CollapsibleSectionVariant = props.variant || "default";
 
+  // Associate the role="button" header with its visible title text (WCAG 4.1.2).
+  const collapsibleTitleId: string = `collapsible-title-${React.useId()}`;
+
   const getContainerClassName: () => string = (): string => {
     const baseClassName: string = props.className || "";
 
@@ -97,6 +100,7 @@ const CollapsibleSection: FunctionComponent<ComponentProps> = (
           }
         }}
         aria-expanded={!isCollapsed}
+        aria-labelledby={collapsibleTitleId}
       >
         <div className="flex items-center flex-1 min-w-0">
           <Icon
@@ -105,7 +109,10 @@ const CollapsibleSection: FunctionComponent<ComponentProps> = (
           />
           <div className="flex-1 min-w-0">
             <div className="flex items-center">
-              <span className="text-sm font-medium text-gray-900 truncate">
+              <span
+                id={collapsibleTitleId}
+                className="text-sm font-medium text-gray-900 truncate"
+              >
                 {props.title}
               </span>
               {isCollapsed && props.badge && (

package/UI/Components/Dropdown/Dropdown.tsx

@@ -59,6 +59,7 @@ export interface ComponentProps {
   id?: string | undefined;
   dataTestId?: string | undefined;
   ariaLabel?: string | undefined;
+  ariaLabelledby?: string | undefined;
 }
 
 const Dropdown: FunctionComponent<ComponentProps> = (
@@ -537,6 +538,7 @@ const Dropdown: FunctionComponent<ComponentProps> = (
           props.onFocus?.();
         }}
         aria-label={props.ariaLabel}
+        aria-labelledby={props.ariaLabelledby}
         aria-invalid={props.error ? true : undefined}
         aria-describedby={props.error ? errorId : undefined}
         classNames={{

package/UI/Components/EntityDropdown/EntityDropdown.tsx

@@ -86,6 +86,7 @@ export interface EntityDropdownProps {
   id?: string | undefined;
   dataTestId?: string | undefined;
   ariaLabel?: string | undefined;
+  ariaLabelledby?: string | undefined;
   disabled?: boolean | undefined;
 
   /*
@@ -1115,6 +1116,7 @@ const EntityDropdown: FunctionComponent<EntityDropdownProps> = (
           <button
             type="button"
             disabled={props.disabled}
+            aria-labelledby={props.ariaLabelledby}
             onClick={(): void => {
               if (props.disabled) {
                 return;
@@ -1204,6 +1206,7 @@ const EntityDropdown: FunctionComponent<EntityDropdownProps> = (
               aria-autocomplete="list"
               aria-expanded={isOpen}
               aria-label={props.ariaLabel}
+              aria-labelledby={props.ariaLabelledby}
               aria-invalid={props.error ? true : undefined}
               data-testid={props.dataTestId}
               role="combobox"

package/UI/Components/FilePicker/FilePicker.tsx

@@ -32,6 +32,7 @@ export interface ComponentProps {
   isMultiFilePicker?: boolean | undefined;
   tabIndex?: number | undefined;
   error?: string | undefined;
+  ariaLabelledby?: string | undefined;
 }
 
 type UploadStatus = {
@@ -449,6 +450,7 @@ const FilePicker: FunctionComponent<ComponentProps> = (
                       id="file-upload"
                       name="file-upload"
                       type="file"
+                      aria-labelledby={props.ariaLabelledby}
                       className="sr-only"
                     />
                   </label>

package/UI/Components/Forms/Fields/ColorPicker.tsx

@@ -24,6 +24,7 @@ export interface ComponentProps {
   dataTestId?: string | undefined;
   onEnterPress?: (() => void) | undefined;
   error?: string | undefined;
+  ariaLabelledby?: string | undefined;
 }
 
 const ColorPicker: FunctionComponent<ComponentProps> = (
@@ -83,6 +84,7 @@ const ColorPicker: FunctionComponent<ComponentProps> = (
           readOnly={true}
           type={InputType.TEXT}
           tabIndex={props.tabIndex}
+          ariaLabelledby={props.ariaLabelledby}
           onChange={(value: string) => {
             if (!value) {
               return handleChange("");

package/UI/Components/Forms/Fields/FieldLabel.tsx

@@ -5,6 +5,8 @@ import React, { FunctionComponent, ReactElement } from "react";
 
 export interface ComponentProps {
   title: string;
+  id?: string | undefined;
+  htmlFor?: string | undefined;
   required?: boolean | undefined;
   sideLink?: FormFieldSideLink | undefined;
   description?: string | ReactElement | undefined;
@@ -26,6 +28,8 @@ const FieldLabelElement: FunctionComponent<ComponentProps> = (
   return (
     <>
       <label
+        id={props.id}
+        htmlFor={props.htmlFor}
         className={
           props.className ||
           `block ${