Add node exporter

.gitignore

@@ -2,4 +2,7 @@
 build_*
 
 manager/node_modules/
-manager/dist/
+manager/dist/
+
+staker-metrics/node_modules/
+staker-metrics/dist/

cadvisor/Dockerfile

@@ -0,0 +1,3 @@
+ARG UPSTREAM_VERSION_CADVISOR
+
+FROM gcr.io/cadvisor/cadvisor:${UPSTREAM_VERSION_CADVISOR}

dappnode_package.json

@@ -1,18 +1,28 @@
 {
   "name": "dms.dnp.dappnode.eth",
-  "version": "1.0.1",
-  "description": "This package privately and locally collects and displays metrics related to your dappnode and its packages. Based on Grafana and Prometheus. It is recommended to also install the package Node-Exporter if you want system metrics. You can find a guide on how to set up your monitoring system in the next link https://forum.dappnode.io/t/begginer-friendly-install-monitoring-system-on-dappnode-using-dms-package/623",
+  "version": "2.0.0",
+  "description": "This package privately and locally collects and displays metrics related to your dappnode and its packages. Based on Grafana and Prometheus. It is recommended to also install the package Node-Exporter if you want system metrics.",
   "shortDescription": "DAppNode Monitoring Service",
   "type": "service",
   "upstream": [
+    {
+      "repo": "prometheus/node_exporter",
+      "version": "v1.6.1",
+      "arg": "UPSTREAM_VERSION_NODE_EXPORTER"
+    },
+    {
+      "repo": "google/cadvisor",
+      "version": "v0.47.1",
+      "arg": "UPSTREAM_VERSION_CADVISOR"
+    },
     {
       "repo": "prometheus/prometheus",
       "version": "2.52.0",
       "arg": "UPSTREAM_VERSION_PROMETHEUS"
     },
     {
       "repo": "grafana/grafana",
-      "version": "11.0.0",
+      "version": "11.1.0",
       "arg": "UPSTREAM_VERSION_GRAFANA"
     }
   ],
@@ -23,7 +33,7 @@
     "DAppLion <dapplion@giveth.io> (https://github.com/dapplion)"
   ],
   "requirements": {
-    "minimumDappnodeVersion": "0.2.39"
+    "minimumDappnodeVersion": "0.2.90"
   },
   "categories": ["Monitoring"],
   "style": {
@@ -44,8 +54,5 @@
   "bugs": {
     "url": "https://github.com/dappnode/DMS/issues"
   },
-  "dependencies": {
-    "dappnode-exporter.dnp.dappnode.eth": "latest"
-  },
   "license": "GPL-3.0"
 }

docker-compose.yml

@@ -1,14 +1,19 @@
-version: "3.4"
+version: "3.8"
 services:
   grafana:
     build:
       context: grafana
       args:
-        UPSTREAM_VERSION_GRAFANA: 11.0.0
+        UPSTREAM_VERSION_GRAFANA: 11.1.0
     image: "grafana.dms.dnp.dappnode.eth:1.0.1"
     restart: always
     volumes:
       - "grafana_data:/var/lib/grafana"
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost/api/health"]
+      interval: 20s
+      timeout: 10s
+      retries: 5
   prometheus:
     build:
       context: prometheus
@@ -28,6 +33,40 @@ services:
     volumes:
       - "manager_data:/data"
       - "prometheus_file_sd:/prometheus_file_sd"
+    depends_on:
+      grafana:
+        condition: service_healthy
+  node-exporter:
+    build:
+      context: node_exporter
+      args:
+        UPSTREAM_VERSION_NODE_EXPORTER: v1.6.1
+    restart: always
+    volumes:
+      - "/:/host:ro,rslave"
+    command:
+      - "--path.rootfs=/host"
+    image: "node-exporter.dms.dnp.dappnode.eth:1.0.3"
+  cadvisor:
+    build:
+      context: cadvisor
+      args:
+        UPSTREAM_VERSION_CADVISOR: v0.47.1
+    restart: always
+    volumes:
+      - "/:/rootfs:ro"
+      - "/var/run:/var/run:rw"
+      - "/sys:/sys:ro"
+      - "/var/lib/docker/:/var/lib/docker:ro"
+    image: "cadvisor.dms.dnp.dappnode.eth:1.0.3"
+  stakers-metrics:
+    build:
+      context: stakers-metrics
+      dockerfile: Dockerfile
+    restart: always
+    image: "stakers-metrics.dms.dnp.dappnode.eth:1.0.3"
+    environment:
+      - DEBUG_MODE=false
 volumes:
   grafana_data: {}
   prometheus_data: {}