@oneuptime/common 7.0.4174 → 7.0.4176
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Server/Utils/Monitor/Criteria/IncomingRequestCriteria.ts +2 -1
- package/Types/Monitor/IncomingMonitor/IncomingMonitorRequest.ts +1 -0
- package/build/dist/Server/Utils/Monitor/Criteria/IncomingRequestCriteria.js +3 -1
- package/build/dist/Server/Utils/Monitor/Criteria/IncomingRequestCriteria.js.map +1 -1
- package/package.json +2 -2
|
@@ -91,7 +91,8 @@ export default class IncomingRequestCriteria {
|
|
|
91
91
|
|
|
92
92
|
const differenceInMinutes: number = OneUptimeDate.getDifferenceInMinutes(
|
|
93
93
|
lastCheckTime,
|
|
94
|
-
|
|
94
|
+
(input.dataToProcess as IncomingMonitorRequest)?.checkedAt ||
|
|
95
|
+
OneUptimeDate.getCurrentDate(),
|
|
95
96
|
);
|
|
96
97
|
|
|
97
98
|
logger.debug("Difference in minutes: " + differenceInMinutes);
|
|
@@ -17,6 +17,7 @@ import CaptureSpan from "../../Telemetry/CaptureSpan";
|
|
|
17
17
|
export default class IncomingRequestCriteria {
|
|
18
18
|
static async isMonitorInstanceCriteriaFilterMet(input) {
|
|
19
19
|
// Server Monitoring Checks
|
|
20
|
+
var _a;
|
|
20
21
|
logger.debug("Checking IncomingRequestCriteria for Monitor: " +
|
|
21
22
|
input.dataToProcess.monitorId.toString());
|
|
22
23
|
logger.debug("Data to process: " + JSON.stringify(input.dataToProcess, null, 2));
|
|
@@ -56,7 +57,8 @@ export default class IncomingRequestCriteria {
|
|
|
56
57
|
input.dataToProcess.monitorId.toString());
|
|
57
58
|
const lastCheckTime = input.dataToProcess.incomingRequestReceivedAt;
|
|
58
59
|
logger.debug("Last Check Time: " + lastCheckTime);
|
|
59
|
-
const differenceInMinutes = OneUptimeDate.getDifferenceInMinutes(lastCheckTime,
|
|
60
|
+
const differenceInMinutes = OneUptimeDate.getDifferenceInMinutes(lastCheckTime, ((_a = input.dataToProcess) === null || _a === void 0 ? void 0 : _a.checkedAt) ||
|
|
61
|
+
OneUptimeDate.getCurrentDate());
|
|
60
62
|
logger.debug("Difference in minutes: " + differenceInMinutes);
|
|
61
63
|
if (!value) {
|
|
62
64
|
return null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IncomingRequestCriteria.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Monitor/Criteria/IncomingRequestCriteria.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,MAAM,uBAAuB,CAAC;AAE3C,OAAO,aAAa,MAAM,mBAAmB,CAAC;AAE9C,OAAO,EACL,OAAO,EAEP,UAAU,GACX,MAAM,qCAAqC,CAAC;AAE7C,OAAO,MAAM,MAAM,qBAAqB,CAAC;AACzC,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;AAClD,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAEhD,OAAO,WAAW,MAAM,6BAA6B,CAAC;AAEtD,MAAM,CAAC,OAAO,OAAO,uBAAuB;IAEtB,AAAb,MAAM,CAAC,KAAK,CAAC,kCAAkC,CAAC,KAGtD;QACC,2BAA2B
|
|
1
|
+
{"version":3,"file":"IncomingRequestCriteria.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Monitor/Criteria/IncomingRequestCriteria.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@oneuptime/common",
|
|
3
|
-
"version": "7.0.
|
|
3
|
+
"version": "7.0.4176",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -77,7 +77,7 @@
|
|
|
77
77
|
"airtable": "^0.12.2",
|
|
78
78
|
"axios": "^1.7.2",
|
|
79
79
|
"bullmq": "^5.3.3",
|
|
80
|
-
"Common": "npm:@oneuptime/common@7.0.
|
|
80
|
+
"Common": "npm:@oneuptime/common@7.0.4176",
|
|
81
81
|
"cookie-parser": "^1.4.7",
|
|
82
82
|
"cors": "^2.8.5",
|
|
83
83
|
"cron-parser": "^4.8.1",
|