Merge pull request #272 from porters-xyz/prom-query-fix

updated query!
porters-xyz · May 21, 2024 · 854be50 · 854be50
2 parents c0cbbbe + 2d06a17
commit 854be50
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/web-portal/backend/fly.prod.toml b/web-portal/backend/fly.prod.toml
@@ -13,6 +13,7 @@ primary_region = 'sea'
   # ONEINCH_API_KEY = ...
   # OX_API_KEY = ...
   # RPC_KEY = ...
+  PROM_URL = 'https://api.fly.io/prometheus/porters/api/v1/'
 
 [[services]]
   internal_port = 4000

diff --git a/web-portal/backend/fly.toml b/web-portal/backend/fly.toml
@@ -15,6 +15,7 @@ primary_region = 'sea'
   # ONEINCH_API_KEY = ...
   # OX_API_KEY = ...
   # RPC_KEY = ...
+  PROM_URL = 'https://api.fly.io/prometheus/porters-staging/api/v1/'
 
 [http_service]
   internal_port = 4000

diff --git a/web-portal/backend/src/usage/usage.service.ts b/web-portal/backend/src/usage/usage.service.ts
@@ -38,8 +38,8 @@ export class UsageService {
     step: number | string,
   ): Promise<Response> {
 
-    const url = `https://api.fly.io/prometheus/porters-staging/api/v1/query_range?query=sum(${query})&start=${start}&end=now&step=${step}`;
-
+    const url = process.env.PROM_URL +`query_range?query=sum(increase(${query}))&start=${start}&end=now&step=${step}`;
+    // do include `/` into url
     const result = await fetch(url, {
       headers: {
         Authorization: String(process.env.PROM_TOKEN),
@@ -59,7 +59,7 @@ export class UsageService {
       case '24h':
         return '1h';
       case '1h':
-        return '1m';
+        return '5m';
       case '7d':
         return '1d';
       case '30d':

diff --git a/web-portal/frontend/components/dashboard/insights.tsx b/web-portal/frontend/components/dashboard/insights.tsx
@@ -164,10 +164,7 @@ const Insights: React.FC = () => {
 
 
     const totalRequests =
-        Math.abs(
-            _.get(_.first(formattedData), 'requests', 0) -
-            _.get(_.last(formattedData), 'requests', 0),
-        )
+      _.sumBy(formattedData, 'requests')
 
 
     const successData = totalRequests;