@oneuptime/common 14.0.5 → 14.0.7

package/Server/Services/WorkspaceNotificationSummaryService.ts

@@ -18,6 +18,8 @@ import IncidentStateTimeline from "../../Models/DatabaseModels/IncidentStateTime
 import AlertStateTimeline from "../../Models/DatabaseModels/AlertStateTimeline";
 import Label from "../../Models/DatabaseModels/Label";
 import Monitor from "../../Models/DatabaseModels/Monitor";
+import LinkedAffectedResources from "../Utils/AffectedResources/LinkedAffectedResources";
+import { escapeMarkdownInline } from "../../Utils/Markdown/MarkdownEscape";
 import WorkspaceNotificationLogService from "./WorkspaceNotificationLogService";
 import WorkspaceNotificationStatus from "../../Types/Workspace/WorkspaceNotificationStatus";
 import WorkspaceNotificationActionType from "../../Types/Workspace/WorkspaceNotificationActionType";
@@ -212,6 +214,18 @@ export class Service extends DatabaseService<WorkspaceNotificationSummary> {
     return `[${text}](${url})`;
   }
 
+  /*
+   * Resource names are escaped: a host or cluster name can come from an
+   * agent rather than from someone typing it, and this text is markdown.
+   */
+  private static joinNames(names: Array<string>): string {
+    return names
+      .map((name: string): string => {
+        return escapeMarkdownInline(name);
+      })
+      .join(", ");
+  }
+
   private static formatDuration(totalMinutes: number): string {
     if (totalMinutes < 1) {
       return "< 1m";
@@ -761,20 +775,20 @@ export class Service extends DatabaseService<WorkspaceNotificationSummary> {
     if (
       Service.has(items, WorkspaceNotificationSummaryItem.ResourcesAffected)
     ) {
-      const names: Set<string> = new Set();
-      for (const inc of incidents) {
-        if (inc.monitors) {
-          for (const m of inc.monitors) {
-            if (m.name) {
-              names.add(m.name);
-            }
-          }
-        }
-      }
-      if (names.size > 0) {
+      // Every resource the period's incidents are linked to, not only monitors.
+      const names: Array<string> = LinkedAffectedResources.getNames({
+        resources: await LinkedAffectedResources.readForIncidents({
+          service: IncidentService,
+          projectId,
+          incidentIds: incidents.map((inc: Incident): ObjectID => {
+            return inc.id!;
+          }),
+        }),
+      });
+      if (names.length > 0) {
         blocks.push(
           Service.md(
-            `${Service.bold(`Resources Affected (${names.size}):`)}  ${Array.from(names).join(", ")}`,
+            `${Service.bold(`Resources Affected (${names.length}):`)}  ${Service.joinNames(names)}`,
           ),
         );
       }
@@ -1203,16 +1217,20 @@ export class Service extends DatabaseService<WorkspaceNotificationSummary> {
     if (
       Service.has(items, WorkspaceNotificationSummaryItem.ResourcesAffected)
     ) {
-      const names: Set<string> = new Set();
-      for (const a of alerts) {
-        if (a.monitor?.name) {
-          names.add(a.monitor.name);
-        }
-      }
-      if (names.size > 0) {
+      // Every resource the period's alerts are linked to, not only monitors.
+      const names: Array<string> = LinkedAffectedResources.getNames({
+        resources: await LinkedAffectedResources.readForAlerts({
+          service: AlertService,
+          projectId,
+          alertIds: alerts.map((a: Alert): ObjectID => {
+            return a.id!;
+          }),
+        }),
+      });
+      if (names.length > 0) {
         blocks.push(
           Service.md(
-            `${Service.bold(`Resources Affected (${names.size}):`)}  ${Array.from(names).join(", ")}`,
+            `${Service.bold(`Resources Affected (${names.length}):`)}  ${Service.joinNames(names)}`,
           ),
         );
       }

package/Server/Types/Database/QueryHelper.ts

@@ -9,7 +9,10 @@ import { FindOperator, Raw } from "typeorm";
 import { FindWhereProperty } from "../../../Types/BaseDatabase/Query";
 import { toLikePattern } from "../../../Types/BaseDatabase/WildcardPattern";
 import CaptureSpan from "../../Utils/Telemetry/CaptureSpan";
-import buildJSONColumnQuery, { JSONColumnQuery } from "./JSONColumnQuery";
+import buildJSONColumnQuery, {
+  JSONColumnQuery,
+  escapeLikePattern,
+} from "./JSONColumnQuery";
 
 export type { FindOperator };
 
@@ -229,6 +232,56 @@ export default class QueryHelper {
     );
   }
 
+  /*
+   * Every word has to appear somewhere in the column, in any order.
+   *
+   * `search` is one substring, so "michigan 104822" misses a row called
+   * "Unit 104822 - Michigan Ave" even though both words are in it. Here each
+   * word gets its own ILIKE, AND-joined, which is how people recall a name
+   * they half remember.
+   *
+   * A word is matched literally: a `%` or `_` somebody typed is escaped
+   * rather than read as a wildcard.
+   *
+   * No words matches NOTHING. An AND over zero predicates is vacuously true,
+   * and "every row in the table" is never what an empty search box meant.
+   */
+  @CaptureSpan()
+  public static searchAllWords(words: Array<string>): FindWhereProperty<any> {
+    const rids: Array<string> = [];
+    const valuesObj: Dictionary<string> = {};
+
+    for (const word of words) {
+      const trimmed: string = (word || "").trim();
+      if (!trimmed) {
+        continue;
+      }
+      const rid: string = Text.generateRandomText(10);
+      rids.push(rid);
+      valuesObj[rid] = `%${escapeLikePattern(trimmed)}%`;
+    }
+
+    if (rids.length === 0) {
+      return Raw(() => {
+        return `TRUE = FALSE`; // this will always return false
+      }, {});
+    }
+
+    return Raw(
+      (alias: string) => {
+        const conditions: string = rids
+          .map((rid: string) => {
+            return `CAST(${alias} AS TEXT) ILIKE :${rid}`;
+          })
+          .join(" AND ");
+        return `(${conditions})`;
+      },
+      {
+        ...valuesObj,
+      },
+    );
+  }
+
   /**
    * Searches the provided entity property names with a single OR-joined ILIKE.
    *

package/Server/Utils/AI/Toolbox/MetricTools.ts

@@ -49,7 +49,7 @@ const METRIC_READ_PERMISSIONS: Array<Permission> = [
 export const QueryMetricsTool: ObservabilityTool = {
   name: "query_metrics",
   description:
-    "Aggregate a metric over time: Avg, Max, Min, Sum, Count or P50/P90/P95/P99 percentiles (histogram-aware). Requires the exact metric name — discover names via lookup_context. Monitor metrics use reserved names like oneuptime.monitor.response.time with the monitor's ID as entityId.",
+    "Aggregate a metric over time: Avg, Max, Min, Sum, Count or P50/P75/P90/P95/P99 percentiles (histogram-aware). Requires the exact metric name — discover names via lookup_context. Monitor metrics use reserved names like oneuptime.monitor.response.time with the monitor's ID as entityId.",
   inputSchema: {
     type: "object",
     properties: {
@@ -60,7 +60,18 @@ export const QueryMetricsTool: ObservabilityTool = {
       },
       aggregationType: {
         type: "string",
-        enum: ["Avg", "Max", "Min", "Sum", "Count", "P50", "P90", "P95", "P99"],
+        enum: [
+          "Avg",
+          "Max",
+          "Min",
+          "Sum",
+          "Count",
+          "P50",
+          "P75",
+          "P90",
+          "P95",
+          "P99",
+        ],
         description: "How to aggregate (default Avg).",
       },
       entityId: {

package/Server/Utils/AI/Toolbox/ResourceTools.ts

@@ -673,7 +673,18 @@ export const QueryResourceTelemetryTool: ObservabilityTool = {
       },
       aggregationType: {
         type: "string",
-        enum: ["Avg", "Min", "Max", "Sum", "Count", "P50", "P90", "P95", "P99"],
+        enum: [
+          "Avg",
+          "Min",
+          "Max",
+          "Sum",
+          "Count",
+          "P50",
+          "P75",
+          "P90",
+          "P95",
+          "P99",
+        ],
         description:
           "Metric aggregation (defaultAvg); counter sums are exported values, not derived rates.",
       },