@oneuptime/common 10.4.9 → 10.4.11

package/Server/Utils/Monitor/MonitorMetricUtil.ts

@@ -5,10 +5,8 @@ import MetricService from "../../Services/MetricService";
 import GlobalConfigService from "../../Services/GlobalConfigService";
 import GlobalConfig from "../../../Models/DatabaseModels/GlobalConfig";
 import DataToProcess from "./DataToProcess";
-import {
-  MetricPointType,
-  ServiceType,
-} from "../../../Models/AnalyticsModels/Metric";
+import { MetricPointType } from "../../../Models/AnalyticsModels/Metric";
+import ServiceType from "../../../Types/Telemetry/ServiceType";
 import MetricType from "../../../Models/DatabaseModels/MetricType";
 import BasicInfrastructureMetrics, {
   NetworkInterfaceMetrics,

package/Server/Utils/Telemetry/Telemetry.ts

@@ -135,6 +135,44 @@ export default class TelemetryUtil {
     };
   }
 
+  /*
+   * Cross-cutting resource stamps. Spread alongside the service stamp on
+   * every analytics row so a single ClickHouse query can find "all
+   * telemetry from host X" / "from docker host Y" / "from cluster Z"
+   * regardless of which Service the row primarily belongs to. Without
+   * these, host context would only be queryable as the raw OTel
+   * `resource.host.name` string with no stable id link.
+   */
+  public static getAttributesForHostIdAndHostName(data: {
+    hostId: ObjectID;
+    hostName: string;
+  }): Dictionary<AttributeType> {
+    return {
+      "oneuptime.host.id": data.hostId.toString(),
+      "oneuptime.host.name": data.hostName,
+    };
+  }
+
+  public static getAttributesForDockerHostIdAndHostName(data: {
+    dockerHostId: ObjectID;
+    hostName: string;
+  }): Dictionary<AttributeType> {
+    return {
+      "oneuptime.docker.host.id": data.dockerHostId.toString(),
+      "oneuptime.docker.host.name": data.hostName,
+    };
+  }
+
+  public static getAttributesForKubernetesClusterIdAndName(data: {
+    kubernetesClusterId: ObjectID;
+    clusterName: string;
+  }): Dictionary<AttributeType> {
+    return {
+      "oneuptime.kubernetes.cluster.id": data.kubernetesClusterId.toString(),
+      "oneuptime.kubernetes.cluster.name": data.clusterName,
+    };
+  }
+
   @CaptureSpan()
   public static getAttributes(data: {
     prefixKeysWithString: string;

package/Tests/Server/Middleware/UserAuthorization.test.ts

@@ -2,6 +2,7 @@ import ProjectMiddleware from "../../../Server/Middleware/ProjectAuthorization";
 import UserMiddleware from "../../../Server/Middleware/UserAuthorization";
 import AccessTokenService from "../../../Server/Services/AccessTokenService";
 import ProjectService from "../../../Server/Services/ProjectService";
+import TeamMemberService from "../../../Server/Services/TeamMemberService";
 import UserService from "../../../Server/Services/UserService";
 import {
   ExpressRequest,
@@ -44,6 +45,7 @@ jest.mock("../../../Server/Services/UserService");
 jest.mock("../../../Server/Services/AccessTokenService");
 jest.mock("../../../Server/Utils/Response");
 jest.mock("../../../Server/Services/ProjectService");
+jest.mock("../../../Server/Services/TeamMemberService");
 jest.mock("../../../Types/HashedString");
 jest.mock("../../../Types/JSONFunctions");
 
@@ -290,6 +292,9 @@ describe("UserMiddleware", () => {
       ).mockReturnValue(mockedAccessToken);
       getJestSpyOn(JSONWebToken, "decode").mockReturnValue(jwtTokenData);
       getJestSpyOn(HashedString, "hashValue").mockResolvedValue(hashValue);
+      getJestSpyOn(TeamMemberService, "getTeamIdsForUser").mockResolvedValue(
+        [],
+      );
     });
 
     beforeEach(() => {

package/Types/Permission.ts

@@ -1124,11 +1124,6 @@ enum Permission {
   EditService = "EditService",
   ReadService = "ReadService",
 
-  CreateServiceDependency = "CreateServiceDependency",
-  DeleteServiceDependency = "DeleteServiceDependency",
-  EditServiceDependency = "EditServiceDependency",
-  ReadServiceDependency = "ReadServiceDependency",
-
   CreateServiceMonitor = "CreateServiceMonitor",
   DeleteServiceMonitor = "DeleteServiceMonitor",
   EditServiceMonitor = "EditServiceMonitor",
@@ -7528,47 +7523,6 @@ export class PermissionHelper {
         group: PermissionGroup.ServiceCatalog,
       },
 
-      {
-        permission: Permission.CreateServiceDependency,
-        title: "Create Service Dependency",
-        description:
-          "This permission can create Service Dependencies in this project.",
-        isAssignableToTenant: true,
-        isAccessControlPermission: false,
-        isRolePermission: false,
-        group: PermissionGroup.ServiceCatalog,
-      },
-      {
-        permission: Permission.DeleteServiceDependency,
-        title: "Delete Service Dependency",
-        description:
-          "This permission can delete Service Dependencies of this project.",
-        isAssignableToTenant: true,
-        isAccessControlPermission: false,
-        isRolePermission: false,
-        group: PermissionGroup.ServiceCatalog,
-      },
-      {
-        permission: Permission.EditServiceDependency,
-        title: "Edit Service Dependency",
-        description:
-          "This permission can edit Service Dependencies of this project.",
-        isAssignableToTenant: true,
-        isAccessControlPermission: false,
-        isRolePermission: false,
-        group: PermissionGroup.ServiceCatalog,
-      },
-      {
-        permission: Permission.ReadServiceDependency,
-        title: "Read Service Dependency",
-        description:
-          "This permission can read Service Dependencies of this project.",
-        isAssignableToTenant: true,
-        isAccessControlPermission: false,
-        isRolePermission: false,
-        group: PermissionGroup.ServiceCatalog,
-      },
-
       {
         permission: Permission.CreateServiceMonitor,
         title: "Create Service Monitor",

package/Types/Telemetry/ServiceType.ts

@@ -0,0 +1,19 @@
+/*
+ * Discriminator stored in the `serviceType` column of every telemetry
+ * row. Tells the read side which Postgres table the row's `serviceId`
+ * points at (the column name is historical — semantically it's a
+ * resource-type discriminator, since hosts, docker hosts, k8s clusters
+ * and monitors all reuse the `serviceId` slot to avoid synthesising
+ * placeholder Service rows just to satisfy the ClickHouse primary key).
+ */
+enum ServiceType {
+  OpenTelemetry = "OpenTelemetry",
+  Monitor = "Monitor",
+  Alert = "Alert",
+  Incident = "Incident",
+  Host = "Host",
+  DockerHost = "DockerHost",
+  KubernetesCluster = "KubernetesCluster",
+}
+
+export default ServiceType;

package/Types/Time/RangeStartAndEndDateTime.ts

@@ -21,6 +21,14 @@ export class RangeStartAndEndDateTimeUtil {
       );
     }
 
+    // 15 mins.
+    if (dashboardStartAndEndDate.range === TimeRange.PAST_FIFTEEN_MINS) {
+      return new InBetween<Date>(
+        OneUptimeDate.addRemoveMinutes(currentDate, -15),
+        currentDate,
+      );
+    }
+
     // 30 mins.
     if (dashboardStartAndEndDate.range === TimeRange.PAST_THIRTY_MINS) {
       return new InBetween<Date>(

package/Types/Time/TimeRange.ts

@@ -1,5 +1,6 @@
 enum Range {
   PAST_FIVE_MINS = "Past 5 Mins",
+  PAST_FIFTEEN_MINS = "Past 15 Mins",
   PAST_THIRTY_MINS = "Past 30 Mins",
   PAST_ONE_HOUR = "Past 1 Hour",
   PAST_TWO_HOURS = "Past 2 Hours",

package/UI/Components/Forms/Validation.ts

@@ -47,8 +47,8 @@ export default class Validation {
       }
 
       if (field.validation.noSpecialCharacters) {
-        if (!content.match(/^[A-Za-z0-9]*$/)) {
-          return `${field.title || name} should not have special characters.`;
+        if (!content.match(/^[A-Za-z0-9_-]*$/)) {
+          return `${field.title || name} can only contain letters, numbers, hyphens (-), and underscores (_).`;
         }
       }
 

package/UI/Components/LogsViewer/LogsViewer.tsx

@@ -21,6 +21,9 @@ import { APP_API_URL } from "../../Config";
 import PageLoader from "../Loader/PageLoader";
 import ErrorMessage from "../ErrorMessage/ErrorMessage";
 import Service from "../../../Models/DatabaseModels/Service";
+import Host from "../../../Models/DatabaseModels/Host";
+import DockerHost from "../../../Models/DatabaseModels/DockerHost";
+import KubernetesCluster from "../../../Models/DatabaseModels/KubernetesCluster";
 import { LIMIT_PER_PROJECT } from "../../../Types/Database/LimitMax";
 import SortOrder from "../../../Types/BaseDatabase/SortOrder";
 import ListResult from "../../../Types/BaseDatabase/ListResult";
@@ -210,6 +213,13 @@ const LogsViewer: FunctionComponent<ComponentProps> = (
   const [pageError, setPageError] = useState<string>("");
 
   const [serviceMap, setServiceMap] = useState<Dictionary<Service>>({});
+  const [hostMap, setHostMap] = useState<Dictionary<Host>>({});
+  const [dockerHostMap, setDockerHostMap] = useState<Dictionary<DockerHost>>(
+    {},
+  );
+  const [kubernetesClusterMap, setKubernetesClusterMap] = useState<
+    Dictionary<KubernetesCluster>
+  >({});
 
   const [selectedLogId, setSelectedLogId] = useState<string | null>(null);
   const [focusedRowIndex, setFocusedRowIndex] = useState<number>(-1);
@@ -373,33 +383,105 @@ const LogsViewer: FunctionComponent<ComponentProps> = (
         setIsPageLoading(true);
         setPageError("");
 
-        const telemetryServices: ListResult<Service> = await ModelAPI.getList({
-          modelType: Service,
-          query: {},
-          select: {
-            name: true,
-            serviceColor: true,
-          },
-          limit: LIMIT_PER_PROJECT,
-          skip: 0,
-          sort: {
-            name: SortOrder.Ascending,
-          },
-        });
-        const services: Dictionary<Service> = {};
+        const [telemetryServices, hosts, dockerHosts, kubernetesClusters]: [
+          ListResult<Service>,
+          ListResult<Host>,
+          ListResult<DockerHost>,
+          ListResult<KubernetesCluster>,
+        ] = await Promise.all([
+          ModelAPI.getList({
+            modelType: Service,
+            query: {},
+            select: {
+              name: true,
+              serviceColor: true,
+            },
+            limit: LIMIT_PER_PROJECT,
+            skip: 0,
+            sort: {
+              name: SortOrder.Ascending,
+            },
+          }),
+          ModelAPI.getList({
+            modelType: Host,
+            query: {},
+            select: {
+              name: true,
+              hostIdentifier: true,
+            },
+            limit: LIMIT_PER_PROJECT,
+            skip: 0,
+            sort: {
+              name: SortOrder.Ascending,
+            },
+          }),
+          ModelAPI.getList({
+            modelType: DockerHost,
+            query: {},
+            select: {
+              name: true,
+              hostIdentifier: true,
+            },
+            limit: LIMIT_PER_PROJECT,
+            skip: 0,
+            sort: {
+              name: SortOrder.Ascending,
+            },
+          }),
+          ModelAPI.getList({
+            modelType: KubernetesCluster,
+            query: {},
+            select: {
+              name: true,
+              clusterIdentifier: true,
+            },
+            limit: LIMIT_PER_PROJECT,
+            skip: 0,
+            sort: {
+              name: SortOrder.Ascending,
+            },
+          }),
+        ]);
 
+        const services: Dictionary<Service> = {};
         telemetryServices.data.forEach((service: Service) => {
           if (!service.id) {
             return;
           }
-
           services[service.id.toString()] = service;
         });
 
+        const hostsById: Dictionary<Host> = {};
+        hosts.data.forEach((host: Host) => {
+          if (!host.id) {
+            return;
+          }
+          hostsById[host.id.toString()] = host;
+        });
+
+        const dockerHostsById: Dictionary<DockerHost> = {};
+        dockerHosts.data.forEach((dockerHost: DockerHost) => {
+          if (!dockerHost.id) {
+            return;
+          }
+          dockerHostsById[dockerHost.id.toString()] = dockerHost;
+        });
+
+        const clustersById: Dictionary<KubernetesCluster> = {};
+        kubernetesClusters.data.forEach((cluster: KubernetesCluster) => {
+          if (!cluster.id) {
+            return;
+          }
+          clustersById[cluster.id.toString()] = cluster;
+        });
+
         setServiceMap(services);
+        setHostMap(hostsById);
+        setDockerHostMap(dockerHostsById);
+        setKubernetesClusterMap(clustersById);
       } catch (err) {
         setPageError(
-          `We couldn't load telemetry service metadata. ${API.getFriendlyErrorMessage(err as Error)}`,
+          `We couldn't load telemetry resource metadata. ${API.getFriendlyErrorMessage(err as Error)}`,
         );
       } finally {
         setIsPageLoading(false);
@@ -724,10 +806,43 @@ const LogsViewer: FunctionComponent<ComponentProps> = (
           displayValue: service?.name || filter.value,
         };
       }
+      if (filter.facetKey === "hostId" && hostMap[filter.value]) {
+        const host: Host | undefined = hostMap[filter.value];
+        return {
+          ...filter,
+          displayValue: host?.name || host?.hostIdentifier || filter.value,
+        };
+      }
+      if (filter.facetKey === "dockerHostId" && dockerHostMap[filter.value]) {
+        const dockerHost: DockerHost | undefined = dockerHostMap[filter.value];
+        return {
+          ...filter,
+          displayValue:
+            dockerHost?.name || dockerHost?.hostIdentifier || filter.value,
+        };
+      }
+      if (
+        filter.facetKey === "kubernetesClusterId" &&
+        kubernetesClusterMap[filter.value]
+      ) {
+        const cluster: KubernetesCluster | undefined =
+          kubernetesClusterMap[filter.value];
+        return {
+          ...filter,
+          displayValue:
+            cluster?.name || cluster?.clusterIdentifier || filter.value,
+        };
+      }
 
       return filter;
     });
-  }, [props.activeFilters, serviceMap]);
+  }, [
+    props.activeFilters,
+    serviceMap,
+    hostMap,
+    dockerHostMap,
+    kubernetesClusterMap,
+  ]);
 
   /*
    * Replace serviceId UUIDs with human-readable names in value suggestions,
@@ -939,6 +1054,9 @@ const LogsViewer: FunctionComponent<ComponentProps> = (
               facetData={props.facetData}
               isLoading={props.facetLoading || false}
               serviceMap={serviceMap}
+              hostMap={hostMap}
+              dockerHostMap={dockerHostMap}
+              kubernetesClusterMap={kubernetesClusterMap}
               onIncludeFilter={props.onFacetInclude || (() => {})}
               onExcludeFilter={props.onFacetExclude || (() => {})}
               activeFilters={props.activeFilters}

package/UI/Components/LogsViewer/components/LogTimeRangePicker.tsx

@@ -23,6 +23,7 @@ export interface LogTimeRangePickerProps {
 // Preset options to show in the dropdown (ordered for log investigation use)
 const PRESET_OPTIONS: Array<{ range: TimeRange; label: string }> = [
   { range: TimeRange.PAST_FIVE_MINS, label: "Past 5 Minutes" },
+  { range: TimeRange.PAST_FIFTEEN_MINS, label: "Past 15 Minutes" },
   { range: TimeRange.PAST_THIRTY_MINS, label: "Past 30 Minutes" },
   { range: TimeRange.PAST_ONE_HOUR, label: "Past 1 Hour" },
   { range: TimeRange.PAST_TWO_HOURS, label: "Past 2 Hours" },

package/UI/Components/LogsViewer/components/LogsFacetSidebar.tsx

@@ -7,6 +7,9 @@ import {
 } from "../types";
 import FacetSection from "./FacetSection";
 import Service from "../../../../Models/DatabaseModels/Service";
+import Host from "../../../../Models/DatabaseModels/Host";
+import DockerHost from "../../../../Models/DatabaseModels/DockerHost";
+import KubernetesCluster from "../../../../Models/DatabaseModels/KubernetesCluster";
 import Dictionary from "../../../../Types/Dictionary";
 import ComponentLoader from "../../ComponentLoader/ComponentLoader";
 import { getSeverityColor } from "./severityColors";
@@ -16,6 +19,9 @@ export interface LogsFacetSidebarProps {
   facetData: FacetData;
   isLoading: boolean;
   serviceMap: Dictionary<Service>;
+  hostMap?: Dictionary<Host>;
+  dockerHostMap?: Dictionary<DockerHost>;
+  kubernetesClusterMap?: Dictionary<KubernetesCluster>;
   onIncludeFilter: (facetKey: string, value: string) => void;
   onExcludeFilter: (facetKey: string, value: string) => void;
   activeFilters?: Array<ActiveFilter> | undefined;
@@ -72,10 +78,63 @@ function buildServiceColorMap(
   return map;
 }
 
+function buildHostDisplayMap(
+  hostMap: Dictionary<Host> | undefined,
+): Record<string, string> {
+  const map: Record<string, string> = {};
+  if (!hostMap) {
+    return map;
+  }
+  for (const [id, host] of Object.entries(hostMap)) {
+    const label: string | undefined = host?.name || host?.hostIdentifier;
+    if (label) {
+      map[id] = label;
+    }
+  }
+  return map;
+}
+
+function buildDockerHostDisplayMap(
+  dockerHostMap: Dictionary<DockerHost> | undefined,
+): Record<string, string> {
+  const map: Record<string, string> = {};
+  if (!dockerHostMap) {
+    return map;
+  }
+  for (const [id, dockerHost] of Object.entries(dockerHostMap)) {
+    const label: string | undefined =
+      dockerHost?.name || dockerHost?.hostIdentifier;
+    if (label) {
+      map[id] = label;
+    }
+  }
+  return map;
+}
+
+function buildClusterDisplayMap(
+  clusterMap: Dictionary<KubernetesCluster> | undefined,
+): Record<string, string> {
+  const map: Record<string, string> = {};
+  if (!clusterMap) {
+    return map;
+  }
+  for (const [id, cluster] of Object.entries(clusterMap)) {
+    const label: string | undefined =
+      cluster?.name || cluster?.clusterIdentifier;
+    if (label) {
+      map[id] = label;
+    }
+  }
+  return map;
+}
+
 function getFacetTitle(key: string): string {
   const titleMap: Record<string, string> = {
     severityText: "Severity",
     serviceId: "Service",
+    hostId: "Host",
+    dockerHostId: "Docker Host",
+    kubernetesClusterId: "Kubernetes Cluster",
     traceId: "Trace ID",
     spanId: "Span ID",
   };
@@ -98,8 +157,26 @@ const LogsFacetSidebar: FunctionComponent<LogsFacetSidebarProps> = (
     return buildServiceColorMap(props.serviceMap);
   }, [props.serviceMap]);
 
+  const hostDisplayMap: Record<string, string> = useMemo(() => {
+    return buildHostDisplayMap(props.hostMap);
+  }, [props.hostMap]);
+
+  const dockerHostDisplayMap: Record<string, string> = useMemo(() => {
+    return buildDockerHostDisplayMap(props.dockerHostMap);
+  }, [props.dockerHostMap]);
+
+  const clusterDisplayMap: Record<string, string> = useMemo(() => {
+    return buildClusterDisplayMap(props.kubernetesClusterMap);
+  }, [props.kubernetesClusterMap]);
+
   const facetKeys: Array<string> = useMemo(() => {
-    const priorityKeys: Array<string> = ["severityText", "serviceId"];
+    const priorityKeys: Array<string> = [
+      "severityText",
+      "serviceId",
+      "hostId",
+      "dockerHostId",
+      "kubernetesClusterId",
+    ];
     const otherKeys: Array<string> = Object.keys(props.facetData).filter(
       (key: string) => {
         return !priorityKeys.includes(key);
@@ -191,6 +268,12 @@ const LogsFacetSidebar: FunctionComponent<LogsFacetSidebarProps> = (
           if (key === "serviceId") {
             valueDisplayMap = serviceDisplayMap;
             valueColorMap = serviceColorMap;
+          } else if (key === "hostId") {
+            valueDisplayMap = hostDisplayMap;
+          } else if (key === "dockerHostId") {
+            valueDisplayMap = dockerHostDisplayMap;
+          } else if (key === "kubernetesClusterId") {
+            valueDisplayMap = clusterDisplayMap;
           } else if (key === "severityText") {
             valueColorMap = severityColorMap;
           }

package/UI/Components/Telemetry/TelemetryRetentionConfigForm.tsx

@@ -11,7 +11,6 @@ import FieldLabelElement from "../Detail/FieldLabel";
 import Input, { InputType } from "../Input/Input";
 
 export interface ComponentProps {
-  error?: string | undefined;
   onChange?: ((value: TelemetryRetentionConfig | null) => void) | undefined;
   value?: TelemetryRetentionConfig | undefined;
   initialValue?: TelemetryRetentionConfig | undefined;

package/UI/Components/TelemetryViewer/components/TelemetryTimeRangePicker.tsx

@@ -22,6 +22,7 @@ export interface TelemetryTimeRangePickerProps {
 
 const PRESET_OPTIONS: Array<{ range: TimeRange; label: string }> = [
   { range: TimeRange.PAST_FIVE_MINS, label: "Past 5 Minutes" },
+  { range: TimeRange.PAST_FIFTEEN_MINS, label: "Past 15 Minutes" },
   { range: TimeRange.PAST_THIRTY_MINS, label: "Past 30 Minutes" },
   { range: TimeRange.PAST_ONE_HOUR, label: "Past 1 Hour" },
   { range: TimeRange.PAST_TWO_HOURS, label: "Past 2 Hours" },

package/build/dist/Models/AnalyticsModels/ExceptionInstance.js

@@ -38,7 +38,7 @@ export default class ExceptionInstance extends AnalyticsBaseModel {
         const serviceIdColumn = new AnalyticsTableColumn({
             key: "serviceId",
             title: "Service ID",
-            description: "ID of the Service which created the log",
+            description: "ID of the resource the exception belongs to (Service / Host / DockerHost / KubernetesCluster / Monitor — disambiguated by serviceType)",
             required: true,
             type: TableColumnType.ObjectID,
             accessControl: {
@@ -62,6 +62,39 @@ export default class ExceptionInstance extends AnalyticsBaseModel {
                 update: [],
             },
         });
+        const serviceTypeColumn = new AnalyticsTableColumn({
+            key: "serviceType",
+            title: "Service Type",
+            description: "Discriminator for serviceId — tells the read side which resource table to dispatch to",
+            required: false,
+            type: TableColumnType.Text,
+            skipIndex: {
+                name: "idx_service_type",
+                type: SkipIndexType.Set,
+                params: [10],
+                granularity: 4,
+            },
+            accessControl: {
+                read: [
+                    Permission.ProjectOwner,
+                    Permission.ProjectAdmin,
+                    Permission.ProjectMember,
+                    Permission.TelemetryAdmin,
+                    Permission.TelemetryMember,
+                    Permission.TelemetryViewer,
+                    Permission.ReadTelemetryException,
+                ],
+                create: [
+                    Permission.ProjectOwner,
+                    Permission.ProjectAdmin,
+                    Permission.ProjectMember,
+                    Permission.TelemetryAdmin,
+                    Permission.TelemetryMember,
+                    Permission.CreateTelemetryException,
+                ],
+                update: [],
+            },
+        });
         const timeColumn = new AnalyticsTableColumn({
             key: "time",
             title: "Time",
@@ -573,6 +606,7 @@ export default class ExceptionInstance extends AnalyticsBaseModel {
             tableColumns: [
                 projectIdColumn,
                 serviceIdColumn,
+                serviceTypeColumn,
                 timeColumn,
                 timeUnixNanoColumn,
                 exceptionTypeColumn,
@@ -614,6 +648,12 @@ export default class ExceptionInstance extends AnalyticsBaseModel {
     set serviceId(v) {
         this.setColumnValue("serviceId", v);
     }
+    get serviceType() {
+        return this.getColumnValue("serviceType");
+    }
+    set serviceType(v) {
+        this.setColumnValue("serviceType", v);
+    }
     get time() {
         return this.getColumnValue("time");
     }