Fix probeId conversion to string in ProbeMonitorResponseService

CommonServer/Utils/Probe/ProbeMonitorResponse.ts

@@ -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);

Dashboard/src/Components/Monitor/MonitorCharts/MonitorChart.tsx

@@ -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,
+                checkOn: checkOn
-                miscData: data.miscData,
             }),
             description: MonitorCharts.getChartDescription({
                 checkOn: checkOn,
             }),
             props: {
-                data: [
+                data: chartData,
-                    {
-                        id: `line-${Text.generateRandomNumber()}`,
-                        data: MonitorCharts.getDataForCharts({
-                            monitorMetricsByMinute,
-                            checkOn: checkOn,
-                            miscData: data.miscData,
-                        }),
-                    },
-                ],
                 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(
-                    charts.push(
+                    MonitorCharts.getChartProps({
-                        MonitorCharts.getChartProps({
+                        monitorMetricsByMinute,
-                            monitorMetricsByMinute,
+                        checkOn,
-                            checkOn,
+                        miscData: distinctMiscData,
-                            miscData,
+                    })
-                        })
+                );
-                    );
-                }
             } 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;
     }
 

docker-compose.dev.yml

@@ -222,6 +222,30 @@ services:
             network: host
             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: