@oneuptime/common 7.0.4131 → 7.0.4135
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.
|
@@ -12,7 +12,7 @@ import Metric from "../../../../Models/AnalyticsModels/Metric";
|
|
|
12
12
|
import MonitorMetricTypeUtil from "../../../../Utils/Monitor/MonitorMetricType";
|
|
13
13
|
import MetricService from "../../../Services/MetricService";
|
|
14
14
|
import CaptureSpan from "../../Telemetry/CaptureSpan";
|
|
15
|
-
import
|
|
15
|
+
import InBetween from "../../../../Types/BaseDatabase/InBetween";
|
|
16
16
|
|
|
17
17
|
export default class EvaluateOverTime {
|
|
18
18
|
@CaptureSpan()
|
|
@@ -35,7 +35,7 @@ export default class EvaluateOverTime {
|
|
|
35
35
|
|
|
36
36
|
const query: Query<Metric> = {
|
|
37
37
|
projectId: data.projectId,
|
|
38
|
-
time:
|
|
38
|
+
time: new InBetween(lastMinutesDate, now),
|
|
39
39
|
serviceId: data.monitorId,
|
|
40
40
|
name: MonitorMetricTypeUtil.getMonitorMeticTypeByCheckOn(data.metricType),
|
|
41
41
|
};
|
|
@@ -13,7 +13,7 @@ import { CheckOn, EvaluateOverTimeType, } from "Common/Types/Monitor/CriteriaFil
|
|
|
13
13
|
import MonitorMetricTypeUtil from "../../../../Utils/Monitor/MonitorMetricType";
|
|
14
14
|
import MetricService from "../../../Services/MetricService";
|
|
15
15
|
import CaptureSpan from "../../Telemetry/CaptureSpan";
|
|
16
|
-
import
|
|
16
|
+
import InBetween from "../../../../Types/BaseDatabase/InBetween";
|
|
17
17
|
export default class EvaluateOverTime {
|
|
18
18
|
static async getValueOverTime(data) {
|
|
19
19
|
// get values over time
|
|
@@ -22,7 +22,7 @@ export default class EvaluateOverTime {
|
|
|
22
22
|
const now = OneUptimeDate.getCurrentDate();
|
|
23
23
|
const query = {
|
|
24
24
|
projectId: data.projectId,
|
|
25
|
-
time:
|
|
25
|
+
time: new InBetween(lastMinutesDate, now),
|
|
26
26
|
serviceId: data.monitorId,
|
|
27
27
|
name: MonitorMetricTypeUtil.getMonitorMeticTypeByCheckOn(data.metricType),
|
|
28
28
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EvaluateOverTime.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Monitor/Criteria/EvaluateOverTime.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,aAAa,MAAM,mBAAmB,CAAC;AAE9C,OAAO,EACL,OAAO,EAEP,oBAAoB,GACrB,MAAM,qCAAqC,CAAC;AAG7C,OAAO,qBAAqB,MAAM,6CAA6C,CAAC;AAChF,OAAO,aAAa,MAAM,iCAAiC,CAAC;AAC5D,OAAO,WAAW,MAAM,6BAA6B,CAAC;AACtD,OAAO,
|
|
1
|
+
{"version":3,"file":"EvaluateOverTime.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Monitor/Criteria/EvaluateOverTime.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.4135",
|
|
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.4135",
|
|
81
81
|
"cookie-parser": "^1.4.7",
|
|
82
82
|
"cors": "^2.8.5",
|
|
83
83
|
"cron-parser": "^4.8.1",
|