From 95171222338eb2cdfc971cb3031eeec56d6a14dd Mon Sep 17 00:00:00 2001 From: franz Date: Wed, 8 Jan 2025 16:40:22 +0100 Subject: [PATCH] remove api key from metric --- apps/scheduler/create-alerts.ts | 11 +++++++++-- modules/controllers/subgraph-monitor-controller.ts | 13 ++++++++----- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/apps/scheduler/create-alerts.ts b/apps/scheduler/create-alerts.ts index b38a818a3..1451e0d30 100644 --- a/apps/scheduler/create-alerts.ts +++ b/apps/scheduler/create-alerts.ts @@ -23,7 +23,14 @@ export async function createAlerts(chainId: string): Promise { const subgraphsToAlert: { subgraphName: string; subgraphUrl: string }[] = []; for (const [subgraphName, subgraphUrl] of subgraphs) { - subgraphsToAlert.push({ subgraphName, subgraphUrl }); + let subgraphUrlClean = subgraphUrl; + if (subgraphUrl.includes('gateway')) { + const parts = subgraphUrl.split('/'); + parts.splice(4, 1); + subgraphUrlClean = parts.join('/'); + } + + subgraphsToAlert.push({ subgraphName, subgraphUrl: subgraphUrlClean }); } await createSubgraphLagAlertsIfNotExist(chainId, config.data.chain.slug, subgraphsToAlert); @@ -159,7 +166,7 @@ async function createSubgraphLagAlertsIfNotExist( // upsert all other alarms for (const subgraph of subgraphs) { const alarmName = `${ALARM_PREFIX}:${subgraph.subgraphName}`; - const metricName = `${chainSlug}-${subgraph.subgraphName}-${subgraph.subgraphUrl}-lag`; + const metricName = `${chainSlug}-${subgraph.subgraphName}-lag-${subgraph.subgraphUrl}`; //make sure metric is available for alarm await subgraphMetricPublisher.publish(metricName, 0); diff --git a/modules/controllers/subgraph-monitor-controller.ts b/modules/controllers/subgraph-monitor-controller.ts index 8290f3958..2919d4892 100644 --- a/modules/controllers/subgraph-monitor-controller.ts +++ b/modules/controllers/subgraph-monitor-controller.ts @@ -1,7 +1,3 @@ -import { Chain } from '@prisma/client'; -import { syncMerklRewards } from '../actions/aprs/merkl'; -import { SwapFeeFromSnapshotsAprService } from '../pool/lib/apr-data-sources/swap-fee-apr-from-snapshots.service'; -import { prisma } from '../../prisma/prisma-client'; import { subgraphMetricPublisher } from '../metrics/metrics.client'; import { AllNetworkConfigs } from '../network/network-config'; import { GaugeSubgraphService } from '../subgraphs/gauge-subgraph/gauge-subgraph.service'; @@ -28,8 +24,15 @@ export function SubgraphMonitorController(tracer?: any) { const meta = await subgraph.getMetadata(); lag = Math.max(Number(latestBlock) - meta.block.number, 0); + let subgraphUrlClean = subgraphUrl; + if (subgraphUrl.includes('gateway')) { + const parts = subgraphUrl.split('/'); + parts.splice(4, 1); + subgraphUrlClean = parts.join('/'); + } + subgraphMetricPublisher.publish( - `${config.data.chain.slug}-${subgraphName}-${subgraphUrl}-lag`, + `${config.data.chain.slug}-${subgraphName}-lag-${subgraphUrl}`, lag, ); }