@oneuptime/common 12.0.33 → 12.0.34

package/Types/Monitor/DockerSwarmAlertTemplates.ts

@@ -2,8 +2,11 @@ import ObjectID from "../ObjectID";
 import MonitorStep from "./MonitorStep";
 import MonitorCriteria from "./MonitorCriteria";
 import MonitorCriteriaInstance from "./MonitorCriteriaInstance";
-import FilterCondition from "../Filter/FilterCondition";
-import { CheckOn, FilterType, EvaluateOverTimeType } from "./CriteriaFilter";
+import {
+  buildHealthyCriteriaInstance,
+  buildUnhealthyCriteriaInstance,
+} from "./Recommendation/RecommendationCriteriaBuilder";
+import { FilterType, EvaluateOverTimeType } from "./CriteriaFilter";
 import MonitorStepDockerSwarmMonitor from "./MonitorStepDockerSwarmMonitor";
 import RollingTime from "../RollingTime/RollingTime";
 import MetricsAggregationType from "../Metrics/MetricsAggregationType";
@@ -34,15 +37,20 @@ export interface DockerSwarmAlertTemplate {
 }
 
 /*
- * Filter contract: the docker_stats receiver keeps container identity in
- * datapoint labels (stored unprefixed in ClickHouse): `container.name`
- * (a Swarm task's container is `<service>.<slot>.<taskid>`) and
- * `container.image.name`. The whole batch is scoped by the
+ * Filter contract: the docker_stats receiver emits one ResourceMetrics per
+ * container and carries container identity as OTLP RESOURCE attributes, so
+ * ClickHouse stores them `resource.`-prefixed:
+ * `resource.container.name` (a Swarm task's container is
+ * `<service>.<slot>.<taskid>`) and `resource.container.image.name`. That is
+ * the spelling the ingest side reads back for these very series
+ * (OtelMetricsIngestService.bufferDockerSwarmTaskMetric), the spelling the
+ * cluster Insights page groups by, and the spelling Docker/Podman use for
+ * the same metric family. The whole batch is additionally scoped by the
  * `docker.swarm.cluster.name` RESOURCE attribute the agent stamps (the
  * worker adds `resource.docker.swarm.cluster.name` from the step's
- * clusterIdentifier). Templates group by `container.name` so one incident
- * fires per task. There is NO `container.runtime` filter — the Docker
- * Swarm agent does not stamp it.
+ * clusterIdentifier). Templates group by `resource.container.name` so one
+ * incident fires per task. There is NO `container.runtime` filter — the
+ * Docker Swarm agent does not stamp it.
  */
 
 export function buildDockerSwarmMonitorStep(args: {
@@ -104,59 +112,12 @@ export function buildDockerSwarmOfflineCriteriaInstance(args: {
   incidentDescription?: string;
   criteriaName?: string;
   criteriaDescription?: string;
+  metricAggregationType?: EvaluateOverTimeType | undefined;
 }): MonitorCriteriaInstance {
-  const instance: MonitorCriteriaInstance = new MonitorCriteriaInstance();
-
-  const incidentTitle: string =
-    args.incidentTitle || `${args.monitorName} - Alert Triggered`;
-  const incidentDescription: string =
-    args.incidentDescription ||
-    `${args.monitorName} has triggered an alert condition. See root cause for detailed Docker Swarm cluster information.`;
-
-  instance.data = {
-    id: ObjectID.generate().toString(),
-    monitorStatusId: args.offlineMonitorStatusId,
-    filterCondition: FilterCondition.Any,
-    filters: [
-      {
-        checkOn: CheckOn.MetricValue,
-        filterType: args.filterType,
-        metricMonitorOptions: {
-          metricAggregationType: EvaluateOverTimeType.AnyValue,
-          metricAlias: args.metricAlias,
-        },
-        value: args.value,
-      },
-    ],
-    incidents: [
-      {
-        title: incidentTitle,
-        description: incidentDescription,
-        incidentSeverityId: args.incidentSeverityId,
-        autoResolveIncident: true,
-        id: ObjectID.generate().toString(),
-        onCallPolicyIds: [],
-      },
-    ],
-    alerts: [
-      {
-        title: incidentTitle,
-        description: incidentDescription,
-        alertSeverityId: args.alertSeverityId,
-        autoResolveAlert: true,
-        id: ObjectID.generate().toString(),
-        onCallPolicyIds: [],
-      },
-    ],
-    changeMonitorStatus: true,
-    createIncidents: true,
-    createAlerts: true,
-    name: args.criteriaName || `${args.monitorName} - Unhealthy`,
-    description:
-      args.criteriaDescription || `Criteria for detecting unhealthy state.`,
-  };
-
-  return instance;
+  return buildUnhealthyCriteriaInstance({
+    ...args,
+    resourceNoun: "Swarm task",
+  });
 }
 
 export function buildDockerSwarmOnlineCriteriaInstance(args: {
@@ -164,34 +125,12 @@ export function buildDockerSwarmOnlineCriteriaInstance(args: {
   metricAlias: string;
   filterType: FilterType;
   value: number;
+  recoveryValue?: number | undefined;
+  marginFraction?: number | undefined;
+  isBinaryMetric?: boolean | undefined;
+  metricAggregationType?: EvaluateOverTimeType | undefined;
 }): MonitorCriteriaInstance {
-  const instance: MonitorCriteriaInstance = new MonitorCriteriaInstance();
-
-  instance.data = {
-    id: ObjectID.generate().toString(),
-    monitorStatusId: args.onlineMonitorStatusId,
-    filterCondition: FilterCondition.Any,
-    filters: [
-      {
-        checkOn: CheckOn.MetricValue,
-        filterType: args.filterType,
-        metricMonitorOptions: {
-          metricAggregationType: EvaluateOverTimeType.AnyValue,
-          metricAlias: args.metricAlias,
-        },
-        value: args.value,
-      },
-    ],
-    incidents: [],
-    alerts: [],
-    changeMonitorStatus: true,
-    createIncidents: false,
-    createAlerts: false,
-    name: "Healthy",
-    description: "Criteria for healthy state.",
-  };
-
-  return instance;
+  return buildHealthyCriteriaInstance(args);
 }
 
 export function buildDockerSwarmMonitorConfig(args: {
@@ -238,7 +177,7 @@ export function buildDockerSwarmMonitorConfig(args: {
 // --- Template Definitions ---
 
 /*
- * Every template groups by `container.name` so each Swarm task is
+ * Every template groups by `resource.container.name` so each Swarm task is
  * evaluated independently — one incident per task container. The worker
  * always adds the cluster scope (`resource.docker.swarm.cluster.name`)
  * from the step's clusterIdentifier; no container.runtime filter.
@@ -248,7 +187,7 @@ const highCpuTemplate: DockerSwarmAlertTemplate = {
   id: "docker-swarm-high-cpu",
   name: "High Task CPU Usage",
   description:
-    "Alert when any Swarm task's container CPU utilization exceeds 80% (container.cpu.utilization). One incident per task.",
+    "Alert when any Swarm task's container uses more than 80% of one CPU core (container.cpu.utilization, where 100% = one full core). One incident per task.",
   category: "Resource",
   severity: "Warning",
   getMonitorStep: (args: DockerSwarmAlertTemplateArgs): MonitorStep => {
@@ -264,9 +203,17 @@ const highCpuTemplate: DockerSwarmAlertTemplate = {
          * Avg per task — container.cpu.utilization is already a
          * percentage per container, so the per-minute average is the
          * sustained utilization regardless of scrape count.
+         *
+         * The scale is CORES, not the task's allocation: docker_stats
+         * computes (cpuDelta / systemDelta) * onlineCPUs * 100, so 100%
+         * is one full core and an 8-core node's ceiling is 800%. There
+         * is no per-container CPU limit series in DockerSwarmMetricCatalog
+         * to divide by, and buildDockerSwarmMonitorConfig ships no
+         * formulaConfigs, so a percent-of-limit ratio is not expressible
+         * here — the wording below must say cores, not limits.
          */
         aggregationType: MetricsAggregationType.Avg,
-        groupByAttributeKey: "container.name",
+        groupByAttributeKey: "resource.container.name",
       }),
       offlineCriteriaInstance: buildDockerSwarmOfflineCriteriaInstance({
         offlineMonitorStatusId: args.offlineMonitorStatusId,
@@ -277,10 +224,10 @@ const highCpuTemplate: DockerSwarmAlertTemplate = {
         filterType: FilterType.GreaterThan,
         value: 80,
         incidentTitle: `[Docker Swarm] High Task CPU Usage (>80%) - ${args.monitorName}`,
-        incidentDescription: `A Docker Swarm task's container CPU utilization has exceeded 80%. Sustained high CPU degrades the service and can trigger Swarm to reschedule the task. Check the root cause for the affected task container, then consider scaling the service or raising its CPU reservation/limit.`,
-        criteriaName: "High Task CPU - Utilization > 80%",
+        incidentDescription: `A Docker Swarm task's container is using more than 80% of one CPU core. container.cpu.utilization is measured against a CPU core, not against the service's CPU reservation — 100% is one full core, so a task granted two cores can reach 200% without exceeding its allocation. Sustained high CPU degrades the service and can trigger Swarm to reschedule the task. Check the root cause for the affected task container, then scale the service out. This monitor applies a single threshold to every task in the cluster, so a service deliberately sized above one core will sit above 100% normally — give those services their own monitor at a threshold matching the cores granted, rather than raising this one.`,
+        criteriaName: "High Task CPU - Utilization > 80% of a core",
         criteriaDescription:
-          "Triggers when any task's average CPU utilization exceeds 80% over the monitoring window.",
+          "Triggers when any task's average CPU utilization exceeds 80% of one CPU core over the monitoring window (100% = one full core).",
       }),
       onlineCriteriaInstance: buildDockerSwarmOnlineCriteriaInstance({
         onlineMonitorStatusId: args.onlineMonitorStatusId,
@@ -296,7 +243,7 @@ const highMemoryTemplate: DockerSwarmAlertTemplate = {
   id: "docker-swarm-high-memory",
   name: "High Task Memory Usage",
   description:
-    "Alert when any Swarm task's container memory usage exceeds 85% of its limit (container.memory.percent). One incident per task.",
+    "Alert when any Swarm task's container memory usage exceeds 85% of its memory limit — or of the node's total memory when the service sets no limit (container.memory.percent). One incident per task.",
   category: "Resource",
   severity: "Warning",
   getMonitorStep: (args: DockerSwarmAlertTemplateArgs): MonitorStep => {
@@ -310,10 +257,16 @@ const highMemoryTemplate: DockerSwarmAlertTemplate = {
         rollingTime: RollingTime.Past5Minutes,
         /*
          * Avg per task — container.memory.percent is already a true
-         * percentage per container.
+         * percentage per container. Its DENOMINATOR is conditional: the
+         * container's memory limit when the service sets one, and the
+         * node's total memory when it does not (docker_stats mirrors
+         * `docker stats` MEM%, and the Docker API's MemoryStats.Limit
+         * reports host memory for an unlimited container). See
+         * DockerSwarmMetricCatalog: "as a percentage of its limit or the
+         * host total". The wording below must not promise a limit.
          */
         aggregationType: MetricsAggregationType.Avg,
-        groupByAttributeKey: "container.name",
+        groupByAttributeKey: "resource.container.name",
       }),
       offlineCriteriaInstance: buildDockerSwarmOfflineCriteriaInstance({
         offlineMonitorStatusId: args.offlineMonitorStatusId,
@@ -324,10 +277,10 @@ const highMemoryTemplate: DockerSwarmAlertTemplate = {
         filterType: FilterType.GreaterThan,
         value: 85,
         incidentTitle: `[Docker Swarm] High Task Memory Usage (>85%) - ${args.monitorName}`,
-        incidentDescription: `A Docker Swarm task's container is using more than 85% of its memory limit. Memory pressure on a task can trigger an OOM kill, which Swarm sees as a task failure and reschedules. Check the root cause for the affected task container, then raise the service's memory limit or investigate the workload.`,
+        incidentDescription: `A Docker Swarm task's container is using more than 85% of its memory limit — or, when the service sets no --limit-memory, more than 85% of the node's total memory, because container.memory.percent divides by the host total for an unlimited container. Either way the container is close to an OOM kill, which Swarm sees as a task failure and reschedules. Check the root cause for the affected task container. If the service sets a memory limit, raise it or investigate the workload; if it sets none, this is 85% of a whole node and threatens every other task scheduled there — set a limit, then move or scale the service.`,
         criteriaName: "High Task Memory - Usage > 85%",
         criteriaDescription:
-          "Triggers when any task's memory usage exceeds 85% of its limit over the monitoring window.",
+          "Triggers when any task's memory usage exceeds 85% of its memory limit — or of the node's total memory for services that set no limit — over the monitoring window.",
       }),
       onlineCriteriaInstance: buildDockerSwarmOnlineCriteriaInstance({
         onlineMonitorStatusId: args.onlineMonitorStatusId,
@@ -357,7 +310,7 @@ const highProcessCountTemplate: DockerSwarmAlertTemplate = {
         rollingTime: RollingTime.Past5Minutes,
         // Max per task — any scrape over the threshold trips it.
         aggregationType: MetricsAggregationType.Max,
-        groupByAttributeKey: "container.name",
+        groupByAttributeKey: "resource.container.name",
       }),
       offlineCriteriaInstance: buildDockerSwarmOfflineCriteriaInstance({
         offlineMonitorStatusId: args.offlineMonitorStatusId,
@@ -387,7 +340,7 @@ const taskDownTemplate: DockerSwarmAlertTemplate = {
   id: "docker-swarm-task-down",
   name: "Task Down (Low Uptime)",
   description:
-    "Alert when any Swarm task's container uptime drops to zero, indicating the task has been rescheduled, restarted, or crashed (container.uptime = 0). One incident per task.",
+    "Alert when any Swarm task's container has been running for less than 60 seconds, indicating the task was just rescheduled, restarted, or crashed and replaced (container.uptime < 60s). One incident per task.",
   category: "Availability",
   severity: "Critical",
   getMonitorStep: (args: DockerSwarmAlertTemplateArgs): MonitorStep => {
@@ -400,12 +353,21 @@ const taskDownTemplate: DockerSwarmAlertTemplate = {
         metricAlias,
         rollingTime: RollingTime.Past1Minute,
         /*
-         * Min per task — a single zero-uptime scrape (a fresh restart)
-         * trips the threshold instead of being masked by scrapes where
-         * the task had been running for a while.
+         * Min per task — the LOWEST uptime in the bucket, so a task that
+         * (re)started inside it is caught by its youngest scrape rather
+         * than masked by a later one.
+         *
+         * The comparison below is a DURATION, not an equality with zero.
+         * `container.uptime` is a float-seconds gauge scraped every 30s
+         * (DockerSwarmAgent/otel-collector-config.yaml), so it is never
+         * exactly 0 at a scrape; and docker_stats lists only running
+         * containers, so a dead task's series simply stops instead of
+         * reporting zero. Swarm also replaces a failed task with a new
+         * task id — hence a new container name and a new series — so
+         * "uptime went back to 0" never happens within one series either.
          */
         aggregationType: MetricsAggregationType.Min,
-        groupByAttributeKey: "container.name",
+        groupByAttributeKey: "resource.container.name",
       }),
       offlineCriteriaInstance: buildDockerSwarmOfflineCriteriaInstance({
         offlineMonitorStatusId: args.offlineMonitorStatusId,
@@ -413,19 +375,40 @@ const taskDownTemplate: DockerSwarmAlertTemplate = {
         alertSeverityId: args.defaultAlertSeverityId,
         monitorName: args.monitorName,
         metricAlias,
-        filterType: FilterType.EqualTo,
-        value: 0,
+        filterType: FilterType.LessThan,
+        value: 60,
+        /*
+         * A restart is an EVENT, not a level, so this is one of the few
+         * templates that overrides the builder's sustained (AllValues)
+         * default — see UnhealthyCriteriaArgs.metricAggregationType.
+         *
+         * Samples are bucketed per MINUTE before the criteria sees them
+         * (aggregatePerSeriesFromRawMetrics), so a Past1Minute window is
+         * one or two buckets. Under AllValues EVERY bucket would have to
+         * read under 60s, which stops being true the moment the window
+         * straddles uptime crossing 60 — leaving a firing window as
+         * narrow as the ~1 minute evaluation cadence, and narrower still
+         * once ingestion lag is counted, so a real restart can be missed
+         * outright. AnyValue asks the question actually intended: did any
+         * scrape in the last minute see this container under a minute old.
+         *
+         * It cannot flap. Uptime only increases within a series, and a
+         * replacement task gets a new container name and therefore a new
+         * series, so the condition is crossed once and never re-entered.
+         * Recovery stays sustained (every bucket >= 66s).
+         */
+        metricAggregationType: EvaluateOverTimeType.AnyValue,
         incidentTitle: `[Docker Swarm] Task Down - ${args.monitorName}`,
-        incidentDescription: `A Docker Swarm task's container uptime has dropped to zero — the task was rescheduled, restarted, or crashed. Repeated restarts mean the service is flapping. Check the root cause for the affected task container, then inspect the task's logs and the service's update/restart policy.`,
-        criteriaName: "Task Down - Uptime = 0",
+        incidentDescription: `A Docker Swarm task's container has been running for under a minute — the task was rescheduled, restarted, or crashed and replaced. Swarm gives every replacement task a new container name, so a service that keeps firing this is flapping. Check the root cause for the affected task container, then inspect the task's logs and the service's update/restart policy. A planned deploy or scale-up trips this too, and clears itself once the new tasks pass a minute of uptime.`,
+        criteriaName: "Task Down - Uptime < 60s",
         criteriaDescription:
-          "Triggers when any task's container uptime drops to zero.",
+          "Triggers when any scrape in the window sees a task's container uptime below 60 seconds — the task (re)started within the last minute. A duration rather than an equality with zero: the gauge is scraped every 30s and is never exactly zero.",
       }),
       onlineCriteriaInstance: buildDockerSwarmOnlineCriteriaInstance({
         onlineMonitorStatusId: args.onlineMonitorStatusId,
         metricAlias,
-        filterType: FilterType.GreaterThan,
-        value: 0,
+        filterType: FilterType.GreaterThanOrEqualTo,
+        value: 60,
       }),
     });
   },