useAdvncedMatching

server/src/db/models/Monitor.ts

@@ -92,6 +92,10 @@ const MonitorSchema = new Schema<MonitorDocument>(
 			type: Boolean,
 			default: false,
 		},
+		useAdvancedMatching: {
+			type: Boolean,
+			default: false,
+		},
 		jsonPath: {
 			type: String,
 		},

server/src/repositories/monitors/MongoMonitorsRepository.ts

@@ -290,6 +290,7 @@ class MongoMonitorsRepository implements IMonitorsRepository {
 			statusWindowThreshold: doc.statusWindowThreshold,
 			type: doc.type,
 			ignoreTlsErrors: doc.ignoreTlsErrors,
+			useAdvancedMatching: doc.useAdvancedMatching ?? false,
 			jsonPath: doc.jsonPath ?? undefined,
 			expectedValue: doc.expectedValue ?? undefined,
 			matchMethod: doc.matchMethod ?? undefined,
@@ -374,6 +375,7 @@ class MongoMonitorsRepository implements IMonitorsRepository {
 			statusWindowThreshold: doc.statusWindowThreshold,
 			type: doc.type,
 			ignoreTlsErrors: doc.ignoreTlsErrors,
+			useAdvancedMatching: doc.useAdvancedMatching ?? false,
 			jsonPath: doc.jsonPath ?? undefined,
 			expectedValue: doc.expectedValue ?? undefined,
 			matchMethod: doc.matchMethod ?? undefined,

server/src/service/infrastructure/networkService.ts

@@ -255,7 +255,7 @@ class NetworkService implements INetworkService {
 	}
 
 	private async requestHttp(monitor: Monitor): Promise<MonitorStatusResponse> {
-		const { url, secret, id, teamId, type, ignoreTlsErrors, jsonPath, matchMethod, expectedValue } = monitor;
+		const { url, secret, id, teamId, type, ignoreTlsErrors, useAdvancedMatching, jsonPath, matchMethod, expectedValue } = monitor;
 		const httpResponse = this.buildStatusResponse({
 			monitor,
 			overrides: {
@@ -305,7 +305,7 @@ class NetworkService implements INetworkService {
 				timings: response.timings,
 			});
 
-			if (!expectedValue && !jsonPath) {
+			if (!useAdvancedMatching) {
 				return httpResponse;
 			}
 

server/src/types/monitor.ts

@@ -26,6 +26,7 @@ export interface Monitor {
 	statusWindowThreshold: number;
 	type: MonitorType;
 	ignoreTlsErrors: boolean;
+	useAdvancedMatching: boolean;
 	jsonPath?: string;
 	expectedValue?: string;
 	matchMethod?: MonitorMatchMethod;

server/src/validation/joi.ts

@@ -158,6 +158,7 @@ const createMonitorBodyValidation = joi.object({
 	statusWindowThreshold: joi.number().min(1).max(100).default(60),
 	url: joi.string().required(),
 	ignoreTlsErrors: joi.boolean().default(false),
+	useAdvancedMatching: joi.boolean().default(false),
 	port: joi.number(),
 	isActive: joi.boolean(),
 	interval: joi.number(),
@@ -193,6 +194,7 @@ const editMonitorBodyValidation = joi.object({
 	notifications: joi.array().items(joi.string()),
 	secret: joi.string(),
 	ignoreTlsErrors: joi.boolean(),
+	useAdvancedMatching: joi.boolean(),
 	jsonPath: joi.string().allow(""),
 	expectedValue: joi.string().allow(""),
 	matchMethod: joi.string().allow(null, ""),