fix: monitoring

softvisio-node · Aug 31, 2024 · e8e7ba3 · e8e7ba3
1 parent 836d601
commit e8e7ba3
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 14 deletions.
diff --git a/lib/app/components/monitoring/api/v1/development/monitoring/instances.js b/lib/app/components/monitoring/api/v1/development/monitoring/instances.js
@@ -1,5 +1,11 @@
 import sql from "#lib/sql";
 
+const STATS_PERIODS = {
+    "1 hour": "minute",
+    "7 days": "hour",
+    "30 days": "hour",
+};
+
 const SQL = {
     "getInstances": sql`SELECT * FROM monitoring_instance WHERE last_updated > CURRENT_TIMESTAMP - INTERVAL '1 hour'`.prepare(),
 
@@ -60,11 +66,6 @@ export default Super =>
         }
 
         async API_getInstanceStats ( ctx, instanceId, period ) {
-            if ( period === "1 hour" ) {
-                return this.dbh.select( SQL.getStats, [ "60 minutes", "minute", instanceId ] );
-            }
-            else {
-                return this.dbh.select( SQL.getStats, [ "30 days", "hour", instanceId ] );
-            }
+            return this.dbh.select( SQL.getStats, [ period, STATS_PERIODS[ period ], instanceId ] );
         }
     };
diff --git a/lib/app/components/monitoring/api/v1/development/monitoring/instances.yaml b/lib/app/components/monitoring/api/v1/development/monitoring/instances.yaml
@@ -14,4 +14,4 @@ methods:
         schema: { type: integer }
       - name: period
         required: true
-        schema: { enum: [1 hour, 30 days] }
+        schema: { enum: [1 hour, 7 days, 30 days] }
diff --git a/lib/app/components/monitoring/api/v1/development/monitoring/methods.js b/lib/app/components/monitoring/api/v1/development/monitoring/methods.js
@@ -1,5 +1,11 @@
 import sql from "#lib/sql";
 
+const STATS_PERIODS = {
+    "1 hour": "minute",
+    "7 days": "hour",
+    "30 days": "hour",
+};
+
 const SQL = {
     "getMethods": sql`
 WITH total AS (
@@ -107,12 +113,7 @@ export default Super =>
         }
 
         async API_getMonitoringMethodStats ( ctx, monitoringMethodId, period ) {
-            if ( period === "1 hour" ) {
-                return this.dbh.select( SQL.getStats, [ "60 minutes", "minute", monitoringMethodId ] );
-            }
-            else {
-                return this.dbh.select( SQL.getStats, [ "30 days", "hour", monitoringMethodId ] );
-            }
+            return this.dbh.select( SQL.getStats, [ period, STATS_PERIODS[ period ], monitoringMethodId ] );
         }
 
         async API_getMethodExceptionsList ( ctx, options = {} ) {

diff --git a/lib/app/components/monitoring/api/v1/development/monitoring/methods.yaml b/lib/app/components/monitoring/api/v1/development/monitoring/methods.yaml
@@ -22,7 +22,7 @@ methods:
         schema: { type: integer }
       - name: period
         required: true
-        schema: { enum: [1 hour, 30 days] }
+        schema: { enum: [1 hour, 7 days, 30 days] }
 
   get-method-exceptions-list:
     title: Read the method exceptions