@oneuptime/common 14.0.0 → 14.0.1

package/Server/Services/ServiceLevelObjectiveLabelRuleEngineService.ts

@@ -0,0 +1,385 @@
+import Label from "../../Models/DatabaseModels/Label";
+import ServiceLevelObjective from "../../Models/DatabaseModels/ServiceLevelObjective";
+import { ServiceLevelObjectiveFeedEventType } from "../../Models/DatabaseModels/ServiceLevelObjectiveFeed";
+import ServiceLevelObjectiveLabelRule from "../../Models/DatabaseModels/ServiceLevelObjectiveLabelRule";
+import { Purple500 } from "../../Types/BrandColors";
+import ObjectID from "../../Types/ObjectID";
+import { escapeMarkdownInline } from "../../Utils/Markdown/MarkdownEscape";
+import { MAX_RULES_EVALUATED_PER_PROJECT } from "../../Utils/Rules/RuleEngineLimits";
+import { RuleCriteriaMatcher } from "../../Utils/Rules/RuleCriteriaMatcher";
+import RulePatternMatchUtil from "../../Utils/Rules/RulePatternMatchUtil";
+import Select from "../Types/Database/Select";
+import logger, { LogAttributes } from "../Utils/Logger";
+import logIfRuleReadWasTruncated from "../Utils/Rules/RuleEngineRuleRead";
+import {
+  ApplyRulesToExistingResourceData,
+  RuleApplicationResult,
+  RuleApplicationResultUtil,
+  RuleRunEngine,
+} from "../Utils/Rules/RuleRun/RuleApplication";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
+import ServiceLevelObjectiveFeedService from "./ServiceLevelObjectiveFeedService";
+import ServiceLevelObjectiveLabelRuleService from "./ServiceLevelObjectiveLabelRuleService";
+import ServiceLevelObjectiveService from "./ServiceLevelObjectiveService";
+
+class ServiceLevelObjectiveLabelRuleEngineServiceClass
+  implements
+    RuleRunEngine<ServiceLevelObjective, ServiceLevelObjectiveLabelRule>
+{
+  public readonly ruleSelect: Select<ServiceLevelObjectiveLabelRule> = {
+    _id: true,
+    name: true,
+    criteria: true,
+    serviceLevelObjectiveLabels: { _id: true },
+    serviceLevelObjectiveNamePattern: true,
+    serviceLevelObjectiveDescriptionPattern: true,
+    labelsToAdd: { _id: true },
+  };
+
+  // Evaluation re-reads the SLO, so a run only has to name it.
+  public readonly resourceSelectForRuleRun: Select<ServiceLevelObjective> = {
+    _id: true,
+    projectId: true,
+  };
+
+  /**
+   * Evaluates ServiceLevelObjectiveLabelRule rows for the given SLO and
+   * attaches matched labels to it. The union is deduped against labels already
+   * on the SLO before insert to avoid PK conflicts on the join table.
+   */
+  @CaptureSpan()
+  public async applyRulesToServiceLevelObjective(
+    serviceLevelObjective: ServiceLevelObjective,
+  ): Promise<void> {
+    if (!serviceLevelObjective.id || !serviceLevelObjective.projectId) {
+      return;
+    }
+
+    try {
+      const rules: Array<ServiceLevelObjectiveLabelRule> =
+        await ServiceLevelObjectiveLabelRuleService.findBy({
+          query: {
+            projectId: serviceLevelObjective.projectId,
+            isEnabled: true,
+          },
+          props: { isRoot: true },
+          select: this.ruleSelect,
+          limit: MAX_RULES_EVALUATED_PER_PROJECT,
+          skip: 0,
+        });
+
+      logIfRuleReadWasTruncated({
+        ruleKind: "ServiceLevelObjectiveLabelRule",
+        projectId: serviceLevelObjective.projectId,
+        rulesRead: rules.length,
+      });
+
+      if (rules.length === 0) {
+        return;
+      }
+
+      await this.applyRules({
+        serviceLevelObjective: serviceLevelObjective,
+        rules: rules,
+      });
+    } catch (error) {
+      logger.error(`Error applying SLO label rules: ${error}`, {
+        projectId: serviceLevelObjective.projectId?.toString(),
+        serviceLevelObjectiveId: serviceLevelObjective.id?.toString(),
+      } as LogAttributes);
+    }
+  }
+
+  /*
+   * "Run now": the same evaluation, for an SLO that already exists and only
+   * the rules being run.
+   */
+  @CaptureSpan()
+  public async applyRulesToExistingResource(
+    data: ApplyRulesToExistingResourceData<
+      ServiceLevelObjective,
+      ServiceLevelObjectiveLabelRule
+    >,
+  ): Promise<RuleApplicationResult> {
+    try {
+      return await this.applyRules({
+        serviceLevelObjective: data.resource,
+        rules: data.rules,
+      });
+    } catch (error) {
+      logger.error(`Error running SLO label rules: ${error}`, {
+        projectId: data.resource.projectId?.toString(),
+        serviceLevelObjectiveId: data.resource.id?.toString(),
+      } as LogAttributes);
+
+      return RuleApplicationResultUtil.failed();
+    }
+  }
+
+  private async applyRules(data: {
+    serviceLevelObjective: ServiceLevelObjective;
+    rules: Array<ServiceLevelObjectiveLabelRule>;
+  }): Promise<RuleApplicationResult> {
+    const { serviceLevelObjective, rules } = data;
+
+    if (
+      !serviceLevelObjective.id ||
+      !serviceLevelObjective.projectId ||
+      rules.length === 0
+    ) {
+      return RuleApplicationResultUtil.noMatch();
+    }
+
+    const sloWithDetails: ServiceLevelObjective | null =
+      await ServiceLevelObjectiveService.findOneById({
+        id: serviceLevelObjective.id,
+        select: {
+          name: true,
+          description: true,
+          labels: { _id: true },
+        },
+        props: { isRoot: true },
+      });
+
+    if (!sloWithDetails) {
+      return RuleApplicationResultUtil.noMatch();
+    }
+
+    const labelIdsToAdd: Set<string> = new Set();
+    const matchedRuleNames: Array<string> = [];
+    let matchedAnyRule: boolean = false;
+
+    for (const rule of rules) {
+      if (!this.doesServiceLevelObjectiveMatchRule(sloWithDetails, rule)) {
+        continue;
+      }
+      matchedAnyRule = true;
+      if ((rule.labelsToAdd || []).length > 0) {
+        matchedRuleNames.push(
+          rule.name || rule.id?.toString() || "Unnamed rule",
+        );
+      }
+      for (const label of rule.labelsToAdd || []) {
+        if (label.id) {
+          labelIdsToAdd.add(label.id.toString());
+        }
+      }
+    }
+
+    if (!matchedAnyRule) {
+      return RuleApplicationResultUtil.noMatch();
+    }
+
+    if (labelIdsToAdd.size === 0) {
+      return RuleApplicationResultUtil.alreadyApplied();
+    }
+
+    const existingLabelIds: Set<string> = new Set(
+      (sloWithDetails.labels || [])
+        .map((l: Label) => {
+          return l.id?.toString() || "";
+        })
+        .filter((id: string) => {
+          return id !== "";
+        }),
+    );
+
+    const newLabelIds: Array<string> = Array.from(labelIdsToAdd).filter(
+      (id: string) => {
+        return !existingLabelIds.has(id);
+      },
+    );
+    if (newLabelIds.length === 0) {
+      return RuleApplicationResultUtil.alreadyApplied();
+    }
+
+    await ServiceLevelObjectiveService.getRepository()
+      .createQueryBuilder()
+      .relation(ServiceLevelObjective, "labels")
+      .of(serviceLevelObjective.id.toString())
+      .add(newLabelIds);
+
+    /*
+     * Sync in-memory labels so the owner-rule engine that runs next in the
+     * same onCreateSuccess chain can match on rule-added labels.
+     */
+    const mergedLabelIds: Set<string> = new Set([
+      ...existingLabelIds,
+      ...newLabelIds,
+    ]);
+    serviceLevelObjective.labels = Array.from(mergedLabelIds).map(
+      (id: string) => {
+        const label: Label = new Label();
+        label.id = new ObjectID(id);
+        return label;
+      },
+    );
+
+    logger.debug(
+      `ServiceLevelObjectiveLabelRuleEngine attached ${newLabelIds.length} labels to SLO ${serviceLevelObjective.id}`,
+      {
+        projectId: serviceLevelObjective.projectId.toString(),
+      } as LogAttributes,
+    );
+
+    await this.postLabelRuleFeedItem({
+      serviceLevelObjectiveId: serviceLevelObjective.id,
+      projectId: serviceLevelObjective.projectId,
+      sloName: sloWithDetails.name,
+      labelsAdded: newLabelIds.length,
+      matchedRuleNames: matchedRuleNames,
+    });
+
+    return RuleApplicationResultUtil.updated(newLabelIds.length);
+  }
+
+  /*
+   * Labels arriving from a rule rather than from a person is exactly what the
+   * SLO's feed cannot otherwise explain, so it records which rules did it.
+   * The labels are already attached by now: a feed failure is logged, never
+   * thrown, or a run would report an SLO it changed as one it failed on.
+   */
+  private async postLabelRuleFeedItem(data: {
+    serviceLevelObjectiveId: ObjectID;
+    projectId: ObjectID;
+    sloName: string | undefined;
+    labelsAdded: number;
+    matchedRuleNames: Array<string>;
+  }): Promise<void> {
+    try {
+      const sloLink: string =
+        await ServiceLevelObjectiveService.getSloMarkdownLink({
+          projectId: data.projectId,
+          sloId: data.serviceLevelObjectiveId,
+          sloName: data.sloName,
+        });
+
+      await ServiceLevelObjectiveFeedService.createServiceLevelObjectiveFeedItem(
+        {
+          serviceLevelObjectiveId: data.serviceLevelObjectiveId,
+          projectId: data.projectId,
+          serviceLevelObjectiveFeedEventType:
+            ServiceLevelObjectiveFeedEventType.LabelRuleExecuted,
+          displayColor: Purple500,
+          feedInfoInMarkdown: `🏷️ ${data.labelsAdded} label(s) were attached to ${sloLink} by label ${data.matchedRuleNames.length === 1 ? "rule" : "rules"}.`,
+          moreInformationInMarkdown: `**Label rules that matched**: ${data.matchedRuleNames
+            .map((name: string): string => {
+              // Rule names are user-controlled and the feed renders markdown.
+              return `**${escapeMarkdownInline(name)}**`;
+            })
+            .join(", ")}`,
+        },
+      );
+    } catch (error) {
+      logger.error(
+        `Error writing the label rule feed item for SLO ${data.serviceLevelObjectiveId.toString()}: ${error}`,
+        { projectId: data.projectId.toString() } as LogAttributes,
+      );
+    }
+  }
+
+  private doesServiceLevelObjectiveMatchRule(
+    serviceLevelObjective: ServiceLevelObjective,
+    rule: ServiceLevelObjectiveLabelRule,
+  ): boolean {
+    return RuleCriteriaMatcher.matchesWithLegacySync({
+      rule,
+      legacyFields: [
+        "serviceLevelObjectiveLabels",
+        "serviceLevelObjectiveNamePattern",
+        "serviceLevelObjectiveDescriptionPattern",
+      ],
+      emptyResult: true,
+      matchesLegacyRule: (
+        legacyRule: ServiceLevelObjectiveLabelRule,
+      ): boolean => {
+        return this.doesServiceLevelObjectiveMatchLegacyRule(
+          serviceLevelObjective,
+          legacyRule,
+        );
+      },
+    });
+  }
+
+  private doesServiceLevelObjectiveMatchLegacyRule(
+    serviceLevelObjective: ServiceLevelObjective,
+    rule: ServiceLevelObjectiveLabelRule,
+  ): boolean {
+    if (
+      rule.serviceLevelObjectiveLabels &&
+      rule.serviceLevelObjectiveLabels.length > 0
+    ) {
+      if (
+        !serviceLevelObjective.labels ||
+        serviceLevelObjective.labels.length === 0
+      ) {
+        return false;
+      }
+      const ruleLabelIds: Array<string> = rule.serviceLevelObjectiveLabels.map(
+        (l: Label) => {
+          return l.id?.toString() || "";
+        },
+      );
+      const labelIds: Array<string> = serviceLevelObjective.labels.map(
+        (l: Label) => {
+          return l.id?.toString() || "";
+        },
+      );
+      if (
+        !ruleLabelIds.some((id: string) => {
+          return labelIds.includes(id);
+        })
+      ) {
+        return false;
+      }
+    }
+
+    if (
+      rule.serviceLevelObjectiveNamePattern &&
+      (!serviceLevelObjective.name ||
+        !this.testPattern(
+          rule.serviceLevelObjectiveNamePattern,
+          serviceLevelObjective.name,
+          rule,
+        ))
+    ) {
+      return false;
+    }
+
+    if (
+      rule.serviceLevelObjectiveDescriptionPattern &&
+      (!serviceLevelObjective.description ||
+        !this.testPattern(
+          rule.serviceLevelObjectiveDescriptionPattern,
+          serviceLevelObjective.description,
+          rule,
+        ))
+    ) {
+      return false;
+    }
+
+    return true;
+  }
+
+  /*
+   * Patterns are regexes, with a '*' wildcard fallback - the same two syntaxes
+   * the SLO monitor rules take. SloRulePatternValidator rejects anything else
+   * on save, so this only warns about a rule written before that check.
+   */
+  private testPattern(
+    pattern: string,
+    value: string,
+    rule: ServiceLevelObjectiveLabelRule,
+  ): boolean {
+    if (!RulePatternMatchUtil.isSupportedPattern(pattern)) {
+      logger.warn(
+        `Invalid pattern in SLO label rule ${rule.id}: ${pattern}. It is neither a valid regular expression nor a wildcard pattern, so it will never match.`,
+      );
+      return false;
+    }
+
+    return RulePatternMatchUtil.matches(value, pattern);
+  }
+}
+
+export default new ServiceLevelObjectiveLabelRuleEngineServiceClass();

