From babce424b23778e1681693edd20f88d9ac6f439f Mon Sep 17 00:00:00 2001
From: Nabarun <nabarun@deepstacksoft.com>
Date: Thu, 30 May 2024 14:37:51 +0530
Subject: [PATCH] Move graph-node upstream head metric exporter to monitoring
 stack

---
 .../data/compose/docker-compose-graph-node.yml       | 11 -----------
 .../data/compose/docker-compose-prom-server.yml      | 12 ++++++++++++
 .../provisioning/datasources/graph-node-postgres.yml |  2 +-
 .../data/config/monitoring/prometheus/prometheus.yml |  9 ++++-----
 stack_orchestrator/data/stacks/graph-node/README.md  |  4 ----
 stack_orchestrator/data/stacks/monitoring/README.md  |  5 +++++
 6 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/stack_orchestrator/data/compose/docker-compose-graph-node.yml b/stack_orchestrator/data/compose/docker-compose-graph-node.yml
index dfcaa9bc..023fe03b 100644
--- a/stack_orchestrator/data/compose/docker-compose-graph-node.yml
+++ b/stack_orchestrator/data/compose/docker-compose-graph-node.yml
@@ -70,17 +70,6 @@ services:
       start_period: 3s
     ports:
       - "5432"
-  graph-node-chain-head-exporter:
-    image: cerc/watcher-ts:local
-    restart: always
-    working_dir: /app/packages/cli
-    environment:
-      ETH_RPC_ENDPOINT: ${ETH_RPC_ENDPOINT:-http://lotus-node-1:1234/rpc/v1}
-    command: ["sh", "-c", "yarn export-metrics:chain-heads"]
-    ports:
-      - '5000'
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
 
 volumes:
   ipfs-import:
diff --git a/stack_orchestrator/data/compose/docker-compose-prom-server.yml b/stack_orchestrator/data/compose/docker-compose-prom-server.yml
index eb8ab971..594c48f0 100644
--- a/stack_orchestrator/data/compose/docker-compose-prom-server.yml
+++ b/stack_orchestrator/data/compose/docker-compose-prom-server.yml
@@ -53,6 +53,18 @@ services:
     extra_hosts:
       - "host.docker.internal:host-gateway"
 
+  graph-node-upstream-head-exporter:
+    image: cerc/watcher-ts:local
+    restart: always
+    working_dir: /app/packages/cli
+    environment:
+      ETH_RPC_ENDPOINT: ${GRAPH_NODE_RPC_ENDPOINT}
+    command: ["sh", "-c", "yarn export-metrics:chain-heads"]
+    ports:
+      - '5000'
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+
   postgres-exporter:
     image: quay.io/prometheuscommunity/postgres-exporter
     restart: always
diff --git a/stack_orchestrator/data/config/monitoring/grafana/provisioning/datasources/graph-node-postgres.yml b/stack_orchestrator/data/config/monitoring/grafana/provisioning/datasources/graph-node-postgres.yml
index 6ae2ef5f..d1604b06 100644
--- a/stack_orchestrator/data/config/monitoring/grafana/provisioning/datasources/graph-node-postgres.yml
+++ b/stack_orchestrator/data/config/monitoring/grafana/provisioning/datasources/graph-node-postgres.yml
@@ -17,4 +17,4 @@ datasources:
     # url: graph-node-db:5432
     # # Set password for graph-node database
     # secureJsonData:
-    #   password: 'passsword'
+    #   password: 'password'
diff --git a/stack_orchestrator/data/config/monitoring/prometheus/prometheus.yml b/stack_orchestrator/data/config/monitoring/prometheus/prometheus.yml
index 6fb538b3..dea7052d 100644
--- a/stack_orchestrator/data/config/monitoring/prometheus/prometheus.yml
+++ b/stack_orchestrator/data/config/monitoring/prometheus/prometheus.yml
@@ -53,11 +53,10 @@ scrape_configs:
         labels:
           instance: 'external'
           chain: 'filecoin'
-      # # Add graph-node chain-head-exported targets to be monitored below
-      # - targets: ['graph-node-chain-head-exporter:5000']
-      #   labels:
-      #     instance: 'graph-node'
-      #     chain: 'filecoin'
+      - targets: ['graph-node-upstream-head-exporter:5000']
+        labels:
+          instance: 'graph-node'
+          chain: 'filecoin'
 
   - job_name: 'postgres'
     scrape_interval: 30s
diff --git a/stack_orchestrator/data/stacks/graph-node/README.md b/stack_orchestrator/data/stacks/graph-node/README.md
index 5b24c5c8..47728ed8 100644
--- a/stack_orchestrator/data/stacks/graph-node/README.md
+++ b/stack_orchestrator/data/stacks/graph-node/README.md
@@ -75,9 +75,6 @@ Update `config.env` file inside deployment directory with the following values b
 export ETH_RPC_HOST=
 export ETH_RPC_PORT=
 
-# RPC endpoint used by graph-node for exposing upstream head as metrics
-export ETH_RPC_ENDPOINT=
-
 # The etherum network(s) graph-node will connect to
 # Set this to a space-separated list of the networks where each entry has the form NAME:URL
 export ETH_NETWORKS=
@@ -104,7 +101,6 @@ Example `config.env` file:
 ```bash
 export ETH_RPC_HOST=filecoin.chainup.net
 export ETH_RPC_PORT=443
-export ETH_RPC_ENDPOINT=https://filecoin.chainup.net
 
 export ETH_NETWORKS=filecoin:https://filecoin.chainup.net/rpc/v1
 
diff --git a/stack_orchestrator/data/stacks/monitoring/README.md b/stack_orchestrator/data/stacks/monitoring/README.md
index 94f2a6e1..f0d39be6 100644
--- a/stack_orchestrator/data/stacks/monitoring/README.md
+++ b/stack_orchestrator/data/stacks/monitoring/README.md
@@ -179,6 +179,11 @@ Set the following env variables in the deployment env config file (`monitoring-d
   # Grafana server host URL (used in various links in alerts, etc.)
   # (Optional, default: http://localhost:3000)
   GF_SERVER_ROOT_URL=
+
+  
+  # RPC endpoint used by graph-node for upstream head metric
+  # (Optional, default: https://mainnet.infura.io/v3)
+  GRAPH_NODE_RPC_ENDPOINT=
   ```
 
 ## Start the stack