diff --git a/web-portal/backend/fly.prod.toml b/web-portal/backend/fly.prod.toml index e056cae..c655711 100644 --- 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 index aef5370..d80a8be 100644 --- 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 index d1f5adf..9b35f58 100644 --- 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 { - 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 index fef18d8..5f46850 100644 --- 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;