package/Server/Services/ServiceLevelObjectiveLabelRuleService.ts

@@ -0,0 +1,51 @@
+import DatabaseService from "./DatabaseService";
+import Model from "../../Models/DatabaseModels/ServiceLevelObjectiveLabelRule";
+import CreateBy from "../Types/Database/CreateBy";
+import { OnCreate, OnUpdate } from "../Types/Database/Hooks";
+import UpdateBy from "../Types/Database/UpdateBy";
+import SloRulePatternValidator from "../Utils/Slo/SloRulePatternValidator";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
+
+/*
+ * No hard-delete retention: a rule is configuration, not an event log, so it
+ * stays until somebody deletes it.
+ */
+export class Service extends DatabaseService<Model> {
+  public constructor() {
+    super(Model);
+  }
+
+  /*
+   * A pattern that is neither a valid regex nor a wildcard can only ever match
+   * nothing, and the rule engine has no way to say so - it just quietly stops
+   * labelling. Reject it while the user is still looking at the form.
+   */
+  @CaptureSpan()
+  protected override async onBeforeCreate(
+    createBy: CreateBy<Model>,
+  ): Promise<OnCreate<Model>> {
+    SloRulePatternValidator.validate({
+      namePattern: createBy.data.serviceLevelObjectiveNamePattern,
+      descriptionPattern: createBy.data.serviceLevelObjectiveDescriptionPattern,
+    });
+
+    return { createBy: createBy, carryForward: null };
+  }
+
+  @CaptureSpan()
+  protected override async onBeforeUpdate(
+    updateBy: UpdateBy<Model>,
+  ): Promise<OnUpdate<Model>> {
+    SloRulePatternValidator.validate({
+      namePattern: updateBy.data.serviceLevelObjectiveNamePattern as
+        | string
+        | undefined,
+      descriptionPattern: updateBy.data
+        .serviceLevelObjectiveDescriptionPattern as string | undefined,
+    });
+
+    return { updateBy: updateBy, carryForward: null };
+  }
+}
+
+export default new Service();

