Metrics only for full client

parity/cli/mod.rs

@@ -566,7 +566,7 @@ usage! {
 		["Metrics"]
 			FLAG flag_metrics: (bool) = false, or |c: &Config| c.metrics.as_ref()?.enable.clone(),
 			"--metrics",
-			"Enable prometheus metrics.",
+			"Enable prometheus metrics (only full client).",
 
 			ARG arg_metrics_port: (u16) = 3000u16, or |c: &Config| c.metrics.as_ref()?.port.clone(),
 			"--metrics-port=[PORT]",

scripts/prometheus/grafana/oe.json → scripts/prometheus/config/grafana/dashboards/oe.json

@@ -1570,7 +1570,7 @@
       ]
     },
     "timezone": "",
-    "title": "OpenEthereum_1",
+    "title": "OpenEthereum",
     "uid": "fH2SyJiMz",
     "version": 2
   }

scripts/prometheus/env/dev/config/grafana/provisioning/dashboards/provider.yaml → scripts/prometheus/config/grafana/provisioning/dashboards/provider.yaml

@@ -21,4 +21,4 @@ providers:
     allowUiUpdates: false
     options:
       # <string, required> path to dashboard files on disk. Required when using the 'file' type
-      path: /etc/grafana
+      path: /etc/grafana/dashboards

scripts/prometheus/env/dev/config/prometheus/prometheus.yml → scripts/prometheus/config/prometheus/prometheus.yml

@@ -27,11 +27,11 @@ scrape_configs:
     - targets: ['localhost:9090']
 
   - job_name: openethereum
-    scrape_interval: 10s
+    scrape_interval: 15s
     metric_relabel_configs:
       - source_labels: [__name__]
         target_label: __name__
         replacement: "oe_${1}"
     static_configs:
     - targets:
-      - localhost:8545
+      - openethereum:3000

scripts/prometheus/env/dev/docker-compose.yaml → scripts/prometheus/docker-compose.yaml

@@ -1,25 +1,37 @@
 version: '3.5'
 services:
 
+  openethereum:
+    build:
+      dockerfile: scripts/docker/alpine/Dockerfile
+      context: ../..
+    ports:
+      - '30303:30303'
+      - '30303:30303/udp'
+      - '8545:8545'
+    links:
+      - prometheus
+
+    entrypoint: ["/home/openethereum/openethereum","--metrics","--metrics-interface=all"]
+
   prometheus:
     image: prom/prometheus
     container_name: prometheus
     restart: always
     volumes:
-      - ../../grafana:/etc/grafana
       - ./config/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml 
     ports:
       - '9090:9090'
-    network_mode: host
 
   grafana:
     image: grafana/grafana
-    container_name: grafana  
+    container_name: grafana
     restart: always
     volumes:
       - ./config/grafana:/etc/grafana
     ports:
       - '3000:3000'
+    depends_on:
+      - prometheus
     environment:
      - GF_SECURITY_ADMIN_PASSWORD:secret
-    network_mode: host