From 83993fc2a469c1a9da7a874dbbade96f05ff6c3e Mon Sep 17 00:00:00 2001 From: Nawaz Dhandala Date: Thu, 29 Jan 2026 08:38:35 +0000 Subject: [PATCH] fix: Correct spelling of 'evaluateOverTime' in multiple criteria files --- .../Utils/Monitor/Criteria/APIRequestCriteria.ts | 2 +- .../Utils/Monitor/Criteria/CompareCriteria.ts | 2 +- .../Monitor/Criteria/IncomingRequestCriteria.ts | 2 +- .../Utils/Monitor/Criteria/SSLMonitorCriteria.ts | 2 +- .../Monitor/Criteria/ServerMonitorCriteria.ts | 4 ++-- .../Utils/Monitor/Criteria/SnmpMonitorCriteria.ts | 2 +- .../Monitor/MonitorCriteriaExpectationBuilder.ts | 2 +- Common/Types/Monitor/CriteriaFilter.ts | 4 ++-- .../src/Components/Form/Monitor/CriteriaFilter.tsx | 14 +++++++------- Dashboard/src/Utils/Form/Monitor/CriteriaFilter.ts | 4 ++-- Probe/Utils/Monitors/MonitorTypes/SnmpMonitor.ts | 2 +- ProbeIngest/Utils/Monitor.ts | 5 ++++- 12 files changed, 24 insertions(+), 21 deletions(-) diff --git a/Common/Server/Utils/Monitor/Criteria/APIRequestCriteria.ts b/Common/Server/Utils/Monitor/Criteria/APIRequestCriteria.ts index 3c516d1e32..2283c02cf5 100644 --- a/Common/Server/Utils/Monitor/Criteria/APIRequestCriteria.ts +++ b/Common/Server/Utils/Monitor/Criteria/APIRequestCriteria.ts @@ -27,7 +27,7 @@ export default class APIRequestCriteria { undefined; if ( - input.criteriaFilter.eveluateOverTime && + input.criteriaFilter.evaluateOverTime && input.criteriaFilter.evaluateOverTimeOptions ) { try { diff --git a/Common/Server/Utils/Monitor/Criteria/CompareCriteria.ts b/Common/Server/Utils/Monitor/Criteria/CompareCriteria.ts index 96ea559c09..79af446f00 100644 --- a/Common/Server/Utils/Monitor/Criteria/CompareCriteria.ts +++ b/Common/Server/Utils/Monitor/Criteria/CompareCriteria.ts @@ -553,7 +553,7 @@ export default class CompareCriteria { } if ( - data.criteriaFilter.eveluateOverTime && + data.criteriaFilter.evaluateOverTime && data.criteriaFilter.evaluateOverTimeOptions?.timeValueInMinutes ) { message += ` over the last ${data.criteriaFilter.evaluateOverTimeOptions.timeValueInMinutes} minutes`; diff --git a/Common/Server/Utils/Monitor/Criteria/IncomingRequestCriteria.ts b/Common/Server/Utils/Monitor/Criteria/IncomingRequestCriteria.ts index 5b1c1f77bf..c57cd23b9a 100644 --- a/Common/Server/Utils/Monitor/Criteria/IncomingRequestCriteria.ts +++ b/Common/Server/Utils/Monitor/Criteria/IncomingRequestCriteria.ts @@ -41,7 +41,7 @@ export default class IncomingRequestCriteria { undefined; if ( - input.criteriaFilter.eveluateOverTime && + input.criteriaFilter.evaluateOverTime && input.criteriaFilter.evaluateOverTimeOptions ) { try { diff --git a/Common/Server/Utils/Monitor/Criteria/SSLMonitorCriteria.ts b/Common/Server/Utils/Monitor/Criteria/SSLMonitorCriteria.ts index 99a574885d..d3a4932522 100644 --- a/Common/Server/Utils/Monitor/Criteria/SSLMonitorCriteria.ts +++ b/Common/Server/Utils/Monitor/Criteria/SSLMonitorCriteria.ts @@ -31,7 +31,7 @@ export default class ServerMonitorCriteria { undefined; if ( - input.criteriaFilter.eveluateOverTime && + input.criteriaFilter.evaluateOverTime && input.criteriaFilter.evaluateOverTimeOptions ) { try { diff --git a/Common/Server/Utils/Monitor/Criteria/ServerMonitorCriteria.ts b/Common/Server/Utils/Monitor/Criteria/ServerMonitorCriteria.ts index 7c438f3c6f..1d1b9c4fb1 100644 --- a/Common/Server/Utils/Monitor/Criteria/ServerMonitorCriteria.ts +++ b/Common/Server/Utils/Monitor/Criteria/ServerMonitorCriteria.ts @@ -29,7 +29,7 @@ export default class ServerMonitorCriteria { undefined; if ( - input.criteriaFilter.eveluateOverTime && + input.criteriaFilter.evaluateOverTime && input.criteriaFilter.evaluateOverTimeOptions ) { try { @@ -69,7 +69,7 @@ export default class ServerMonitorCriteria { // check evaluate over time. if ( - input.criteriaFilter.eveluateOverTime && + input.criteriaFilter.evaluateOverTime && input.criteriaFilter.evaluateOverTimeOptions ) { offlineIfNotCheckedInMinutes = diff --git a/Common/Server/Utils/Monitor/Criteria/SnmpMonitorCriteria.ts b/Common/Server/Utils/Monitor/Criteria/SnmpMonitorCriteria.ts index 062d6aece1..71cdee7b1a 100644 --- a/Common/Server/Utils/Monitor/Criteria/SnmpMonitorCriteria.ts +++ b/Common/Server/Utils/Monitor/Criteria/SnmpMonitorCriteria.ts @@ -32,7 +32,7 @@ export default class SnmpMonitorCriteria { undefined; if ( - input.criteriaFilter.eveluateOverTime && + input.criteriaFilter.evaluateOverTime && input.criteriaFilter.evaluateOverTimeOptions ) { try { diff --git a/Common/Server/Utils/Monitor/MonitorCriteriaExpectationBuilder.ts b/Common/Server/Utils/Monitor/MonitorCriteriaExpectationBuilder.ts index de527e9e6f..4726625cf7 100644 --- a/Common/Server/Utils/Monitor/MonitorCriteriaExpectationBuilder.ts +++ b/Common/Server/Utils/Monitor/MonitorCriteriaExpectationBuilder.ts @@ -116,7 +116,7 @@ export default class MonitorCriteriaExpectationBuilder { const parts: Array = []; if ( - criteriaFilter.eveluateOverTime && + criteriaFilter.evaluateOverTime && criteriaFilter.evaluateOverTimeOptions?.timeValueInMinutes ) { parts.push( diff --git a/Common/Types/Monitor/CriteriaFilter.ts b/Common/Types/Monitor/CriteriaFilter.ts index c51843ff71..7c512e82cb 100644 --- a/Common/Types/Monitor/CriteriaFilter.ts +++ b/Common/Types/Monitor/CriteriaFilter.ts @@ -108,7 +108,7 @@ export interface CriteriaFilter { snmpMonitorOptions?: SnmpMonitorOptions | undefined; filterType: FilterType | undefined; value: string | number | undefined; - eveluateOverTime?: boolean | undefined; + evaluateOverTime?: boolean | undefined; evaluateOverTimeOptions?: EvaluateOverTimeOptions | undefined; } @@ -223,7 +223,7 @@ export const CriteriaFilterSchema: ZodSchema = Zod.object({ }).optional(), filterType: Zod.string().optional(), value: Zod.union([Zod.string(), Zod.number()]).optional(), - eveluateOverTime: Zod.boolean().optional(), + evaluateOverTime: Zod.boolean().optional(), evaluateOverTimeOptions: Zod.object({ timeValueInMinutes: Zod.number().optional(), evaluateOverTimeType: Zod.string().optional(), diff --git a/Dashboard/src/Components/Form/Monitor/CriteriaFilter.tsx b/Dashboard/src/Components/Form/Monitor/CriteriaFilter.tsx index 5c32510edf..8953bbe835 100644 --- a/Dashboard/src/Components/Form/Monitor/CriteriaFilter.tsx +++ b/Dashboard/src/Components/Form/Monitor/CriteriaFilter.tsx @@ -180,7 +180,7 @@ const CriteriaFilterElement: FunctionComponent = ( checkOn: value?.toString() as CheckOn, filterType: undefined, value: undefined, - eveluateOverTime: false, + evaluateOverTime: false, evaluateOverTimeOptions: undefined, }); }} @@ -260,12 +260,12 @@ const CriteriaFilterElement: FunctionComponent = ( ) && (
{ props.onChange?.({ ...criteriaFilter, - eveluateOverTime: value, + evaluateOverTime: value, }); }} /> @@ -275,7 +275,7 @@ const CriteriaFilterElement: FunctionComponent = ( {criteriaFilter?.checkOn && criteriaFilter?.checkOn && CriteriaFilterUtil.isEvaluateOverTimeFilter(criteriaFilter?.checkOn) && - criteriaFilter.eveluateOverTime ? ( + criteriaFilter.evaluateOverTime ? (
= ( props.onChange?.({ ...criteriaFilter, - eveluateOverTime: true, + evaluateOverTime: true, evaluateOverTimeOptions: { ...evaluateOverTimeOption, evaluateOverTimeType: @@ -313,7 +313,7 @@ const CriteriaFilterElement: FunctionComponent = ( {criteriaFilter?.checkOn && criteriaFilter?.checkOn && CriteriaFilterUtil.isEvaluateOverTimeFilter(criteriaFilter?.checkOn) && - criteriaFilter.eveluateOverTime ? ( + criteriaFilter.evaluateOverTime ? (
= ( props.onChange?.({ ...criteriaFilter, - eveluateOverTime: true, + evaluateOverTime: true, evaluateOverTimeOptions: { ...evaluateOverTimeOption, timeValueInMinutes: value as number, diff --git a/Dashboard/src/Utils/Form/Monitor/CriteriaFilter.ts b/Dashboard/src/Utils/Form/Monitor/CriteriaFilter.ts index c4aa867ba6..10f98d07df 100644 --- a/Dashboard/src/Utils/Form/Monitor/CriteriaFilter.ts +++ b/Dashboard/src/Utils/Form/Monitor/CriteriaFilter.ts @@ -46,7 +46,7 @@ export default class CriteriaFilterUtil { // check evaluation over time values. if ( - criteriaFilter?.eveluateOverTime && + criteriaFilter?.evaluateOverTime && criteriaFilter.evaluateOverTimeOptions?.evaluateOverTimeType ) { if ( @@ -96,7 +96,7 @@ export default class CriteriaFilterUtil { // add minutes if evaluate over time is true if ( - criteriaFilter?.eveluateOverTime && + criteriaFilter?.evaluateOverTime && criteriaFilter.evaluateOverTimeOptions?.timeValueInMinutes ) { text += diff --git a/Probe/Utils/Monitors/MonitorTypes/SnmpMonitor.ts b/Probe/Utils/Monitors/MonitorTypes/SnmpMonitor.ts index 98c805d94c..5ec755e108 100644 --- a/Probe/Utils/Monitors/MonitorTypes/SnmpMonitor.ts +++ b/Probe/Utils/Monitors/MonitorTypes/SnmpMonitor.ts @@ -103,7 +103,7 @@ export default class SnmpMonitor { if (isTimeout) { return { - isOnline: true, + isOnline: false, isTimeout: true, responseTimeInMs: responseTimeInMs, failureCause: diff --git a/ProbeIngest/Utils/Monitor.ts b/ProbeIngest/Utils/Monitor.ts index 3e84bd48dd..54a5691a7d 100644 --- a/ProbeIngest/Utils/Monitor.ts +++ b/ProbeIngest/Utils/Monitor.ts @@ -42,7 +42,7 @@ export default class MonitorUtil { monitorType: MonitorType; monitorId: ObjectID; }): Promise { - const isSecretsLoaded: boolean = false; + let isSecretsLoaded: boolean = false; let monitorSecrets: MonitorSecret[] = []; const monitorSteps: MonitorSteps = data.monitorSteps; @@ -148,6 +148,7 @@ export default class MonitorUtil { ) { if (!isSecretsLoaded) { monitorSecrets = await MonitorUtil.loadMonitorSecrets(monitorId); + isSecretsLoaded = true; } monitorStep.data.snmpMonitor.communityString = @@ -164,6 +165,7 @@ export default class MonitorUtil { ) { if (!isSecretsLoaded) { monitorSecrets = await MonitorUtil.loadMonitorSecrets(monitorId); + isSecretsLoaded = true; } monitorStep.data.snmpMonitor.snmpV3Auth.authKey = @@ -181,6 +183,7 @@ export default class MonitorUtil { ) { if (!isSecretsLoaded) { monitorSecrets = await MonitorUtil.loadMonitorSecrets(monitorId); + isSecretsLoaded = true; } monitorStep.data.snmpMonitor.snmpV3Auth.privKey =