package/Server/Services/ServiceLevelObjectiveMonitorRuleEngineService.ts

@@ -7,8 +7,19 @@ import { Gray500, Green500 } from "../../Types/BrandColors";
 import { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax";
 import PartialEntity from "../../Types/Database/PartialEntity";
 import ObjectID from "../../Types/ObjectID";
+import FilterCondition from "../../Types/Filter/FilterCondition";
+import RuleCriteria, {
+  RuleCriteriaFilter,
+  RuleCriteriaOperator,
+} from "../../Types/Rules/RuleCriteria";
+import {
+  getMonitorTypeCriteriaValidationError,
+  isMonitorTypeCriteriaValue,
+} from "../../Utils/Rules/MonitorTypeRuleCriteria";
 import { escapeMarkdownInline } from "../../Utils/Markdown/MarkdownEscape";
-import RuleCriteriaMatcher from "../../Utils/Rules/RuleCriteriaMatcher";
+import RuleCriteriaMatcher, {
+  isValidRuleCriteria,
+} from "../../Utils/Rules/RuleCriteriaMatcher";
 import { MAX_RULES_EVALUATED_PER_PROJECT } from "../../Utils/Rules/RuleEngineLimits";
 import RulePatternMatchUtil from "../../Utils/Rules/RulePatternMatchUtil";
 import QueryHelper from "../Types/Database/QueryHelper";
@@ -96,6 +107,7 @@ const RULE_SELECT: Select<ServiceLevelObjectiveMonitorRule> = {
   serviceLevelObjectiveId: true,
   isEnabled: true,
   monitorLabels: { _id: true },
+  monitorType: true,
   monitorNamePattern: true,
   monitorDescriptionPattern: true,
   criteria: true,
@@ -122,7 +134,7 @@ const MAX_MONITORS_LISTED_IN_FEED_DETAILS: number = 50;
  *
  *   - the SLO side (one of its rules was created, edited, disabled or
  *     deleted) -> syncMonitorsForSlo
- *   - the monitor side (its labels, name or description changed, or it was
+ *   - the monitor side (its labels, type, name or description changed, or it was
  *     just created) -> syncSlosForMonitor
  *
  * Both write through ServiceLevelObjective.autoAddedMonitors, which records
@@ -215,6 +227,7 @@ export class ServiceLevelObjectiveMonitorRuleEngineServiceClass {
         projectId: true,
         name: true,
         description: true,
+        monitorType: true,
         labels: {
           _id: true,
         },
@@ -479,20 +492,64 @@ export class ServiceLevelObjectiveMonitorRuleEngineServiceClass {
     monitor: Monitor;
     rule: ServiceLevelObjectiveMonitorRule;
   }): boolean {
-    return RuleCriteriaMatcher.matchesWithLegacySync({
-      rule: data.rule,
-      legacyFields: [
-        "monitorLabels",
-        "monitorNamePattern",
-        "monitorDescriptionPattern",
-      ],
+    const criteria: RuleCriteria | null | undefined = data.rule.criteria;
+
+    if (criteria === undefined || criteria === null) {
+      return this.doesMonitorMatchLegacyRule(data);
+    }
+
+    // A malformed type condition must fail the whole rule, even under Match any.
+    if (
+      !isValidRuleCriteria(criteria) ||
+      criteria.filters.some((filter: RuleCriteriaFilter): boolean => {
+        return (
+          filter.field === "monitorType" &&
+          getMonitorTypeCriteriaValidationError(filter) !== null
+        );
+      })
+    ) {
+      return false;
+    }
+
+    return RuleCriteriaMatcher.matchesSync({
+      criteria: criteria,
       emptyResult: false,
-      matchesLegacyRule: (
-        legacyRule: ServiceLevelObjectiveMonitorRule,
-      ): boolean => {
-        return this.doesMonitorMatchLegacyRule({
-          monitor: data.monitor,
-          rule: legacyRule,
+      matchesFilter: (filter: RuleCriteriaFilter): boolean => {
+        if (filter.field === "monitorType") {
+          if (!isMonitorTypeCriteriaValue(data.monitor.monitorType)) {
+            return false;
+          }
+
+          return filter.operator === RuleCriteriaOperator.Equals
+            ? data.monitor.monitorType === filter.value
+            : data.monitor.monitorType !== filter.value;
+        }
+
+        // Existing text and label conditions retain their legacy-compatible semantics.
+        return RuleCriteriaMatcher.matchesWithLegacySync({
+          rule: {
+            ...data.rule,
+            criteria: {
+              ...criteria,
+              filterCondition: FilterCondition.All,
+              filters: [filter],
+            },
+          } as ServiceLevelObjectiveMonitorRule,
+          legacyFields: [
+            "monitorLabels",
+            "monitorType",
+            "monitorNamePattern",
+            "monitorDescriptionPattern",
+          ],
+          emptyResult: false,
+          matchesLegacyRule: (
+            legacyRule: ServiceLevelObjectiveMonitorRule,
+          ): boolean => {
+            return this.doesMonitorMatchLegacyRule({
+              monitor: data.monitor,
+              rule: legacyRule,
+            });
+          },
         });
       },
     });
@@ -512,7 +569,24 @@ export class ServiceLevelObjectiveMonitorRuleEngineServiceClass {
       rule.monitorDescriptionPattern,
     );
 
-    if (!hasLabelCriteria && !hasNameCriteria && !hasDescriptionCriteria) {
+    const hasTypeCriteria: boolean =
+      rule.monitorType !== undefined && rule.monitorType !== null;
+
+    if (
+      !hasLabelCriteria &&
+      !hasNameCriteria &&
+      !hasDescriptionCriteria &&
+      !hasTypeCriteria
+    ) {
+      return false;
+    }
+
+    if (
+      hasTypeCriteria &&
+      (!isMonitorTypeCriteriaValue(rule.monitorType) ||
+        !isMonitorTypeCriteriaValue(monitor.monitorType) ||
+        monitor.monitorType !== rule.monitorType)
+    ) {
       return false;
     }
 
@@ -638,6 +712,7 @@ export class ServiceLevelObjectiveMonitorRuleEngineServiceClass {
         _id: true,
         name: true,
         description: true,
+        monitorType: true,
         labels: {
           _id: true,
         },
@@ -663,6 +738,7 @@ export class ServiceLevelObjectiveMonitorRuleEngineServiceClass {
 
     return Boolean(
       (rule.monitorLabels && rule.monitorLabels.length > 0) ||
+        rule.monitorType ||
         rule.monitorNamePattern ||
         rule.monitorDescriptionPattern,
     );

package/Server/Services/ServiceLevelObjectiveMonitorRuleService.ts

@@ -11,6 +11,11 @@ import Color from "../../Types/Color";
 import LIMIT_MAX, { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax";
 import BadDataException from "../../Types/Exception/BadDataException";
 import ObjectID from "../../Types/ObjectID";
+import MonitorType from "../../Types/Monitor/MonitorType";
+import {
+  getMonitorTypeCriteriaValidationError,
+  isMonitorTypeCriteriaValue,
+} from "../../Utils/Rules/MonitorTypeRuleCriteria";
 import { escapeMarkdownInline } from "../../Utils/Markdown/MarkdownEscape";
 import {
   getRuleCriteriaValidationError,
@@ -51,6 +56,7 @@ const RULE_SNAPSHOT_SELECT: Select<Model> = {
     _id: true,
     name: true,
   },
+  monitorType: true,
   monitorNamePattern: true,
   monitorDescriptionPattern: true,
   criteria: true,
@@ -92,6 +98,7 @@ export class Service extends DatabaseService<Model> {
 
     this.assertHasMatchCriteria({
       monitorLabelCount: (createBy.data.monitorLabels || []).length,
+      monitorType: createBy.data.monitorType,
       monitorNamePattern: createBy.data.monitorNamePattern,
       monitorDescriptionPattern: createBy.data.monitorDescriptionPattern,
       criteria: createBy.data.criteria,
@@ -188,6 +195,7 @@ export class Service extends DatabaseService<Model> {
 
     const touchesCriteria: boolean =
       updateBy.data.monitorLabels !== undefined ||
+      updateBy.data.monitorType !== undefined ||
       updateBy.data.monitorNamePattern !== undefined ||
       updateBy.data.monitorDescriptionPattern !== undefined ||
       updateBy.data.criteria !== undefined;
@@ -656,6 +664,7 @@ export class Service extends DatabaseService<Model> {
    */
   private assertHasMatchCriteria(data: {
     monitorLabelCount: number;
+    monitorType?: MonitorType | undefined;
     monitorNamePattern?: string | undefined;
     monitorDescriptionPattern?: string | undefined;
     criteria?: Model["criteria"];
@@ -673,6 +682,17 @@ export class Service extends DatabaseService<Model> {
         isValidRuleCriteria(data.criteria) &&
         data.criteria.filters.length > 0
       ) {
+        for (const filter of data.criteria.filters) {
+          if (filter.field === "monitorType") {
+            const typeError: string | null =
+              getMonitorTypeCriteriaValidationError(filter);
+
+            if (typeError) {
+              throw new BadDataException(typeError);
+            }
+          }
+        }
+
         return;
       }
 
@@ -681,13 +701,24 @@ export class Service extends DatabaseService<Model> {
       );
     }
 
+    if (
+      data.monitorType !== undefined &&
+      data.monitorType !== null &&
+      !isMonitorTypeCriteriaValue(data.monitorType)
+    ) {
+      throw new BadDataException(
+        "Monitor type criteria require a valid monitor type.",
+      );
+    }
+
     if (
       data.monitorLabelCount === 0 &&
+      !data.monitorType &&
       !data.monitorNamePattern &&
       !data.monitorDescriptionPattern
     ) {
       throw new BadDataException(
-        "An SLO monitor rule needs at least one match criterion: monitor labels, a monitor name pattern, or a monitor description pattern. Use .* as the name pattern to match every monitor in the project.",
+        "An SLO monitor rule needs at least one match criterion: monitor labels, a monitor type, a monitor name pattern, or a monitor description pattern. Use .* as the name pattern to match every monitor in the project.",
       );
     }
   }
@@ -744,6 +775,10 @@ export class Service extends DatabaseService<Model> {
           ? rule.monitorLabels || []
           : nextLabels || []
         ).length,
+        monitorType:
+          updateBy.data.monitorType === undefined
+            ? rule.monitorType
+            : (updateBy.data.monitorType as MonitorType | undefined),
         monitorNamePattern:
           updateBy.data.monitorNamePattern === undefined
             ? rule.monitorNamePattern