mirrors/oneuptime
1
0
Fork 0
mirror of https://github.com/OneUptime/oneuptime synced 2024-11-21 22:59:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix probeId conversion to string in ProbeMonitorResponseService

Browse Source
This commit is contained in:
Simon Larsen 2024-04-01 12:23:29 +01:00
parent 28f4f0f37c
commit 038684e512
No known key found for this signature in database
GPG Key ID: AB45983AA9C81CDE
3 changed files with 82 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CommonServer/Utils/Probe/ProbeMonitorResponse.ts
View File

@ -470,7 +470,7 @@ export default class ProbeMonitorResponseService {
data.dataToProcess as ProbeMonitorResponse
).responseTimeInMs;
monitorMetricsByMinute.miscData = {
probeId: (data.dataToProcess as ProbeMonitorResponse).probeId,
probeId: (data.dataToProcess as ProbeMonitorResponse).probeId.toString(),
};
itemsToSave.push(monitorMetricsByMinute);
@ -486,7 +486,7 @@ export default class ProbeMonitorResponseService {
data.dataToProcess as ProbeMonitorResponse
).responseCode;
monitorMetricsByMinute.miscData = {
probeId: (data.dataToProcess as ProbeMonitorResponse).probeId,
probeId: (data.dataToProcess as ProbeMonitorResponse).probeId.toString(),
};
itemsToSave.push(monitorMetricsByMinute);

89
Dashboard/src/Components/Monitor/MonitorCharts/MonitorChart.tsx
View File

@ -9,6 +9,7 @@ import {
AxisLeft,
AxisType,
ChartCurve,
LineChartData,
LineChartDataItem,
LineChartPoint,
XScale,
@ -47,7 +48,7 @@ export class MonitorCharts {
public static getDistinctMiscDataFromMonitorMetricsByMinute(data: {
monitorMetricsByMinute: Array<MonitorMetricsByMinute>;
checkOn: CheckOn;
}): Array<JSONObject | undefined> {
}): Array<JSONObject> {
const miscData: Array<JSONObject | undefined> =
data.monitorMetricsByMinute
.filter((item: MonitorMetricsByMinute) => {
@ -69,13 +70,34 @@ export class MonitorCharts {
}) === index
);
}
);
).filter((item: JSONObject | undefined) => {
return !!item;
}) as Array<JSONObject>;
}
public static getChartData(data: {
monitorMetricsByMinute: Array<MonitorMetricsByMinute>;
checkOn: CheckOn;
miscData: JSONObject | undefined;
}): LineChartData {
const { monitorMetricsByMinute, checkOn } = data;
return {
id: `line-${Text.generateRandomNumber()}`,
data: MonitorCharts.getDataForCharts({
monitorMetricsByMinute,
checkOn: checkOn,
miscData: data.miscData,
}),
}
}
public static getChartProps(data: {
monitorMetricsByMinute: Array<MonitorMetricsByMinute>;
checkOn: CheckOn;
miscData: JSONObject | undefined;
miscData: Array<JSONObject> | undefined;
}): Chart {
const { monitorMetricsByMinute, checkOn } = data;
@ -85,27 +107,36 @@ export class MonitorCharts {
checkOn: checkOn,
});
const chartData: Array<LineChartData> = [];
if(!data.miscData) {
chartData.push(MonitorCharts.getChartData({
monitorMetricsByMinute,
checkOn,
miscData: undefined,
}));
}
for (const miscData of data.miscData || []) {
chartData.push(MonitorCharts.getChartData({
monitorMetricsByMinute,
checkOn,
miscData: miscData,
}));
}
return {
id: `chart-${Text.generateRandomNumber()}`,
type: ChartType.LINE,
title: MonitorCharts.getChartTitle({
checkOn: checkOn,
miscData: data.miscData,
checkOn: checkOn
}),
description: MonitorCharts.getChartDescription({
checkOn: checkOn,
}),
props: {
data: [
{
id: `line-${Text.generateRandomNumber()}`,
data: MonitorCharts.getDataForCharts({
monitorMetricsByMinute,
checkOn: checkOn,
miscData: data.miscData,
}),
},
],
data: chartData,
xScale: MonitorCharts.getXScaleFor({
monitorMetricsByMinute,
}),
@ -146,22 +177,22 @@ export class MonitorCharts {
const charts: Array<Chart> = [];
for (const checkOn of checkOns) {
const distinctMiscData: Array<JSONObject | undefined> =
const distinctMiscData: Array<JSONObject> =
MonitorCharts.getDistinctMiscDataFromMonitorMetricsByMinute({
monitorMetricsByMinute,
checkOn,
}).filter((item: JSONObject | undefined) => {
return !!item;
});
if (distinctMiscData.length > 0) {
for (const miscData of distinctMiscData) {
charts.push(
MonitorCharts.getChartProps({
monitorMetricsByMinute,
checkOn,
miscData,
})
);
}
charts.push(
MonitorCharts.getChartProps({
monitorMetricsByMinute,
checkOn,
miscData: distinctMiscData,
})
);
} else {
charts.push(
MonitorCharts.getChartProps({
@ -208,15 +239,7 @@ export class MonitorCharts {
public static getChartTitle(data: {
checkOn: CheckOn;
miscData: JSONObject | undefined;
}): string {
if (data.checkOn === CheckOn.DiskUsagePercent) {
return (
'Disk Usage (in %)' +
(data.miscData ? ` for ${data.miscData['diskPath']}` : '')
);
}
return data.checkOn;
}

24
docker-compose.dev.yml
View File

@ -223,6 +223,30 @@ services:
context: .
dockerfile: ./Probe/Dockerfile
probe-2:
volumes:
- ./Probe:/usr/src/app
# Use node modules of the container and not host system.
# https://stackoverflow.com/questions/29181032/add-a-volume-to-docker-but-exclude-a-sub-folder
- /usr/src/app/node_modules/
- ./Common:/usr/src/Common
- ./Model:/usr/src/Model
- ./CommonServer:/usr/src/CommonServer
- ./CommonUI:/usr/src/CommonUI
- /usr/src/Common/node_modules/
- /usr/src/CommonUI/node_modules/
- /usr/src/CommonServer/node_modules/
- /usr/src/Model/node_modules/
extends:
file: ./docker-compose.base.yml
service: probe-2
ports:
- '9656:9229' # Debugging port.
build:
network: host
context: .
dockerfile: ./Probe/Dockerfile
ingestor:
volumes:
- ./Ingestor:/usr/src/app