@oneuptime/common 10.0.26 → 10.0.28

package/Models/DatabaseModels/GlobalConfig.ts

@@ -605,4 +605,22 @@ export default class GlobalConfig extends GlobalConfigModel {
     unique: true,
   })
   public monitorLogRetentionInDays?: number = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.Number,
+    title: "Monitor Metric Retention Days",
+    description:
+      "Number of days to retain monitor metrics. Monitor metrics older than this will be automatically deleted. Default is 1 day.",
+  })
+  @Column({
+    type: ColumnType.Number,
+    nullable: true,
+    unique: true,
+  })
+  public monitorMetricRetentionInDays?: number = undefined;
 }

package/Server/API/TelemetryAPI.ts

@@ -212,7 +212,7 @@ router.post(
         ? OneUptimeDate.fromString(body["endTime"] as string)
         : OneUptimeDate.getCurrentDate();
 
-      const limit: number = (body["limit"] as number) || 10;
+      const limit: number = (body["limit"] as number) || 500;
 
       const serviceIds: Array<ObjectID> | undefined = body["serviceIds"]
         ? (body["serviceIds"] as Array<string>).map((id: string) => {

package/Server/Infrastructure/Postgres/SchemaMigrations/1772350000000-MigrationName.ts

@@ -0,0 +1,23 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1772350000000 implements MigrationInterface {
+  public name = "MigrationName1772350000000";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" ADD "monitorMetricRetentionInDays" integer`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" ADD CONSTRAINT "UQ_monitor_metric_retention" UNIQUE ("monitorMetricRetentionInDays")`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" DROP CONSTRAINT "UQ_monitor_metric_retention"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" DROP COLUMN "monitorMetricRetentionInDays"`,
+    );
+  }
+}

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

@@ -261,6 +261,7 @@ import { MigrationName1770834237090 } from "./1770834237090-MigrationName";
 import { MigrationName1770834237091 } from "./1770834237091-MigrationName";
 import { MigrationName1772111896988 } from "./1772111896988-MigrationName";
 import { MigrationName1772280000000 } from "./1772280000000-MigrationName";
+import { MigrationName1772350000000 } from "./1772350000000-MigrationName";
 
 export default [
   InitialMigration,
@@ -526,4 +527,5 @@ export default [
   MigrationName1770834237091,
   MigrationName1772111896988,
   MigrationName1772280000000,
+  MigrationName1772350000000,
 ];

package/Server/Services/LogAggregationService.ts

@@ -45,7 +45,7 @@ export interface FacetRequest {
 }
 
 export class LogAggregationService {
-  private static readonly DEFAULT_FACET_LIMIT: number = 10;
+  private static readonly DEFAULT_FACET_LIMIT: number = 500;
   private static readonly TABLE_NAME: string = "LogItem";
   private static readonly TOP_LEVEL_COLUMNS: Set<string> = new Set([
     "severityText",

package/Server/Utils/AnalyticsDatabase/Statement.ts

@@ -9,6 +9,7 @@ import LessThan from "../../../Types/BaseDatabase/LessThan";
 import LessThanOrEqual from "../../../Types/BaseDatabase/LessThanOrEqual";
 import LessThanOrNull from "../../../Types/BaseDatabase/LessThanOrNull";
 import GreaterThanOrNull from "../../../Types/BaseDatabase/GreaterThanOrNull";
+import NotEqual from "../../../Types/BaseDatabase/NotEqual";
 import Search from "../../../Types/BaseDatabase/Search";
 import OneUptimeDate from "../../../Types/Date";
 import Dictionary from "../../../Types/Dictionary";
@@ -103,7 +104,8 @@ export class Statement implements BaseQueryParams {
       v.value instanceof GreaterThan ||
       v.value instanceof GreaterThanOrEqual ||
       v.value instanceof LessThanOrNull ||
-      v.value instanceof GreaterThanOrNull
+      v.value instanceof GreaterThanOrNull ||
+      v.value instanceof NotEqual
     ) {
       finalValue = v.value.value;
     } else if (v.value instanceof Includes) {

package/Server/Utils/Monitor/MonitorLogUtil.ts

@@ -1,4 +1,6 @@
 import MonitorLogService from "../../Services/MonitorLogService";
+import GlobalConfigService from "../../Services/GlobalConfigService";
+import GlobalConfig from "../../../Models/DatabaseModels/GlobalConfig";
 import logger from "../Logger";
 import OneUptimeDate from "../../../Types/Date";
 import ObjectID from "../../../Types/ObjectID";
@@ -6,6 +8,64 @@ import { JSONObject } from "../../../Types/JSON";
 import DataToProcess from "./DataToProcess";
 
 export default class MonitorLogUtil {
+  // Default retention in days if GlobalConfig is not set
+  private static readonly DEFAULT_RETENTION_DAYS: number = 1;
+
+  // Cached retention value to avoid querying GlobalConfig on every monitor check
+  private static cachedRetentionDays: number | null = null;
+  private static lastCacheRefresh: Date | null = null;
+  private static readonly CACHE_TTL_MS: number = 5 * 60 * 1000; // 5 minutes
+
+  private static async getRetentionDays(): Promise<number> {
+    const now: Date = OneUptimeDate.getCurrentDate();
+
+    // Return cached value if still fresh
+    if (
+      this.cachedRetentionDays !== null &&
+      this.lastCacheRefresh !== null &&
+      now.getTime() - this.lastCacheRefresh.getTime() < this.CACHE_TTL_MS
+    ) {
+      return this.cachedRetentionDays;
+    }
+
+    try {
+      const globalConfig: GlobalConfig | null =
+        await GlobalConfigService.findOneBy({
+          query: {
+            _id: ObjectID.getZeroObjectID().toString(),
+          },
+          props: {
+            isRoot: true,
+          },
+          select: {
+            monitorLogRetentionInDays: true,
+          },
+        });
+
+      if (
+        globalConfig &&
+        globalConfig.monitorLogRetentionInDays !== undefined &&
+        globalConfig.monitorLogRetentionInDays !== null &&
+        globalConfig.monitorLogRetentionInDays > 0
+      ) {
+        this.cachedRetentionDays = globalConfig.monitorLogRetentionInDays;
+      } else {
+        this.cachedRetentionDays = this.DEFAULT_RETENTION_DAYS;
+      }
+
+      this.lastCacheRefresh = now;
+    } catch (error) {
+      logger.error(
+        "Error fetching monitor log retention config, using default:",
+      );
+      logger.error(error);
+      this.cachedRetentionDays = this.DEFAULT_RETENTION_DAYS;
+      this.lastCacheRefresh = now;
+    }
+
+    return this.cachedRetentionDays;
+  }
+
   public static saveMonitorLog(data: {
     monitorId: ObjectID;
     projectId: ObjectID;
@@ -23,28 +83,37 @@ export default class MonitorLogUtil {
       return;
     }
 
-    const logIngestionDate: Date = OneUptimeDate.getCurrentDate();
-    const logTimestamp: string =
-      OneUptimeDate.toClickhouseDateTime(logIngestionDate);
-
-    const retentionDate: Date = OneUptimeDate.addRemoveDays(
-      logIngestionDate,
-      15,
-    );
-
-    const monitorLogRow: JSONObject = {
-      _id: ObjectID.generate().toString(),
-      createdAt: logTimestamp,
-      updatedAt: logTimestamp,
-      projectId: data.projectId.toString(),
-      monitorId: data.monitorId.toString(),
-      time: logTimestamp,
-      logBody: JSON.parse(JSON.stringify(data.dataToProcess)),
-      retentionDate: OneUptimeDate.toClickhouseDateTime(retentionDate),
-    };
-
-    MonitorLogService.insertJsonRows([monitorLogRow]).catch((err: Error) => {
-      logger.error(err);
-    });
+    // Fire-and-forget: fetch retention config then insert
+    this.getRetentionDays()
+      .then((retentionDays: number) => {
+        const logIngestionDate: Date = OneUptimeDate.getCurrentDate();
+        const logTimestamp: string =
+          OneUptimeDate.toClickhouseDateTime(logIngestionDate);
+
+        const retentionDate: Date = OneUptimeDate.addRemoveDays(
+          logIngestionDate,
+          retentionDays,
+        );
+
+        const monitorLogRow: JSONObject = {
+          _id: ObjectID.generate().toString(),
+          createdAt: logTimestamp,
+          updatedAt: logTimestamp,
+          projectId: data.projectId.toString(),
+          monitorId: data.monitorId.toString(),
+          time: logTimestamp,
+          logBody: JSON.parse(JSON.stringify(data.dataToProcess)),
+          retentionDate: OneUptimeDate.toClickhouseDateTime(retentionDate),
+        };
+
+        MonitorLogService.insertJsonRows([monitorLogRow]).catch(
+          (err: Error) => {
+            logger.error(err);
+          },
+        );
+      })
+      .catch((err: Error) => {
+        logger.error(err);
+      });
   }
 }

package/Server/Utils/Monitor/MonitorMetricUtil.ts

@@ -2,6 +2,8 @@ import logger from "../Logger";
 import CaptureSpan from "../Telemetry/CaptureSpan";
 import TelemetryUtil from "../Telemetry/Telemetry";
 import MetricService from "../../Services/MetricService";
+import GlobalConfigService from "../../Services/GlobalConfigService";
+import GlobalConfig from "../../../Models/DatabaseModels/GlobalConfig";
 import DataToProcess from "./DataToProcess";
 import {
   MetricPointType,
@@ -20,6 +22,63 @@ import ObjectID from "../../../Types/ObjectID";
 import OneUptimeDate from "../../../Types/Date";
 
 export default class MonitorMetricUtil {
+  // Default retention in days if GlobalConfig is not set
+  private static readonly DEFAULT_RETENTION_DAYS: number = 1;
+
+  // Cached retention value to avoid querying GlobalConfig on every monitor check
+  private static cachedRetentionDays: number | null = null;
+  private static lastCacheRefresh: Date | null = null;
+  private static readonly CACHE_TTL_MS: number = 5 * 60 * 1000; // 5 minutes
+
+  private static async getRetentionDays(): Promise<number> {
+    const now: Date = OneUptimeDate.getCurrentDate();
+
+    // Return cached value if still fresh
+    if (
+      this.cachedRetentionDays !== null &&
+      this.lastCacheRefresh !== null &&
+      now.getTime() - this.lastCacheRefresh.getTime() < this.CACHE_TTL_MS
+    ) {
+      return this.cachedRetentionDays;
+    }
+
+    try {
+      const globalConfig: GlobalConfig | null =
+        await GlobalConfigService.findOneBy({
+          query: {
+            _id: ObjectID.getZeroObjectID().toString(),
+          },
+          props: {
+            isRoot: true,
+          },
+          select: {
+            monitorMetricRetentionInDays: true,
+          },
+        });
+
+      if (
+        globalConfig &&
+        globalConfig.monitorMetricRetentionInDays !== undefined &&
+        globalConfig.monitorMetricRetentionInDays !== null &&
+        globalConfig.monitorMetricRetentionInDays > 0
+      ) {
+        this.cachedRetentionDays = globalConfig.monitorMetricRetentionInDays;
+      } else {
+        this.cachedRetentionDays = this.DEFAULT_RETENTION_DAYS;
+      }
+
+      this.lastCacheRefresh = now;
+    } catch (error) {
+      logger.error(
+        "Error fetching monitor metric retention config, using default:",
+      );
+      logger.error(error);
+      this.cachedRetentionDays = this.DEFAULT_RETENTION_DAYS;
+      this.lastCacheRefresh = now;
+    }
+
+    return this.cachedRetentionDays;
+  }
   private static buildMonitorMetricAttributes(data: {
     monitorId: ObjectID;
     projectId: ObjectID;
@@ -47,14 +106,14 @@ export default class MonitorMetricUtil {
     return attributes;
   }
 
-  private static buildMonitorMetricRow(data: {
+  private static async buildMonitorMetricRow(data: {
     projectId: ObjectID;
     monitorId: ObjectID;
     metricName: string;
     value: number | null | undefined;
     attributes: JSONObject;
     metricPointType?: MetricPointType;
-  }): JSONObject {
+  }): Promise<JSONObject> {
     const ingestionDate: Date = OneUptimeDate.getCurrentDate();
     const ingestionTimestamp: string =
       OneUptimeDate.toClickhouseDateTime(ingestionDate);
@@ -65,7 +124,11 @@ export default class MonitorMetricUtil {
     const attributeKeys: Array<string> =
       TelemetryUtil.getAttributeKeys(attributes);
 
-    const retentionDate: Date = OneUptimeDate.addRemoveDays(ingestionDate, 15);
+    const retentionDays: number = await this.getRetentionDays();
+    const retentionDate: Date = OneUptimeDate.addRemoveDays(
+      ingestionDate,
+      retentionDays,
+    );
 
     return {
       _id: ObjectID.generate().toString(),
@@ -149,7 +212,7 @@ export default class MonitorMetricUtil {
           probeName: data.probeName,
         });
 
-        const metricRow: JSONObject = this.buildMonitorMetricRow({
+        const metricRow: JSONObject = await this.buildMonitorMetricRow({
           projectId: data.projectId,
           monitorId: data.monitorId,
           metricName: MonitorMetricType.IsOnline,
@@ -186,7 +249,7 @@ export default class MonitorMetricUtil {
           probeName: data.probeName,
         });
 
-        const metricRow: JSONObject = this.buildMonitorMetricRow({
+        const metricRow: JSONObject = await this.buildMonitorMetricRow({
           projectId: data.projectId,
           monitorId: data.monitorId,
           metricName: MonitorMetricType.CPUUsagePercent,
@@ -214,7 +277,7 @@ export default class MonitorMetricUtil {
           probeName: data.probeName,
         });
 
-        const metricRow: JSONObject = this.buildMonitorMetricRow({
+        const metricRow: JSONObject = await this.buildMonitorMetricRow({
           projectId: data.projectId,
           monitorId: data.monitorId,
           metricName: MonitorMetricType.MemoryUsagePercent,
@@ -250,7 +313,7 @@ export default class MonitorMetricUtil {
             extraAttributes: extraAttributes,
           });
 
-          const metricRow: JSONObject = this.buildMonitorMetricRow({
+          const metricRow: JSONObject = await this.buildMonitorMetricRow({
             projectId: data.projectId,
             monitorId: data.monitorId,
             metricName: MonitorMetricType.DiskUsagePercent,
@@ -288,7 +351,7 @@ export default class MonitorMetricUtil {
         extraAttributes: extraAttributes,
       });
 
-      const metricRow: JSONObject = this.buildMonitorMetricRow({
+      const metricRow: JSONObject = await this.buildMonitorMetricRow({
         projectId: data.projectId,
         monitorId: data.monitorId,
         metricName: MonitorMetricType.ExecutionTime,
@@ -345,7 +408,7 @@ export default class MonitorMetricUtil {
           extraAttributes: extraAttributes,
         });
 
-        const metricRow: JSONObject = this.buildMonitorMetricRow({
+        const metricRow: JSONObject = await this.buildMonitorMetricRow({
           projectId: data.projectId,
           monitorId: data.monitorId,
           metricName: MonitorMetricType.ExecutionTime,
@@ -380,7 +443,7 @@ export default class MonitorMetricUtil {
         extraAttributes: extraAttributes,
       });
 
-      const metricRow: JSONObject = this.buildMonitorMetricRow({
+      const metricRow: JSONObject = await this.buildMonitorMetricRow({
         projectId: data.projectId,
         monitorId: data.monitorId,
         metricName: MonitorMetricType.ResponseTime,
@@ -415,7 +478,7 @@ export default class MonitorMetricUtil {
         extraAttributes: extraAttributes,
       });
 
-      const metricRow: JSONObject = this.buildMonitorMetricRow({
+      const metricRow: JSONObject = await this.buildMonitorMetricRow({
         projectId: data.projectId,
         monitorId: data.monitorId,
         metricName: MonitorMetricType.IsOnline,
@@ -449,7 +512,7 @@ export default class MonitorMetricUtil {
         extraAttributes: extraAttributes,
       });
 
-      const metricRow: JSONObject = this.buildMonitorMetricRow({
+      const metricRow: JSONObject = await this.buildMonitorMetricRow({
         projectId: data.projectId,
         monitorId: data.monitorId,
         metricName: MonitorMetricType.ResponseStatusCode,

package/UI/Components/LogsViewer/LogsViewer.tsx

@@ -465,31 +465,10 @@ const LogsViewer: FunctionComponent<ComponentProps> = (
     });
   }, [props.activeFilters, serviceMap]);
 
-  if (isPageLoading) {
-    return <PageLoader isVisible={true} />;
-  }
-
-  if (pageError) {
-    return <ErrorMessage message={pageError} />;
-  }
-
-  const toolbarProps: LogsViewerToolbarProps = {
-    resultCount: totalItems,
-    currentPage,
-    totalPages,
-    ...(props.liveOptions ? { liveOptions: props.liveOptions } : {}),
-    ...(props.timeRange && props.onTimeRangeChange
-      ? {
-          timeRange: props.timeRange,
-          onTimeRangeChange: props.onTimeRangeChange,
-        }
-      : {}),
-  };
-
-  const showSidebar: boolean =
-    props.showFacetSidebar !== false && Boolean(props.facetData);
-
-  // Replace serviceId UUIDs with human-readable names in value suggestions
+  /*
+   * Replace serviceId UUIDs with human-readable names in value suggestions
+   * Must be before early returns to maintain consistent hook call order.
+   */
   const resolvedValueSuggestions: Record<string, Array<string>> | undefined =
     useMemo(() => {
       if (!props.valueSuggestions) {
@@ -512,7 +491,10 @@ const LogsViewer: FunctionComponent<ComponentProps> = (
       return suggestions;
     }, [props.valueSuggestions, serviceMap]);
 
-  // Wrap onFieldValueSelect to resolve service names back to UUIDs
+  /*
+   * Wrap onFieldValueSelect to resolve service names back to UUIDs
+   * Must be before early returns to maintain consistent hook call order.
+   */
   const handleFieldValueSelectWithServiceResolve:
     | ((fieldKey: string, value: string) => void)
     | undefined = useMemo(() => {
@@ -537,6 +519,30 @@ const LogsViewer: FunctionComponent<ComponentProps> = (
     };
   }, [props.onFieldValueSelect, serviceMap]);
 
+  if (isPageLoading) {
+    return <PageLoader isVisible={true} />;
+  }
+
+  if (pageError) {
+    return <ErrorMessage message={pageError} />;
+  }
+
+  const toolbarProps: LogsViewerToolbarProps = {
+    resultCount: totalItems,
+    currentPage,
+    totalPages,
+    ...(props.liveOptions ? { liveOptions: props.liveOptions } : {}),
+    ...(props.timeRange && props.onTimeRangeChange
+      ? {
+          timeRange: props.timeRange,
+          onTimeRangeChange: props.onTimeRangeChange,
+        }
+      : {}),
+  };
+
+  const showSidebar: boolean =
+    props.showFacetSidebar !== false && Boolean(props.facetData);
+
   return (
     <div className="space-y-2">
       {props.showFilters && (

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

@@ -1,4 +1,9 @@
-import React, { FunctionComponent, ReactElement, useState } from "react";
+import React, {
+  FunctionComponent,
+  ReactElement,
+  useState,
+  useMemo,
+} from "react";
 import { FacetValue } from "../types";
 import FacetValueRow from "./FacetValueRow";
 import Icon from "../../Icon/Icon";
@@ -17,21 +22,40 @@ export interface FacetSectionProps {
 }
 
 const DEFAULT_VISIBLE_COUNT: number = 5;
+const SEARCH_THRESHOLD: number = 6;
 
 const FacetSection: FunctionComponent<FacetSectionProps> = (
   props: FacetSectionProps,
 ): ReactElement => {
   const [isExpanded, setIsExpanded] = useState<boolean>(true);
   const [showAll, setShowAll] = useState<boolean>(false);
+  const [searchText, setSearchText] = useState<string>("");
+
+  const showSearch: boolean = props.values.length >= SEARCH_THRESHOLD;
+
+  const filteredValues: Array<FacetValue> = useMemo(() => {
+    if (!searchText.trim()) {
+      return props.values;
+    }
+    const query: string = searchText.toLowerCase().trim();
+    return props.values.filter((facet: FacetValue) => {
+      const displayName: string =
+        props.valueDisplayMap?.[facet.value] ?? facet.value;
+      return displayName.toLowerCase().includes(query);
+    });
+  }, [props.values, props.valueDisplayMap, searchText]);
 
   const visibleCount: number =
     props.initialVisibleCount ?? DEFAULT_VISIBLE_COUNT;
 
-  const displayedValues: Array<FacetValue> = showAll
-    ? props.values
-    : props.values.slice(0, visibleCount);
+  const displayedValues: Array<FacetValue> = searchText.trim()
+    ? filteredValues
+    : showAll
+      ? filteredValues
+      : filteredValues.slice(0, visibleCount);
 
-  const hasMore: boolean = props.values.length > visibleCount;
+  const hasMore: boolean =
+    !searchText.trim() && filteredValues.length > visibleCount;
 
   const maxCount: number =
     props.values.length > 0
@@ -71,6 +95,20 @@ const FacetSection: FunctionComponent<FacetSectionProps> = (
 
       {isExpanded && (
         <div className="mt-1 px-1">
+          {showSearch && (
+            <div className="mb-1 px-1">
+              <input
+                type="text"
+                placeholder={`Search ${props.title.toLowerCase()}...`}
+                value={searchText}
+                onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
+                  setSearchText(e.target.value);
+                }}
+                className="w-full rounded border border-gray-200 bg-gray-50 px-2 py-1 text-[11px] text-gray-700 placeholder-gray-400 outline-none focus:border-indigo-300 focus:bg-white focus:ring-1 focus:ring-indigo-200"
+              />
+            </div>
+          )}
+
           {displayedValues.map((facet: FacetValue) => {
             return (
               <FacetValueRow
@@ -91,9 +129,9 @@ const FacetSection: FunctionComponent<FacetSectionProps> = (
             );
           })}
 
-          {props.values.length === 0 && (
+          {displayedValues.length === 0 && (
             <p className="px-1 py-2 text-[11px] text-gray-400">
-              No values found
+              {searchText.trim() ? "No matches found" : "No values found"}
             </p>
           )}
 

package/build/dist/Models/DatabaseModels/GlobalConfig.js

@@ -65,6 +65,7 @@ let GlobalConfig = class GlobalConfig extends GlobalConfigModel {
         this.enterpriseLicenseExpiresAt = undefined;
         this.enterpriseLicenseToken = undefined;
         this.monitorLogRetentionInDays = undefined;
+        this.monitorMetricRetentionInDays = undefined;
     }
 };
 __decorate([
@@ -654,6 +655,24 @@ __decorate([
     }),
     __metadata("design:type", Number)
 ], GlobalConfig.prototype, "monitorLogRetentionInDays", void 0);
+__decorate([
+    ColumnAccessControl({
+        create: [],
+        read: [],
+        update: [],
+    }),
+    TableColumn({
+        type: TableColumnType.Number,
+        title: "Monitor Metric Retention Days",
+        description: "Number of days to retain monitor metrics. Monitor metrics older than this will be automatically deleted. Default is 1 day.",
+    }),
+    Column({
+        type: ColumnType.Number,
+        nullable: true,
+        unique: true,
+    }),
+    __metadata("design:type", Number)
+], GlobalConfig.prototype, "monitorMetricRetentionInDays", void 0);
 GlobalConfig = __decorate([
     TableMetadata({
         tableName: "GlobalConfig",