From 651da65a0e843105eaf21db3f8e8cb01350a7da9 Mon Sep 17 00:00:00 2001
From: adria0 <adria@codecontext.io>
Date: Mon, 1 Jun 2020 21:04:16 +0200
Subject: [PATCH 01/32] wip

---
 Cargo.lock                       | 80 +++++++++++++++++++-------------
 Cargo.toml                       |  2 +-
 cli-signer/rpc-client/Cargo.toml |  4 +-
 miner/stratum/Cargo.toml         |  4 +-
 rpc/Cargo.toml                   | 12 ++---
 rpc/src/lib.rs                   |  1 +
 rpc/src/v1/impls/light/parity.rs |  4 ++
 rpc/src/v1/impls/parity.rs       | 19 ++++++++
 rpc/src/v1/traits/parity.rs      |  4 ++
 9 files changed, 86 insertions(+), 44 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 022e1c0b328..0abe6cbfdac 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1533,7 +1533,7 @@ version = "1.12.0"
 dependencies = [
  "env_logger 0.5.13",
  "ethereum-types",
- "jsonrpc-core",
+ "jsonrpc-core 14.1.0",
  "jsonrpc-tcp-server",
  "keccak-hash",
  "log",
@@ -2384,11 +2384,20 @@ dependencies = [
  "serde_json",
 ]
 
+[[package]]
+name = "jsonrpc-core"
+version = "14.1.0"
+dependencies = [
+ "futures",
+ "log",
+ "serde",
+ "serde_derive",
+ "serde_json",
+]
+
 [[package]]
 name = "jsonrpc-derive"
-version = "14.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8609af8f63b626e8e211f52441fcdb6ec54f1a446606b10d5c89ae9bf8a20058"
+version = "14.1.0"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.9",
@@ -2398,13 +2407,11 @@ dependencies = [
 
 [[package]]
 name = "jsonrpc-http-server"
-version = "14.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "816d63997ea45d3634608edbef83ddb35e661f7c0b27b5b72f237e321f0e9807"
+version = "14.1.0"
 dependencies = [
  "hyper",
- "jsonrpc-core",
- "jsonrpc-server-utils",
+ "jsonrpc-core 14.1.0",
+ "jsonrpc-server-utils 14.1.0",
  "log",
  "net2",
  "parking_lot 0.10.0",
@@ -2413,12 +2420,10 @@ dependencies = [
 
 [[package]]
 name = "jsonrpc-ipc-server"
-version = "14.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3cc22b91e6e92e7925110c080bfa0dfdc731b156ccb2a3ce0561e902a33a9cf"
+version = "14.1.0"
 dependencies = [
- "jsonrpc-core",
- "jsonrpc-server-utils",
+ "jsonrpc-core 14.1.0",
+ "jsonrpc-server-utils 14.1.0",
  "log",
  "parity-tokio-ipc",
  "parking_lot 0.10.0",
@@ -2427,13 +2432,12 @@ dependencies = [
 
 [[package]]
 name = "jsonrpc-pubsub"
-version = "14.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b31c9b90731276fdd24d896f31bb10aecf2e5151733364ae81123186643d939"
+version = "14.1.0"
 dependencies = [
- "jsonrpc-core",
+ "jsonrpc-core 14.1.0",
  "log",
  "parking_lot 0.10.0",
+ "rand 0.7.3",
  "serde",
 ]
 
@@ -2445,7 +2449,21 @@ checksum = "95b7635e618a0edbbe0d2a2bbbc69874277c49383fcf6c3c0414491cfb517d22"
 dependencies = [
  "bytes",
  "globset",
- "jsonrpc-core",
+ "jsonrpc-core 14.0.5",
+ "lazy_static",
+ "log",
+ "tokio",
+ "tokio-codec",
+ "unicase",
+]
+
+[[package]]
+name = "jsonrpc-server-utils"
+version = "14.1.0"
+dependencies = [
+ "bytes",
+ "globset",
+ "jsonrpc-core 14.1.0",
  "lazy_static",
  "log",
  "tokio",
@@ -2455,12 +2473,10 @@ dependencies = [
 
 [[package]]
 name = "jsonrpc-tcp-server"
-version = "14.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a03d03b8eccd463b8f1c675d5e5febff5055291b82235c8ec0af973e6d7b84fc"
+version = "14.1.0"
 dependencies = [
- "jsonrpc-core",
- "jsonrpc-server-utils",
+ "jsonrpc-core 14.1.0",
+ "jsonrpc-server-utils 14.1.0",
  "log",
  "parking_lot 0.10.0",
  "tokio-service",
@@ -2468,12 +2484,10 @@ dependencies = [
 
 [[package]]
 name = "jsonrpc-ws-server"
-version = "14.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b94e5773b2ae66e0e02c80775ce6bbba6f15d5bb47c14ec36a36fcf94f8df851"
+version = "14.1.0"
 dependencies = [
- "jsonrpc-core",
- "jsonrpc-server-utils",
+ "jsonrpc-core 14.1.0",
+ "jsonrpc-server-utils 14.1.0",
  "log",
  "parking_lot 0.10.0",
  "slab",
@@ -3139,7 +3153,7 @@ dependencies = [
  "futures",
  "ipnetwork",
  "journaldb",
- "jsonrpc-core",
+ "jsonrpc-core 14.1.0",
  "keccak-hash",
  "kvdb",
  "kvdb-rocksdb",
@@ -3341,7 +3355,7 @@ dependencies = [
  "fetch",
  "futures",
  "itertools",
- "jsonrpc-core",
+ "jsonrpc-core 14.1.0",
  "jsonrpc-derive",
  "jsonrpc-http-server",
  "jsonrpc-ipc-server",
@@ -3386,7 +3400,7 @@ version = "1.4.0"
 dependencies = [
  "ethereum-types",
  "futures",
- "jsonrpc-core",
+ "jsonrpc-core 14.1.0",
  "jsonrpc-ws-server",
  "keccak-hash",
  "log",
@@ -3432,7 +3446,7 @@ dependencies = [
  "ethereum-types",
  "futures",
  "hyper",
- "jsonrpc-server-utils",
+ "jsonrpc-server-utils 14.0.5",
  "keccak-hash",
  "kvdb",
  "kvdb-rocksdb",
diff --git a/Cargo.toml b/Cargo.toml
index fe140117de1..9303da6f162 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -41,7 +41,7 @@ ethstore = { path = "accounts/ethstore" }
 fdlimit = "0.1"
 futures = "0.1"
 journaldb = { path = "util/journaldb" }
-jsonrpc-core = "14.0.3"
+jsonrpc-core = { path = "../jsonrpc/core"} 
 keccak-hash = "0.5.0"
 kvdb = "0.5.0"
 kvdb-rocksdb = "0.7.0"
diff --git a/cli-signer/rpc-client/Cargo.toml b/cli-signer/rpc-client/Cargo.toml
index f1931921f57..3beb61697f2 100644
--- a/cli-signer/rpc-client/Cargo.toml
+++ b/cli-signer/rpc-client/Cargo.toml
@@ -15,7 +15,7 @@ serde_json = "1.0"
 url = "2.1.1"
 matches = "0.1"
 parking_lot = "0.10.0"
-jsonrpc-core = "14.0.3"
-jsonrpc-ws-server = "14.0.3"
+jsonrpc-core = { path = "../../../jsonrpc/core" } 
+jsonrpc-ws-server = { path = "../../../jsonrpc/ws" }
 parity-rpc = { path = "../../rpc" }
 keccak-hash = "0.5.0"
diff --git a/miner/stratum/Cargo.toml b/miner/stratum/Cargo.toml
index c681e52db24..06d6f1e4bd8 100644
--- a/miner/stratum/Cargo.toml
+++ b/miner/stratum/Cargo.toml
@@ -8,8 +8,8 @@ authors = ["Parity Technologies <admin@parity.io>"]
 [dependencies]
 ethereum-types = "0.9.0"
 keccak-hash = "0.5.0"
-jsonrpc-core = "14.0.3"
-jsonrpc-tcp-server = "14.0.3"
+jsonrpc-core = { path = "../../../jsonrpc/core" } 
+jsonrpc-tcp-server = { path = "../../../jsonrpc/tcp" }
 log = "0.4"
 parking_lot = "0.10.0"
 
diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
index 19208fa8328..5b1779806bc 100644
--- a/rpc/Cargo.toml
+++ b/rpc/Cargo.toml
@@ -26,12 +26,12 @@ tokio-timer = "0.2.13"
 transient-hashmap = "0.4"
 itertools = "0.8.2"
 
-jsonrpc-core = "14.0.5"
-jsonrpc-derive = "14.0.5"
-jsonrpc-http-server = "14.0.5"
-jsonrpc-ws-server = "14.0.5"
-jsonrpc-ipc-server = "14.0.6"
-jsonrpc-pubsub = "14.0.5"
+jsonrpc-core = { path = "../../jsonrpc/core" }
+jsonrpc-derive = { path = "../../jsonrpc/derive" }
+jsonrpc-http-server = { path = "../../jsonrpc/http" }
+jsonrpc-ws-server = { path = "../../jsonrpc/ws" }
+jsonrpc-ipc-server = { path = "../../jsonrpc/ipc" }
+jsonrpc-pubsub = { path = "../../jsonrpc/pubsub" }
 
 client-traits = { path = "../ethcore/client-traits" }
 common-types = { path = "../ethcore/types" }
diff --git a/rpc/src/lib.rs b/rpc/src/lib.rs
index 3a3673b7b5d..8ef813cad37 100644
--- a/rpc/src/lib.rs
+++ b/rpc/src/lib.rs
@@ -188,6 +188,7 @@ pub fn start_http<M, S, H, T>(
 		.cors(cors_domains)
 		.allowed_hosts(allowed_hosts)
 		.health_api(("/api/health", "parity_nodeStatus"))
+		.raw_api(("/metrics", "parity_nodeMetrics"))
 		.cors_allow_headers(AccessControlAllowHeaders::Any)
 		.max_request_body_size(max_payload * 1024 * 1024)
 		.start_http(addr)?)
diff --git a/rpc/src/v1/impls/light/parity.rs b/rpc/src/v1/impls/light/parity.rs
index 4168abd9717..8ed10c58207 100644
--- a/rpc/src/v1/impls/light/parity.rs
+++ b/rpc/src/v1/impls/light/parity.rs
@@ -391,6 +391,10 @@ where
 		}
 	}
 
+	fn metrics(&self) -> Result<String> {
+		Ok(String::from("none"))
+	}
+
 	fn logs_no_tx_hash(&self, filter: Filter) -> BoxFuture<Vec<Log>> {
 		let filter = match filter.try_into() {
 			Ok(value) => value,
diff --git a/rpc/src/v1/impls/parity.rs b/rpc/src/v1/impls/parity.rs
index cbb89a8ca95..c97f4a7c2c9 100644
--- a/rpc/src/v1/impls/parity.rs
+++ b/rpc/src/v1/impls/parity.rs
@@ -453,6 +453,25 @@ impl<C, M, U, S> Parity for ParityClient<C, M, U> where
 		}
 	}
 
+	fn metrics(&self) -> Result<String> {
+		let mut r = String::new();
+
+		let scalar = |b| if b {1} else {0};
+
+		let sync_status = self.sync.status();
+		r.push_str(&format!("oe_sync_peers {}\n",sync_status.num_peers));
+		r.push_str(&format!("oe_sync_active_peers {}\n",sync_status.num_active_peers));
+		r.push_str(&format!("oe_sync_blocks_recieved {}\n",sync_status.blocks_received));
+		r.push_str(&format!("oe_sync_blocks_total {}\n",sync_status.blocks_total));
+		r.push_str(&format!("oe_sync_blocks_highest {}\n",sync_status.highest_block_number.unwrap_or(0)));
+		r.push_str(&format!("oe_sync_is_majorsync {}\n",scalar(self.sync.is_major_syncing())));
+		r.push_str(&format!("oe_sync_snapshot_is_sync {}\n",scalar(sync_status.is_snapshot_syncing())));
+		r.push_str(&format!("oe_sync_snapshot_chunks {}\n",sync_status.num_snapshot_chunks));
+		r.push_str(&format!("oe_sync_snapshot_chunks_done {}\n",sync_status.snapshot_chunks_done));
+		r.push_str(&format!("oe_sync_mem_used {}\n",sync_status.mem_used));
+		Ok(String::from(r))
+	}
+
 	fn logs_no_tx_hash(&self, filter: Filter) -> BoxFuture<Vec<Log>> {
 		use v1::impls::eth::base_logs;
 		// only specific impl for lightclient
diff --git a/rpc/src/v1/traits/parity.rs b/rpc/src/v1/traits/parity.rs
index 1eeb2fd5b79..2983b0165a6 100644
--- a/rpc/src/v1/traits/parity.rs
+++ b/rpc/src/v1/traits/parity.rs
@@ -226,6 +226,10 @@ pub trait Parity {
 	#[rpc(name = "parity_nodeStatus")]
 	fn status(&self) -> Result<()>;
 
+	/// [adria0] document
+	#[rpc(name = "parity_nodeMetrics")]
+	fn metrics(&self) -> Result<String>;
+
 	/// Extracts Address and public key from signature using the r, s and v params. Equivalent to Solidity erecover
 	/// as well as checks the signature for chain replay protection
 	#[rpc(name = "parity_verifySignature")]

From f85bd4036624598b4e22bb5579b0a053a6714428 Mon Sep 17 00:00:00 2001
From: adria0 <adria@codecontext.io>
Date: Thu, 4 Jun 2020 22:19:33 +0200
Subject: [PATCH 02/32] working version

---
 Cargo.lock                       | 51 +++++++++++++++++++++++++
 Cargo.toml                       |  3 +-
 cli-signer/rpc-client/Cargo.toml |  4 +-
 ethcore/Cargo.toml               |  2 +-
 ethcore/src/client/client.rs     | 64 ++++++++++++++++++++++++++++++++
 ethcore/src/lib.rs               |  1 +
 ethcore/sync/Cargo.toml          |  1 +
 ethcore/sync/src/api.rs          | 22 ++++++++++-
 miner/stratum/Cargo.toml         |  4 +-
 parity/lib.rs                    |  1 +
 rpc/Cargo.toml                   | 12 +++---
 rpc/src/v1/impls/parity.rs       | 30 +++++++--------
 util/stats/Cargo.toml            |  1 +
 util/stats/src/lib.rs            | 19 +++++++++-
 14 files changed, 184 insertions(+), 31 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0abe6cbfdac..bc4a31e9246 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1577,6 +1577,7 @@ dependencies = [
  "rustc-hex 2.1.0",
  "snapshot",
  "spec",
+ "stats",
  "trace-time",
  "triehash-ethereum",
 ]
@@ -2387,6 +2388,7 @@ dependencies = [
 [[package]]
 name = "jsonrpc-core"
 version = "14.1.0"
+source = "git+https://github.com/adria0/jsonrpc?branch=adria0/rawapi#2707b08fb757cdc83697ef6bc5b8127b53d317c4"
 dependencies = [
  "futures",
  "log",
@@ -2398,6 +2400,7 @@ dependencies = [
 [[package]]
 name = "jsonrpc-derive"
 version = "14.1.0"
+source = "git+https://github.com/adria0/jsonrpc?branch=adria0/rawapi#2707b08fb757cdc83697ef6bc5b8127b53d317c4"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.9",
@@ -2408,6 +2411,7 @@ dependencies = [
 [[package]]
 name = "jsonrpc-http-server"
 version = "14.1.0"
+source = "git+https://github.com/adria0/jsonrpc?branch=adria0/rawapi#2707b08fb757cdc83697ef6bc5b8127b53d317c4"
 dependencies = [
  "hyper",
  "jsonrpc-core 14.1.0",
@@ -2421,6 +2425,7 @@ dependencies = [
 [[package]]
 name = "jsonrpc-ipc-server"
 version = "14.1.0"
+source = "git+https://github.com/adria0/jsonrpc?branch=adria0/rawapi#2707b08fb757cdc83697ef6bc5b8127b53d317c4"
 dependencies = [
  "jsonrpc-core 14.1.0",
  "jsonrpc-server-utils 14.1.0",
@@ -2433,6 +2438,7 @@ dependencies = [
 [[package]]
 name = "jsonrpc-pubsub"
 version = "14.1.0"
+source = "git+https://github.com/adria0/jsonrpc?branch=adria0/rawapi#2707b08fb757cdc83697ef6bc5b8127b53d317c4"
 dependencies = [
  "jsonrpc-core 14.1.0",
  "log",
@@ -2460,6 +2466,7 @@ dependencies = [
 [[package]]
 name = "jsonrpc-server-utils"
 version = "14.1.0"
+source = "git+https://github.com/adria0/jsonrpc?branch=adria0/rawapi#2707b08fb757cdc83697ef6bc5b8127b53d317c4"
 dependencies = [
  "bytes",
  "globset",
@@ -2474,6 +2481,7 @@ dependencies = [
 [[package]]
 name = "jsonrpc-tcp-server"
 version = "14.1.0"
+source = "git+https://github.com/adria0/jsonrpc?branch=adria0/rawapi#2707b08fb757cdc83697ef6bc5b8127b53d317c4"
 dependencies = [
  "jsonrpc-core 14.1.0",
  "jsonrpc-server-utils 14.1.0",
@@ -2485,6 +2493,7 @@ dependencies = [
 [[package]]
 name = "jsonrpc-ws-server"
 version = "14.1.0"
+source = "git+https://github.com/adria0/jsonrpc?branch=adria0/rawapi#2707b08fb757cdc83697ef6bc5b8127b53d317c4"
 dependencies = [
  "jsonrpc-core 14.1.0",
  "jsonrpc-server-utils 14.1.0",
@@ -3177,6 +3186,7 @@ dependencies = [
  "parity-version",
  "parking_lot 0.10.0",
  "pretty_assertions",
+ "prometheus",
  "regex",
  "registrar",
  "rlp",
@@ -3876,6 +3886,26 @@ dependencies = [
  "unicode-xid 0.2.0",
 ]
 
+[[package]]
+name = "prometheus"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd0ced56dee39a6e960c15c74dc48849d614586db2eaada6497477af7c7811cd"
+dependencies = [
+ "cfg-if",
+ "fnv",
+ "lazy_static",
+ "protobuf",
+ "spin",
+ "thiserror",
+]
+
+[[package]]
+name = "protobuf"
+version = "2.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e86d370532557ae7573551a1ec8235a0f8d6cb276c7c9e6aa490b511c447485"
+
 [[package]]
 name = "pwasm-run-test"
 version = "0.1.0"
@@ -4747,6 +4777,7 @@ name = "stats"
 version = "0.1.0"
 dependencies = [
  "log",
+ "prometheus",
 ]
 
 [[package]]
@@ -4874,6 +4905,26 @@ dependencies = [
  "unicode-width",
 ]
 
+[[package]]
+name = "thiserror"
+version = "1.0.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b13f926965ad00595dd129fa12823b04bbf866e9085ab0a5f2b05b850fbfc344"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "893582086c2f98cde18f906265a65b5030a074b1046c674ae898be6519a7f479"
+dependencies = [
+ "proc-macro2 1.0.9",
+ "quote 1.0.3",
+ "syn 1.0.17",
+]
+
 [[package]]
 name = "thread-id"
 version = "3.3.0"
diff --git a/Cargo.toml b/Cargo.toml
index 9303da6f162..845a729c273 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -41,7 +41,7 @@ ethstore = { path = "accounts/ethstore" }
 fdlimit = "0.1"
 futures = "0.1"
 journaldb = { path = "util/journaldb" }
-jsonrpc-core = { path = "../jsonrpc/core"} 
+jsonrpc-core = { git = "https://github.com/adria0/jsonrpc", branch="adria0/rawapi"} 
 keccak-hash = "0.5.0"
 kvdb = "0.5.0"
 kvdb-rocksdb = "0.7.0"
@@ -79,6 +79,7 @@ term_size = "0.3"
 textwrap = "0.11.0"
 toml = "0.5.6"
 verification = { path = "ethcore/verification" }
+prometheus = "0.9.0"
 
 [build-dependencies]
 rustc_version = "0.2"
diff --git a/cli-signer/rpc-client/Cargo.toml b/cli-signer/rpc-client/Cargo.toml
index 3beb61697f2..bf2f9905a63 100644
--- a/cli-signer/rpc-client/Cargo.toml
+++ b/cli-signer/rpc-client/Cargo.toml
@@ -15,7 +15,7 @@ serde_json = "1.0"
 url = "2.1.1"
 matches = "0.1"
 parking_lot = "0.10.0"
-jsonrpc-core = { path = "../../../jsonrpc/core" } 
-jsonrpc-ws-server = { path = "../../../jsonrpc/ws" }
+jsonrpc-core = { git = "https://github.com/adria0/jsonrpc", branch="adria0/rawapi"} 
+jsonrpc-ws-server = { git = "https://github.com/adria0/jsonrpc", branch="adria0/rawapi"}
 parity-rpc = { path = "../../rpc" }
 keccak-hash = "0.5.0"
diff --git a/ethcore/Cargo.toml b/ethcore/Cargo.toml
index a7133316af6..8e07b7fa59a 100644
--- a/ethcore/Cargo.toml
+++ b/ethcore/Cargo.toml
@@ -56,6 +56,7 @@ serde_derive = "1.0"
 snapshot = { path = "snapshot" }
 spec = { path = "spec" }
 state-db = { path = "state-db" }
+stats = { path = "../util/stats" }
 tempfile = { version = "3.1", optional = true }
 trace = { path = "trace" }
 trace-time = "0.1"
@@ -83,7 +84,6 @@ lazy_static = "1.3"
 machine = { path = "./machine", features = ["test-helpers"] }
 parity-runtime = "0.1.1"
 serde_json = "1.0"
-stats = { path = "../util/stats" }
 pod = { path = "pod" }
 tempfile = "3.1"
 trie-standardmap = "0.15.0"
diff --git a/ethcore/src/client/client.rs b/ethcore/src/client/client.rs
index 17419c5eca2..8c40353282c 100644
--- a/ethcore/src/client/client.rs
+++ b/ethcore/src/client/client.rs
@@ -136,6 +136,7 @@ use types::data_format::DataFormat;
 use verification::{self, BlockQueue};
 use verification::queue::kind::BlockLike;
 use vm::{CreateContractAddress, EnvInfo, LastHashes};
+use stats::{prometheus_counter,prometheus_gauge,prometheus,PrometheusMetrics};
 
 const MAX_ANCIENT_BLOCKS_QUEUE_SIZE: usize = 4096;
 // Max number of blocks imported at once.
@@ -2857,6 +2858,69 @@ impl IoChannelQueue {
 	}
 }
 
+impl PrometheusMetrics for Client {
+	fn prometheus_metrics(&self, r: &mut prometheus::Registry) {
+
+		// gas, tx & blocks
+		let report = self.report();
+
+		prometheus_counter(r,"import_gas","Gas processed",report.gas_processed.as_u64() as i64);
+		prometheus_counter(r,"import_blocks","Blocks imported",report.blocks_imported as i64);
+		prometheus_counter(r,"import_txs","Transactions applied",report.transactions_applied as i64);
+
+		let state_db = self.state_db.read();
+		prometheus_gauge(r,"statedb_mem_used","State DB memory used",state_db.mem_used() as i64);
+		prometheus_gauge(r,"statedb_cache_size","State DB cache size",state_db.cache_size() as i64);
+
+		// blockchain caché
+		let blockchain_cache_info = self.blockchain_cache_info();
+		prometheus_gauge(r,"blockchaincache_block_details","BlockDetails cache size",blockchain_cache_info.block_details as i64);
+		prometheus_gauge(r,"blockchaincache_block_recipts","Block receipts size",blockchain_cache_info.block_receipts as i64);
+		prometheus_gauge(r,"blockchaincache_blocks","Blocks cache size",blockchain_cache_info.blocks as i64);
+		prometheus_gauge(r,"blockchaincache_txaddrs","Transaction addresses cache size",blockchain_cache_info.transaction_addresses as i64);
+		prometheus_gauge(r,"blockchaincache_size","Total blockchain cache size",blockchain_cache_info.total() as i64);
+
+		// io
+		let io_stats = self.db.read().key_value().io_stats(kvdb::IoStatsKind::Overall);
+		prometheus_counter(r,"io_transactions","Number of transactions", io_stats.transactions as i64);
+		prometheus_counter(r,"io_reads","Number of read operations", io_stats.reads as i64);
+		prometheus_counter(r,"io_writes","Number of write operations", io_stats.writes as i64);
+		prometheus_counter(r,"io_cache_reads","Number of reads resulted in a read from cache", io_stats.cache_reads as i64);
+		prometheus_counter(r,"io_bytes_read","Number of bytes read", io_stats.bytes_read as i64);
+		prometheus_counter(r,"io_cache_read_bytes",".", io_stats.cache_read_bytes as i64);
+		prometheus_counter(r,"io_bytes_written","Number of bytes written", io_stats.bytes_written as i64);
+
+		// chain info
+		let chain = self.chain_info();
+
+		let gap = chain.ancient_block_number.map(|x| U256::from(x + 1))
+			.and_then(|first| chain.first_block_number.map(|last| (first, U256::from(last))));
+		if let Some((first,last)) = gap  {
+			prometheus_gauge(r,"chain_warpsync_gap_first","Warp sync gap, first block",first.as_u64() as i64);
+			prometheus_gauge(r,"chain_warpsync_gap_last","Warp sync gap, last block",last.as_u64() as i64);
+		}
+
+		prometheus_gauge(r,"chain_difficulty_total","Blockchain difficulty",chain.total_difficulty.as_u64() as i64);
+		prometheus_gauge(r,"chain_difficulty_total_pending","Block queue difficulty",chain.pending_total_difficulty.as_u64() as i64);
+		prometheus_gauge(r,"chain_block","Best block number",chain.best_block_number as i64);
+
+
+		// prunning info
+		let prunning = self.pruning_info();
+		prometheus_gauge(r,"prunning_earliest_chain","The first block which everything can be served after",prunning.earliest_chain as i64);
+		prometheus_gauge(r,"prunning_earliest_state","The first block where state requests may be served",prunning.earliest_state as i64);
+
+		// queue info
+		let queue = self.queue_info();
+		prometheus_gauge(r,"queue_mem_used","Queue heap memory used in bytes",queue.mem_used as i64);
+		prometheus_gauge(r,"queue_size_total","The total size of the queues",queue.total_queue_size() as i64);
+		prometheus_gauge(r,"queue_size_unverified","Number of queued items pending verification",queue.unverified_queue_size as i64);
+		prometheus_gauge(r,"queue_size_verified","Number of verified queued items pending import",queue.verified_queue_size as i64);
+		prometheus_gauge(r,"queue_size_verifying","Number of items being verified",queue.verifying_queue_size as i64);
+
+	}
+}
+
 #[cfg(test)]
 mod tests {
 	use std::sync::Arc;
diff --git a/ethcore/src/lib.rs b/ethcore/src/lib.rs
index b21cd959b5f..8b81c1e6ecf 100644
--- a/ethcore/src/lib.rs
+++ b/ethcore/src/lib.rs
@@ -49,6 +49,7 @@ extern crate rlp;
 extern crate rustc_hex;
 extern crate serde;
 extern crate snapshot;
+extern crate stats;
 extern crate spec;
 extern crate state_db;
 extern crate trace;
diff --git a/ethcore/sync/Cargo.toml b/ethcore/sync/Cargo.toml
index 89c98a741dd..c4a54a22a96 100644
--- a/ethcore/sync/Cargo.toml
+++ b/ethcore/sync/Cargo.toml
@@ -32,6 +32,7 @@ rand = "0.7.3"
 parking_lot = "0.10.0"
 rlp = "0.4.5"
 snapshot = { path = "../snapshot" }
+stats = { path = "../../util/stats" }
 trace-time = "0.1"
 triehash-ethereum = { version = "0.2", path = "../../util/triehash-ethereum" }
 
diff --git a/ethcore/sync/src/api.rs b/ethcore/sync/src/api.rs
index cd96c9eea58..46c7c84bb58 100644
--- a/ethcore/sync/src/api.rs
+++ b/ethcore/sync/src/api.rs
@@ -66,7 +66,7 @@ use common_types::{
 	pruning_info::PruningInfo,
 	transaction::UnverifiedTransaction,
 };
-
+use stats::{PrometheusMetrics, prometheus_counter, prometheus_gauge, prometheus};
 
 /// Parity sync protocol
 pub const WARP_SYNC_PROTOCOL_ID: ProtocolId = *b"par";
@@ -150,7 +150,7 @@ impl Default for SyncConfig {
 pub type Notification<T> = futures_mpsc::UnboundedReceiver<T>;
 
 /// Current sync status
-pub trait SyncProvider: Send + Sync {
+pub trait SyncProvider: Send + Sync + PrometheusMetrics {
 	/// Get sync status
 	fn status(&self) -> EthSyncStatus;
 
@@ -412,6 +412,24 @@ impl EthSync {
 	}
 }
 
+impl PrometheusMetrics for EthSync {
+	fn prometheus_metrics(&self, r: &mut prometheus::Registry) {
+		let scalar = |b| if b {1i64} else {0i64};
+		let sync_status = self.status();
+
+		prometheus_gauge(r,"sync_peers","Total number of connected peers",sync_status.num_peers as i64);
+		prometheus_gauge(r,"sync_active_peers","Total number of active peers",sync_status.num_active_peers as i64);
+		prometheus_counter(r,"sync_blocks_recieved","Number of blocks downloaded so far",sync_status.blocks_received as i64);
+		prometheus_counter(r,"sync_blocks_total","Total number of blocks for the sync process",sync_status.blocks_total as i64);
+		prometheus_gauge(r,"sync_blocks_highest","Highest block number in the download queue",sync_status.highest_block_number.unwrap_or(0) as i64);
+		prometheus_gauge(r,"sync_is_majorsync","Are we in the middle of a major sync?",scalar(self.is_major_syncing()));
+		prometheus_gauge(r,"sync_mem_used","Heap memory used in bytes",sync_status.mem_used  as i64);
+		prometheus_gauge(r,"sync_snapshot_is_sync",".",scalar(sync_status.is_snapshot_syncing()));
+		prometheus_gauge(r,"sync_snapshot_chunks","Snapshot chunks",sync_status.num_snapshot_chunks as i64);
+		prometheus_gauge(r,"sync_snapshot_chunks_done","Snapshot chunks downloaded",sync_status.snapshot_chunks_done as i64);
+	}
+}
+
 impl SyncProvider for EthSync {
 	/// Get sync status
 	fn status(&self) -> EthSyncStatus {
diff --git a/miner/stratum/Cargo.toml b/miner/stratum/Cargo.toml
index 06d6f1e4bd8..b96134a80b8 100644
--- a/miner/stratum/Cargo.toml
+++ b/miner/stratum/Cargo.toml
@@ -8,8 +8,8 @@ authors = ["Parity Technologies <admin@parity.io>"]
 [dependencies]
 ethereum-types = "0.9.0"
 keccak-hash = "0.5.0"
-jsonrpc-core = { path = "../../../jsonrpc/core" } 
-jsonrpc-tcp-server = { path = "../../../jsonrpc/tcp" }
+jsonrpc-core = { git = "https://github.com/adria0/jsonrpc", branch="adria0/rawapi"} 
+jsonrpc-tcp-server = { git = "https://github.com/adria0/jsonrpc", branch="adria0/rawapi"}
 log = "0.4"
 parking_lot = "0.10.0"
 
diff --git a/parity/lib.rs b/parity/lib.rs
index f8be172fa0e..5fe34004a8b 100644
--- a/parity/lib.rs
+++ b/parity/lib.rs
@@ -75,6 +75,7 @@ extern crate registrar;
 extern crate snapshot;
 extern crate spec;
 extern crate verification;
+extern crate prometheus;
 
 #[macro_use]
 extern crate log as rlog;
diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
index 5b1779806bc..90dacf2f4a2 100644
--- a/rpc/Cargo.toml
+++ b/rpc/Cargo.toml
@@ -26,12 +26,12 @@ tokio-timer = "0.2.13"
 transient-hashmap = "0.4"
 itertools = "0.8.2"
 
-jsonrpc-core = { path = "../../jsonrpc/core" }
-jsonrpc-derive = { path = "../../jsonrpc/derive" }
-jsonrpc-http-server = { path = "../../jsonrpc/http" }
-jsonrpc-ws-server = { path = "../../jsonrpc/ws" }
-jsonrpc-ipc-server = { path = "../../jsonrpc/ipc" }
-jsonrpc-pubsub = { path = "../../jsonrpc/pubsub" }
+jsonrpc-core ={ git = "https://github.com/adria0/jsonrpc", branch="adria0/rawapi"}
+jsonrpc-derive = { git = "https://github.com/adria0/jsonrpc", branch="adria0/rawapi"}
+jsonrpc-http-server = { git = "https://github.com/adria0/jsonrpc", branch="adria0/rawapi"}
+jsonrpc-ws-server = { git = "https://github.com/adria0/jsonrpc", branch="adria0/rawapi"}
+jsonrpc-ipc-server = { git = "https://github.com/adria0/jsonrpc", branch="adria0/rawapi"}
+jsonrpc-pubsub ={ git = "https://github.com/adria0/jsonrpc", branch="adria0/rawapi"}
 
 client-traits = { path = "../ethcore/client-traits" }
 common-types = { path = "../ethcore/types" }
diff --git a/rpc/src/v1/impls/parity.rs b/rpc/src/v1/impls/parity.rs
index c97f4a7c2c9..f9774ed1f1c 100644
--- a/rpc/src/v1/impls/parity.rs
+++ b/rpc/src/v1/impls/parity.rs
@@ -39,6 +39,10 @@ use types::{
 };
 use updater::{Service as UpdateService};
 use version::version_data;
+use stats::{
+	PrometheusMetrics,
+	prometheus::{self, Encoder}
+};
 
 use v1::helpers::{self, errors, fake_sign, NetworkSettings, verify_signature};
 use v1::helpers::external_signer::{SigningQueue, SignerService};
@@ -70,7 +74,7 @@ pub struct ParityClient<C, M, U> {
 }
 
 impl<C, M, U> ParityClient<C, M, U> where
-	C: BlockChainClient,
+	C: BlockChainClient + PrometheusMetrics,
 {
 	/// Creates new `ParityClient`.
 	pub fn new(
@@ -102,7 +106,7 @@ impl<C, M, U> ParityClient<C, M, U> where
 
 impl<C, M, U, S> Parity for ParityClient<C, M, U> where
 	S: StateInfo + 'static,
-	C: miner::BlockChainClient + BlockChainClient + StateClient<State=S> + Call<State=S> + 'static,
+	C: miner::BlockChainClient + BlockChainClient + PrometheusMetrics + StateClient<State=S> + Call<State=S> + 'static,
 	M: MinerService<State=S> + 'static,
 	U: UpdateService + 'static,
 {
@@ -454,22 +458,16 @@ impl<C, M, U, S> Parity for ParityClient<C, M, U> where
 	}
 
 	fn metrics(&self) -> Result<String> {
-		let mut r = String::new();
 
-		let scalar = |b| if b {1} else {0};
+		let mut reg = prometheus::Registry::new();
+		self.client.prometheus_metrics(&mut reg);
+		self.sync.prometheus_metrics(&mut reg);
 
-		let sync_status = self.sync.status();
-		r.push_str(&format!("oe_sync_peers {}\n",sync_status.num_peers));
-		r.push_str(&format!("oe_sync_active_peers {}\n",sync_status.num_active_peers));
-		r.push_str(&format!("oe_sync_blocks_recieved {}\n",sync_status.blocks_received));
-		r.push_str(&format!("oe_sync_blocks_total {}\n",sync_status.blocks_total));
-		r.push_str(&format!("oe_sync_blocks_highest {}\n",sync_status.highest_block_number.unwrap_or(0)));
-		r.push_str(&format!("oe_sync_is_majorsync {}\n",scalar(self.sync.is_major_syncing())));
-		r.push_str(&format!("oe_sync_snapshot_is_sync {}\n",scalar(sync_status.is_snapshot_syncing())));
-		r.push_str(&format!("oe_sync_snapshot_chunks {}\n",sync_status.num_snapshot_chunks));
-		r.push_str(&format!("oe_sync_snapshot_chunks_done {}\n",sync_status.snapshot_chunks_done));
-		r.push_str(&format!("oe_sync_mem_used {}\n",sync_status.mem_used));
-		Ok(String::from(r))
+		let mut buffer = vec![];
+		let encoder = prometheus::TextEncoder::new();
+		let metric_families = reg.gather();
+		encoder.encode(&metric_families, &mut buffer).unwrap();
+		Ok(String::from_utf8(buffer).unwrap())
 	}
 
 	fn logs_no_tx_hash(&self, filter: Filter) -> BoxFuture<Vec<Log>> {
diff --git a/util/stats/Cargo.toml b/util/stats/Cargo.toml
index 9997c7846d2..52c7cae728a 100644
--- a/util/stats/Cargo.toml
+++ b/util/stats/Cargo.toml
@@ -5,3 +5,4 @@ authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
 log = "0.4"
+prometheus = "0.9.0"
\ No newline at end of file
diff --git a/util/stats/src/lib.rs b/util/stats/src/lib.rs
index fa56bf273ae..631d0553df7 100644
--- a/util/stats/src/lib.rs
+++ b/util/stats/src/lib.rs
@@ -21,8 +21,25 @@ use std::ops::{Add, Sub, Deref, Div};
 
 #[macro_use]
 extern crate log;
+pub extern crate prometheus;
 
-/// Sorted corpus of data.
+pub trait PrometheusMetrics {
+	fn prometheus_metrics(&self, registry: &mut prometheus::Registry);
+}
+
+pub fn prometheus_counter(reg: &mut prometheus::Registry, name: &str, help: &str, value: i64) {
+	let c = prometheus::IntCounter::new(name,help).expect("does not fail. qed.");
+	c.inc_by(value);
+	reg.register(Box::new(c)).expect("qed");
+}
+
+pub fn prometheus_gauge(reg: &mut prometheus::Registry, name: &str, help: &str, value: i64) {
+	let g = prometheus::IntGauge::new(name,help).expect("does not fail. qed.");
+	g.set(value);
+	reg.register(Box::new(g)).expect("qed");
+}
+
+/// Sorted corpus of data.1
 #[derive(Debug, Clone, PartialEq)]
 pub struct Corpus<T>(Vec<T>);
 

From 6e967d6212bad0912da7e6fedf537b28cd42b071 Mon Sep 17 00:00:00 2001
From: adria0 <adria@codecontext.io>
Date: Fri, 5 Jun 2020 08:19:03 +0200
Subject: [PATCH 03/32] fix perf compilation

---
 ethcore/src/test_helpers/test_client.rs   | 6 ++++++
 rpc/src/v1/tests/helpers/sync_provider.rs | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/ethcore/src/test_helpers/test_client.rs b/ethcore/src/test_helpers/test_client.rs
index 0f4cde783b8..bc800723394 100644
--- a/ethcore/src/test_helpers/test_client.rs
+++ b/ethcore/src/test_helpers/test_client.rs
@@ -81,6 +81,7 @@ use spec::{Spec, self};
 use account_state::state::StateInfo;
 use state_db::StateDB;
 use trace::LocalizedTrace;
+use stats::{PrometheusMetrics,prometheus};
 
 /// Test client.
 pub struct TestBlockChainClient {
@@ -995,3 +996,8 @@ impl client_traits::EngineClient for TestBlockChainClient {
 		BlockChainClient::block_header(self, id)
 	}
 }
+
+impl PrometheusMetrics for TestBlockChainClient {
+	fn prometheus_metrics(&self, r: &mut prometheus::Registry) {
+	}
+}
\ No newline at end of file
diff --git a/rpc/src/v1/tests/helpers/sync_provider.rs b/rpc/src/v1/tests/helpers/sync_provider.rs
index 27fd16ba7c0..97863669ee5 100644
--- a/rpc/src/v1/tests/helpers/sync_provider.rs
+++ b/rpc/src/v1/tests/helpers/sync_provider.rs
@@ -22,6 +22,7 @@ use parking_lot::RwLock;
 use network::client_version::ClientVersion;
 use futures::sync::mpsc;
 use sync::{SyncProvider, EthProtocolInfo, SyncStatus, PeerInfo, TransactionStats, SyncState};
+use stats::{PrometheusMetrics,prometheus};
 
 /// TestSyncProvider config.
 pub struct Config {
@@ -72,6 +73,11 @@ impl TestSyncProvider {
 	}
 }
 
+impl PrometheusMetrics for TestSyncProvider {
+	fn prometheus_metrics(&self, r: &mut prometheus::Registry) {
+	}
+}
+
 impl SyncProvider for TestSyncProvider {
 	fn status(&self) -> SyncStatus {
 		self.status.read().clone()

From 6665e8dda4d9791e5fbbbfda93377b2736c10d8f Mon Sep 17 00:00:00 2001
From: adria0 <adria@codecontext.io>
Date: Fri, 5 Jun 2020 13:54:04 +0200
Subject: [PATCH 04/32] docker-compose

---
 scripts/prometheus/config/grafana/grafana.ini |  705 +++++++++++
 scripts/prometheus/config/grafana/loki.yaml   |   10 +
 .../prometheus/config/grafana/prometheus.yaml |   50 +
 .../config/prometheus/prometheus.yml          |   44 +
 .../prometheus/config/promtail/config.yaml    |   18 +
 scripts/prometheus/docker-compose.yaml        |  107 ++
 scripts/prometheus/model.json                 | 1092 +++++++++++++++++
 scripts/prometheus/start.sh                   |    1 +
 8 files changed, 2027 insertions(+)
 create mode 100644 scripts/prometheus/config/grafana/grafana.ini
 create mode 100644 scripts/prometheus/config/grafana/loki.yaml
 create mode 100644 scripts/prometheus/config/grafana/prometheus.yaml
 create mode 100644 scripts/prometheus/config/prometheus/prometheus.yml
 create mode 100644 scripts/prometheus/config/promtail/config.yaml
 create mode 100644 scripts/prometheus/docker-compose.yaml
 create mode 100644 scripts/prometheus/model.json
 create mode 100755 scripts/prometheus/start.sh

diff --git a/scripts/prometheus/config/grafana/grafana.ini b/scripts/prometheus/config/grafana/grafana.ini
new file mode 100644
index 00000000000..49e05c3b519
--- /dev/null
+++ b/scripts/prometheus/config/grafana/grafana.ini
@@ -0,0 +1,705 @@
+##################### Grafana Configuration Defaults #####################
+#
+# Do not modify this file in grafana installs
+#
+
+# possible values : production, development
+app_mode = production
+
+# instance name, defaults to HOSTNAME environment variable value or hostname if HOSTNAME var is empty
+instance_name = ${HOSTNAME}
+
+#################################### Paths ###############################
+[paths]
+# Path to where grafana can store temp files, sessions, and the sqlite3 db (if that is used)
+data = data
+
+# Temporary files in `data` directory older than given duration will be removed
+temp_data_lifetime = 24h
+
+# Directory where grafana can store logs
+logs = data/log
+
+# Directory where grafana will automatically scan and look for plugins
+plugins = data/plugins
+
+# folder that contains provisioning config files that grafana will apply on startup and while running.
+provisioning = conf/provisioning
+
+#################################### Server ##############################
+[server]
+# Protocol (http, https, h2, socket)
+protocol = http
+
+# The ip address to bind to, empty will bind to all interfaces
+http_addr =
+
+# The http port to use
+http_port = 3000
+
+# The public facing domain name used to access grafana from a browser
+domain = localhost
+
+# Redirect to correct domain if host header does not match domain
+# Prevents DNS rebinding attacks
+enforce_domain = false
+
+# The full public facing url
+root_url = %(protocol)s://%(domain)s:%(http_port)s/
+
+# Serve Grafana from subpath specified in `root_url` setting. By default it is set to `false` for compatibility reasons.
+serve_from_sub_path = false
+
+# Log web requests
+router_logging = false
+
+# the path relative working path
+static_root_path = public
+
+# enable gzip
+enable_gzip = false
+
+# https certs & key file
+cert_file =
+cert_key =
+
+# Unix socket path
+socket = /tmp/grafana.sock
+
+#################################### Database ############################
+[database]
+# You can configure the database connection by specifying type, host, name, user and password
+# as separate properties or as on string using the url property.
+
+# Either "mysql", "postgres" or "sqlite3", it's your choice
+type = sqlite3
+host = 127.0.0.1:3306
+name = grafana
+user = root
+# If the password contains # or ; you have to wrap it with triple quotes. Ex """#password;"""
+password =
+# Use either URL or the previous fields to configure the database
+# Example: mysql://user:secret@host:port/database
+url =
+
+# Max idle conn setting default is 2
+max_idle_conn = 2
+
+# Max conn setting default is 0 (mean not set)
+max_open_conn =
+
+# Connection Max Lifetime default is 14400 (means 14400 seconds or 4 hours)
+conn_max_lifetime = 14400
+
+# Set to true to log the sql calls and execution times.
+log_queries =
+
+# For "postgres", use either "disable", "require" or "verify-full"
+# For "mysql", use either "true", "false", or "skip-verify".
+ssl_mode = disable
+
+ca_cert_path =
+client_key_path =
+client_cert_path =
+server_cert_name =
+
+# For "sqlite3" only, path relative to data_path setting
+path = grafana.db
+
+# For "sqlite3" only. cache mode setting used for connecting to the database
+cache_mode = private
+
+#################################### Cache server #############################
+[remote_cache]
+# Either "redis", "memcached" or "database" default is "database"
+type = database
+
+# cache connectionstring options
+# database: will use Grafana primary database.
+# redis: config like redis server e.g. `addr=127.0.0.1:6379,pool_size=100,db=0,ssl=false`. Only addr is required. ssl may be 'true', 'false', or 'insecure'.
+# memcache: 127.0.0.1:11211
+connstr =
+
+#################################### Data proxy ###########################
+[dataproxy]
+
+# This enables data proxy logging, default is false
+logging = false
+
+# How long the data proxy should wait before timing out default is 30 (seconds)
+timeout = 30
+
+# If enabled and user is not anonymous, data proxy will add X-Grafana-User header with username into the request, default is false.
+send_user_header = false
+
+#################################### Analytics ###########################
+[analytics]
+# Server reporting, sends usage counters to stats.grafana.org every 24 hours.
+# No ip addresses are being tracked, only simple counters to track
+# running instances, dashboard and error counts. It is very helpful to us.
+# Change this option to false to disable reporting.
+reporting_enabled = true
+
+# Set to false to disable all checks to https://grafana.com
+# for new versions (grafana itself and plugins), check is used
+# in some UI views to notify that grafana or plugin update exists
+# This option does not cause any auto updates, nor send any information
+# only a GET request to https://grafana.com to get latest versions
+check_for_updates = true
+
+# Google Analytics universal tracking code, only enabled if you specify an id here
+google_analytics_ua_id =
+
+# Google Tag Manager ID, only enabled if you specify an id here
+google_tag_manager_id =
+
+#################################### Security ############################
+[security]
+# disable creation of admin user on first start of grafana
+disable_initial_admin_creation = false
+
+# default admin user, created on startup
+admin_user = admin
+
+# default admin password, can be changed before first start of grafana, or in profile settings
+admin_password = admin
+
+# used for signing
+secret_key = SW2YcwTIb9zpOOhoPsMm
+
+# disable gravatar profile images
+disable_gravatar = false
+
+# data source proxy whitelist (ip_or_domain:port separated by spaces)
+data_source_proxy_whitelist =
+
+# disable protection against brute force login attempts
+disable_brute_force_login_protection = false
+
+# set to true if you host Grafana behind HTTPS. default is false.
+cookie_secure = false
+
+# set cookie SameSite attribute. defaults to `lax`. can be set to "lax", "strict" and "none"
+cookie_samesite = lax
+
+# set to true if you want to allow browsers to render Grafana in a <frame>, <iframe>, <embed> or <object>. default is false.
+allow_embedding = false
+
+# Set to true if you want to enable http strict transport security (HSTS) response header.
+# This is only sent when HTTPS is enabled in this configuration.
+# HSTS tells browsers that the site should only be accessed using HTTPS.
+# The default will change to true in the next minor release, 6.3.
+strict_transport_security = false
+
+# Sets how long a browser should cache HSTS. Only applied if strict_transport_security is enabled.
+strict_transport_security_max_age_seconds = 86400
+
+# Set to true if to enable HSTS preloading option. Only applied if strict_transport_security is enabled.
+strict_transport_security_preload = false
+
+# Set to true if to enable the HSTS includeSubDomains option. Only applied if strict_transport_security is enabled.
+strict_transport_security_subdomains = false
+
+# Set to true to enable the X-Content-Type-Options response header.
+# The X-Content-Type-Options response HTTP header is a marker used by the server to indicate that the MIME types advertised
+# in the Content-Type headers should not be changed and be followed. The default will change to true in the next minor release, 6.3.
+x_content_type_options = false
+
+# Set to true to enable the X-XSS-Protection header, which tells browsers to stop pages from loading
+# when they detect reflected cross-site scripting (XSS) attacks. The default will change to true in the next minor release, 6.3.
+x_xss_protection = false
+
+
+#################################### Snapshots ###########################
+[snapshots]
+# snapshot sharing options
+external_enabled = true
+external_snapshot_url = https://snapshots-origin.raintank.io
+external_snapshot_name = Publish to snapshot.raintank.io
+
+# Set to true to enable this Grafana instance act as an external snapshot server and allow unauthenticated requests for
+# creating and deleting snapshots.
+public_mode = false
+
+# remove expired snapshot
+snapshot_remove_expired = true
+
+#################################### Dashboards ##################
+
+[dashboards]
+# Number dashboard versions to keep (per dashboard). Default: 20, Minimum: 1
+versions_to_keep = 20
+
+#################################### Users ###############################
+[users]
+# disable user signup / registration
+allow_sign_up = false
+
+# Allow non admin users to create organizations
+allow_org_create = false
+
+# Set to true to automatically assign new users to the default organization (id 1)
+auto_assign_org = true
+
+# Set this value to automatically add new users to the provided organization (if auto_assign_org above is set to true)
+auto_assign_org_id = 1
+
+# Default role new users will be automatically assigned (if auto_assign_org above is set to true)
+auto_assign_org_role = Viewer
+
+# Require email validation before sign up completes
+verify_email_enabled = false
+
+# Background text for the user field on the login page
+login_hint = email or username
+password_hint = password
+
+# Default UI theme ("dark" or "light")
+default_theme = dark
+
+# External user management
+external_manage_link_url =
+external_manage_link_name =
+external_manage_info =
+
+# Viewers can edit/inspect dashboard settings in the browser. But not save the dashboard.
+viewers_can_edit = false
+
+# Editors can administrate dashboard, folders and teams they create
+editors_can_admin = false
+
+[auth]
+# Login cookie name
+login_cookie_name = grafana_session
+
+# The lifetime (days) an authenticated user can be inactive before being required to login at next visit. Default is 7 days.
+login_maximum_inactive_lifetime_days = 7
+
+# The maximum lifetime (days) an authenticated user can be logged in since login time before being required to login. Default is 30 days.
+login_maximum_lifetime_days = 30
+
+# How often should auth tokens be rotated for authenticated users when being active. The default is each 10 minutes.
+token_rotation_interval_minutes = 10
+
+# Set to true to disable (hide) the login form, useful if you use OAuth
+disable_login_form = false
+
+# Set to true to disable the signout link in the side menu. useful if you use auth.proxy
+disable_signout_menu = false
+
+# URL to redirect the user to after sign out
+signout_redirect_url =
+
+# Set to true to attempt login with OAuth automatically, skipping the login screen.
+# This setting is ignored if multiple OAuth providers are configured.
+oauth_auto_login = false
+
+# limit of api_key seconds to live before expiration
+api_key_max_seconds_to_live = -1
+
+#################################### Anonymous Auth ######################
+[auth.anonymous]
+# enable anonymous access
+enabled = false
+
+# specify organization name that should be used for unauthenticated users
+org_name = Main Org.
+
+# specify role for unauthenticated users
+org_role = Viewer
+
+#################################### Github Auth #########################
+[auth.github]
+enabled = false
+allow_sign_up = true
+client_id = some_id
+client_secret = some_secret
+scopes = user:email,read:org
+auth_url = https://github.com/login/oauth/authorize
+token_url = https://github.com/login/oauth/access_token
+api_url = https://api.github.com/user
+allowed_domains =
+team_ids =
+allowed_organizations =
+
+#################################### GitLab Auth #########################
+[auth.gitlab]
+enabled = false
+allow_sign_up = true
+client_id = some_id
+client_secret = some_secret
+scopes = api
+auth_url = https://gitlab.com/oauth/authorize
+token_url = https://gitlab.com/oauth/token
+api_url = https://gitlab.com/api/v4
+allowed_domains =
+allowed_groups =
+
+#################################### Google Auth #########################
+[auth.google]
+enabled = false
+allow_sign_up = true
+client_id = some_client_id
+client_secret = some_client_secret
+scopes = https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email
+auth_url = https://accounts.google.com/o/oauth2/auth
+token_url = https://accounts.google.com/o/oauth2/token
+api_url = https://www.googleapis.com/oauth2/v1/userinfo
+allowed_domains =
+hosted_domain =
+
+#################################### Grafana.com Auth ####################
+# legacy key names (so they work in env variables)
+[auth.grafananet]
+enabled = false
+allow_sign_up = true
+client_id = some_id
+client_secret = some_secret
+scopes = user:email
+allowed_organizations =
+
+[auth.grafana_com]
+enabled = false
+allow_sign_up = true
+client_id = some_id
+client_secret = some_secret
+scopes = user:email
+allowed_organizations =
+
+#################################### Generic OAuth #######################
+[auth.generic_oauth]
+name = OAuth
+enabled = false
+allow_sign_up = true
+client_id = some_id
+client_secret = some_secret
+scopes = user:email
+email_attribute_name = email:primary
+email_attribute_path =
+role_attribute_path =
+auth_url =
+token_url =
+api_url =
+allowed_domains =
+team_ids =
+allowed_organizations =
+tls_skip_verify_insecure = false
+tls_client_cert =
+tls_client_key =
+tls_client_ca =
+
+#################################### SAML Auth ###########################
+[auth.saml] # Enterprise only
+# Defaults to false. If true, the feature is enabled
+enabled = false
+
+# Base64-encoded public X.509 certificate. Used to sign requests to the IdP
+certificate =
+
+# Path to the public X.509 certificate. Used to sign requests to the IdP
+certificate_path =
+
+# Base64-encoded private key. Used to decrypt assertions from the IdP
+private_key =
+
+# Path to the private key. Used to decrypt assertions from the IdP
+private_key_path =
+
+# Base64-encoded IdP SAML metadata XML. Used to verify and obtain binding locations from the IdP
+idp_metadata =
+
+# Path to the SAML metadata XML. Used to verify and obtain binding locations from the IdP
+idp_metadata_path =
+
+# URL to fetch SAML IdP metadata. Used to verify and obtain binding locations from the IdP
+idp_metadata_url =
+
+# Duration, since the IdP issued a response and the SP is allowed to process it. Defaults to 90 seconds
+max_issue_delay = 90s
+
+# Duration, for how long the SP's metadata should be valid. Defaults to 48 hours
+metadata_valid_duration = 48h
+
+# Friendly name or name of the attribute within the SAML assertion to use as the user's name
+assertion_attribute_name = displayName
+
+# Friendly name or name of the attribute within the SAML assertion to use as the user's login handle
+assertion_attribute_login = mail
+
+# Friendly name or name of the attribute within the SAML assertion to use as the user's email
+assertion_attribute_email = mail
+
+#################################### Basic Auth ##########################
+[auth.basic]
+enabled = true
+
+#################################### Auth Proxy ##########################
+[auth.proxy]
+enabled = false
+header_name = X-WEBAUTH-USER
+header_property = username
+auto_sign_up = true
+# Deprecated, use sync_ttl instead
+ldap_sync_ttl = 60
+sync_ttl = 60
+whitelist =
+headers =
+enable_login_token = false
+
+#################################### Auth LDAP ###########################
+[auth.ldap]
+enabled = false
+config_file = /etc/grafana/ldap.toml
+allow_sign_up = true
+
+# LDAP backround sync (Enterprise only)
+# At 1 am every day
+sync_cron = "0 0 1 * * *"
+active_sync_enabled = true
+
+#################################### SMTP / Emailing #####################
+[smtp]
+enabled = false
+host = localhost:25
+user =
+# If the password contains # or ; you have to wrap it with triple quotes. Ex """#password;"""
+password =
+cert_file =
+key_file =
+skip_verify = false
+from_address = admin@grafana.localhost
+from_name = Grafana
+ehlo_identity =
+
+[emails]
+welcome_email_on_sign_up = false
+templates_pattern = emails/*.html
+
+#################################### Logging ##########################
+[log]
+# Either "console", "file", "syslog". Default is console and file
+# Use space to separate multiple modes, e.g. "console file"
+mode = console file
+
+# Either "debug", "info", "warn", "error", "critical", default is "info"
+level = info
+
+# optional settings to set different levels for specific loggers. Ex filters = sqlstore:debug
+filters =
+
+# For "console" mode only
+[log.console]
+level =
+
+# log line format, valid options are text, console and json
+format = console
+
+# For "file" mode only
+[log.file]
+level =
+
+# log line format, valid options are text, console and json
+format = text
+
+# This enables automated log rotate(switch of following options), default is true
+log_rotate = true
+
+# Max line number of single file, default is 1000000
+max_lines = 1000000
+
+# Max size shift of single file, default is 28 means 1 << 28, 256MB
+max_size_shift = 28
+
+# Segment log daily, default is true
+daily_rotate = true
+
+# Expired days of log file(delete after max days), default is 7
+max_days = 7
+
+[log.syslog]
+level =
+
+# log line format, valid options are text, console and json
+format = text
+
+# Syslog network type and address. This can be udp, tcp, or unix. If left blank, the default unix endpoints will be used.
+network =
+address =
+
+# Syslog facility. user, daemon and local0 through local7 are valid.
+facility =
+
+# Syslog tag. By default, the process' argv[0] is used.
+tag =
+
+#################################### Usage Quotas ########################
+[quota]
+enabled = false
+
+#### set quotas to -1 to make unlimited. ####
+# limit number of users per Org.
+org_user = 10
+
+# limit number of dashboards per Org.
+org_dashboard = 100
+
+# limit number of data_sources per Org.
+org_data_source = 10
+
+# limit number of api_keys per Org.
+org_api_key = 10
+
+# limit number of orgs a user can create.
+user_org = 10
+
+# Global limit of users.
+global_user = -1
+
+# global limit of orgs.
+global_org = -1
+
+# global limit of dashboards
+global_dashboard = -1
+
+# global limit of api_keys
+global_api_key = -1
+
+# global limit on number of logged in users.
+global_session = -1
+
+#################################### Alerting ############################
+[alerting]
+# Disable alerting engine & UI features
+enabled = true
+# Makes it possible to turn off alert rule execution but alerting UI is visible
+execute_alerts = true
+
+# Default setting for new alert rules. Defaults to categorize error and timeouts as alerting. (alerting, keep_state)
+error_or_timeout = alerting
+
+# Default setting for how Grafana handles nodata or null values in alerting. (alerting, no_data, keep_state, ok)
+nodata_or_nullvalues = no_data
+
+# Alert notifications can include images, but rendering many images at the same time can overload the server
+# This limit will protect the server from render overloading and make sure notifications are sent out quickly
+concurrent_render_limit = 5
+
+# Default setting for alert calculation timeout. Default value is 30
+evaluation_timeout_seconds = 30
+
+# Default setting for alert notification timeout. Default value is 30
+notification_timeout_seconds = 30
+
+# Default setting for max attempts to sending alert notifications. Default value is 3
+max_attempts = 3
+
+
+#################################### Explore #############################
+[explore]
+# Enable the Explore section
+enabled = true
+
+#################################### Internal Grafana Metrics ############
+# Metrics available at HTTP API Url /metrics
+[metrics]
+enabled              = true
+interval_seconds     = 10
+# Disable total stats (stat_totals_*) metrics to be generated
+disable_total_stats = false
+
+#If both are set, basic auth will be required for the metrics endpoint.
+basic_auth_username =
+basic_auth_password =
+
+# Send internal Grafana metrics to graphite
+[metrics.graphite]
+# Enable by setting the address setting (ex localhost:2003)
+address =
+prefix = prod.grafana.%(instance_name)s.
+
+#################################### Grafana.com integration  ##########################
+[grafana_net]
+url = https://grafana.com
+
+[grafana_com]
+url = https://grafana.com
+
+#################################### Distributed tracing ############
+[tracing.jaeger]
+# jaeger destination (ex localhost:6831)
+address =
+# tag that will always be included in when creating new spans. ex (tag1:value1,tag2:value2)
+always_included_tag =
+# Type specifies the type of the sampler: const, probabilistic, rateLimiting, or remote
+sampler_type = const
+# jaeger samplerconfig param
+# for "const" sampler, 0 or 1 for always false/true respectively
+# for "probabilistic" sampler, a probability between 0 and 1
+# for "rateLimiting" sampler, the number of spans per second
+# for "remote" sampler, param is the same as for "probabilistic"
+# and indicates the initial sampling rate before the actual one
+# is received from the mothership
+sampler_param = 1
+# Whether or not to use Zipkin span propagation (x-b3- HTTP headers).
+zipkin_propagation = false
+# Setting this to true disables shared RPC spans.
+# Not disabling is the most common setting when using Zipkin elsewhere in your infrastructure.
+disable_shared_zipkin_spans = false
+
+#################################### External Image Storage ##############
+[external_image_storage]
+# Used for uploading images to public servers so they can be included in slack/email messages.
+# You can choose between (s3, webdav, gcs, azure_blob, local)
+provider =
+
+[external_image_storage.s3]
+endpoint =
+path_style_access =
+bucket_url =
+bucket =
+region =
+path =
+access_key =
+secret_key =
+
+[external_image_storage.webdav]
+url =
+username =
+password =
+public_url =
+
+[external_image_storage.gcs]
+key_file =
+bucket =
+path =
+
+[external_image_storage.azure_blob]
+account_name =
+account_key =
+container_name =
+
+[external_image_storage.local]
+# does not require any configuration
+
+[rendering]
+# Options to configure a remote HTTP image rendering service, e.g. using https://github.com/grafana/grafana-image-renderer.
+# URL to a remote HTTP image renderer service, e.g. http://localhost:8081/render, will enable Grafana to render panels and dashboards to PNG-images using HTTP requests to an external service.
+server_url =
+# If the remote HTTP image renderer service runs on a different server than the Grafana server you may have to configure this to a URL where Grafana is reachable, e.g. http://grafana.domain/.
+callback_url =
+
+[panels]
+# here for to support old env variables, can remove after a few months
+enable_alpha = false
+disable_sanitize_html = false
+
+[plugins]
+enable_alpha = false
+app_tls_skip_verify_insecure = false
+
+[enterprise]
+license_path =
+
+[feature_toggles]
+# enable features, separated by spaces
+enable =
diff --git a/scripts/prometheus/config/grafana/loki.yaml b/scripts/prometheus/config/grafana/loki.yaml
new file mode 100644
index 00000000000..4722ec4e102
--- /dev/null
+++ b/scripts/prometheus/config/grafana/loki.yaml
@@ -0,0 +1,10 @@
+apiVersion: 1
+
+datasources:
+  - name: Loki
+    type: loki
+    access: proxy
+    url: http://loki:3100
+    jsonData:
+      maxLines: 1000
+
diff --git a/scripts/prometheus/config/grafana/prometheus.yaml b/scripts/prometheus/config/grafana/prometheus.yaml
new file mode 100644
index 00000000000..c02bb38b3d3
--- /dev/null
+++ b/scripts/prometheus/config/grafana/prometheus.yaml
@@ -0,0 +1,50 @@
+# config file version
+apiVersion: 1
+
+# list of datasources that should be deleted from the database
+deleteDatasources:
+  - name: Prometheus
+    orgId: 1
+
+# list of datasources to insert/update depending
+# whats available in the database
+datasources:
+  # <string, required> name of the datasource. Required
+- name: Prometheus
+  # <string, required> datasource type. Required
+  type: prometheus
+  # <string, required> access mode. direct or proxy. Required
+  access: proxy
+  # <int> org id. will default to orgId 1 if not specified
+  orgId: 1
+  # <string> url
+  url: http://prometheus:9090
+  # <string> database password, if used
+  password:
+  # <string> database user, if used
+  user:
+  # <string> database name, if used
+  database:
+  # <bool> enable/disable basic auth
+  basicAuth: false
+  # <string> basic auth username, if used
+  basicAuthUser:
+  # <string> basic auth password, if used
+  basicAuthPassword:
+  # <bool> enable/disable with credentials headers
+  withCredentials:
+  # <bool> mark as default datasource. Max one per org
+  isDefault: true
+  # <map> fields that will be converted to json and stored in json_data
+  jsonData:
+     graphiteVersion: "1.1"
+     tlsAuth: false
+     tlsAuthWithCACert: false
+  # <string> json object of data that will be encrypted.
+  secureJsonData:
+    tlsCACert: "..."
+    tlsClientCert: "..."
+    tlsClientKey: "..."
+  version: 1
+  # <bool> allow users to edit datasources from the UI.
+  editable: true
diff --git a/scripts/prometheus/config/prometheus/prometheus.yml b/scripts/prometheus/config/prometheus/prometheus.yml
new file mode 100644
index 00000000000..310c993df1c
--- /dev/null
+++ b/scripts/prometheus/config/prometheus/prometheus.yml
@@ -0,0 +1,44 @@
+# my global config
+global:
+  scrape_interval:     15s # Set the scrape interval to every 15 seconds. Default is every 1 minute.
+  evaluation_interval: 15s # Evaluate rules every 15 seconds. The default is every 1 minute.
+  # scrape_timeout is set to the global default (10s).
+
+# Alertmanager configuration
+alerting:
+  alertmanagers:
+  - static_configs:
+    - targets:
+      # - alertmanager:9093
+
+# Load rules once and periodically evaluate them according to the global 'evaluation_interval'.
+rule_files:
+  # - "first_rules.yml"
+  # - "second_rules.yml"
+
+# A scrape configuration containing exactly one endpoint to scrape:
+# Here it's Prometheus itself.
+scrape_configs:
+  # The job name is added as a label `job=<job_name>` to any timeseries scraped from this config.
+  - job_name: 'prometheus'
+    # metrics_path defaults to '/metrics'
+    # scheme defaults to 'http'.
+    static_configs:
+    - targets: ['localhost:9090']
+
+  - job_name: openethereum
+    scrape_interval: 10s
+    metric_relabel_configs:
+      - source_labels: [__name__]
+        target_label: __name__
+        replacement: "oe_${1}"
+    static_configs:
+    - targets:
+      - 10.0.1.1:8545
+
+  - job_name: cadvisor
+    scrape_interval: 5s
+    static_configs:
+    - targets:
+      - 10.0.10.4:8080
+
diff --git a/scripts/prometheus/config/promtail/config.yaml b/scripts/prometheus/config/promtail/config.yaml
new file mode 100644
index 00000000000..1288cd97621
--- /dev/null
+++ b/scripts/prometheus/config/promtail/config.yaml
@@ -0,0 +1,18 @@
+server:
+  http_listen_port: 9080
+  grpc_listen_port: 0
+
+positions:
+  filename: /tmp/positions.yaml
+
+scrape_configs:
+- job_name: openethereum
+  static_configs:
+  - targets:
+      - localhost
+    labels:
+      job: openethereum
+      __path__: /log/oe/*log
+
+
+
diff --git a/scripts/prometheus/docker-compose.yaml b/scripts/prometheus/docker-compose.yaml
new file mode 100644
index 00000000000..bcdd7379238
--- /dev/null
+++ b/scripts/prometheus/docker-compose.yaml
@@ -0,0 +1,107 @@
+version: '3.5'
+services:
+
+  openethereum:
+    image: openethereum:prometheus
+    restart: always
+    ports:
+      - '8545:8545'
+      - '30303:30303'
+      - '30303:30303/udp'
+    dns: 1.1.1.1
+    networks:
+      scnetwork:
+        ipv4_address: 10.0.1.1
+    volumes:
+      - /tmp/oe:/log
+    entrypoint: ./openethereum  --no-warp --jsonrpc-port 8545 --jsonrpc-interface 10.0.1.1 --jsonrpc-hosts all
+
+  promtail:
+    image: grafana/promtail:latest
+    volumes:
+      - ./config/promtail/config.yaml:/etc/promtail/config.yaml
+      - /tmp/xdailogs:/log/xdai
+    command: -client.url=${LOKI_PUSH_URL} -config.file=/etc/promtail/config.yaml
+    dns: 1.1.1.1
+    networks:
+      scnetwork:
+        ipv4_address: 10.0.1.2
+    depends_on:
+      - openethereum
+
+  prometheus:
+    image: prom/prometheus
+    container_name: prometheus
+    restart: always
+    volumes:
+      - ./config/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml 
+    ports:
+      - '9090:9090'
+    dns: 1.1.1.1
+    networks:
+      scnetwork:
+        ipv4_address: 10.0.10.1
+    logging:
+      options:
+        max-size: 10m
+        max-file: '3'
+
+
+  loki:
+    image: grafana/loki
+    container_name: loki
+    restart: always
+    ports:
+      - '3100:3100'
+    dns: 1.1.1.1
+    networks:
+      scnetwork:
+        ipv4_address: 10.0.10.2
+    logging:
+      options:
+        max-size: 10m
+        max-file: '3'
+
+  grafana:
+    image: grafana/grafana
+    container_name: grafana  
+    restart: always
+    volumes:
+      - ./config/grafana/grafana.ini:/etc/grafana/grafana.ini
+      - ./config/grafana/prometheus.yaml:/etc/grafana/provisioning/datasources/prometheus.yaml
+      - ./config/grafana/loki.yaml:/etc/grafana/provisioning/datasources/loki.yaml
+    ports:
+      - '3000:3000'
+    environment:
+     - GF_SECURITY_ADMIN_PASSWORD:secret
+    dns: 1.1.1.1
+    networks:
+      scnetwork:
+        ipv4_address: 10.0.10.3
+    logging:
+      options:
+        max-size: 10m
+        max-file: '3'
+
+  cadvisor:
+    image: google/cadvisor:latest
+    container_name: cadvisor
+    ports:
+      - 8080:8080
+    volumes:
+      - /:/rootfs:ro
+      - /var/run:/var/run:rw
+      - /sys:/sys:ro
+      - /var/lib/docker/:/var/lib/docker:ro
+      - /dev/disk/:/dev/disk:ro
+    networks:
+      scnetwork:
+        ipv4_address: 10.0.10.4
+
+networks:
+  scnetwork:
+    driver: bridge
+    ipam:
+      config:
+        - subnet: 10.0.0.0/16
+
diff --git a/scripts/prometheus/model.json b/scripts/prometheus/model.json
new file mode 100644
index 00000000000..9a8148b6a3f
--- /dev/null
+++ b/scripts/prometheus/model.json
@@ -0,0 +1,1092 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": "-- Grafana --",
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
+  "id": 1,
+  "links": [],
+  "panels": [
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": false,
+      "colors": [
+        "#299c46",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
+      "datasource": null,
+      "format": "none",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 3,
+        "w": 5,
+        "x": 0,
+        "y": 0
+      },
+      "id": 20,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "options": {},
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false,
+        "ymax": null,
+        "ymin": null
+      },
+      "tableColumn": "",
+      "targets": [
+        {
+          "expr": "oe_sync_blocks_highest",
+          "refId": "A"
+        }
+      ],
+      "thresholds": "",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Highest block",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "avg"
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": null,
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 4,
+        "w": 4,
+        "x": 12,
+        "y": 0
+      },
+      "hiddenSeries": false,
+      "id": 10,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": false,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "oe_import_txs",
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Tx/s",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": false,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": null,
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 4,
+        "w": 4,
+        "x": 16,
+        "y": 0
+      },
+      "hiddenSeries": false,
+      "id": 8,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": false,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "oe_import_blocks",
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Block/s",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": false,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": null,
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 4,
+        "w": 4,
+        "x": 20,
+        "y": 0
+      },
+      "hiddenSeries": false,
+      "id": 6,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": false,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "oe_import_gas",
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Gas/s",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": false,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "cacheTimeout": null,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": null,
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 4,
+        "w": 12,
+        "x": 0,
+        "y": 3
+      },
+      "hiddenSeries": false,
+      "id": 22,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": false,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "oe_blockchaincache_block_details",
+          "refId": "A"
+        },
+        {
+          "expr": "oe_blockchaincache_block_recipts",
+          "refId": "B"
+        },
+        {
+          "expr": "oe_blockchaincache_blocks",
+          "refId": "C"
+        },
+        {
+          "expr": "oe_blockchaincache_txaddrs",
+          "refId": "D"
+        },
+        {
+          "expr": "",
+          "refId": "E"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Blockchain cache",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": false,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "decimals": 0,
+          "format": "short",
+          "label": "",
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        },
+        {
+          "decimals": 0,
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": null,
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 4,
+        "w": 12,
+        "x": 12,
+        "y": 4
+      },
+      "hiddenSeries": false,
+      "id": 12,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": false,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "rate(oe_io_bytes_read[1m])",
+          "refId": "A"
+        },
+        {
+          "expr": "rate(oe_io_bytes_written[1m])",
+          "refId": "B"
+        },
+        {
+          "expr": "rate(oe_io_cache_read_bytes[1m])",
+          "refId": "C"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "DB IO",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": false,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": null,
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 4,
+        "w": 6,
+        "x": 0,
+        "y": 7
+      },
+      "hiddenSeries": false,
+      "id": 4,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": false,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "oe_sync_snapshot_chunks ",
+          "refId": "A"
+        },
+        {
+          "expr": "oe_sync_snapshot_chunks_done",
+          "refId": "B"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Snapshot sync",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": false,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": null,
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 4,
+        "w": 6,
+        "x": 6,
+        "y": 7
+      },
+      "hiddenSeries": false,
+      "id": 24,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": false,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "rate(oe_sync_snapshot_chunks_done[2m])",
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Snapshot Sync rate",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": false,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": null,
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 3,
+        "w": 12,
+        "x": 12,
+        "y": 8
+      },
+      "hiddenSeries": false,
+      "id": 2,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": false,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": true,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "oe_queue_mem_used",
+          "refId": "A"
+        },
+        {
+          "expr": "oe_sync_mem_used",
+          "refId": "B"
+        },
+        {
+          "expr": "oe_statedb_mem_used",
+          "refId": "C"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Memory",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": false,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "alert": {
+        "alertRuleTags": {},
+        "conditions": [
+          {
+            "evaluator": {
+              "params": [
+                1
+              ],
+              "type": "gt"
+            },
+            "operator": {
+              "type": "and"
+            },
+            "query": {
+              "params": [
+                "B",
+                "10s",
+                "now"
+              ]
+            },
+            "reducer": {
+              "params": [],
+              "type": "avg"
+            },
+            "type": "query"
+          }
+        ],
+        "executionErrorState": "alerting",
+        "for": "5m",
+        "frequency": "1m",
+        "handler": 1,
+        "name": "Peers alert",
+        "noDataState": "no_data",
+        "notifications": []
+      },
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": null,
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 5,
+        "w": 12,
+        "x": 0,
+        "y": 11
+      },
+      "hiddenSeries": false,
+      "id": 16,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": false,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pluginVersion": "6.5.2",
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "oe_sync_peers",
+          "refId": "A"
+        },
+        {
+          "expr": "oe_sync_active_peers",
+          "refId": "B"
+        }
+      ],
+      "thresholds": [
+        {
+          "colorMode": "critical",
+          "fill": true,
+          "line": true,
+          "op": "gt",
+          "value": 1
+        }
+      ],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Peers",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": false,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": null,
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 5,
+        "w": 12,
+        "x": 12,
+        "y": 11
+      },
+      "hiddenSeries": false,
+      "id": 14,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": false,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "oe_queue_size_unverified",
+          "refId": "A"
+        },
+        {
+          "expr": "oe_queue_size_verified",
+          "refId": "B"
+        },
+        {
+          "expr": "oe_queue_size_verifying",
+          "refId": "C"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Queue",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": false,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "decimals": 0,
+          "format": "short",
+          "label": "",
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        },
+        {
+          "decimals": 0,
+          "format": "short",
+          "label": "",
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    }
+  ],
+  "refresh": "5s",
+  "schemaVersion": 21,
+  "style": "dark",
+  "tags": [],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-15m",
+    "to": "now"
+  },
+  "timepicker": {
+    "refresh_intervals": [
+      "5s",
+      "10s",
+      "30s",
+      "1m",
+      "5m",
+      "15m",
+      "30m",
+      "1h",
+      "2h",
+      "1d"
+    ]
+  },
+  "timezone": "",
+  "title": "OE",
+  "uid": "uUkuLMmMz",
+  "version": 1
+}
diff --git a/scripts/prometheus/start.sh b/scripts/prometheus/start.sh
new file mode 100755
index 00000000000..83ed0d06d37
--- /dev/null
+++ b/scripts/prometheus/start.sh
@@ -0,0 +1 @@
+docker-compose up

From 66d11ba5c5d39da3e08df1600446d9c449d4a1a3 Mon Sep 17 00:00:00 2001
From: Artem Vorotnikov <artem@vorotnikov.me>
Date: Mon, 1 Jun 2020 18:11:04 +0300
Subject: [PATCH 05/32] Add missing forks to fork ID (#11747)

---
 ethcore/spec/src/spec.rs              | 13 ++++++++++++-
 ethcore/sync/src/chain/fork_filter.rs | 17 +++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/ethcore/spec/src/spec.rs b/ethcore/spec/src/spec.rs
index 95ab70338da..b65f8c5dd95 100644
--- a/ethcore/spec/src/spec.rs
+++ b/ethcore/spec/src/spec.rs
@@ -406,6 +406,7 @@ impl Spec {
 			params.eip1344_transition,
 			params.eip1884_transition,
 			params.eip2028_transition,
+			params.eip2046_transition,
 			params.eip2200_advance_transition,
 			params.eip2315_transition,
 			params.dust_protection_transition,
@@ -426,7 +427,17 @@ impl Spec {
 			ethjson::spec::Engine::Null(null) => Arc::new(NullEngine::new(null.params.into(), machine)),
 			ethjson::spec::Engine::Ethash(ethash) => {
 				// Specific transitions for Ethash-based networks
-				for block in &[ethash.params.homestead_transition, ethash.params.dao_hardfork_transition] {
+				for block in &[
+					ethash.params.homestead_transition,
+					ethash.params.dao_hardfork_transition,
+					ethash.params.difficulty_hardfork_transition,
+					ethash.params.bomb_defuse_transition,
+					ethash.params.eip100b_transition,
+					ethash.params.ecip1010_pause_transition,
+					ethash.params.ecip1010_continue_transition,
+					ethash.params.ecip1017_era_rounds,
+					ethash.params.expip2_transition,
+				] {
 					if let Some(block) = *block {
 						hard_forks.insert(block.into());
 					}
diff --git a/ethcore/sync/src/chain/fork_filter.rs b/ethcore/sync/src/chain/fork_filter.rs
index 144e98d8223..63ed22cb4c3 100644
--- a/ethcore/sync/src/chain/fork_filter.rs
+++ b/ethcore/sync/src/chain/fork_filter.rs
@@ -140,4 +140,21 @@ mod tests {
 			],
 		)
 	}
+
+	#[test]
+	fn classic_spec() {
+		test_spec(
+			|| spec::new_classic(&String::new()),
+		vec![
+				1150000,
+				2500000,
+				3000000,
+				5000000,
+				5900000,
+				8772000,
+				9573000,
+				10500839,
+			],
+		)
+	}
 }

From 9132ab2522dbd8b28f9baaf9f763b61e3e490205 Mon Sep 17 00:00:00 2001
From: Alexander <alex.m.vlasov@gmail.com>
Date: Thu, 4 Jun 2020 21:01:33 +0300
Subject: [PATCH 06/32] Implementation of EIP 2537 (#11707)

---
 Cargo.lock                                    |  73 +-
 ethcore/builtin/Cargo.toml                    |   1 +
 ethcore/builtin/src/lib.rs                    | 804 +++++++++++++++++-
 ethcore/res/ethereum/foundation.json          |  81 ++
 .../res/ethereum/test-specs/berlin_test.json  |  83 +-
 ethcore/spec/src/chain.rs                     |   7 +-
 json/src/spec/builtin.rs                      |  89 +-
 7 files changed, 1132 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index bc4a31e9246..88fedc20466 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1036,6 +1036,32 @@ dependencies = [
  "termcolor",
 ]
 
+[[package]]
+name = "eth_pairings"
+version = "0.6.0"
+source = "git+https://github.com/matter-labs/eip1962.git?rev=ece6cbabc41948db4200e41f0bfdab7ab94c7af8#ece6cbabc41948db4200e41f0bfdab7ab94c7af8"
+dependencies = [
+ "byteorder",
+ "eth_pairings_repr_derive",
+ "fixed_width_field",
+ "fixed_width_group_and_loop",
+ "num-bigint 0.2.6",
+ "num-traits 0.2.11",
+ "once_cell",
+ "static_assertions",
+]
+
+[[package]]
+name = "eth_pairings_repr_derive"
+version = "0.2.0"
+source = "git+https://github.com/matter-labs/eip1962.git?rev=ece6cbabc41948db4200e41f0bfdab7ab94c7af8#ece6cbabc41948db4200e41f0bfdab7ab94c7af8"
+dependencies = [
+ "byteorder",
+ "proc-macro2 1.0.9",
+ "quote 1.0.3",
+ "syn 1.0.17",
+]
+
 [[package]]
 name = "ethabi"
 version = "12.0.0"
@@ -1248,6 +1274,7 @@ dependencies = [
  "byteorder",
  "common-types",
  "eip-152",
+ "eth_pairings",
  "ethereum-types",
  "ethjson",
  "hex-literal",
@@ -1861,6 +1888,22 @@ dependencies = [
  "static_assertions",
 ]
 
+[[package]]
+name = "fixed_width_field"
+version = "0.1.0"
+source = "git+https://github.com/matter-labs/eip1962.git?rev=ece6cbabc41948db4200e41f0bfdab7ab94c7af8#ece6cbabc41948db4200e41f0bfdab7ab94c7af8"
+dependencies = [
+ "simple_uint",
+]
+
+[[package]]
+name = "fixed_width_group_and_loop"
+version = "0.1.0"
+source = "git+https://github.com/matter-labs/eip1962.git?rev=ece6cbabc41948db4200e41f0bfdab7ab94c7af8#ece6cbabc41948db4200e41f0bfdab7ab94c7af8"
+dependencies = [
+ "simple_uint",
+]
+
 [[package]]
 name = "fixedbitset"
 version = "0.1.9"
@@ -3027,7 +3070,7 @@ version = "0.1.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e"
 dependencies = [
- "num-bigint",
+ "num-bigint 0.1.44",
  "num-integer",
  "num-iter",
  "num-traits 0.2.11",
@@ -3045,6 +3088,17 @@ dependencies = [
  "rustc-serialize",
 ]
 
+[[package]]
+name = "num-bigint"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304"
+dependencies = [
+ "autocfg 1.0.0",
+ "num-integer",
+ "num-traits 0.2.11",
+]
+
 [[package]]
 name = "num-integer"
 version = "0.1.42"
@@ -3113,6 +3167,12 @@ dependencies = [
  "winapi-build",
 ]
 
+[[package]]
+name = "once_cell"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1c601810575c99596d4afc46f78a678c80105117c379eb3650cf99b8a21ce5b"
+
 [[package]]
 name = "oorandom"
 version = "11.1.0"
@@ -4566,6 +4626,17 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
 
+[[package]]
+name = "simple_uint"
+version = "0.1.0"
+source = "git+https://github.com/matter-labs/eip1962.git?rev=ece6cbabc41948db4200e41f0bfdab7ab94c7af8#ece6cbabc41948db4200e41f0bfdab7ab94c7af8"
+dependencies = [
+ "byteorder",
+ "crunchy",
+ "rustc-hex 2.1.0",
+ "static_assertions",
+]
+
 [[package]]
 name = "slab"
 version = "0.4.2"
diff --git a/ethcore/builtin/Cargo.toml b/ethcore/builtin/Cargo.toml
index 16780253706..68031ab8f1b 100644
--- a/ethcore/builtin/Cargo.toml
+++ b/ethcore/builtin/Cargo.toml
@@ -17,6 +17,7 @@ log = "0.4"
 num = { version = "0.1", default-features = false, features = ["bigint"] }
 parity-bytes = "0.1"
 parity-crypto = { version = "0.6.1", features = ["publickey"] }
+eth_pairings = { git = "https://github.com/matter-labs/eip1962.git", default-features = false, features = ["eip_2537"], rev = "ece6cbabc41948db4200e41f0bfdab7ab94c7af8" }
 
 [dev-dependencies]
 hex-literal = "0.2.1"
diff --git a/ethcore/builtin/src/lib.rs b/ethcore/builtin/src/lib.rs
index 8f9dde5fc3e..8ba36e963db 100644
--- a/ethcore/builtin/src/lib.rs
+++ b/ethcore/builtin/src/lib.rs
@@ -37,6 +37,12 @@ use num::{BigUint, Zero, One};
 use parity_bytes::BytesRef;
 use parity_crypto::digest;
 use eip_152::compress;
+use eth_pairings::public_interface::eip2537::{
+	EIP2537Executor,
+	SERIALIZED_G1_POINT_BYTE_LENGTH,
+	SERIALIZED_G2_POINT_BYTE_LENGTH,
+	SCALAR_BYTE_LENGTH
+};
 
 /// Native implementation of a built-in contract.
 pub trait Implementation: Send + Sync {
@@ -77,6 +83,10 @@ enum Pricing {
 	Blake2F(Blake2FPricer),
 	Linear(Linear),
 	Modexp(ModexpPricer),
+	Bls12Pairing(Bls12PairingPricer),
+	Bls12ConstOperations(Bls12ConstOperations),
+	Bls12MultiexpG1(Bls12MultiexpPricerG1),
+	Bls12MultiexpG2(Bls12MultiexpPricerG2),
 }
 
 impl Pricer for Pricing {
@@ -87,6 +97,10 @@ impl Pricer for Pricing {
 			Pricing::Blake2F(inner) => inner.cost(input),
 			Pricing::Linear(inner) => inner.cost(input),
 			Pricing::Modexp(inner) => inner.cost(input),
+			Pricing::Bls12Pairing(inner) => inner.cost(input),
+			Pricing::Bls12ConstOperations(inner) => inner.cost(input),
+			Pricing::Bls12MultiexpG1(inner) => inner.cost(input),
+			Pricing::Bls12MultiexpG2(inner) => inner.cost(input),
 		}
 	}
 }
@@ -207,6 +221,118 @@ impl ModexpPricer {
 	}
 }
 
+/// Bls12 pairing price
+#[derive(Debug, Copy, Clone)]
+struct Bls12PairingPrice {
+	base: u64,
+	pair: u64,
+}
+
+/// bls12_pairing pricing model. This computes a price using a base cost and a cost per pair.
+#[derive(Debug)]
+struct Bls12PairingPricer {
+	price: Bls12PairingPrice,
+}
+
+/// Pricing for constant Bls12 operations (ADD and MUL in G1 and G2, as well as mappings)
+#[derive(Debug, Copy, Clone)]
+pub struct Bls12ConstOperations {
+	/// Fixed price.
+	pub price: u64,
+}
+
+/// Discount table for multiexponentiation (Peppinger algorithm)
+/// Later on is normalized using the divisor
+pub const BLS12_MULTIEXP_DISCOUNTS_TABLE: [[u64; 2]; BLS12_MULTIEXP_PAIRS_FOR_MAX_DISCOUNT] = [
+	[1, 1200], [2, 888], [3, 764], [4, 641], [5, 594], [6, 547], [7, 500], [8, 453], 
+	[9, 438], [10, 423], [11, 408], [12, 394], [13, 379], [14, 364], [15, 349], [16, 334], 
+	[17, 330], [18, 326], [19, 322], [20, 318], [21, 314], [22, 310], [23, 306], [24, 302], 
+	[25, 298], [26, 294], [27, 289], [28, 285], [29, 281], [30, 277], [31, 273], [32, 269], 
+	[33, 268], [34, 266], [35, 265], [36, 263], [37, 262], [38, 260], [39, 259], [40, 257], 
+	[41, 256], [42, 254], [43, 253], [44, 251], [45, 250], [46, 248], [47, 247], [48, 245], 
+	[49, 244], [50, 242], [51, 241], [52, 239], [53, 238], [54, 236], [55, 235], [56, 233], 
+	[57, 232], [58, 231], [59, 229], [60, 228], [61, 226], [62, 225], [63, 223], [64, 222], 
+	[65, 221], [66, 220], [67, 219], [68, 219], [69, 218], [70, 217], [71, 216], [72, 216], 
+	[73, 215], [74, 214], [75, 213], [76, 213], [77, 212], [78, 211], [79, 211], [80, 210], 
+	[81, 209], [82, 208], [83, 208], [84, 207], [85, 206], [86, 205], [87, 205], [88, 204], 
+	[89, 203], [90, 202], [91, 202], [92, 201], [93, 200], [94, 199], [95, 199], [96, 198], 
+	[97, 197], [98, 196], [99, 196], [100, 195], [101, 194], [102, 193], [103, 193], [104, 192], 
+	[105, 191], [106, 191], [107, 190], [108, 189], [109, 188], [110, 188], [111, 187], [112, 186], 
+	[113, 185], [114, 185], [115, 184], [116, 183], [117, 182], [118, 182], [119, 181], [120, 180], 
+	[121, 179], [122, 179], [123, 178], [124, 177], [125, 176], [126, 176], [127, 175], [128, 174]
+];
+
+/// Max discount allowed
+pub const BLS12_MULTIEXP_MAX_DISCOUNT: u64 = 174;
+/// Max discount is reached at this number of pairs
+pub const BLS12_MULTIEXP_PAIRS_FOR_MAX_DISCOUNT: usize = 128;
+/// Divisor for discounts table
+pub const BLS12_MULTIEXP_DISCOUNT_DIVISOR: u64 = 1000;
+/// Length of single G1 + G2 points pair for pairing operation
+pub const BLS12_G1_AND_G2_PAIR_LEN: usize = SERIALIZED_G1_POINT_BYTE_LENGTH + SERIALIZED_G2_POINT_BYTE_LENGTH;
+
+/// Marter trait for length of input per one pair (point + scalar)
+pub trait PointScalarLength: Copy + Clone + std::fmt::Debug + Send + Sync {
+	/// Length itself
+	const LENGTH: usize;
+}
+/// Marker trait that indicated that we perform operations in G1
+#[derive(Clone, Copy, Debug)]
+pub struct G1Marker;
+impl PointScalarLength for G1Marker {
+	const LENGTH: usize = SERIALIZED_G1_POINT_BYTE_LENGTH + SCALAR_BYTE_LENGTH;
+}
+/// Marker trait that indicated that we perform operations in G2
+#[derive(Clone, Copy, Debug)]
+pub struct G2Marker;
+impl PointScalarLength for G2Marker {
+	const LENGTH: usize = SERIALIZED_G2_POINT_BYTE_LENGTH + SCALAR_BYTE_LENGTH;
+}
+
+
+/// Pricing for constant Bls12 operations (ADD and MUL in G1 and G2, as well as mappings)
+#[derive(Debug, Copy, Clone)]
+pub struct Bls12MultiexpPricer<P: PointScalarLength> {
+	/// Base const of the operation (G1 or G2 multiplication)
+	pub base_price: Bls12ConstOperations,
+
+	_marker: std::marker::PhantomData<P>
+}
+
+impl Pricer for Bls12ConstOperations {
+	fn cost(&self, _input: &[u8]) -> U256 {
+		self.price.into()
+	}
+}
+
+impl Pricer for Bls12PairingPricer {
+	fn cost(&self, input: &[u8]) -> U256 {
+		U256::from(self.price.base) + U256::from(self.price.pair) * U256::from(input.len() / BLS12_G1_AND_G2_PAIR_LEN)
+	}
+}
+
+impl<P: PointScalarLength> Pricer for Bls12MultiexpPricer<P> {
+	fn cost(&self, input: &[u8]) -> U256 {
+		let num_pairs = input.len() / P::LENGTH;
+		if num_pairs == 0 {
+			return U256::zero();
+		}
+		let discount = if num_pairs > BLS12_MULTIEXP_PAIRS_FOR_MAX_DISCOUNT {
+			BLS12_MULTIEXP_MAX_DISCOUNT
+		} else {
+			let table_entry = BLS12_MULTIEXP_DISCOUNTS_TABLE[num_pairs - 1];
+			table_entry[1]
+		};
+		U256::from(self.base_price.price) * U256::from(num_pairs) * U256::from(discount) / U256::from(BLS12_MULTIEXP_DISCOUNT_DIVISOR)
+	}
+}
+
+/// Multiexp pricer in G1
+pub type Bls12MultiexpPricerG1 = Bls12MultiexpPricer<G1Marker>;
+
+/// Multiexp pricer in G2
+pub type Bls12MultiexpPricerG2 = Bls12MultiexpPricer<G2Marker>;
+
 /// Pricing scheme, execution definition, and activation block for a built-in contract.
 ///
 /// Call `cost` to compute cost for the given input, `execute` to execute the contract
@@ -297,6 +423,38 @@ impl From<ethjson::spec::builtin::Pricing> for Pricing {
 					price: pricer.price
 				})
 			}
+			ethjson::spec::builtin::Pricing::Bls12ConstOperations(pricer) => {
+				Pricing::Bls12ConstOperations(Bls12ConstOperations {
+					price: pricer.price
+				})
+			},
+			ethjson::spec::builtin::Pricing::Bls12Pairing(pricer) => {
+				Pricing::Bls12Pairing(Bls12PairingPricer {
+						price : Bls12PairingPrice {
+							base: pricer.base,
+							pair: pricer.pair
+						}
+					}
+				)
+			},
+			ethjson::spec::builtin::Pricing::Bls12G1Multiexp(pricer) => {
+				Pricing::Bls12MultiexpG1(Bls12MultiexpPricerG1 {
+						base_price: Bls12ConstOperations {
+							price: pricer.base,
+						},
+						_marker: std::marker::PhantomData
+					}
+				)
+			},
+			ethjson::spec::builtin::Pricing::Bls12G2Multiexp(pricer) => {
+				Pricing::Bls12MultiexpG2(Bls12MultiexpPricerG2 {
+						base_price: Bls12ConstOperations {
+							price: pricer.base
+						},
+						_marker: std::marker::PhantomData
+					}
+				)
+			},
 		}
 	}
 }
@@ -320,7 +478,25 @@ enum EthereumBuiltin {
 	/// alt_bn128_pairing
 	Bn128Pairing(Bn128Pairing),
 	/// blake2_f (The Blake2 compression function F, EIP-152)
-	Blake2F(Blake2F)
+	Blake2F(Blake2F),
+	/// bls12_381 addition in g1
+	Bls12G1Add(Bls12G1Add),
+	/// bls12_381 multiplication in g1
+	Bls12G1Mul(Bls12G1Mul),
+	/// bls12_381 multiexponentiation in g1
+	Bls12G1MultiExp(Bls12G1MultiExp),
+	/// bls12_381 addition in g2
+	Bls12G2Add(Bls12G2Add),
+	/// bls12_381 multiplication in g2
+	Bls12G2Mul(Bls12G2Mul),
+	/// bls12_381 multiexponentiation in g2
+	Bls12G2MultiExp(Bls12G2MultiExp),
+	/// bls12_381 pairing
+	Bls12Pairing(Bls12Pairing),
+	/// bls12_381 fp to g1 mapping
+	Bls12MapFpToG1(Bls12MapFpToG1),
+	/// bls12_381 fp2 to g2 mapping
+	Bls12MapFp2ToG2(Bls12MapFp2ToG2),
 }
 
 impl FromStr for EthereumBuiltin {
@@ -337,6 +513,15 @@ impl FromStr for EthereumBuiltin {
 			"alt_bn128_mul" => Ok(EthereumBuiltin::Bn128Mul(Bn128Mul)),
 			"alt_bn128_pairing" => Ok(EthereumBuiltin::Bn128Pairing(Bn128Pairing)),
 			"blake2_f" => Ok(EthereumBuiltin::Blake2F(Blake2F)),
+			"bls12_381_g1_add" => Ok(EthereumBuiltin::Bls12G1Add(Bls12G1Add)),
+			"bls12_381_g1_mul" => Ok(EthereumBuiltin::Bls12G1Mul(Bls12G1Mul)),
+			"bls12_381_g1_multiexp" => Ok(EthereumBuiltin::Bls12G1MultiExp(Bls12G1MultiExp)),
+			"bls12_381_g2_add" => Ok(EthereumBuiltin::Bls12G2Add(Bls12G2Add)),
+			"bls12_381_g2_mul" => Ok(EthereumBuiltin::Bls12G2Mul(Bls12G2Mul)),
+			"bls12_381_g2_multiexp" => Ok(EthereumBuiltin::Bls12G2MultiExp(Bls12G2MultiExp)),
+			"bls12_381_pairing" => Ok(EthereumBuiltin::Bls12Pairing(Bls12Pairing)),
+			"bls12_381_fp_to_g1" => Ok(EthereumBuiltin::Bls12MapFpToG1(Bls12MapFpToG1)),
+			"bls12_381_fp2_to_g2" => Ok(EthereumBuiltin::Bls12MapFp2ToG2(Bls12MapFp2ToG2)),
 			_ => return Err(EthcoreError::Msg(format!("invalid builtin name: {}", name))),
 		}
 	}
@@ -354,6 +539,15 @@ impl Implementation for EthereumBuiltin {
 			EthereumBuiltin::Bn128Mul(inner) => inner.execute(input, output),
 			EthereumBuiltin::Bn128Pairing(inner) => inner.execute(input, output),
 			EthereumBuiltin::Blake2F(inner) => inner.execute(input, output),
+			EthereumBuiltin::Bls12G1Add(inner) => inner.execute(input, output),
+			EthereumBuiltin::Bls12G1Mul(inner) => inner.execute(input, output),
+			EthereumBuiltin::Bls12G1MultiExp(inner) => inner.execute(input, output),
+			EthereumBuiltin::Bls12G2Add(inner) => inner.execute(input, output),
+			EthereumBuiltin::Bls12G2Mul(inner) => inner.execute(input, output),
+			EthereumBuiltin::Bls12G2MultiExp(inner) => inner.execute(input, output),
+			EthereumBuiltin::Bls12Pairing(inner) => inner.execute(input, output),
+			EthereumBuiltin::Bls12MapFpToG1(inner) => inner.execute(input, output),
+			EthereumBuiltin::Bls12MapFp2ToG2(inner) => inner.execute(input, output),
 		}
 	}
 }
@@ -394,6 +588,42 @@ pub struct Bn128Pairing;
 /// The Blake2F builtin
 pub struct Blake2F;
 
+#[derive(Debug)]
+/// The Bls12G1Add builtin.
+pub struct Bls12G1Add;
+
+#[derive(Debug)]
+/// The Bls12G1Mul builtin.
+pub struct Bls12G1Mul;
+
+#[derive(Debug)]
+/// The Bls12G1MultiExp builtin.
+pub struct Bls12G1MultiExp;
+
+#[derive(Debug)]
+/// The Bls12G2Add builtin.
+pub struct Bls12G2Add;
+
+#[derive(Debug)]
+/// The Bls12G2Mul builtin.
+pub struct Bls12G2Mul;
+
+#[derive(Debug)]
+/// The Bls12G2MultiExp builtin.
+pub struct Bls12G2MultiExp;
+
+#[derive(Debug)]
+/// The Bls12Pairing builtin.
+pub struct Bls12Pairing;
+
+#[derive(Debug)]
+/// The Bls12MapFpToG1 builtin.
+pub struct Bls12MapFpToG1;
+
+#[derive(Debug)]
+/// The Bls12MapFp2ToG2 builtin.
+pub struct Bls12MapFp2ToG2;
+
 impl Implementation for Identity {
 	fn execute(&self, input: &[u8], output: &mut BytesRef) -> Result<(), &'static str> {
 		output.write(0, input);
@@ -756,6 +986,178 @@ impl Bn128Pairing {
 	}
 }
 
+impl Implementation for Bls12G1Add {
+	fn execute(&self, input: &[u8], output: &mut BytesRef) -> Result<(), &'static str> {
+		let result = EIP2537Executor::g1_add(input);
+
+		match result {
+			Ok(result_bytes) => {
+				output.write(0, &result_bytes[..]);
+
+				Ok(())
+			},
+			Err(e) => {
+				trace!(target: "builtin", "Bls12G1Add error: {:?}", e);
+
+				Err("Bls12G1Add error")
+			}
+		}
+	}
+}
+
+impl Implementation for Bls12G1Mul {
+	fn execute(&self, input: &[u8], output: &mut BytesRef) -> Result<(), &'static str> {
+		let result = EIP2537Executor::g1_mul(input);
+
+		match result {
+			Ok(result_bytes) => {
+				output.write(0, &result_bytes[..]);
+
+				Ok(())
+			},
+			Err(e) => {
+				trace!(target: "builtin", "Bls12G1Mul error: {:?}", e);
+
+				Err("Bls12G1Mul error")
+			}
+		}
+	}
+}
+
+impl Implementation for Bls12G1MultiExp {
+	fn execute(&self, input: &[u8], output: &mut BytesRef) -> Result<(), &'static str> {
+		let result = EIP2537Executor::g1_multiexp(input);
+
+		match result {
+			Ok(result_bytes) => {
+				output.write(0, &result_bytes[..]);
+
+				Ok(())
+			},
+			Err(e) => {
+				trace!(target: "builtin", "Bls12G1MultiExp error: {:?}", e);
+
+				Err("Bls12G1MultiExp error")
+			}
+		}
+	}
+}
+
+impl Implementation for Bls12G2Add {
+	fn execute(&self, input: &[u8], output: &mut BytesRef) -> Result<(), &'static str> {
+		let result = EIP2537Executor::g2_add(input);
+
+		match result {
+			Ok(result_bytes) => {
+				output.write(0, &result_bytes[..]);
+
+				Ok(())
+			},
+			Err(e) => {
+				trace!(target: "builtin", "Bls12G2Add error: {:?}", e);
+
+				Err("Bls12G2Add error")
+			}
+		}
+	}
+}
+
+impl Implementation for Bls12G2Mul {
+	fn execute(&self, input: &[u8], output: &mut BytesRef) -> Result<(), &'static str> {
+		let result = EIP2537Executor::g2_mul(input);
+
+		match result {
+			Ok(result_bytes) => {
+				output.write(0, &result_bytes[..]);
+
+				Ok(())
+			},
+			Err(e) => {
+				trace!(target: "builtin", "Bls12G2Mul error: {:?}", e);
+
+				Err("Bls12G2Mul error")
+			}
+		}
+	}
+}
+
+impl Implementation for Bls12G2MultiExp {
+	fn execute(&self, input: &[u8], output: &mut BytesRef) -> Result<(), &'static str> {
+		let result = EIP2537Executor::g2_multiexp(input);
+
+		match result {
+			Ok(result_bytes) => {
+				output.write(0, &result_bytes[..]);
+
+				Ok(())
+			},
+			Err(e) => {
+				trace!(target: "builtin", "Bls12G2MultiExp error: {:?}", e);
+
+				Err("Bls12G2MultiExp error")
+			}
+		}
+	}
+}
+
+impl Implementation for Bls12Pairing {
+	fn execute(&self, input: &[u8], output: &mut BytesRef) -> Result<(), &'static str> {
+		let result = EIP2537Executor::pair(input);
+
+		match result {
+			Ok(result_bytes) => {
+				output.write(0, &result_bytes[..]);
+
+				Ok(())
+			},
+			Err(e) => {
+				trace!(target: "builtin", "Bls12Pairing error: {:?}", e);
+
+				Err("Bls12Pairing error")
+			}
+		}
+	}
+}
+
+impl Implementation for Bls12MapFpToG1 {
+	fn execute(&self, input: &[u8], output: &mut BytesRef) -> Result<(), &'static str> {
+		let result = EIP2537Executor::map_fp_to_g1(input);
+
+		match result {
+			Ok(result_bytes) => {
+				output.write(0, &result_bytes[..]);
+
+				Ok(())
+			},
+			Err(e) => {
+				trace!(target: "builtin", "Bls12MapFpToG1 error: {:?}", e);
+
+				Err("Bls12MapFpToG1 error")
+			}
+		}
+	}
+}
+
+impl Implementation for Bls12MapFp2ToG2 {
+	fn execute(&self, input: &[u8], output: &mut BytesRef) -> Result<(), &'static str> {
+		let result = EIP2537Executor::map_fp2_to_g2(input);
+
+		match result {
+			Ok(result_bytes) => {
+				output.write(0, &result_bytes[..]);
+
+				Ok(())
+			},
+			Err(e) => {
+				trace!(target: "builtin", "Bls12MapFp2ToG2 error: {:?}", e);
+
+				Err("Bls12MapFp2ToG2 error")
+			}
+		}
+	}
+}
+
+
 #[cfg(test)]
 mod tests {
 	use std::convert::TryFrom;
@@ -770,7 +1172,9 @@ mod tests {
 	use parity_bytes::BytesRef;
 	use super::{
 		Builtin, EthereumBuiltin, FromStr, Implementation, Linear,
-		ModexpPricer, modexp as me, Pricing
+		ModexpPricer, modexp as me, Pricing,
+		Bls12ConstOperations,
+		Bls12PairingPrice,Bls12PairingPricer
 	};
 
 	#[test]
@@ -1523,4 +1927,400 @@ mod tests {
 		assert_eq!(b.cost(&[0; 1], 0), U256::from(0), "not activated yet");
 		assert_eq!(b.cost(&[0; 1], 1), U256::from(1_337), "use price #3");
 	}
+
+	#[test]
+	fn bls12_381_g1_add() {
+		let f = Builtin {
+			pricer: btreemap![0 => Pricing::Bls12ConstOperations(Bls12ConstOperations{price: 1})],
+			native: EthereumBuiltin::from_str("bls12_381_g1_add").unwrap(),
+		};
+
+		let input = hex!("
+			00000000000000000000000000000000117dbe419018f67844f6a5e1b78a1e597283ad7b8ee7ac5e58846f5a5fd68d0da99ce235a91db3ec1cf340fe6b7afcdb
+			0000000000000000000000000000000013316f23de032d25e912ae8dc9b54c8dba1be7cecdbb9d2228d7e8f652011d46be79089dd0a6080a73c82256ce5e4ed2
+			000000000000000000000000000000000441e7f7f96198e4c23bd5eb16f1a7f045dbc8c53219ab2bcea91d3a027e2dfe659feac64905f8b9add7e4bfc91bec2b
+			0000000000000000000000000000000005fc51bb1b40c87cd4292d4b66f8ca5ce4ef9abd2b69d4464b4879064203bda7c9fc3f896a3844ebc713f7bb20951d95
+		");
+		let expected = hex!("
+			0000000000000000000000000000000016b8ab56b45a9294466809b8e858c1ad15ad0d52cfcb62f8f5753dc94cee1de6efaaebce10701e3ec2ecaa9551024ea
+			600000000000000000000000000000000124571eec37c0b1361023188d66ec17c1ec230d31b515e0e81e599ec19e40c8a7c8cdea9735bc3d8b4e37ca7e5dd71f6
+		");
+
+		let mut output = [0u8; 128];
+
+		f.execute(&input[..], &mut BytesRef::Fixed(&mut output[..])).expect("Builtin should not fail");
+		assert_eq!(&output[..], &expected[..]);
+	}
+
+	#[test]
+	fn bls12_381_g1_mul() {
+		let f = Builtin {
+			pricer: btreemap![0 => Pricing::Bls12ConstOperations(Bls12ConstOperations{price: 1})],
+			native: EthereumBuiltin::from_str("bls12_381_g1_mul").unwrap(),
+		};
+
+		let input = hex!("
+			000000000000000000000000000000000b3a1dfe2d1b62538ed49648cb2a8a1d66bdc4f7a492eee59942ab810a306876a7d49e5ac4c6bb1613866c158ded993e
+			000000000000000000000000000000001300956110f47ca8e2aacb30c948dfd046bf33f69bf54007d76373c5a66019454da45e3cf14ce2b9d53a50c9b4366aa3
+			ac23d04ee3acc757aae6795532ce4c9f34534e506a4d843a26b052a040c79659
+		");
+		let expected = hex!("
+			000000000000000000000000000000001227b7021e9d3dc8bcbf5b346fc503f7f8576965769c5e22bb70056eef03c84b8c80290ae9ce20345770290c55549bce
+			00000000000000000000000000000000188ddbbfb4ad2d34a8d3dc0ec92b70b63caa73ad7dea0cc9740bac2309b4bb11107912bd086379746e9a9bcd26d4db58
+		");
+
+		let mut output = [0u8; 128];
+
+		f.execute(&input[..], &mut BytesRef::Fixed(&mut output[..])).expect("Builtin should not fail");
+		assert_eq!(&output[..], &expected[..]);
+	}
+
+	#[test]
+	fn bls12_381_g1_multiexp() {
+		let f = Builtin {
+			pricer: btreemap![0 => Pricing::Bls12ConstOperations(Bls12ConstOperations{price: 1})],
+			native: EthereumBuiltin::from_str("bls12_381_g1_multiexp").unwrap(),
+		};
+		let input = hex!("
+			0000000000000000000000000000000012196c5a43d69224d8713389285f26b98f86ee910ab3dd668e413738282003cc5b7357af9a7af54bb713d62255e80f56
+			0000000000000000000000000000000006ba8102bfbeea4416b710c73e8cce3032c31c6269c44906f8ac4f7874ce99fb17559992486528963884ce429a992fee
+			b3c940fe79b6966489b527955de7599194a9ac69a6ff58b8d99e7b1084f0464e
+			00000000000000000000000000000000117dbe419018f67844f6a5e1b78a1e597283ad7b8ee7ac5e58846f5a5fd68d0da99ce235a91db3ec1cf340fe6b7afcdb
+			0000000000000000000000000000000013316f23de032d25e912ae8dc9b54c8dba1be7cecdbb9d2228d7e8f652011d46be79089dd0a6080a73c82256ce5e4ed2
+			4d0e25bf3f6fc9f4da25d21fdc71773f1947b7a8a775b8177f7eca990b05b71d
+			0000000000000000000000000000000008ab7b556c672db7883ec47efa6d98bb08cec7902ebb421aac1c31506b177ac444ffa2d9b400a6f1cbdc6240c607ee11
+			0000000000000000000000000000000016b7fa9adf4addc2192271ce7ad3c8d8f902d061c43b7d2e8e26922009b777855bffabe7ed1a09155819eabfa87f276f
+			973f40c12c92b703d7b7848ef8b4466d40823aad3943a312b57432b91ff68be1
+			0000000000000000000000000000000015ff9a232d9b5a8020a85d5fe08a1dcfb73ece434258fe0e2fddf10ddef0906c42dcb5f5d62fc97f934ba900f17beb33
+			0000000000000000000000000000000009cfe4ee2241d9413c616462d7bac035a6766aeaab69c81e094d75b840df45d7e0dfac0265608b93efefb9a8728b98e4
+			4c51f97bcdda93904ae26991b471e9ea942e2b5b8ed26055da11c58bc7b5002a
+			0000000000000000000000000000000017a17b82e3bfadf3250210d8ef572c02c3610d65ab4d7366e0b748768a28ee6a1b51f77ed686a64f087f36f641e7dca9
+			00000000000000000000000000000000077ea73d233ccea51dc4d5acecf6d9332bf17ae51598f4b394a5f62fb387e9c9aa1d6823b64a074f5873422ca57545d3
+			8964d5867927bc3e35a0b4c457482373969bff5edff8a781d65573e07fd87b89
+			000000000000000000000000000000000c1243478f4fbdc21ea9b241655947a28accd058d0cdb4f9f0576d32f09dddaf0850464550ff07cab5927b3e4c863ce9
+			0000000000000000000000000000000015fb54db10ffac0b6cd374eb7168a8cb3df0a7d5f872d8e98c1f623deb66df5dd08ff4c3658f2905ec8bd02598bd4f90
+			787c38b944eadbd03fd3187f450571740f6cd00e5b2e560165846eb800e5c944
+			000000000000000000000000000000000328f09584b6d6c98a709fc22e184123994613aca95a28ac53df8523b92273eb6f4e2d9b2a7dcebb474604d54a210719
+			000000000000000000000000000000001220ebde579911fe2e707446aaad8d3789fae96ae2e23670a4fd856ed82daaab704779eb4224027c1ed9460f39951a1b
+			aaee7ae2a237e8e53560c79e7baa9adf9c00a0ea4d6f514e7a6832eb15cef1e1
+			0000000000000000000000000000000002ebfa98aa92c32a29ebe17fcb1819ba82e686abd9371fcee8ea793b4c72b6464085044f818f1f5902396df0122830cb
+			00000000000000000000000000000000001184715b8432ed190b459113977289a890f68f6085ea111466af15103c9c02467da33e01d6bff87fd57db6ccba442a
+			dac6ed3ef45c1d7d3028f0f89e5458797996d3294b95bebe049b76c7d0db317c
+			0000000000000000000000000000000009d6424e002439998e91cd509f85751ad25e574830c564e7568347d19e3f38add0cab067c0b4b0801785a78bcbeaf246
+			000000000000000000000000000000000ef6d7db03ee654503b46ff0dbc3297536a422e963bda9871a8da8f4eeb98dedebd6071c4880b4636198f4c2375dc795
+			bb30985756c3ca075114c92f231575d6befafe4084517f1166a47376867bd108
+			0000000000000000000000000000000002d1cdb93191d1f9f0308c2c55d0208a071f5520faca7c52ab0311dbc9ba563bd33b5dd6baa77bf45ac2c3269e945f48
+			00000000000000000000000000000000072a52106e6d7b92c594c4dacd20ef5fab7141e45c231457cd7e71463b2254ee6e72689e516fa6a8f29f2a173ce0a190
+			fb730105809f64ea522983d6bbb62f7e2e8cbf702685e9be10e2ef71f8187672
+			0000000000000000000000000000000000641642f6801d39a09a536f506056f72a619c50d043673d6d39aa4af11d8e3ded38b9c3bbc970dbc1bd55d68f94b50d
+			0000000000000000000000000000000009ab050de356a24aea90007c6b319614ba2f2ed67223b972767117769e3c8e31ee4056494628fb2892d3d37afb6ac943
+			b6a9408625b0ca8fcbfb21d34eec2d8e24e9a30d2d3b32d7a37d110b13afbfea
+			000000000000000000000000000000000fd4893addbd58fb1bf30b8e62bef068da386edbab9541d198e8719b2de5beb9223d87387af82e8b55bd521ff3e47e2d
+			000000000000000000000000000000000f3a923b76473d5b5a53501790cb02597bb778bdacb3805a9002b152d22241ad131d0f0d6a260739cbab2c2fe602870e
+			3b77283d0a7bb9e17a27e66851792fdd605cc0a339028b8985390fd024374c76
+			0000000000000000000000000000000002cb4b24c8aa799fd7cb1e4ab1aab1372113200343d8526ea7bc64dfaf926baf5d90756a40e35617854a2079cd07fba4
+			0000000000000000000000000000000003327ca22bd64ebd673cc6d5b02b2a8804d5353c9d251637c4273ad08d581cc0d58da9bea27c37a0b3f4961dbafd276b
+			dd994eae929aee7428fdda2e44f8cb12b10b91c83b22abc8bbb561310b62257c
+			00000000000000000000000000000000024ad70f2b2105ca37112858e84c6f5e3ffd4a8b064522faae1ecba38fabd52a6274cb46b00075deb87472f11f2e67d9
+			0000000000000000000000000000000010a502c8b2a68aa30d2cb719273550b9a3c283c35b2e18a01b0b765344ffaaa5cb30a1e3e6ecd3a53ab67658a5787681
+			7010b134989c8368c7f831f9dd9f9a890e2c1435681107414f2e8637153bbf6a
+			0000000000000000000000000000000000704cc57c8e0944326ddc7c747d9e7347a7f6918977132eea269f161461eb64066f773352f293a3ac458dc3ccd5026a
+			000000000000000000000000000000001099d3c2bb2d082f2fdcbed013f7ac69e8624f4fcf6dfab3ee9dcf7fbbdb8c49ee79de40e887c0b6828d2496e3a6f768
+			94c68bc8d91ac8c489ee87dbfc4b94c93c8bbd5fc04c27db8b02303f3a659054
+			00000000000000000000000000000000130535a29392c77f045ac90e47f2e7b3cffff94494fe605aad345b41043f6663ada8e2e7ecd3d06f3b8854ef92212f42
+			000000000000000000000000000000001699a3cc1f10cd2ed0dc68eb916b4402e4f12bf4746893bf70e26e209e605ea89e3d53e7ac52bd07713d3c8fc671931d
+			b3682accc3939283b870357cf83683350baf73aa0d3d68bda82a0f6ae7e51746
+		");
+		let expected = hex!("
+			000000000000000000000000000000000b370fc4ca67fb0c3c270b1b4c4816ef953cd9f7cf6ad20e88099c40aace9c4bb3f4cd215e5796f65080c69c9f4d2a0f
+			0000000000000000000000000000000007203220935ddc0190e2d7a99ec3f9231da550768373f9a5933dffd366f48146f8ea5fe5dee6539d925288083bb5a8f1
+		");
+
+		let mut output = [0u8; 128];
+
+		f.execute(&input[..], &mut BytesRef::Fixed(&mut output[..])).expect("Builtin should not fail");
+		assert_eq!(&output[..], &expected[..]);
+	}
+	
+	#[test]
+	fn bls12_381_g2_add() {
+		let f = Builtin {
+			pricer: btreemap![0 => Pricing::Bls12ConstOperations(Bls12ConstOperations{price: 1})],
+			native: EthereumBuiltin::from_str("bls12_381_g2_add").unwrap(),
+		};
+		let input = hex!("
+			00000000000000000000000000000000161c595d151a765c7dee03c9210414cdffab84b9078b4b98f9df09be5ec299b8f6322c692214f00ede97958f235c352b
+			00000000000000000000000000000000106883e0937cb869e579b513bde8f61020fcf26be38f8b98eae3885cedec2e028970415fc653cf10e64727b7f6232e06
+			000000000000000000000000000000000f351a82b733af31af453904874b7ca6252957a1ab51ec7f7b6fff85bbf3331f870a7e72a81594a9930859237e7a154d
+			0000000000000000000000000000000012fcf20d1750901f2cfed64fd362f010ee64fafe9ddab406cc352b65829b929881a50514d53247d1cca7d6995d0bc9b2
+			00000000000000000000000000000000148b7dfc21521d79ff817c7a0305f1048851e283be13c07d5c04d28b571d48172838399ba539529e8d037ffd1f729558
+			0000000000000000000000000000000003015abea326c15098f5205a8b2d3cd74d72dac59d60671ca6ef8c9c714ea61ffdacd46d1024b5b4f7e6b3b569fabaf2
+			0000000000000000000000000000000011f0c512fe7dc2dd8abdc1d22c2ecd2e7d1b84f8950ab90fc93bf54badf7bb9a9bad8c355d52a5efb110dca891e4cc3d
+			0000000000000000000000000000000019774010814d1d94caf3ecda3ef4f5c5986e966eaf187c32a8a5a4a59452af0849690cf71338193f2d8435819160bcfb
+		");
+		let expected = hex!("
+			000000000000000000000000000000000383ab7a17cc57e239e874af3f1aaabba0e64625b848676712f05f56132dbbd1cadfabeb3fe1f461daba3f1720057ddd
+			00000000000000000000000000000000096967e9b3747f1b8e344535eaa0c51e70bc77412bfaa2a7ce76f11f570c9febb8f4227316866a416a50436d098e6f9a
+			000000000000000000000000000000001079452b7519a7b090d668d54c266335b1cdd1080ed867dd17a2476b11c2617da829bf740e51cb7dfd60d73ed02c0c67
+			00000000000000000000000000000000015fc3a972e05cbd9014882cfe6f2f16d0291c403bf28b05056ac625e4f71dfb1295c85d73145ef554614e6eb2d5bf02
+		");
+
+		let mut output = [0u8; 256];
+
+		f.execute(&input[..], &mut BytesRef::Fixed(&mut output[..])).expect("Builtin should not fail");
+		assert_eq!(&output[..], &expected[..]);
+	}
+
+	#[test]
+	fn bls12_381_g2_mul() {
+		let f = Builtin {
+			pricer: btreemap![0 => Pricing::Bls12ConstOperations(Bls12ConstOperations{price: 1})],
+			native: EthereumBuiltin::from_str("bls12_381_g2_mul").unwrap(),
+		};
+
+		let input = hex!("
+			00000000000000000000000000000000159da74f15e4c614b418997f81a1b8a3d9eb8dd80d94b5bad664bff271bb0f2d8f3c4ceb947dc6300d5003a2f7d7a829
+			000000000000000000000000000000000cdd4d1d4666f385dd54052cf5c1966328403251bebb29f0d553a9a96b5ade350c8493270e9b5282d8a06f9fa8d7b1d9
+			00000000000000000000000000000000189f8d3c94fdaa72cc67a7f93d35f91e22206ff9e97eed9601196c28d45b69c802ae92bcbf582754717b0355e08d37c0
+			00000000000000000000000000000000054b0a282610f108fc7f6736b8c22c8778d082bf4b0d0abca5a228198eba6a868910dd5c5c440036968e977955054196
+			b6a9408625b0ca8fcbfb21d34eec2d8e24e9a30d2d3b32d7a37d110b13afbfea
+		");
+		let expected = hex!("
+			000000000000000000000000000000000b24adeb2ca184c9646cb39f45e0cf8711e10bf308ddae06519562b0af3b43be44c2fcb90622726f7446ed690551d30e
+			00000000000000000000000000000000069467c3edc19416067f572c51740ba8e0e7380121ade98e38ce26d907a2bf3a4e82af2bd195b6c3b7c9b29218880531
+			000000000000000000000000000000000eb8c90d0727511be53ffcb6f3b144c07983ed4b76d31ab003e45b37c7bc1066910f5e29f5adad5757af979dd0d8351d
+			0000000000000000000000000000000004760f8d814189dcd893949797a3c4f56f2b60964bba3a4fc741e7ead05eb886787b2502fc64b20363eeba44e65d0ca0
+		");
+
+		let mut output = [0u8; 256];
+
+		f.execute(&input[..], &mut BytesRef::Fixed(&mut output[..])).expect("Builtin should not fail");
+		assert_eq!(&output[..], &expected[..]);
+	}
+
+	#[test]
+	fn bls12_381_g2_multiexp() {
+		let f = Builtin {
+			pricer: btreemap![0 => Pricing::Bls12ConstOperations(Bls12ConstOperations{price: 1})],
+			native: EthereumBuiltin::from_str("bls12_381_g2_multiexp").unwrap(),
+		};
+
+		let input = hex!("
+			00000000000000000000000000000000039b10ccd664da6f273ea134bb55ee48f09ba585a7e2bb95b5aec610631ac49810d5d616f67ba0147e6d1be476ea220e
+			0000000000000000000000000000000000fbcdff4e48e07d1f73ec42fe7eb026f5c30407cfd2f22bbbfe5b2a09e8a7bb4884178cb6afd1c95f80e646929d3004
+			0000000000000000000000000000000001ed3b0e71acb0adbf44643374edbf4405af87cfc0507db7e8978889c6c3afbe9754d1182e98ac3060d64994d31ef576
+			000000000000000000000000000000001681a2bf65b83be5a2ca50430949b6e2a099977482e9405b593f34d2ed877a3f0d1bddc37d0cec4d59d7df74b2b8f2df
+			b3c940fe79b6966489b527955de7599194a9ac69a6ff58b8d99e7b1084f0464e
+			0000000000000000000000000000000018c0ada6351b70661f053365deae56910798bd2ace6e2bf6ba4192d1a229967f6af6ca1c9a8a11ebc0a232344ee0f6d6
+			000000000000000000000000000000000cc70a587f4652039d8117b6103858adcd9728f6aebe230578389a62da0042b7623b1c0436734f463cfdd187d2090324
+			0000000000000000000000000000000009f50bd7beedb23328818f9ffdafdb6da6a4dd80c5a9048ab8b154df3cad938ccede829f1156f769d9e149791e8e0cd9
+			00000000000000000000000000000000079ba50d2511631b20b6d6f3841e616e9d11b68ec3368cd60129d9d4787ab56c4e9145a38927e51c9cd6271d493d9388
+			4d0e25bf3f6fc9f4da25d21fdc71773f1947b7a8a775b8177f7eca990b05b71d
+			0000000000000000000000000000000003632695b09dbf86163909d2bb25995b36ad1d137cf252860fd4bb6c95749e19eb0c1383e9d2f93f2791cb0cf6c8ed9d
+			000000000000000000000000000000001688a855609b0bbff4452d146396558ff18777f329fd4f76a96859dabfc6a6f6977c2496280dbe3b1f8923990c1d6407
+			000000000000000000000000000000000c8567fee05d05af279adc67179468a29d7520b067dbb348ee315a99504f70a206538b81a457cce855f4851ad48b7e80
+			000000000000000000000000000000001238dcdfa80ea46e1500026ea5feadb421de4409f4992ffbf5ae59fa67fd82f38452642a50261b849e74b4a33eed70cc
+			973f40c12c92b703d7b7848ef8b4466d40823aad3943a312b57432b91ff68be1
+			000000000000000000000000000000000149704960cccf9d5ea414c73871e896b1d4cf0a946b0db72f5f2c5df98d2ec4f3adbbc14c78047961bc9620cb6cfb59
+			00000000000000000000000000000000140c5d25e534fb1bfdc19ba4cecaabe619f6e0cd3d60b0f17dafd7bcd27b286d4f4477d00c5e1af22ee1a0c67fbf177c
+			00000000000000000000000000000000029a1727041590b8459890de736df15c00d80ab007c3aee692ddcdf75790c9806d198e9f4502bec2f0a623491c3f877d
+			0000000000000000000000000000000008a94c98baa9409151030d4fae2bd4a64c6f11ea3c99b9661fdaed226b9a7c2a7d609be34afda5d18b8911b6e015bf49
+			4c51f97bcdda93904ae26991b471e9ea942e2b5b8ed26055da11c58bc7b5002a
+			000000000000000000000000000000001156d478661337478ab0cbc877a99d9e4d9824a2b3f605d41404d6b557b3ffabbf42635b0bbcb854cf9ed8b8637561a8
+			000000000000000000000000000000001147ed317d5642e699787a7b47e6795c9a8943a34a694007e44f8654ba96390cf19f010dcf695e22c21874022c6ce291
+			000000000000000000000000000000000c6dccdf920fd5e7fae284115511952633744c6ad94120d9cae6acda8a7c23c48bd912cba6c38de5159587e1e6cad519
+			000000000000000000000000000000001944227d462bc2e5dcc6f6db0f83dad411ba8895262836f975b2b91e06fd0e2138862162acc04e9e65050b34ccbd1a4e
+			8964d5867927bc3e35a0b4c457482373969bff5edff8a781d65573e07fd87b89
+			0000000000000000000000000000000019c31e3ab8cc9c920aa8f56371f133b6cb8d7b0b74b23c0c7201aca79e5ae69dc01f1f74d2492dcb081895b17d106b4e
+			000000000000000000000000000000001789b0d371bd63077ccde3dbbebf3531368feb775bced187fb31cc6821481664600978e323ff21085b8c08e0f21daf72
+			000000000000000000000000000000000009eacfe8f4a2a9bae6573424d07f42bd6af8a9d55f71476a7e3c7a4b2b898550c1e72ec13afd4eff22421a03af1d31
+			000000000000000000000000000000000410bd4ea74dcfa33f2976aa1b571c67cbb596ab10f76a8aaf4548f1097e55b3373bff02683f806cb84e1e0e877819e2
+			787c38b944eadbd03fd3187f450571740f6cd00e5b2e560165846eb800e5c944
+			00000000000000000000000000000000147f09986691f2e57073378e8bfd58804241eed7934f6adfe6d0a6bac4da0b738495778a303e52113e1c80e698476d50
+			000000000000000000000000000000000762348b84c92a8ca6de319cf1f8f11db296a71b90fe13e1e4bcd25903829c00a5d2ad4b1c8d98c37eaad7e042ab023d
+			0000000000000000000000000000000011d1d94530d4a2daf0e902a5c3382cd135938557f94b04bccea5e16ea089c5e020e13524c854a316662bd68784fe31f3
+			00000000000000000000000000000000070828522bec75b6a492fd9bca7b54dac6fbbf4f0bc3179d312bb65c647439e3868e4d5b21af5a64c93aeee8a9b7e46e
+			aaee7ae2a237e8e53560c79e7baa9adf9c00a0ea4d6f514e7a6832eb15cef1e1
+			000000000000000000000000000000000690a0869204c8dced5ba0ce13554b2703a3f18afb8fa8fa1c457d79c58fdc25471ae85bafad52e506fc1917fc3becff
+			0000000000000000000000000000000010f7dbb16f8571ede1cec79e3f9ea03ae6468d7285984713f19607f5cab902b9a6b7cbcfd900be5c2e407cc093ea0e67
+			00000000000000000000000000000000151caf87968433cb1f85fc1854c57049be22c26497a86bfbd66a2b3af121d894dba8004a17c6ff96a5843c2719fa32d1
+			0000000000000000000000000000000011f0270f2b039409f70392879bcc2c67c836c100cf9883d3dc48d7adbcd52037d270539e863a951acd47ecaa1ca4db12
+			dac6ed3ef45c1d7d3028f0f89e5458797996d3294b95bebe049b76c7d0db317c
+			0000000000000000000000000000000017fae043c8fd4c520a90d4a6bd95f5b0484acc279b899e7b1d8f7f7831cc6ba37cd5965c4dc674768f5805842d433af3
+			0000000000000000000000000000000008ddd7b41b8fa4d29fb931830f29b46f4015ec202d51cb969d7c832aafc0995c875cd45eff4a083e2d5ecb5ad185b64f
+			0000000000000000000000000000000015d384ab7e52420b83a69827257cb52b00f0199ed2240a142812b46cf67e92b99942ac59fb9f9efd7dd822f5a36c799f
+			00000000000000000000000000000000074b3a16a9cc4be9da0ac8e2e7003d9c1ec89244d2c33441b31af76716cce439f805843a9a44701203231efdca551d5b
+			bb30985756c3ca075114c92f231575d6befafe4084517f1166a47376867bd108
+			000000000000000000000000000000000e25365988664e8b6ade2e5a40da49c11ff1e084cc0f8dca51f0d0578555d39e3617c8cadb2abc2633b28c5895ab0a9e
+			00000000000000000000000000000000169f5fd768152169c403475dee475576fd2cc3788179453b0039ff3cb1b7a5a0fff8f82d03f56e65cad579218486c3b6
+			00000000000000000000000000000000087ccd7f92032febc1f75c7115111ede4acbb2e429cbccf3959524d0b79c449d431ff65485e1aecb442b53fec80ecb40
+			00000000000000000000000000000000135d63f264360003b2eb28f126c6621a40088c6eb15acc4aea89d6068e9d5a47f842aa4b4300f5cda5cc5831edb81596
+			fb730105809f64ea522983d6bbb62f7e2e8cbf702685e9be10e2ef71f8187672
+			00000000000000000000000000000000159da74f15e4c614b418997f81a1b8a3d9eb8dd80d94b5bad664bff271bb0f2d8f3c4ceb947dc6300d5003a2f7d7a829
+			000000000000000000000000000000000cdd4d1d4666f385dd54052cf5c1966328403251bebb29f0d553a9a96b5ade350c8493270e9b5282d8a06f9fa8d7b1d9
+			00000000000000000000000000000000189f8d3c94fdaa72cc67a7f93d35f91e22206ff9e97eed9601196c28d45b69c802ae92bcbf582754717b0355e08d37c0
+			00000000000000000000000000000000054b0a282610f108fc7f6736b8c22c8778d082bf4b0d0abca5a228198eba6a868910dd5c5c440036968e977955054196
+			b6a9408625b0ca8fcbfb21d34eec2d8e24e9a30d2d3b32d7a37d110b13afbfea
+			000000000000000000000000000000000f29b0d2b6e3466668e1328048e8dbc782c1111ab8cbe718c85d58ded992d97ca8ba20b9d048feb6ed0aa1b4139d02d3
+			000000000000000000000000000000000d1f0dae940b99fbfc6e4a58480cac8c4e6b2fe33ce6f39c7ac1671046ce94d9e16cba2bb62c6749ef73d45bea21501a
+			000000000000000000000000000000001902ccece1c0c763fd06934a76d1f2f056563ae6d8592bafd589cfebd6f057726fd908614ccd6518a21c66ecc2f78b66
+			0000000000000000000000000000000017f6b113f8872c3187d20b0c765d73b850b54244a719cf461fb318796c0b8f310b5490959f9d9187f99c8ed3e25e42a9
+			3b77283d0a7bb9e17a27e66851792fdd605cc0a339028b8985390fd024374c76
+			000000000000000000000000000000000576b8cf1e69efdc277465c344cadf7f8cceffacbeca83821f3ff81717308b97f4ac046f1926e7c2eb42677d7afc257c
+			000000000000000000000000000000000cc1524531e96f3c00e4250dd351aedb5a4c3184aff52ec8c13d470068f5967f3674fe173ee239933e67501a9decc668
+			0000000000000000000000000000000001610cfcaea414c241b44cf6f3cc319dcb51d6b8de29c8a6869ff7c1ebb7b747d881e922b42e8fab96bde7cf23e8e4cd
+			0000000000000000000000000000000017d4444dc8b6893b681cf10dac8169054f9d2f61d3dd5fd785ae7afa49d18ebbde9ce8dde5641adc6b38173173459836
+			dd994eae929aee7428fdda2e44f8cb12b10b91c83b22abc8bbb561310b62257c
+			000000000000000000000000000000000ca8f961f86ee6c46fc88fbbf721ba760186f13cd4cce743f19dc60a89fd985cb3feee34dcc4656735a326f515a729e4
+			00000000000000000000000000000000174baf466b809b1155d524050f7ee58c7c5cf728c674e0ce549f5551047a4479ca15bdf69b403b03fa74eb1b26bbff6c
+			0000000000000000000000000000000000e8c8b587c171b1b292779abfef57202ed29e7fe94ade9634ec5a2b3b4692a4f3c15468e3f6418b144674be70780d5b
+			000000000000000000000000000000001865e99cf97d88bdf56dae32314eb32295c39a1e755cd7d1478bea8520b9ff21c39b683b92ae15568420c390c42b123b
+			7010b134989c8368c7f831f9dd9f9a890e2c1435681107414f2e8637153bbf6a
+			0000000000000000000000000000000017eccd446f10018219a1bd111b8786cf9febd49f9e7e754e82dd155ead59b819f0f20e42f4635d5044ec5d550d847623
+			000000000000000000000000000000000403969d2b8f914ff2ea3bf902782642e2c6157bd2a343acf60ff9125b48b558d990a74c6d4d6398e7a3cc2a16037346
+			000000000000000000000000000000000bd45f61f142bd78619fb520715320eb5e6ebafa8b078ce796ba62fe1a549d5fb9df57e92d8d2795988eb6ae18cf9d93
+			00000000000000000000000000000000097db1314e064b8e670ec286958f17065bce644cf240ab1b1b220504560d36a0b43fc18453ff3a2bb315e219965f5bd3
+			94c68bc8d91ac8c489ee87dbfc4b94c93c8bbd5fc04c27db8b02303f3a659054
+			00000000000000000000000000000000018244ab39a716e252cbfb986c7958b371e29ea9190010d1f5e1cfdb6ce4822d4055c37cd411fc9a0c46d728f2c13ecf
+			0000000000000000000000000000000001985d3c667c8d68c9adb92bdc7a8af959c17146544997d97116120a0f55366bd7ad7ffa28d93ee51222ff9222779675
+			000000000000000000000000000000000c70fd4e3c8f2a451f83fb6c046431b38251b7bae44cf8d36df69a03e2d3ce6137498523fcf0bcf29b5d69e8f265e24d
+			00000000000000000000000000000000047b9163a218f7654a72e0d7c651a2cf7fd95e9784a59e0bf119d081de6c0465d374a55fbc1eff9828c9fd29abf4c4bd
+			b3682accc3939283b870357cf83683350baf73aa0d3d68bda82a0f6ae7e51746
+		");
+		let expected = hex!("
+			00000000000000000000000000000000083ad744b34f6393bc983222b004657494232c5d9fbc978d76e2377a28a34c4528da5d91cbc0977dc953397a6d21eca2
+			0000000000000000000000000000000015aec6526e151cf5b8403353517dfb9a162087a698b71f32b266d3c5c936a83975d5567c25b3a5994042ec1379c8e526
+			000000000000000000000000000000000e3647185d1a20efad19f975729908840dc33909a583600f7915025f906aef9c022fd34e618170b11178aaa824ae36b3
+			00000000000000000000000000000000159576d1d53f6cd12c39d651697e11798321f17cd287118d7ebeabf68281bc03109ee103ee8ef2ef93c71dd1dcbaf1e0
+		");
+
+		let mut output = [0u8; 256];
+
+		f.execute(&input[..], &mut BytesRef::Fixed(&mut output[..])).expect("Builtin should not fail");
+		assert_eq!(&output[..], &expected[..]);
+	}
+
+	#[test]
+	fn bls12_381_pairing() {
+		let f = Builtin {
+			pricer: btreemap![0 => 	Pricing::Bls12Pairing(Bls12PairingPricer{price: Bls12PairingPrice{base: 1, pair: 1}})],
+			native: EthereumBuiltin::from_str("bls12_381_pairing").unwrap(),
+		};
+
+		let input = hex!("
+			000000000000000000000000000000001830f52d9bff64a623c6f5259e2cd2c2a08ea17a8797aaf83174ea1e8c3bd3955c2af1d39bfa474815bfe60714b7cd80
+			000000000000000000000000000000000874389c02d4cf1c61bc54c4c24def11dfbe7880bc998a95e70063009451ee8226fec4b278aade3a7cea55659459f1d5
+			00000000000000000000000000000000197737f831d4dc7e708475f4ca7ca15284db2f3751fcaac0c17f517f1ddab35e1a37907d7b99b39d6c8d9001cd50e79e
+			000000000000000000000000000000000af1a3f6396f0c983e7c2d42d489a3ae5a3ff0a553d93154f73ac770cd0af7467aa0cef79f10bbd34621b3ec9583a834
+			000000000000000000000000000000001918cb6e448ed69fb906145de3f11455ee0359d030e90d673ce050a360d796de33ccd6a941c49a1414aca1c26f9e699e
+			0000000000000000000000000000000019a915154a13249d784093facc44520e7f3a18410ab2a3093e0b12657788e9419eec25729944f7945e732104939e7a9e
+			000000000000000000000000000000001830f52d9bff64a623c6f5259e2cd2c2a08ea17a8797aaf83174ea1e8c3bd3955c2af1d39bfa474815bfe60714b7cd80
+			00000000000000000000000000000000118cd94e36ab177de95f52f180fdbdc584b8d30436eb882980306fa0625f07a1f7ad3b4c38a921c53d14aa9a6ba5b8d6
+			00000000000000000000000000000000197737f831d4dc7e708475f4ca7ca15284db2f3751fcaac0c17f517f1ddab35e1a37907d7b99b39d6c8d9001cd50e79e
+			000000000000000000000000000000000af1a3f6396f0c983e7c2d42d489a3ae5a3ff0a553d93154f73ac770cd0af7467aa0cef79f10bbd34621b3ec9583a834
+			000000000000000000000000000000001918cb6e448ed69fb906145de3f11455ee0359d030e90d673ce050a360d796de33ccd6a941c49a1414aca1c26f9e699e
+			0000000000000000000000000000000019a915154a13249d784093facc44520e7f3a18410ab2a3093e0b12657788e9419eec25729944f7945e732104939e7a9e
+		");
+		let expected = hex!("
+			0000000000000000000000000000000000000000000000000000000000000001
+		");
+
+		let mut output = [0u8; 32];
+
+		f.execute(&input[..], &mut BytesRef::Fixed(&mut output[..])).expect("Builtin should not fail");
+		assert_eq!(&output[..], &expected[..]);
+	}
+
+	#[test]
+	fn bls12_381_fp_to_g1() {
+		let f = Builtin {
+			pricer: btreemap![0 => 	Pricing::Bls12Pairing(Bls12PairingPricer{price: Bls12PairingPrice{base: 1, pair: 1}})],
+			native: EthereumBuiltin::from_str("bls12_381_fp_to_g1").unwrap(),
+		};
+
+		let input = hex!("
+			0000000000000000000000000000000017f66b472b36717ee0902d685c808bb5f190bbcb2c51d067f1cbec64669f10199a5868d7181dcec0498fcc71f5acaf79
+		");
+		let expected = hex!("
+			00000000000000000000000000000000188dc9e5ddf48977f33aeb6e505518269bf67fb624fa86b79741d842e75a6fa1be0911c2caa9e55571b6e55a3c0c0b9e
+			00000000000000000000000000000000193e8b7c7e78daf104a59d7b39401a65355fa874bd34e91688580941e99a863367efc68fe871e38e07423090e93919c9
+		");
+
+		let mut output = [0u8; 128];
+
+		f.execute(&input[..], &mut BytesRef::Fixed(&mut output[..])).expect("Builtin should not fail");
+		assert_eq!(&output[..], &expected[..]);
+	}
+
+	#[test]
+	fn bls12_381_fp2_to_g2() {
+		let f = Builtin {
+			pricer: btreemap![0 => 	Pricing::Bls12Pairing(Bls12PairingPricer{price: Bls12PairingPrice{base: 1, pair: 1}})],
+			native: EthereumBuiltin::from_str("bls12_381_fp2_to_g2").unwrap(),
+		};
+
+		let input = hex!("
+			000000000000000000000000000000000f470603a402bc134db1b389fd187460f9eb2dd001a2e99f730af386508c62f0e911d831a2562da84bce11d39f2ff13f
+			000000000000000000000000000000000d8c45f4ab20642d0cba9764126e0818b7d731a6ba29ed234d9d6309a5e8ddfbd85193f1fa8b7cfeed3d31b23b904ee9
+		");
+		let expected = hex!("
+			0000000000000000000000000000000012e74d5a0c005a86ca148e9eff8e34a00bfa8b6e6aadf633d65cd09bb29917e0ceb0d5c9d9650c162d7fe4aa27452685
+			0000000000000000000000000000000005f09101a2088712619f9c096403b66855a12f9016c55aef6047372fba933f02d9d59db1a86df7be57978021e2457821
+			00000000000000000000000000000000136975b37fe400d1d217a2b496c1552b39be4e9e71dd7ad482f5f0836d271d02959fdb698dda3d0530587fb86e0db1dd
+			0000000000000000000000000000000000bad0aabd9309e92e2dd752f4dd73be07c0de2c5ddd57916b9ffa065d7440d03d44e7c042075cda694414a9fb639bb7
+		");
+
+		let mut output = [0u8; 256];
+
+		f.execute(&input[..], &mut BytesRef::Fixed(&mut output[..])).expect("Builtin should not fail");
+		assert_eq!(&output[..], &expected[..]);
+	}
+
+	#[test]
+	fn bls12_381_g1_multiexp_init_from_spec() {
+		use ethjson::spec::builtin::{Pricing, Bls12G1Multiexp};
+
+		let b = Builtin::try_from(JsonBuiltin {
+			name: "bls12_381_g1_multiexp".to_owned(),
+			pricing: btreemap![
+				10000000 => PricingAt {
+					info: None,
+					price: Pricing::Bls12G1Multiexp(Bls12G1Multiexp{
+							base: 12000,
+					}),
+				}
+			],
+		}).unwrap();
+
+		match b.native {
+			EthereumBuiltin::Bls12G1MultiExp(..) => {},
+			_ => {
+				panic!("invalid precompile type");
+			}
+		}
+	}
+
+	#[test]
+	fn bls12_381_g2_multiexp_init_from_spec() {
+		use ethjson::spec::builtin::{Pricing, Bls12G2Multiexp};
+
+		let b = Builtin::try_from(JsonBuiltin {
+			name: "bls12_381_g2_multiexp".to_owned(),
+			pricing: btreemap![
+				10000000 => PricingAt {
+					info: None,
+					price: Pricing::Bls12G2Multiexp(Bls12G2Multiexp{
+							base: 55000,
+					}),
+				}
+			],
+		}).unwrap();
+
+		match b.native {
+			EthereumBuiltin::Bls12G2MultiExp(..) => {},
+			_ => {
+				panic!("invalid precompile type");
+			}
+		}
+	}
 }
diff --git a/ethcore/res/ethereum/foundation.json b/ethcore/res/ethereum/foundation.json
index 1949efb0093..bdf8f1168e4 100644
--- a/ethcore/res/ethereum/foundation.json
+++ b/ethcore/res/ethereum/foundation.json
@@ -4888,6 +4888,87 @@
 				}
 			}
 		},
+		"000000000000000000000000000000000000000a": {
+			"builtin": {
+				"name": "bls12_381_g1_add",
+				"activate_at": "0x7fffffffffffff",
+				"pricing": {
+					"bls12_const_operations": { "price": 600 }
+				}
+			}
+		},
+		"000000000000000000000000000000000000000b": {
+			"builtin": {
+				"name": "bls12_381_g1_mul",
+				"activate_at": "0x7fffffffffffff",
+				"pricing": {
+					"bls12_const_operations": { "price": 12000 }
+				}
+			}
+		},
+		"000000000000000000000000000000000000000c": {
+			"builtin": {
+				"name": "bls12_381_g1_multiexp",
+				"activate_at": "0x7fffffffffffff",
+				"pricing": {
+					"bls12_g1_multiexp": { "base": 12000 }
+				}
+			}
+		},
+		"000000000000000000000000000000000000000d": {
+			"builtin": {
+				"name": "bls12_381_g2_add",
+				"activate_at": "0x7fffffffffffff",
+				"pricing": {
+					"bls12_const_operations": { "price": 4500 }
+				}
+			}
+		},
+		"000000000000000000000000000000000000000e": {
+			"builtin": {
+				"name": "bls12_381_g2_mul",
+				"activate_at": "0x7fffffffffffff",
+				"pricing": {
+					"bls12_const_operations": { "price": 55000 }
+				}
+			}
+		},
+		"000000000000000000000000000000000000000f": {
+			"builtin": {
+				"name": "bls12_381_g2_multiexp",
+				"activate_at": "0x7fffffffffffff",
+				"pricing": {
+					"bls12_g2_multiexp": { "base": 55000 }
+				}
+			}
+		},
+		"0000000000000000000000000000000000000010": {
+			"builtin": {
+				"name": "bls12_381_pairing",
+				"activate_at": "0x7fffffffffffff",
+				"pricing": {
+					"bls12_pairing": { "base": 115000, "pair": 23000 }
+				}
+			}
+		},
+		"0000000000000000000000000000000000000011": {
+			"builtin": {
+				"name": "bls12_381_fp_to_g1",
+				"activate_at": "0x7fffffffffffff",
+				"pricing": {
+					"bls12_const_operations": { "price": 5500 }
+				}
+			}
+		},
+		"0000000000000000000000000000000000000012": {
+			"builtin": {
+				"name": "bls12_381_fp2_to_g2",
+				"activate_at": "0x7fffffffffffff",
+				"pricing": {
+					"bls12_const_operations": { "price": 110000 }
+				}
+			}
+		},
 		"0x3282791d6fd713f1e94f4bfd565eaa78b3a0599d": {
 			"balance": "0x487a9a304539440000"
 		},
diff --git a/ethcore/res/ethereum/test-specs/berlin_test.json b/ethcore/res/ethereum/test-specs/berlin_test.json
index e1ff63fe95b..40b84a09b54 100644
--- a/ethcore/res/ethereum/test-specs/berlin_test.json
+++ b/ethcore/res/ethereum/test-specs/berlin_test.json
@@ -111,13 +111,94 @@
 		"0000000000000000000000000000000000000009": {
 			"builtin": {
 				"name": "blake2_f",
-				"activate_at": "0x00",
+				"activate_at": "0x0",
 				"pricing": {
 					"blake2_f": {
 						"gas_per_round": 1
 					}
 				}
 			}
+		},
+		"000000000000000000000000000000000000000a": {
+			"builtin": {
+				"name": "bls12_381_g1_add",
+				"activate_at": "0x0",
+				"pricing": {
+					"bls12_const_operations": { "price": 600 }
+				}
+			}
+		},
+		"000000000000000000000000000000000000000b": {
+			"builtin": {
+				"name": "bls12_381_g1_mul",
+				"activate_at": "0x0",
+				"pricing": {
+					"bls12_const_operations": { "price": 12000 }
+				}
+			}
+		},
+		"000000000000000000000000000000000000000c": {
+			"builtin": {
+				"name": "bls12_381_g1_multiexp",
+				"activate_at": "0x0",
+				"pricing": {
+					"bls12_g1_multiexp": { "base": 12000 }
+				}
+			}
+		},
+		"000000000000000000000000000000000000000d": {
+			"builtin": {
+				"name": "bls12_381_g2_add",
+				"activate_at": "0x0",
+				"pricing": {
+					"bls12_const_operations": { "price": 4500 }
+				}
+			}
+		},
+		"000000000000000000000000000000000000000e": {
+			"builtin": {
+				"name": "bls12_381_g2_mul",
+				"activate_at": "0x0",
+				"pricing": {
+					"bls12_const_operations": { "price": 55000 }
+				}
+			}
+		},
+		"000000000000000000000000000000000000000f": {
+			"builtin": {
+				"name": "bls12_381_g2_multiexp",
+				"activate_at": "0x0",
+				"pricing": {
+					"bls12_g2_multiexp": { "base": 55000 }
+				}
+			}
+		},
+		"0000000000000000000000000000000000000010": {
+			"builtin": {
+				"name": "bls12_381_pairing",
+				"activate_at": "0x0",
+				"pricing": {
+					"bls12_pairing": { "base": 115000, "pair": 23000 }
+				}
+			}
+		},
+		"0000000000000000000000000000000000000011": {
+			"builtin": {
+				"name": "bls12_381_fp_to_g1",
+				"activate_at": "0x0",
+				"pricing": {
+					"bls12_const_operations": { "price": 5500 }
+				}
+			}
+		},
+		"0000000000000000000000000000000000000012": {
+			"builtin": {
+				"name": "bls12_381_fp2_to_g2",
+				"activate_at": "0x00",
+				"pricing": {
+					"bls12_const_operations": { "price": 110000 }
+				}
+			}
 		}
 	}
 }
diff --git a/ethcore/spec/src/chain.rs b/ethcore/spec/src/chain.rs
index 0a2145c675a..cb1ec7bdb42 100644
--- a/ethcore/spec/src/chain.rs
+++ b/ethcore/spec/src/chain.rs
@@ -153,7 +153,7 @@ mod tests {
 	use tempfile::TempDir;
 	use ethcore::test_helpers::get_temp_state_db;
 
-	use super::{new_ropsten, new_foundation};
+	use super::{new_ropsten, new_foundation, new_berlin_test_machine};
 
 	#[test]
 	fn ensure_db_good() {
@@ -190,4 +190,9 @@ mod tests {
 		let genesis = frontier.genesis_block();
 		assert_eq!(view!(BlockView, &genesis).header_view().hash(), "d4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3".parse().unwrap());
 	}
+
+	#[test]
+	fn berlin_test_spec() {
+		let _ = new_berlin_test_machine();
+	}
 }
diff --git a/json/src/spec/builtin.rs b/json/src/spec/builtin.rs
index 173975fafe7..9a66c3a732a 100644
--- a/json/src/spec/builtin.rs
+++ b/json/src/spec/builtin.rs
@@ -57,6 +57,41 @@ pub struct AltBn128Pairing {
 	pub pair: u64,
 }
 
+
+/// Bls12 pairing price
+#[derive(Debug, PartialEq, Deserialize, Clone)]
+#[serde(deny_unknown_fields)]
+pub struct Bls12Pairing {
+	/// Price per final exp
+	pub base: u64,
+	/// Price per pair (Miller loop)
+	pub pair: u64,
+}
+
+/// Pricing for constant Bls12 operations (ADD and MUL in G1 and G2, as well as mappings)
+#[derive(Debug, PartialEq, Deserialize, Clone)]
+#[serde(deny_unknown_fields)]
+pub struct Bls12ConstOperations {
+	/// Fixed price.
+	pub price: u64,
+}
+
+/// Pricing for constant Bls12 operations (ADD and MUL in G1, as well as mappings)
+#[derive(Debug, PartialEq, Deserialize, Clone)]
+#[serde(deny_unknown_fields)]
+pub struct Bls12G1Multiexp {
+	/// Base const of the operation (G1 or G2 multiplication)
+	pub base: u64,
+}
+
+/// Pricing for constant Bls12 operations (ADD and MUL in G2, as well as mappings)
+#[derive(Debug, PartialEq, Deserialize, Clone)]
+#[serde(deny_unknown_fields)]
+pub struct Bls12G2Multiexp {
+	/// Base const of the operation (G1 or G2 multiplication)
+	pub base: u64,
+}
+
 /// Pricing variants.
 #[derive(Debug, PartialEq, Deserialize, Clone)]
 #[serde(deny_unknown_fields)]
@@ -75,6 +110,14 @@ pub enum Pricing {
 	AltBn128Pairing(AltBn128Pairing),
 	/// Pricing for constant alt_bn128 operations
 	AltBn128ConstOperations(AltBn128ConstOperations),
+	/// Pricing of constant price bls12_381 operations
+	Bls12ConstOperations(Bls12ConstOperations),
+	/// Pricing of pairing bls12_381 operation
+	Bls12Pairing(Bls12Pairing),
+	/// Pricing of bls12_381 multiexp operations in G1
+	Bls12G1Multiexp(Bls12G1Multiexp),
+	/// Pricing of bls12_381 multiexp operations in G2
+	Bls12G2Multiexp(Bls12G2Multiexp),
 }
 
 /// Builtin compability layer
@@ -139,7 +182,7 @@ pub struct PricingAt {
 
 #[cfg(test)]
 mod tests {
-	use super::{Builtin, BuiltinCompat, Pricing, PricingAt, Linear, Modexp, AltBn128ConstOperations};
+	use super::{Builtin, BuiltinCompat, Pricing, PricingAt, Linear, Modexp, AltBn128ConstOperations, Bls12G1Multiexp, Bls12G2Multiexp};
 	use maplit::btreemap;
 
 	#[test]
@@ -242,4 +285,48 @@ mod tests {
 			}
 		]);
 	}
+
+	#[test]
+	fn deserialization_bls12_381_multiexp_operation() {
+		let s = r#"{
+			"name": "bls12_381_g1_multiexp",
+			"pricing": {
+				"10000000": {
+					"price": { "bls12_g1_multiexp": { "base": 12000}}
+				}
+			}
+		}"#;
+		let builtin: Builtin = serde_json::from_str::<BuiltinCompat>(s).unwrap().into();
+		assert_eq!(builtin.name, "bls12_381_g1_multiexp");
+		assert_eq!(builtin.pricing, btreemap![
+			10000000 => PricingAt {
+				info: None,
+				price: Pricing::Bls12G1Multiexp(Bls12G1Multiexp{
+						base: 12000
+				}),
+			}
+		]);
+	}
+
+	#[test]
+	fn deserialization_bls12_381_multiexp_operation_in_g2() {
+		let s = r#"{
+			"name": "bls12_381_g2_multiexp",
+			"pricing": {
+				"10000000": {
+					"price": { "bls12_g2_multiexp": { "base": 55000}}
+				}
+			}
+		}"#;
+		let builtin: Builtin = serde_json::from_str::<BuiltinCompat>(s).unwrap().into();
+		assert_eq!(builtin.name, "bls12_381_g2_multiexp");
+		assert_eq!(builtin.pricing, btreemap![
+			10000000 => PricingAt {
+				info: None,
+				price: Pricing::Bls12G2Multiexp(Bls12G2Multiexp{
+						base: 55000
+				}),
+			}
+		]);
+	}
 }

From 4a26608d6d586cd25111e926756160585c940862 Mon Sep 17 00:00:00 2001
From: Svyatoslav Nikolsky <svyatonik@gmail.com>
Date: Fri, 5 Jun 2020 11:41:48 +0300
Subject: [PATCH 07/32] update secret-store reference (#11761)

---
 Cargo.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index 88fedc20466..4e4f7f4308d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3507,7 +3507,7 @@ dependencies = [
 [[package]]
 name = "parity-secretstore"
 version = "1.0.0"
-source = "git+https://github.com/paritytech/secret-store?branch=v1.x#02964410fc05d7f94a133c0a2e5632f386040854"
+source = "git+https://github.com/paritytech/secret-store?branch=v1.x#2ca2842edb6ae580663b59624a30d99a7d9f8e78"
 dependencies = [
  "byteorder",
  "ethabi",

From b76c116f76dd5856fda8725065881918493969ac Mon Sep 17 00:00:00 2001
From: "adria0.eth" <5526331+adria0@users.noreply.github.com>
Date: Fri, 5 Jun 2020 18:42:37 +0200
Subject: [PATCH 08/32] Update Simple Subroutines to the latest spec  (#11731)

---
 .gitmodules                                 |  2 +-
 ethcore/evm/src/instructions.rs             | 12 +++---
 ethcore/evm/src/interpreter/mod.rs          |  6 +--
 ethcore/evm/src/interpreter/shared_cache.rs |  4 +-
 ethcore/evm/src/tests.rs                    | 42 +++++++++++++++------
 ethcore/machine/src/executive.rs            |  1 +
 ethcore/res/ethereum/tests                  |  2 +-
 ethcore/src/json_tests/chain.rs             |  1 +
 ethcore/src/json_tests/state.rs             |  1 +
 ethcore/trace/src/types/error.rs            |  6 +++
 ethcore/vm/src/error.rs                     |  3 ++
 11 files changed, 56 insertions(+), 24 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 64ff463571b..7abf7f59263 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "ethcore/res/ethereum/tests"]
 	path = ethcore/res/ethereum/tests
 	url = https://github.com/ethereum/tests.git
-	branch = v7.0.0
+	branch = develop
 [submodule "ethcore/res/wasm-tests"]
 	path = ethcore/res/wasm-tests
 	url = https://github.com/openethereum/wasm-tests
diff --git a/ethcore/evm/src/instructions.rs b/ethcore/evm/src/instructions.rs
index f32710a4b27..e108282c244 100644
--- a/ethcore/evm/src/instructions.rs
+++ b/ethcore/evm/src/instructions.rs
@@ -321,11 +321,11 @@ enum_with_from_u8! {
 		LOG4 = 0xa4,
 
 		#[doc = "Marks the entry point to a subroutine."]
-		BEGINSUB = 0xb2,
-		#[doc = "Jumps to a defined BEGINSUB subroutine."]
-		JUMPSUB = 0xb3,
+		BEGINSUB = 0x5c,
 		#[doc = "Returns from a subroutine."]
-		RETURNSUB = 0xb7,
+		RETURNSUB = 0x5d,
+		#[doc = "Jumps to a defined BEGINSUB subroutine."]
+		JUMPSUB = 0x5e,
 
 		#[doc = "create a new account with associated code"]
 		CREATE = 0xf0,
@@ -593,8 +593,8 @@ lazy_static! {
 		arr[LOG3 as usize] = Some(InstructionInfo::new("LOG3", 5, 0, GasPriceTier::Special));
 		arr[LOG4 as usize] = Some(InstructionInfo::new("LOG4", 6, 0, GasPriceTier::Special));
 		arr[BEGINSUB as usize] = Some(InstructionInfo::new("BEGINSUB", 0, 0, GasPriceTier::Base));
-		arr[JUMPSUB as usize] = Some(InstructionInfo::new("JUMPSUB", 1, 0, GasPriceTier::Low));
-		arr[RETURNSUB as usize] = Some(InstructionInfo::new("RETURNSUB", 0, 0, GasPriceTier::VeryLow));
+		arr[JUMPSUB as usize] = Some(InstructionInfo::new("JUMPSUB", 1, 0, GasPriceTier::High));
+		arr[RETURNSUB as usize] = Some(InstructionInfo::new("RETURNSUB", 0, 0, GasPriceTier::Low));
 		arr[CREATE as usize] = Some(InstructionInfo::new("CREATE", 3, 1, GasPriceTier::Special));
 		arr[CALL as usize] = Some(InstructionInfo::new("CALL", 7, 1, GasPriceTier::Special));
 		arr[CALLCODE as usize] = Some(InstructionInfo::new("CALLCODE", 7, 1, GasPriceTier::Special));
diff --git a/ethcore/evm/src/interpreter/mod.rs b/ethcore/evm/src/interpreter/mod.rs
index 8aa6eb4c7df..9b207199ac2 100644
--- a/ethcore/evm/src/interpreter/mod.rs
+++ b/ethcore/evm/src/interpreter/mod.rs
@@ -64,7 +64,7 @@ const TWO_POW_248: U256 = U256([0, 0, 0, 0x100000000000000]); //0x1 00000000 000
 
 /// Maximal subroutine stack size as specified in
 /// https://eips.ethereum.org/EIPS/eip-2315.
-pub const MAX_SUB_STACK_SIZE : usize = 1024;
+pub const MAX_SUB_STACK_SIZE : usize = 1023;
 
 /// Abstraction over raw vector of Bytes. Easier state management of PC.
 struct CodeReader {
@@ -432,7 +432,7 @@ impl<Cost: CostType> Interpreter<Cost> {
 					Err(e) => return InterpreterResult::Done(Err(e))
 				};
 				self.return_stack.push(self.reader.position);
-				self.reader.position = pos;
+				self.reader.position = pos + 1;
 			},	
 			InstructionResult::ReturnFromSubroutine(pos) => {
 				self.reader.position = pos;
@@ -553,7 +553,7 @@ impl<Cost: CostType> Interpreter<Cost> {
 				// ignore
 			},
 			instructions::BEGINSUB => {
-				// ignore
+				return Err(vm::Error::InvalidSubEntry);
 			},
 			instructions::JUMPSUB => {
 				if self.return_stack.len() >= MAX_SUB_STACK_SIZE {
diff --git a/ethcore/evm/src/interpreter/shared_cache.rs b/ethcore/evm/src/interpreter/shared_cache.rs
index 20cccae8a23..d4db6f047bd 100644
--- a/ethcore/evm/src/interpreter/shared_cache.rs
+++ b/ethcore/evm/src/interpreter/shared_cache.rs
@@ -160,7 +160,7 @@ fn test_find_sub_entrypoints() {
 	// given
 
 	// see https://eips.ethereum.org/EIPS/eip-2315 for disassembly
-	let code = hex!("6800000000000000000cb300b26011b3b7b2b7");
+	let code = hex!("6800000000000000000c5e005c60115e5d5c5d");
 
 	// when
 	let cache_item = SharedCache::find_jump_and_sub_destinations(&code);
@@ -180,7 +180,7 @@ fn test_find_jump_and_sub_allowing_unknown_opcodes() {
 	// 0000 5B   JUMPDEST       
 	// 0001 CC   ???
 	// 0002 B2   BEGINSUB
-	let code = hex!("5BCCB2");
+	let code = hex!("5BCC5C");
 
 	// when
 	let cache_item = SharedCache::find_jump_and_sub_destinations(&code);
diff --git a/ethcore/evm/src/tests.rs b/ethcore/evm/src/tests.rs
index 1ce71845052..d9749bddad6 100644
--- a/ethcore/evm/src/tests.rs
+++ b/ethcore/evm/src/tests.rs
@@ -790,10 +790,10 @@ fn test_jumps(factory: super::Factory) {
 evm_test!{test_subs_simple: test_subs_simple_int}
 fn test_subs_simple(factory: super::Factory) {
 	// as defined in https://eips.ethereum.org/EIPS/eip-2315
-	let code = hex!("6004b300b2b7").to_vec();
+	let code = hex!("60045e005c5d").to_vec();
 
 	let mut params = ActionParams::default();
-	params.gas = U256::from(13);
+	params.gas = U256::from(18);
 	params.code = Some(Arc::new(code));
 	let mut ext = FakeExt::new_berlin();
 
@@ -808,10 +808,10 @@ fn test_subs_simple(factory: super::Factory) {
 evm_test!{test_subs_two_levels: test_subs_two_levels_int}
 fn test_subs_two_levels(factory: super::Factory) {
 	// as defined in https://eips.ethereum.org/EIPS/eip-2315
-	let code = hex!("6800000000000000000cb300b26011b3b7b2b7").to_vec();
+	let code = hex!("6800000000000000000c5e005c60115e5d5c5d").to_vec();
 
 	let mut params = ActionParams::default();
-	params.gas = U256::from(26);
+	params.gas = U256::from(36);
 	params.code = Some(Arc::new(code));
 	let mut ext = FakeExt::new_berlin();
 
@@ -826,7 +826,7 @@ fn test_subs_two_levels(factory: super::Factory) {
 evm_test!{test_subs_invalid_jump: test_subs_invalid_jump_int}
 fn test_subs_invalid_jump(factory: super::Factory) {
 	// as defined in https://eips.ethereum.org/EIPS/eip-2315
-	let code = hex!("6801000000000000000cb300b26011b3b7b2b7").to_vec();
+	let code = hex!("6801000000000000000c5e005c60115e5d5c5d").to_vec();
 
 	let mut params = ActionParams::default();
 	params.gas = U256::from(24);
@@ -845,7 +845,7 @@ fn test_subs_invalid_jump(factory: super::Factory) {
 evm_test!{test_subs_shallow_return_stack: test_subs_shallow_return_stack_int}
 fn test_subs_shallow_return_stack(factory: super::Factory) {
 	// as defined in https://eips.ethereum.org/EIPS/eip-2315
-	let code = hex!("b75858").to_vec();
+	let code = hex!("5d5858").to_vec();
 
 	let mut params = ActionParams::default();
 	params.gas = U256::from(24);
@@ -865,7 +865,9 @@ evm_test!{test_subs_substack_limit: test_subs_substack_limit_int}
 fn test_subs_substack_limit(factory: super::Factory) {
 
 	//    PUSH <recursion_limit>
+	//    JUMP :a
 	// :s BEGINSUB
+    // :a JUMPDEST
 	//    DUP1
 	//    JUMPI :c
 	//    STOP
@@ -875,7 +877,7 @@ fn test_subs_substack_limit(factory: super::Factory) {
 	//    SUB
 	//    JUMPSUB :s
 
-	let mut code = hex!("610400b280600957005b600190036003b3").to_vec();
+	let mut code = hex!("6104006007565c5b80600d57005b6001900360065e").to_vec();
 	code[1..3].copy_from_slice(&(MAX_SUB_STACK_SIZE as u16).to_be_bytes()[..]);
 
 	let mut params = ActionParams::default();
@@ -888,12 +890,12 @@ fn test_subs_substack_limit(factory: super::Factory) {
 		test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
 	};
 
-	assert_eq!(gas_left, U256::from(963_115));
+	assert_eq!(gas_left, U256::from(959_049));
 }
 
 evm_test!{test_subs_substack_out: test_subs_substack_out_int}
 fn test_subs_substack_out(factory: super::Factory) {
-	let mut code = hex!("610400b280600957005b600190036003b3").to_vec();
+	let mut code = hex!("6104006007565c5b80600d57005b6001900360065e").to_vec();
 	code[1..3].copy_from_slice(&((MAX_SUB_STACK_SIZE+1) as u16).to_be_bytes()[..]);
 
 	let mut params = ActionParams::default();
@@ -912,10 +914,10 @@ fn test_subs_substack_out(factory: super::Factory) {
 
 evm_test!{test_subs_sub_at_end: test_subs_sub_at_end_int}
 fn test_subs_sub_at_end(factory: super::Factory) {
-	let code = hex!("600556b2b75b6003b3").to_vec();
+	let code = hex!("6005565c5d5b60035e").to_vec();
 
 	let mut params = ActionParams::default();
-	params.gas = U256::from(25);
+	params.gas = U256::from(30);
 	params.code = Some(Arc::new(code));
 	let mut ext = FakeExt::new_berlin();
 
@@ -927,6 +929,24 @@ fn test_subs_sub_at_end(factory: super::Factory) {
 	assert_eq!(gas_left, U256::from(0));
 }
 
+evm_test!{test_subs_walk_into_subroutine: test_subs_walk_into_subroutine_int}
+fn test_subs_walk_into_subroutine(factory: super::Factory) {
+	let code = hex!("5c5d00").to_vec();
+
+	let mut params = ActionParams::default();
+	params.gas = U256::from(100);
+	params.code = Some(Arc::new(code));
+	let mut ext = FakeExt::new_berlin();
+
+	let current = {
+		let vm = factory.create(params, ext.schedule(), ext.depth());
+		test_finalize(vm.exec(&mut ext).ok().unwrap())
+	};
+
+	let expected = Result::Err(vm::Error::InvalidSubEntry);
+	assert_eq!(current, expected);
+}
+
 evm_test!{test_calls: test_calls_int}
 fn test_calls(factory: super::Factory) {
 	let code = hex!("600054602d57600160005560006000600060006050610998610100f160006000600060006050610998610100f25b").to_vec();
diff --git a/ethcore/machine/src/executive.rs b/ethcore/machine/src/executive.rs
index b1b7463e3b4..119780f6358 100644
--- a/ethcore/machine/src/executive.rs
+++ b/ethcore/machine/src/executive.rs
@@ -359,6 +359,7 @@ impl<'a> CallCreateExecutive<'a> {
 				| Err(vm::Error::Reverted)
 				| Err(vm::Error::SubStackUnderflow {..})
 				| Err(vm::Error::OutOfSubStack {..})
+				| Err(vm::Error::InvalidSubEntry)
 				| Ok(FinalizationResult { apply_state: false, .. }) => {
 					if let Some(addr) = UNPRUNABLE_PRECOMPILE_ADDRESS {
 						if un_substate.touched.contains(&addr) {
diff --git a/ethcore/res/ethereum/tests b/ethcore/res/ethereum/tests
index 5e4539b1b50..16fa567686a 160000
--- a/ethcore/res/ethereum/tests
+++ b/ethcore/res/ethereum/tests
@@ -1 +1 @@
-Subproject commit 5e4539b1b50747e699a5990b3f8696c9267e6c31
+Subproject commit 16fa567686a8cea578a500b0095c4d7f9f3bbe63
diff --git a/ethcore/src/json_tests/chain.rs b/ethcore/src/json_tests/chain.rs
index f45414d6776..7442ec9f2f5 100644
--- a/ethcore/src/json_tests/chain.rs
+++ b/ethcore/src/json_tests/chain.rs
@@ -304,6 +304,7 @@ mod block_tests {
 	declare_test!{BlockchainTests_GeneralStateTest_stSStoreTest, "BlockchainTests/GeneralStateTests/stSStoreTest/"}
 	declare_test!{BlockchainTests_GeneralStateTest_stStackTests, "BlockchainTests/GeneralStateTests/stStackTests/"}
 	declare_test!{BlockchainTests_GeneralStateTest_stStaticCall, "BlockchainTests/GeneralStateTests/stStaticCall/"}
+	declare_test!{BlockchainTests_GeneralStateTest_stSubroutine, "BlockchainTests/GeneralStateTests/stSubroutine/"}
 	declare_test!{BlockchainTests_GeneralStateTest_stSystemOperationsTest, "BlockchainTests/GeneralStateTests/stSystemOperationsTest/"}
 	declare_test!{BlockchainTests_GeneralStateTest_stTimeConsuming, "BlockchainTests/GeneralStateTests/stTimeConsuming/"}
 	declare_test!{BlockchainTests_GeneralStateTest_stTransactionTest, "BlockchainTests/GeneralStateTests/stTransactionTest/"}
diff --git a/ethcore/src/json_tests/state.rs b/ethcore/src/json_tests/state.rs
index 6b8b6e9b8b9..9ec3628f982 100644
--- a/ethcore/src/json_tests/state.rs
+++ b/ethcore/src/json_tests/state.rs
@@ -175,6 +175,7 @@ mod state_tests {
 	declare_test!{GeneralStateTest_stSStoreTest, "GeneralStateTests/stSStoreTest/"}
 	declare_test!{GeneralStateTest_stStackTests, "GeneralStateTests/stStackTests/"}
 	declare_test!{GeneralStateTest_stStaticCall, "GeneralStateTests/stStaticCall/"}
+	declare_test!{GeneralStateTest_stSubroutine, "GeneralStateTests/stSubroutine/"}
 	declare_test!{GeneralStateTest_stSystemOperationsTest, "GeneralStateTests/stSystemOperationsTest/"}
 	declare_test!{GeneralStateTest_stTimeConsuming, "GeneralStateTests/stTimeConsuming/"}
 	declare_test!{GeneralStateTest_stTransactionTest, "GeneralStateTests/stTransactionTest/"}
diff --git a/ethcore/trace/src/types/error.rs b/ethcore/trace/src/types/error.rs
index 26501167b17..7b18703f752 100644
--- a/ethcore/trace/src/types/error.rs
+++ b/ethcore/trace/src/types/error.rs
@@ -38,6 +38,8 @@ pub enum Error {
 	SubStackUnderflow,
 	/// When execution would exceed defined subroutine Stack Limit
 	OutOfSubStack,
+	/// When the code walks into a subroutine, that is not allowed
+	InvalidSubEntry,
 	/// When builtin contract failed on input data
 	BuiltIn,
 	/// Returned on evm internal error. Should never be ignored during development.
@@ -61,6 +63,7 @@ impl<'a> From<&'a VmError> for Error {
 			VmError::BadInstruction { .. } => Error::BadInstruction,
 			VmError::StackUnderflow { .. } => Error::StackUnderflow,
 			VmError::OutOfStack { .. } => Error::OutOfStack,
+			VmError::InvalidSubEntry { .. } => Error::InvalidSubEntry,
 			VmError::BuiltIn { .. } => Error::BuiltIn,
 			VmError::Wasm { .. } => Error::Wasm,
 			VmError::Internal(_) => Error::Internal,
@@ -88,6 +91,7 @@ impl fmt::Display for Error {
 			BadInstruction => "Bad instruction",
 			StackUnderflow => "Stack underflow",
 			OutOfStack => "Out of stack",
+			InvalidSubEntry => "Invalid subroutine entry",
 			BuiltIn => "Built-in failed",
 			Wasm => "Wasm runtime error",
 			Internal => "Internal error",
@@ -118,6 +122,7 @@ impl Encodable for Error {
 			Reverted => 10,
 			SubStackUnderflow => 11,
 			OutOfSubStack => 12,
+			InvalidSubEntry => 13,
 		};
 
 		s.append_internal(&value);
@@ -142,6 +147,7 @@ impl Decodable for Error {
 			10 => Ok(Reverted),
 			11 => Ok(SubStackUnderflow),
 			12 => Ok(OutOfSubStack),
+			13 => Ok(InvalidSubEntry),
 			_ => Err(DecoderError::Custom("Invalid error type")),
 		}
 	}
diff --git a/ethcore/vm/src/error.rs b/ethcore/vm/src/error.rs
index 24e4c6a69f0..40c2a3a8f38 100644
--- a/ethcore/vm/src/error.rs
+++ b/ethcore/vm/src/error.rs
@@ -85,6 +85,8 @@ pub enum Error {
 		/// What was the stack limit
 		limit: usize
 	},
+	/// When the code walks into a subroutine, that is not allowed
+	InvalidSubEntry,
 	/// Built-in contract failed on given input
 	BuiltIn(&'static str),
 	/// When execution tries to modify the state in static context
@@ -122,6 +124,7 @@ impl fmt::Display for Error {
 			OutOfStack { instruction, wanted, limit } => write!(f, "Out of stack {} {}/{}", instruction, wanted, limit),
 			SubStackUnderflow { wanted, on_stack } => write!(f, "Subroutine stack underflow {}/{}", wanted, on_stack),
 			OutOfSubStack { wanted, limit } => write!(f, "Out of subroutine stack {}/{}", wanted, limit),
+			InvalidSubEntry => write!(f,"Invalid subroutine entry"),
 			BuiltIn(name) => write!(f, "Built-in failed: {}", name),
 			Internal(ref msg) => write!(f, "Internal error: {}", msg),
 			MutableCallInStaticContext => write!(f, "Mutable call in static context"),

From 588908e486b4a25049d02135049adc16e7a4f24b Mon Sep 17 00:00:00 2001
From: Artem Vorotnikov <artem@vorotnikov.me>
Date: Wed, 3 Jun 2020 13:53:18 +0300
Subject: [PATCH 09/32] Add YOLO-1 testnet

---
 ethcore/res/ethereum/yolov1.json | 982 +++++++++++++++++++++++++++++++
 ethcore/spec/src/chain.rs        |   3 +-
 parity/params.rs                 |   7 +
 3 files changed, 991 insertions(+), 1 deletion(-)
 create mode 100644 ethcore/res/ethereum/yolov1.json

diff --git a/ethcore/res/ethereum/yolov1.json b/ethcore/res/ethereum/yolov1.json
new file mode 100644
index 00000000000..55923012d02
--- /dev/null
+++ b/ethcore/res/ethereum/yolov1.json
@@ -0,0 +1,982 @@
+{
+	"name": "YOLO-1 Testnet",
+	"dataDir": "yolov1",
+	"engine": {
+		"clique": {
+			"params": {
+				"period": 15,
+				"epoch": 30000
+			}
+		}
+	},
+	"params": {
+		"accountStartNonce": "0x0",
+		"chainID": "0x796f6c6f7631",
+		"eip140Transition": "0x0",
+		"eip145Transition": "0x0",
+		"eip150Transition": "0x0",
+		"eip155Transition": "0x0",
+		"eip160Transition": "0x0",
+		"eip161abcTransition": "0x0",
+		"eip161dTransition": "0x0",
+		"eip211Transition": "0x0",
+		"eip214Transition": "0x0",
+		"eip658Transition": "0x0",
+		"eip1014Transition": "0x0",
+		"eip1052Transition": "0x0",
+		"eip1283Transition": "0x0",
+		"eip1283DisableTransition": "0x0",
+		"eip1283ReenableTransition": "0x0",
+		"eip1344Transition": "0x0",
+		"eip1706Transition": "0x0",
+		"eip1884Transition": "0x0",
+		"eip2028Transition": "0x0",
+		"eip2315Transition": "0x0",
+		"gasLimitBoundDivisor": "0x400",
+		"maxCodeSize": "0x6000",
+		"maxCodeSizeTransition": "0x0",
+		"maximumExtraDataSize": "0xffff",
+		"minGasLimit": "0x1388",
+		"networkID": "0x796f6c6f7631"
+	},
+	"genesis": {
+		"author": "0x0000000000000000000000000000000000000000",
+		"difficulty": "0x1",
+		"extraData": "0x00000000000000000000000000000000000000000000000000000000000000008a37866fd3627c9205a37c8685666f32ec07bb1b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+		"gasLimit": "0x47b760",
+		"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+		"seal": {
+			"ethereum": {
+				"nonce": "0x0000000000000000",
+				"mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+			}
+		},
+		"timestamp": "0x5ed754f1"
+	},
+	"nodes": [
+		"enode://9e1096aa59862a6f164994cb5cb16f5124d6c992cdbf4535ff7dea43ea1512afe5448dca9df1b7ab0726129603f1a3336b631e4d7a1a44c94daddd03241587f9@35.178.210.161:30303"
+	],
+	"accounts": {
+		"0x0000000000000000000000000000000000000000": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000001": {
+			"balance": "0x1",
+			"builtin": {
+				"name": "ecrecover",
+				"pricing": {
+					"linear": {
+						"base": 3000,
+						"word": 0
+					}
+				}
+			}
+		},
+		"0x0000000000000000000000000000000000000002": {
+			"balance": "0x1",
+			"builtin": {
+				"name": "sha256",
+				"pricing": {
+					"linear": {
+						"base": 60,
+						"word": 12
+					}
+				}
+			}
+		},
+		"0x0000000000000000000000000000000000000003": {
+			"balance": "0x1",
+			"builtin": {
+				"name": "ripemd160",
+				"pricing": {
+					"linear": {
+						"base": 600,
+						"word": 120
+					}
+				}
+			}
+		},
+		"0x0000000000000000000000000000000000000004": {
+			"balance": "0x1",
+			"builtin": {
+				"name": "identity",
+				"pricing": {
+					"linear": {
+						"base": 15,
+						"word": 3
+					}
+				}
+			}
+		},
+		"0x0000000000000000000000000000000000000005": {
+			"balance": "0x1",
+			"builtin": {
+				"name": "modexp",
+				"pricing": {
+					"modexp": {
+						"divisor": 20
+					}
+				}
+			}
+		},
+		"0x0000000000000000000000000000000000000006": {
+			"balance": "0x1",
+			"builtin": {
+				"name": "alt_bn128_add",
+				"pricing": {
+					"alt_bn128_const_operations": {
+						"price": 500
+					}
+				}
+			}
+		},
+		"0x0000000000000000000000000000000000000007": {
+			"balance": "0x1",
+			"builtin": {
+				"name": "alt_bn128_mul",
+				"pricing": {
+					"alt_bn128_const_operations": {
+						"price": 6000
+					}
+				}
+			}
+		},
+		"0x0000000000000000000000000000000000000008": {
+			"balance": "0x1",
+			"builtin": {
+				"name": "alt_bn128_pairing",
+				"pricing": {
+					"alt_bn128_pairing": {
+						"base": 45000,
+						"pair": 34000
+					}
+				}
+			}
+		},
+		"0x0000000000000000000000000000000000000009": {
+			"balance": "0x1",
+			"builtin": {
+				"name": "blake2_f",
+				"pricing": {
+					"blake2_f": {
+						"gas_per_round": 1
+					}
+				}
+			}
+		},
+		"000000000000000000000000000000000000000a": {
+			"balance": "0x1",
+			"builtin": {
+				"name": "bls12_381_g1_add",
+				"pricing": {
+					"bls12_const_operations": {
+						"price": 600
+					}
+				}
+			}
+		},
+		"000000000000000000000000000000000000000b": {
+			"balance": "0x1",
+			"builtin": {
+				"name": "bls12_381_g1_mul",
+				"pricing": {
+					"bls12_const_operations": {
+						"price": 12000
+					}
+				}
+			}
+		},
+		"000000000000000000000000000000000000000c": {
+			"balance": "0x1",
+			"builtin": {
+				"name": "bls12_381_g1_multiexp",
+				"pricing": {
+					"bls12_g1_multiexp": {
+						"base": 12000
+					}
+				}
+			}
+		},
+		"000000000000000000000000000000000000000d": {
+			"balance": "0x1",
+			"builtin": {
+				"name": "bls12_381_g2_add",
+				"pricing": {
+					"bls12_const_operations": {
+						"price": 4500
+					}
+				}
+			}
+		},
+		"000000000000000000000000000000000000000e": {
+			"balance": "0x1",
+			"builtin": {
+				"name": "bls12_381_g2_mul",
+				"pricing": {
+					"bls12_const_operations": {
+						"price": 55000
+					}
+				}
+			}
+		},
+		"000000000000000000000000000000000000000f": {
+			"balance": "0x1",
+			"builtin": {
+				"name": "bls12_381_g2_multiexp",
+				"pricing": {
+					"bls12_g2_multiexp": {
+						"base": 55000
+					}
+				}
+			}
+		},
+		"0000000000000000000000000000000000000010": {
+			"balance": "0x1",
+			"builtin": {
+				"name": "bls12_381_pairing",
+				"pricing": {
+					"bls12_pairing": {
+						"base": 115000,
+						"pair": 23000
+					}
+				}
+			}
+		},
+		"0000000000000000000000000000000000000011": {
+			"balance": "0x1",
+			"builtin": {
+				"name": "bls12_381_fp_to_g1",
+				"pricing": {
+					"bls12_const_operations": {
+						"price": 5500
+					}
+				}
+			}
+		},
+		"0000000000000000000000000000000000000012": {
+			"balance": "0x1",
+			"builtin": {
+				"name": "bls12_381_fp2_to_g2",
+				"pricing": {
+					"bls12_const_operations": {
+						"price": 110000
+					}
+				}
+			}
+		},
+		"0x0000000000000000000000000000000000000013": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000014": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000015": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000016": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000017": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000018": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000019": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000001a": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000001b": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000001c": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000001d": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000001e": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000001f": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000020": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000021": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000022": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000023": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000024": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000025": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000026": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000027": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000028": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000029": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000002a": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000002b": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000002c": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000002d": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000002e": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000002f": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000030": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000031": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000032": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000033": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000034": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000035": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000036": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000037": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000038": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000039": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000003a": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000003b": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000003c": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000003d": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000003e": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000003f": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000040": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000041": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000042": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000043": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000044": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000045": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000046": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000047": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000048": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000049": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000004a": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000004b": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000004c": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000004d": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000004e": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000004f": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000050": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000051": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000052": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000053": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000054": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000055": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000056": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000057": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000058": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000059": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000005a": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000005b": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000005c": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000005d": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000005e": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000005f": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000060": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000061": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000062": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000063": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000064": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000065": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000066": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000067": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000068": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000069": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000006a": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000006b": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000006c": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000006d": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000006e": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000006f": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000070": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000071": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000072": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000073": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000074": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000075": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000076": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000077": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000078": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000079": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000007a": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000007b": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000007c": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000007d": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000007e": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000007f": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000080": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000081": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000082": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000083": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000084": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000085": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000086": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000087": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000088": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000089": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000008a": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000008b": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000008c": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000008d": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000008e": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000008f": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000090": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000091": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000092": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000093": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000094": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000095": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000096": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000097": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000098": {
+			"balance": "0x1"
+		},
+		"0x0000000000000000000000000000000000000099": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000009a": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000009b": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000009c": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000009d": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000009e": {
+			"balance": "0x1"
+		},
+		"0x000000000000000000000000000000000000009f": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000a0": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000a1": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000a2": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000a3": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000a4": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000a5": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000a6": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000a7": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000a8": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000a9": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000aa": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000ab": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000ac": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000ad": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000ae": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000af": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000b0": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000b1": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000b2": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000b3": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000b4": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000b5": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000b6": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000b7": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000b8": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000b9": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000ba": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000bb": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000bc": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000bd": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000be": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000bf": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000c0": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000c1": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000c2": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000c3": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000c4": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000c5": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000c6": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000c7": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000c8": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000c9": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000ca": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000cb": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000cc": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000cd": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000ce": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000cf": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000d0": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000d1": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000d2": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000d3": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000d4": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000d5": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000d6": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000d7": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000d8": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000d9": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000da": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000db": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000dc": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000dd": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000de": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000df": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000e0": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000e1": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000e2": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000e3": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000e4": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000e5": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000e6": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000e7": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000e8": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000e9": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000ea": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000eb": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000ec": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000ed": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000ee": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000ef": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000f0": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000f1": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000f2": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000f3": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000f4": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000f5": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000f6": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000f7": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000f8": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000f9": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000fa": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000fb": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000fc": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000fd": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000fe": {
+			"balance": "0x1"
+		},
+		"0x00000000000000000000000000000000000000ff": {
+			"balance": "0x1"
+		},
+		"0x8a37866fd3627c9205a37c8685666f32ec07bb1b": {
+			"balance": "0x200000000000000000000000000000000000000000000000000000000000000"
+		}
+	}
+}
\ No newline at end of file
diff --git a/ethcore/spec/src/chain.rs b/ethcore/spec/src/chain.rs
index cb1ec7bdb42..5f80f82bd3b 100644
--- a/ethcore/spec/src/chain.rs
+++ b/ethcore/spec/src/chain.rs
@@ -94,7 +94,8 @@ bundle_release_spec! {
 	"ethereum/rinkeby" => new_rinkeby,
 	"ethereum/ropsten" => new_ropsten,
 	"ethereum/volta" => new_volta,
-	"ethereum/xdai" => new_xdai
+	"ethereum/xdai" => new_xdai,
+	"ethereum/yolov1" => new_yolov1
 }
 
 bundle_test_spec! {
diff --git a/parity/params.rs b/parity/params.rs
index 8dfd0017cc3..d7b0c83fe94 100644
--- a/parity/params.rs
+++ b/parity/params.rs
@@ -50,6 +50,7 @@ pub enum SpecType {
 	Kovan,
 	Rinkeby,
 	Goerli,
+	YOLOv1,
 	Kotti,
 	Sokol,
 	Evantestcore,
@@ -87,6 +88,7 @@ impl str::FromStr for SpecType {
 			"kovan" => SpecType::Kovan,
 			"rinkeby" => SpecType::Rinkeby,
 			"goerli" | "görli" | "testnet" => SpecType::Goerli,
+			"yolo" | "yolov1" => SpecType::YOLOv1,
 			"kotti" => SpecType::Kotti,
 			"sokol" | "poasokol" => SpecType::Sokol,
 			"evantestcore" => SpecType::Evantestcore,
@@ -118,6 +120,7 @@ impl fmt::Display for SpecType {
 			SpecType::Kovan => "kovan",
 			SpecType::Rinkeby => "rinkeby",
 			SpecType::Goerli => "goerli",
+			SpecType::YOLOv1 => "yolov1",
 			SpecType::Kotti => "kotti",
 			SpecType::Sokol => "sokol",
 			SpecType::Evantestcore => "evantestcore",
@@ -149,6 +152,7 @@ impl SpecType {
 			SpecType::Kovan => Ok(spec::new_kovan(params)),
 			SpecType::Rinkeby => Ok(spec::new_rinkeby(params)),
 			SpecType::Goerli => Ok(spec::new_goerli(params)),
+			SpecType::YOLOv1 => Ok(spec::new_yolov1(params)),
 			SpecType::Kotti => Ok(spec::new_kotti(params)),
 			SpecType::Sokol => Ok(spec::new_sokol(params)),
 			SpecType::Evantestcore => Ok(spec::new_evantestcore(params)),
@@ -411,6 +415,8 @@ mod tests {
 		assert_eq!(SpecType::Goerli, "goerli".parse().unwrap());
 		assert_eq!(SpecType::Goerli, "görli".parse().unwrap());
 		assert_eq!(SpecType::Goerli, "testnet".parse().unwrap());
+		assert_eq!(SpecType::YOLOv1, "yolo".parse().unwrap());
+		assert_eq!(SpecType::YOLOv1, "yolov1".parse().unwrap());
 		assert_eq!(SpecType::Kotti, "kotti".parse().unwrap());
 		assert_eq!(SpecType::Sokol, "sokol".parse().unwrap());
 		assert_eq!(SpecType::Sokol, "poasokol".parse().unwrap());
@@ -441,6 +447,7 @@ mod tests {
 		assert_eq!(format!("{}", SpecType::Kovan), "kovan");
 		assert_eq!(format!("{}", SpecType::Rinkeby), "rinkeby");
 		assert_eq!(format!("{}", SpecType::Goerli), "goerli");
+		assert_eq!(format!("{}", SpecType::YOLOv1), "yolov1");
 		assert_eq!(format!("{}", SpecType::Kotti), "kotti");
 		assert_eq!(format!("{}", SpecType::Sokol), "sokol");
 		assert_eq!(format!("{}", SpecType::Evantestcore), "evantestcore");

From 47c535babe45589920cd11bccf456b526c2fb231 Mon Sep 17 00:00:00 2001
From: Artem Vorotnikov <artem@vorotnikov.me>
Date: Sun, 7 Jun 2020 12:45:12 +0300
Subject: [PATCH 10/32] Upgrade num to 0.2, use enum-primitive-derive (#11636)

---
 Cargo.lock                            | 74 +++++++++++++--------------
 ethcore/builtin/Cargo.toml            |  2 +-
 ethcore/sync/Cargo.toml               |  3 +-
 ethcore/sync/src/chain/handler.rs     |  2 +-
 ethcore/sync/src/chain/supplier.rs    |  2 +-
 ethcore/sync/src/chain/sync_packet.rs | 68 ++++++++++++------------
 6 files changed, 75 insertions(+), 76 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4e4f7f4308d..26162ff989b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -544,7 +544,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "80094f509cf8b5ae86a4966a39b3ff66cd7e2a3e594accec3743ff3fabeab5b2"
 dependencies = [
  "num-integer",
- "num-traits 0.2.11",
+ "num-traits",
  "time",
 ]
 
@@ -718,7 +718,7 @@ dependencies = [
  "csv",
  "itertools",
  "lazy_static",
- "num-traits 0.2.11",
+ "num-traits",
  "oorandom",
  "plotters",
  "rayon",
@@ -989,12 +989,14 @@ dependencies = [
 ]
 
 [[package]]
-name = "enum_primitive"
-version = "0.1.1"
+name = "enum-primitive-derive"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be4551092f4d519593039259a9ed8daedf0da12e5109c5280338073eaeb81180"
+checksum = "5f52288f9a7ebb08959188872b58e7eaa12af9cb47da8e94158e16da7e143340"
 dependencies = [
- "num-traits 0.1.43",
+ "num-traits",
+ "quote 1.0.3",
+ "syn 1.0.17",
 ]
 
 [[package]]
@@ -1045,8 +1047,8 @@ dependencies = [
  "eth_pairings_repr_derive",
  "fixed_width_field",
  "fixed_width_group_and_loop",
- "num-bigint 0.2.6",
- "num-traits 0.2.11",
+ "num-bigint",
+ "num-traits",
  "once_cell",
  "static_assertions",
 ]
@@ -1576,7 +1578,7 @@ dependencies = [
  "client-traits",
  "common-types",
  "engine",
- "enum_primitive",
+ "enum-primitive-derive",
  "env_logger 0.5.13",
  "ethcore",
  "ethcore-io",
@@ -1593,6 +1595,7 @@ dependencies = [
  "kvdb-memorydb",
  "log",
  "machine",
+ "num-traits",
  "parity-bytes",
  "parity-crypto",
  "parity-runtime",
@@ -3066,37 +3069,37 @@ dependencies = [
 
 [[package]]
 name = "num"
-version = "0.1.42"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e"
+checksum = "b8536030f9fea7127f841b45bb6243b27255787fb4eb83958aa1ef9d2fdc0c36"
 dependencies = [
- "num-bigint 0.1.44",
+ "num-bigint",
+ "num-complex",
  "num-integer",
  "num-iter",
- "num-traits 0.2.11",
+ "num-rational",
+ "num-traits",
 ]
 
 [[package]]
 name = "num-bigint"
-version = "0.1.44"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e63899ad0da84ce718c14936262a41cee2c79c981fc0a0e7c7beb47d5a07e8c1"
+checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304"
 dependencies = [
+ "autocfg 1.0.0",
  "num-integer",
- "num-traits 0.2.11",
- "rand 0.4.6",
- "rustc-serialize",
+ "num-traits",
 ]
 
 [[package]]
-name = "num-bigint"
-version = "0.2.6"
+name = "num-complex"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304"
+checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95"
 dependencies = [
  "autocfg 1.0.0",
- "num-integer",
- "num-traits 0.2.11",
+ "num-traits",
 ]
 
 [[package]]
@@ -3106,7 +3109,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba"
 dependencies = [
  "autocfg 1.0.0",
- "num-traits 0.2.11",
+ "num-traits",
 ]
 
 [[package]]
@@ -3117,16 +3120,19 @@ checksum = "dfb0800a0291891dd9f4fe7bd9c19384f98f7fbe0cd0f39a2c6b88b9868bbc00"
 dependencies = [
  "autocfg 1.0.0",
  "num-integer",
- "num-traits 0.2.11",
+ "num-traits",
 ]
 
 [[package]]
-name = "num-traits"
-version = "0.1.43"
+name = "num-rational"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
+checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef"
 dependencies = [
- "num-traits 0.2.11",
+ "autocfg 1.0.0",
+ "num-bigint",
+ "num-integer",
+ "num-traits",
 ]
 
 [[package]]
@@ -3154,7 +3160,7 @@ version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dbf9993e59c894e3c08aa1c2712914e9e6bf1fcbfc6bef283e2183df345a4fee"
 dependencies = [
- "num-traits 0.2.11",
+ "num-traits",
 ]
 
 [[package]]
@@ -3798,7 +3804,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4e3bb8da247d27ae212529352020f3e5ee16e83c0c258061d27b08ab92675eeb"
 dependencies = [
  "js-sys",
- "num-traits 0.2.11",
+ "num-traits",
  "wasm-bindgen",
  "web-sys",
 ]
@@ -4393,12 +4399,6 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6"
 
-[[package]]
-name = "rustc-serialize"
-version = "0.3.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
-
 [[package]]
 name = "rustc_version"
 version = "0.2.3"
diff --git a/ethcore/builtin/Cargo.toml b/ethcore/builtin/Cargo.toml
index 68031ab8f1b..143bae75a43 100644
--- a/ethcore/builtin/Cargo.toml
+++ b/ethcore/builtin/Cargo.toml
@@ -14,7 +14,7 @@ ethereum-types = "0.9.0"
 ethjson = { path = "../../json" }
 keccak-hash = "0.5.0"
 log = "0.4"
-num = { version = "0.1", default-features = false, features = ["bigint"] }
+num = "0.2"
 parity-bytes = "0.1"
 parity-crypto = { version = "0.6.1", features = ["publickey"] }
 eth_pairings = { git = "https://github.com/matter-labs/eip1962.git", default-features = false, features = ["eip_2537"], rev = "ece6cbabc41948db4200e41f0bfdab7ab94c7af8" }
diff --git a/ethcore/sync/Cargo.toml b/ethcore/sync/Cargo.toml
index c4a54a22a96..030e9c0e9d8 100644
--- a/ethcore/sync/Cargo.toml
+++ b/ethcore/sync/Cargo.toml
@@ -13,7 +13,7 @@ bytes = { package = "parity-bytes", version = "0.1" }
 client-traits = { path = "../client-traits" }
 common-types = { path = "../types" }
 devp2p = { package = "ethcore-network-devp2p", path = "../../util/network-devp2p" }
-enum_primitive = "0.1.1"
+enum-primitive-derive = "0.2"
 ethcore-io = { path = "../../util/io" }
 ethcore-private-tx = { path = "../private-tx" }
 ethereum-forkid = "0.2"
@@ -25,6 +25,7 @@ keccak-hash = "0.5.0"
 light = { package = "ethcore-light", path = "../light" }
 log = "0.4"
 network = { package = "ethcore-network", path = "../../util/network" }
+num-traits = "0.2"
 parity-runtime = "0.1.1"
 parity-crypto = { version = "0.6.1", features = ["publickey"] }
 parity-util-mem = "0.6.0"
diff --git a/ethcore/sync/src/chain/handler.rs b/ethcore/sync/src/chain/handler.rs
index 21e82cfed47..dae66140aab 100644
--- a/ethcore/sync/src/chain/handler.rs
+++ b/ethcore/sync/src/chain/handler.rs
@@ -38,7 +38,7 @@ use crate::{
 };
 
 use bytes::Bytes;
-use enum_primitive::FromPrimitive;
+use num_traits::FromPrimitive;
 use ethereum_types::{H256, U256};
 use keccak_hash::keccak;
 use network::PeerId;
diff --git a/ethcore/sync/src/chain/supplier.rs b/ethcore/sync/src/chain/supplier.rs
index 14651c99b13..a835dedf4e0 100644
--- a/ethcore/sync/src/chain/supplier.rs
+++ b/ethcore/sync/src/chain/supplier.rs
@@ -20,7 +20,7 @@ use std::time::{Duration, Instant};
 use crate::sync_io::SyncIo;
 
 use bytes::Bytes;
-use enum_primitive::FromPrimitive;
+use num_traits::FromPrimitive;
 use ethereum_types::H256;
 use log::{debug, trace, warn};
 use network::{self, PeerId};
diff --git a/ethcore/sync/src/chain/sync_packet.rs b/ethcore/sync/src/chain/sync_packet.rs
index 92d29f629f1..bba38d3548d 100644
--- a/ethcore/sync/src/chain/sync_packet.rs
+++ b/ethcore/sync/src/chain/sync_packet.rs
@@ -25,42 +25,40 @@
 use crate::api::{ETH_PROTOCOL, WARP_SYNC_PROTOCOL_ID};
 use self::SyncPacket::*;
 
-use enum_primitive::{enum_from_primitive, enum_from_primitive_impl, enum_from_primitive_impl_ty};
+use enum_primitive_derive::Primitive;
 use network::{PacketId, ProtocolId};
 
-enum_from_primitive! {
-	/// An enum that defines all known packet ids in the context of
-	/// synchronization and provides a mechanism to convert from
-	/// packet ids (of type PacketId or u8) directly read from the network
-	/// to enum variants. This implicitly provides a mechanism to
-	/// check whether a given packet id is known, and to prevent
-	/// packet id clashes when defining new ids.
-	#[derive(Clone, Copy, Debug, PartialEq)]
-	pub enum SyncPacket {
-		StatusPacket = 0x00,
-		NewBlockHashesPacket = 0x01,
-		TransactionsPacket = 0x02,
-		GetBlockHeadersPacket = 0x03,
-		BlockHeadersPacket = 0x04,
-		GetBlockBodiesPacket = 0x05,
-		BlockBodiesPacket = 0x06,
-		NewBlockPacket = 0x07,
-
-		GetNodeDataPacket = 0x0d,
-		NodeDataPacket = 0x0e,
-		GetReceiptsPacket = 0x0f,
-		ReceiptsPacket = 0x10,
-
-		GetSnapshotManifestPacket = 0x11,
-		SnapshotManifestPacket = 0x12,
-		GetSnapshotDataPacket = 0x13,
-		SnapshotDataPacket = 0x14,
-		ConsensusDataPacket = 0x15,
-		PrivateTransactionPacket = 0x16,
-		SignedPrivateTransactionPacket = 0x17,
-		GetPrivateStatePacket = 0x18,
-		PrivateStatePacket = 0x19,
-	}
+/// An enum that defines all known packet ids in the context of
+/// synchronization and provides a mechanism to convert from
+/// packet ids (of type PacketId or u8) directly read from the network
+/// to enum variants. This implicitly provides a mechanism to
+/// check whether a given packet id is known, and to prevent
+/// packet id clashes when defining new ids.
+#[derive(Clone, Copy, Debug, PartialEq, Primitive)]
+pub enum SyncPacket {
+	StatusPacket = 0x00,
+	NewBlockHashesPacket = 0x01,
+	TransactionsPacket = 0x02,
+	GetBlockHeadersPacket = 0x03,
+	BlockHeadersPacket = 0x04,
+	GetBlockBodiesPacket = 0x05,
+	BlockBodiesPacket = 0x06,
+	NewBlockPacket = 0x07,
+
+	GetNodeDataPacket = 0x0d,
+	NodeDataPacket = 0x0e,
+	GetReceiptsPacket = 0x0f,
+	ReceiptsPacket = 0x10,
+
+	GetSnapshotManifestPacket = 0x11,
+	SnapshotManifestPacket = 0x12,
+	GetSnapshotDataPacket = 0x13,
+	SnapshotDataPacket = 0x14,
+	ConsensusDataPacket = 0x15,
+	PrivateTransactionPacket = 0x16,
+	SignedPrivateTransactionPacket = 0x17,
+	GetPrivateStatePacket = 0x18,
+	PrivateStatePacket = 0x19,
 }
 
 
@@ -118,7 +116,7 @@ impl PacketInfo for SyncPacket {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use enum_primitive::FromPrimitive;
+	use num_traits::FromPrimitive;
 
 	#[test]
 	fn packet_ids_from_u8_when_from_primitive_zero_then_equals_status_packet() {

From 40b885ccda9a10b0c35825bfcf430ae5598a24fb Mon Sep 17 00:00:00 2001
From: adria0 <adria@codecontext.io>
Date: Tue, 9 Jun 2020 08:12:45 +0200
Subject: [PATCH 11/32] Better board & metrics

---
 ethcore/service/src/service.rs                |   2 +-
 ethcore/snapshot/src/service.rs               |  20 +-
 ethcore/snapshot/src/traits.rs                |   7 +-
 ethcore/src/client/client.rs                  |   3 -
 ethcore/sync/src/api.rs                       |  37 +-
 ethcore/sync/src/chain/handler.rs             |   2 +-
 ethcore/sync/src/chain/mod.rs                 |   8 +-
 ethcore/types/src/snapshot.rs                 |  14 +
 parity/informant.rs                           |   6 +-
 parity/snapshot_cmd.rs                        |   8 +-
 rpc/src/v1/impls/eth.rs                       |   4 +-
 rpc/src/v1/impls/parity.rs                    |  11 +-
 .../grafana/dashboards/openethereum.json}     | 715 ++++++++++++++----
 scripts/prometheus/config/grafana/grafana.ini |   2 +-
 scripts/prometheus/config/grafana/loki.yaml   |  10 -
 .../provisioning/dashboards/provider.yaml     |  24 +
 .../datasources}/prometheus.yaml              |   2 +-
 .../config/prometheus/prometheus.yml          |   8 +-
 .../prometheus/config/promtail/config.yaml    |  18 -
 scripts/prometheus/docker-compose.yaml        |  88 +--
 util/stats/src/lib.rs                         |  10 +
 21 files changed, 707 insertions(+), 292 deletions(-)
 rename scripts/prometheus/{model.json => config/grafana/dashboards/openethereum.json} (68%)
 delete mode 100644 scripts/prometheus/config/grafana/loki.yaml
 create mode 100644 scripts/prometheus/config/grafana/provisioning/dashboards/provider.yaml
 rename scripts/prometheus/config/grafana/{ => provisioning/datasources}/prometheus.yaml (97%)
 delete mode 100644 scripts/prometheus/config/promtail/config.yaml

diff --git a/ethcore/service/src/service.rs b/ethcore/service/src/service.rs
index 0be68fdba46..d7349cb7ac8 100644
--- a/ethcore/service/src/service.rs
+++ b/ethcore/service/src/service.rs
@@ -240,7 +240,7 @@ where
 		match timer {
 			CLIENT_TICK_TIMER => {
 				use snapshot::SnapshotService;
-				let snapshot_restoration = if let RestorationStatus::Ongoing{..} = self.snapshot.status() { true } else { false };
+				let snapshot_restoration = if let RestorationStatus::Ongoing{..} = self.snapshot.restoration_status() { true } else { false };
 				self.client.tick(snapshot_restoration)
 			},
 			SNAPSHOT_TICK_TIMER => self.snapshot.tick(),
diff --git a/ethcore/snapshot/src/service.rs b/ethcore/snapshot/src/service.rs
index 3977d97808a..b0980ae4b92 100644
--- a/ethcore/snapshot/src/service.rs
+++ b/ethcore/snapshot/src/service.rs
@@ -30,7 +30,7 @@ use common_types::{
 	io_message::ClientIoMessage,
 	errors::{EthcoreError as Error, SnapshotError, SnapshotError::UnlinkedAncientBlockChain},
 	ids::BlockId,
-	snapshot::{ManifestData, Progress, RestorationStatus},
+	snapshot::{ManifestData, Progress, CreationStatus, RestorationStatus},
 };
 use client_traits::ChainInfo;
 use engine::Engine;
@@ -267,6 +267,7 @@ pub struct Service<C: Send + Sync + 'static> {
 	client: Arc<C>,
 	progress: RwLock<Progress>,
 	taking_snapshot: AtomicBool,
+	taking_snapshot_num : AtomicUsize,
 	restoring_snapshot: AtomicBool,
 }
 
@@ -288,6 +289,7 @@ impl<C> Service<C> where C: SnapshotClient + ChainInfo {
 			client: params.client,
 			progress: RwLock::new(Progress::new()),
 			taking_snapshot: AtomicBool::new(false),
+			taking_snapshot_num: AtomicUsize::new(0),
 			restoring_snapshot: AtomicBool::new(false),
 		};
 
@@ -509,6 +511,7 @@ impl<C> Service<C> where C: SnapshotClient + ChainInfo {
 
 		info!("Taking snapshot at #{}", num);
 		{
+			self.taking_snapshot_num.store(num as usize, Ordering::SeqCst);
 			scopeguard::defer! {{
 				self.taking_snapshot.store(false, Ordering::SeqCst);
 			}}
@@ -613,6 +616,7 @@ impl<C> Service<C> where C: SnapshotClient + ChainInfo {
 
 		self.restoring_snapshot.store(true, Ordering::SeqCst);
 
+		let block_number = manifest.block_number;
 		// Import previous chunks, continue if it fails
 		self.import_prev_chunks(&mut res, manifest).ok();
 
@@ -620,6 +624,7 @@ impl<C> Service<C> where C: SnapshotClient + ChainInfo {
 		let mut restoration_status = self.status.lock();
 		if let RestorationStatus::Initializing { .. } = *restoration_status {
 			*restoration_status = RestorationStatus::Ongoing {
+				block_number,
 				state_chunks: state_chunks as u32,
 				block_chunks: block_chunks as u32,
 				state_chunks_done: self.state_chunks.load(Ordering::SeqCst) as u32,
@@ -759,7 +764,7 @@ impl<C> Service<C> where C: SnapshotClient + ChainInfo {
 	/// Feed a chunk with the Restoration
 	fn feed_chunk_with_restoration(&self, restoration: &mut Option<Restoration>, hash: H256, chunk: &[u8], is_state: bool) -> Result<(), Error> {
 		let (result, db) = {
-			match self.status() {
+			match self.restoration_status() {
 				RestorationStatus::Inactive | RestorationStatus::Failed | RestorationStatus::Finalizing => {
 					trace!(target: "snapshot", "Tried to restore chunk {:x} while inactive, failed or finalizing", hash);
 					return Ok(());
@@ -852,7 +857,16 @@ impl<C: Send + Sync> SnapshotService for Service<C> {
 		self.reader.read().as_ref().and_then(|r| r.chunk(hash).ok())
 	}
 
-	fn status(&self) -> RestorationStatus {
+	fn creation_status(&self) -> CreationStatus {
+		match self.taking_snapshot.load(Ordering::SeqCst) {
+			false => CreationStatus::Inactive,
+			true => CreationStatus::Ongoing {
+				block_number: self.taking_snapshot_num.load(Ordering::SeqCst) as u32
+			},
+		}
+	}
+
+	fn restoration_status(&self) -> RestorationStatus {
 		let mut cur_status = self.status.lock();
 
 		match *cur_status {
diff --git a/ethcore/snapshot/src/traits.rs b/ethcore/snapshot/src/traits.rs
index 2528c0c883c..fd147ff1eaa 100644
--- a/ethcore/snapshot/src/traits.rs
+++ b/ethcore/snapshot/src/traits.rs
@@ -22,7 +22,7 @@ use client_traits::{BlockChainClient, BlockInfo, DatabaseRestore, BlockChainRese
 use common_types::{
 	ids::BlockId,
 	errors::{EthcoreError as Error, SnapshotError},
-	snapshot::{ManifestData, ChunkSink, Progress, RestorationStatus},
+	snapshot::{ManifestData, ChunkSink, Progress, CreationStatus, RestorationStatus},
 };
 use engine::Engine;
 use ethereum_types::H256;
@@ -49,7 +49,10 @@ pub trait SnapshotService : Sync + Send {
 	fn chunk(&self, hash: H256) -> Option<Bytes>;
 
 	/// Ask the snapshot service for the restoration status.
-	fn status(&self) -> RestorationStatus;
+	fn restoration_status(&self) -> RestorationStatus;
+
+	/// Ask the snapshot service for the creation status.
+	fn creation_status(&self) -> CreationStatus;
 
 	/// Begin snapshot restoration.
 	/// If a restoration is in progress, this will reset it and clear all data.
diff --git a/ethcore/src/client/client.rs b/ethcore/src/client/client.rs
index 8c40353282c..8ef960702db 100644
--- a/ethcore/src/client/client.rs
+++ b/ethcore/src/client/client.rs
@@ -2900,11 +2900,8 @@ impl PrometheusMetrics for Client {
 			prometheus_gauge(r,"chain_warpsync_gap_last","Warp sync gap, last block",last.as_u64() as i64);
 		}
 
-		prometheus_gauge(r,"chain_difficulty_total","Blockchain difficulty",chain.total_difficulty.as_u64() as i64);
-		prometheus_gauge(r,"chain_difficulty_total_pending","Block queue difficulty",chain.pending_total_difficulty.as_u64() as i64);
 		prometheus_gauge(r,"chain_block","Best block number",chain.best_block_number as i64);
 
-
 		// prunning info
 		let prunning = self.pruning_info();
 		prometheus_gauge(r,"prunning_earliest_chain","The first block which everything can be served after",prunning.earliest_chain as i64);
diff --git a/ethcore/sync/src/api.rs b/ethcore/sync/src/api.rs
index 46c7c84bb58..31648274e8c 100644
--- a/ethcore/sync/src/api.rs
+++ b/ethcore/sync/src/api.rs
@@ -65,6 +65,7 @@ use common_types::{
 	chain_notify::{NewBlocks, ChainMessageType},
 	pruning_info::PruningInfo,
 	transaction::UnverifiedTransaction,
+	snapshot::{CreationStatus, RestorationStatus}
 };
 use stats::{PrometheusMetrics, prometheus_counter, prometheus_gauge, prometheus};
 
@@ -417,16 +418,42 @@ impl PrometheusMetrics for EthSync {
 		let scalar = |b| if b {1i64} else {0i64};
 		let sync_status = self.status();
 
-		prometheus_gauge(r,"sync_peers","Total number of connected peers",sync_status.num_peers as i64);
-		prometheus_gauge(r,"sync_active_peers","Total number of active peers",sync_status.num_active_peers as i64);
+		prometheus_gauge(r,
+			"sync_status",
+			"WaitingPeers(0), SnapshotManifest(1), SnapshotData(2), SnapshotWaiting(3), Blocks(4), Idle(5), Waiting(6), NewBlocks(7)", 
+			match self.eth_handler.sync.status().state {
+			SyncState::WaitingPeers => 0,
+			SyncState::SnapshotManifest => 1,
+			SyncState::SnapshotData => 2,
+			SyncState::SnapshotWaiting => 3,
+			SyncState::Blocks => 4,
+			SyncState::Idle => 5,
+			SyncState::Waiting => 6,
+			SyncState::NewBlocks => 7,
+		});
+
+		prometheus_gauge(r,"net_peers","Total number of connected peers",sync_status.num_peers as i64);
+		prometheus_gauge(r,"net_active_peers","Total number of active peers",sync_status.num_active_peers as i64);
 		prometheus_counter(r,"sync_blocks_recieved","Number of blocks downloaded so far",sync_status.blocks_received as i64);
 		prometheus_counter(r,"sync_blocks_total","Total number of blocks for the sync process",sync_status.blocks_total as i64);
 		prometheus_gauge(r,"sync_blocks_highest","Highest block number in the download queue",sync_status.highest_block_number.unwrap_or(0) as i64);
 		prometheus_gauge(r,"sync_is_majorsync","Are we in the middle of a major sync?",scalar(self.is_major_syncing()));
 		prometheus_gauge(r,"sync_mem_used","Heap memory used in bytes",sync_status.mem_used  as i64);
-		prometheus_gauge(r,"sync_snapshot_is_sync",".",scalar(sync_status.is_snapshot_syncing()));
-		prometheus_gauge(r,"sync_snapshot_chunks","Snapshot chunks",sync_status.num_snapshot_chunks as i64);
-		prometheus_gauge(r,"sync_snapshot_chunks_done","Snapshot chunks downloaded",sync_status.snapshot_chunks_done as i64);
+		prometheus_gauge(r,"snapshot_download_active","1 if downloading snapshots",scalar(sync_status.is_snapshot_syncing()));
+		prometheus_gauge(r,"snapshot_download_chunks","Snapshot chunks",sync_status.num_snapshot_chunks as i64);
+		prometheus_gauge(r,"snapshot_download_chunks_done","Snapshot chunks downloaded",sync_status.snapshot_chunks_done as i64);
+
+		let restoration = self.eth_handler.snapshot_service.restoration_status();
+		let creation = self.eth_handler.snapshot_service.creation_status();
+
+		prometheus_gauge(r,"snapshot_create_block", "First block of the current snapshot creation", match creation {
+			CreationStatus::Ongoing{block_number} => block_number as i64,
+			_ => 0,
+		});
+		prometheus_gauge(r,"snapshot_restore_block", "First block of the current snapshot restoration", match restoration {
+			RestorationStatus::Ongoing{block_number, ..} => block_number as i64,
+			_ => 0,
+		});
 	}
 }
 
diff --git a/ethcore/sync/src/chain/handler.rs b/ethcore/sync/src/chain/handler.rs
index dae66140aab..07748e96ace 100644
--- a/ethcore/sync/src/chain/handler.rs
+++ b/ethcore/sync/src/chain/handler.rs
@@ -507,7 +507,7 @@ impl SyncHandler {
 		}
 
 		// check service status
-		let status = io.snapshot_service().status();
+		let status = io.snapshot_service().restoration_status();
 		match status {
 			RestorationStatus::Inactive | RestorationStatus::Failed => {
 				trace!(target: "snapshot_sync", "{}: Snapshot restoration status: {:?}", peer_id, status);
diff --git a/ethcore/sync/src/chain/mod.rs b/ethcore/sync/src/chain/mod.rs
index 98627c4d1b5..5348ad28282 100644
--- a/ethcore/sync/src/chain/mod.rs
+++ b/ethcore/sync/src/chain/mod.rs
@@ -1119,8 +1119,8 @@ impl ChainSync {
 					}
 				},
 				SyncState::SnapshotData => {
-					match io.snapshot_service().status() {
-						RestorationStatus::Ongoing { state_chunks_done, block_chunks_done, state_chunks, block_chunks } => {
+					match io.snapshot_service().restoration_status() {
+						RestorationStatus::Ongoing { state_chunks_done, block_chunks_done, state_chunks, block_chunks, .. } => {
 							// Initialize the snapshot if not already done
 							self.snapshot.initialize(io.snapshot_service(), block_chunks as usize + state_chunks as usize);
 							if self.snapshot.done_chunks() - (state_chunks_done + block_chunks_done) as usize > MAX_SNAPSHOT_CHUNKS_DOWNLOAD_AHEAD {
@@ -1322,14 +1322,14 @@ impl ChainSync {
 				self.set_state(SyncState::Blocks);
 				self.continue_sync(io);
 			},
-			SyncState::SnapshotData => match io.snapshot_service().status() {
+			SyncState::SnapshotData => match io.snapshot_service().restoration_status() {
 				RestorationStatus::Inactive | RestorationStatus::Failed => {
 					self.set_state(SyncState::SnapshotWaiting);
 				},
 				RestorationStatus::Initializing { .. } | RestorationStatus::Ongoing { .. } | RestorationStatus::Finalizing => (),
 			},
 			SyncState::SnapshotWaiting => {
-				match io.snapshot_service().status() {
+				match io.snapshot_service().restoration_status() {
 					RestorationStatus::Inactive => {
 						trace!(target:"snapshot_sync", "Snapshot restoration is complete");
 						self.restart(io);
diff --git a/ethcore/types/src/snapshot.rs b/ethcore/types/src/snapshot.rs
index 1ecfe7e112c..ccb5339f8cd 100644
--- a/ethcore/types/src/snapshot.rs
+++ b/ethcore/types/src/snapshot.rs
@@ -183,6 +183,8 @@ pub enum RestorationStatus {
 	},
 	/// Ongoing restoration.
 	Ongoing {
+		/// Block number specified in the manifest.
+		block_number: u64,
 		/// Total number of state chunks.
 		state_chunks: u32,
 		/// Total number of block chunks.
@@ -197,3 +199,15 @@ pub enum RestorationStatus {
 	/// Failed restoration.
 	Failed,
 }
+
+/// Statuses for snapshot creation.
+#[derive(PartialEq, Eq, Clone, Copy, Debug)]
+pub enum CreationStatus {
+	/// No creation activity currently.
+	Inactive,
+	/// Snapshot creation is in progress.
+	Ongoing {
+		/// Current created snapshot.
+		block_number: u32,
+	}
+}
diff --git a/parity/informant.rs b/parity/informant.rs
index d4e81deda2d..25c62100c8f 100644
--- a/parity/informant.rs
+++ b/parity/informant.rs
@@ -276,7 +276,7 @@ impl<T: InformantData> Informant<T> {
 
 		let rpc_stats = self.rpc_stats.as_ref();
 		let snapshot_sync = sync_info.as_ref().map_or(false, |s| s.snapshot_sync) && self.snapshot.as_ref().map_or(false, |s|
-			match s.status() {
+			match s.restoration_status() {
 				RestorationStatus::Ongoing { .. } | RestorationStatus::Initializing { .. } => true,
 				_ => false,
 			}
@@ -315,8 +315,8 @@ impl<T: InformantData> Informant<T> {
 					),
 					true => {
 						self.snapshot.as_ref().map_or(String::new(), |s|
-							match s.status() {
-								RestorationStatus::Ongoing { state_chunks, block_chunks, state_chunks_done, block_chunks_done } => {
+							match s.restoration_status() {
+								RestorationStatus::Ongoing { state_chunks, block_chunks, state_chunks_done, block_chunks_done, .. } => {
 									format!("Syncing snapshot {}/{}", state_chunks_done + block_chunks_done, state_chunks + block_chunks)
 								},
 								RestorationStatus::Initializing { chunks_done, state_chunks, block_chunks } => {
diff --git a/parity/snapshot_cmd.rs b/parity/snapshot_cmd.rs
index 0f27e0886bd..f4095a37482 100644
--- a/parity/snapshot_cmd.rs
+++ b/parity/snapshot_cmd.rs
@@ -86,7 +86,7 @@ fn restore_using<R: SnapshotReader>(snapshot: Arc<SnapshotService<Client>>, read
 
 	let informant_handle = snapshot.clone();
 	::std::thread::spawn(move || {
- 		while let RestorationStatus::Ongoing { state_chunks_done, block_chunks_done, .. } = informant_handle.status() {
+ 		while let RestorationStatus::Ongoing { state_chunks_done, block_chunks_done, .. } = informant_handle.restoration_status() {
  			info!("Processed {}/{} state chunks and {}/{} block chunks.",
  				state_chunks_done, num_state, block_chunks_done, num_blocks);
  			::std::thread::sleep(Duration::from_secs(5));
@@ -95,7 +95,7 @@ fn restore_using<R: SnapshotReader>(snapshot: Arc<SnapshotService<Client>>, read
 
  	info!("Restoring state");
  	for &state_hash in &manifest.state_hashes {
- 		if snapshot.status() == RestorationStatus::Failed {
+ 		if snapshot.restoration_status() == RestorationStatus::Failed {
  			return Err("Restoration failed".into());
  		}
 
@@ -112,7 +112,7 @@ fn restore_using<R: SnapshotReader>(snapshot: Arc<SnapshotService<Client>>, read
 
 	info!("Restoring blocks");
 	for &block_hash in &manifest.block_hashes {
-		if snapshot.status() == RestorationStatus::Failed {
+		if snapshot.restoration_status() == RestorationStatus::Failed {
 			return Err("Restoration failed".into());
 		}
 
@@ -126,7 +126,7 @@ fn restore_using<R: SnapshotReader>(snapshot: Arc<SnapshotService<Client>>, read
 		snapshot.feed_block_chunk(block_hash, &chunk);
 	}
 
-	match snapshot.status() {
+	match snapshot.restoration_status() {
 		RestorationStatus::Ongoing { .. } => Err("Snapshot file is incomplete and missing chunks.".into()),
 		RestorationStatus::Initializing { .. } => Err("Snapshot restoration is still initializing.".into()),
 		RestorationStatus::Finalizing => Err("Snapshot restoration is still finalizing.".into()),
diff --git a/rpc/src/v1/impls/eth.rs b/rpc/src/v1/impls/eth.rs
index fa28a7e4303..d0143a3e63e 100644
--- a/rpc/src/v1/impls/eth.rs
+++ b/rpc/src/v1/impls/eth.rs
@@ -551,10 +551,10 @@ impl<C, SN: ?Sized, S: ?Sized, M, EM, T: StateInfo + 'static> Eth for EthClient<
 	fn syncing(&self) -> Result<SyncStatus> {
 		let status = self.sync.status();
 		let client = &self.client;
-		let snapshot_status = self.snapshot.status();
+		let snapshot_status = self.snapshot.restoration_status();
 
 		let (warping, warp_chunks_amount, warp_chunks_processed) = match snapshot_status {
-			RestorationStatus::Ongoing { state_chunks, block_chunks, state_chunks_done, block_chunks_done } =>
+			RestorationStatus::Ongoing { state_chunks, block_chunks, state_chunks_done, block_chunks_done, .. } =>
 				(true, Some(block_chunks + state_chunks), Some(block_chunks_done + state_chunks_done)),
 			_ => (false, None, None),
 		};
diff --git a/rpc/src/v1/impls/parity.rs b/rpc/src/v1/impls/parity.rs
index f9774ed1f1c..792d1243832 100644
--- a/rpc/src/v1/impls/parity.rs
+++ b/rpc/src/v1/impls/parity.rs
@@ -17,6 +17,7 @@
 //! Parity-specific rpc implementation.
 use std::sync::Arc;
 use std::collections::BTreeMap;
+use std::time::Instant;
 
 use crypto::DEFAULT_MAC;
 use ethereum_types::{H64, H160, H256, H512, U64, U256};
@@ -41,6 +42,7 @@ use updater::{Service as UpdateService};
 use version::version_data;
 use stats::{
 	PrometheusMetrics,
+	prometheus_gauge,
 	prometheus::{self, Encoder}
 };
 
@@ -443,7 +445,7 @@ impl<C, M, U, S> Parity for ParityClient<C, M, U> where
 
 	fn status(&self) -> Result<()> {
 		let has_peers = self.settings.is_dev_chain || self.sync.status().num_peers > 0;
-		let is_warping = match self.snapshot.as_ref().map(|s| s.status()) {
+		let is_warping = match self.snapshot.as_ref().map(|s| s.restoration_status()) {
 			Some(RestorationStatus::Ongoing { .. }) => true,
 			_ => false,
 		};
@@ -458,11 +460,16 @@ impl<C, M, U, S> Parity for ParityClient<C, M, U> where
 	}
 
 	fn metrics(&self) -> Result<String> {
-
+		let start = Instant::now();
 		let mut reg = prometheus::Registry::new();
+
 		self.client.prometheus_metrics(&mut reg);
 		self.sync.prometheus_metrics(&mut reg);
 
+		let elapsed = start.elapsed();
+		let ms = (elapsed.as_secs() as i64)*1000 + (elapsed.subsec_millis() as i64);
+		prometheus_gauge(&mut reg,"metrics_time","Time to perform rpc metrics",ms);
+
 		let mut buffer = vec![];
 		let encoder = prometheus::TextEncoder::new();
 		let metric_families = reg.gather();
diff --git a/scripts/prometheus/model.json b/scripts/prometheus/config/grafana/dashboards/openethereum.json
similarity index 68%
rename from scripts/prometheus/model.json
rename to scripts/prometheus/config/grafana/dashboards/openethereum.json
index 9a8148b6a3f..3924c6bfe71 100644
--- a/scripts/prometheus/model.json
+++ b/scripts/prometheus/config/grafana/dashboards/openethereum.json
@@ -15,7 +15,6 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 0,
-  "id": 1,
   "links": [],
   "panels": [
     {
@@ -38,7 +37,7 @@
       },
       "gridPos": {
         "h": 3,
-        "w": 5,
+        "w": 4,
         "x": 0,
         "y": 0
       },
@@ -82,24 +81,447 @@
       "tableColumn": "",
       "targets": [
         {
-          "expr": "oe_sync_blocks_highest",
+          "expr": "oe_sync_blocks_highest",
+          "refId": "A"
+        }
+      ],
+      "thresholds": "",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Highest block",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "avg"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": false,
+      "colors": [
+        "#299c46",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
+      "datasource": null,
+      "format": "none",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 3,
+        "w": 4,
+        "x": 4,
+        "y": 0
+      },
+      "id": 24,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "options": {},
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false,
+        "ymax": null,
+        "ymin": null
+      },
+      "tableColumn": "",
+      "targets": [
+        {
+          "expr": "oe_sync_status",
+          "refId": "A"
+        }
+      ],
+      "thresholds": "",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Sync status",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "WaitingPeers",
+          "value": "0"
+        },
+        {
+          "op": "=",
+          "text": "Waiting",
+          "value": "6"
+        },
+        {
+          "op": "=",
+          "text": "SnapshotManifest",
+          "value": "1"
+        },
+        {
+          "op": "=",
+          "text": "SnapshotData",
+          "value": "2"
+        },
+        {
+          "op": "=",
+          "text": "SnapshotWaiting",
+          "value": "3"
+        },
+        {
+          "op": "=",
+          "text": "Blocks",
+          "value": "4"
+        },
+        {
+          "op": "=",
+          "text": "Idle",
+          "value": "5"
+        },
+        {
+          "op": "=",
+          "text": "NewBlocks",
+          "value": "7"
+        }
+      ],
+      "valueName": "current"
+    },
+    {
+      "alert": {
+        "alertRuleTags": {},
+        "conditions": [
+          {
+            "evaluator": {
+              "params": [
+                100
+              ],
+              "type": "gt"
+            },
+            "operator": {
+              "type": "and"
+            },
+            "query": {
+              "params": [
+                "A",
+                "5m",
+                "now"
+              ]
+            },
+            "reducer": {
+              "params": [],
+              "type": "avg"
+            },
+            "type": "query"
+          }
+        ],
+        "executionErrorState": "alerting",
+        "for": "5m",
+        "frequency": "1m",
+        "handler": 1,
+        "name": "RPC Metrics alert",
+        "noDataState": "no_data",
+        "notifications": []
+      },
+      "aliasColors": {},
+      "bars": true,
+      "cacheTimeout": null,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": null,
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 3,
+        "w": 4,
+        "x": 8,
+        "y": 0
+      },
+      "hiddenSeries": false,
+      "id": 28,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": false,
+        "total": false,
+        "values": false
+      },
+      "lines": false,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "oe_metrics_time",
+          "refId": "A"
+        }
+      ],
+      "thresholds": [
+        {
+          "colorMode": "critical",
+          "fill": true,
+          "line": true,
+          "op": "gt",
+          "value": 100,
+          "yaxis": "left"
+        }
+      ],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "RPC Metrics Reponse time",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": false,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "ms",
+          "label": null,
+          "logBase": 1,
+          "max": "1000",
+          "min": "0",
+          "show": false
+        },
+        {
+          "decimals": null,
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": false
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": null,
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 4,
+        "w": 4,
+        "x": 12,
+        "y": 0
+      },
+      "hiddenSeries": false,
+      "id": 8,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": false,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "rate(oe_import_blocks[1m])",
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Block/s",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": false,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": null,
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 4,
+        "w": 4,
+        "x": 16,
+        "y": 0
+      },
+      "hiddenSeries": false,
+      "id": 6,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": false,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "rate(oe_import_gas[1m])/1000000",
           "refId": "A"
         }
       ],
-      "thresholds": "",
+      "thresholds": [],
       "timeFrom": null,
+      "timeRegions": [],
       "timeShift": null,
-      "title": "Highest block",
-      "type": "singlestat",
-      "valueFontSize": "80%",
-      "valueMaps": [
+      "title": "MGas/s",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": false,
+        "values": []
+      },
+      "yaxes": [
         {
-          "op": "=",
-          "text": "N/A",
-          "value": "null"
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
         }
       ],
-      "valueName": "avg"
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
     {
       "aliasColors": {},
@@ -112,7 +534,7 @@
       "gridPos": {
         "h": 4,
         "w": 4,
-        "x": 12,
+        "x": 20,
         "y": 0
       },
       "hiddenSeries": false,
@@ -142,7 +564,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "oe_import_txs",
+          "expr": "rate(oe_import_txs[1m])",
           "refId": "A"
         }
       ],
@@ -188,6 +610,41 @@
       }
     },
     {
+      "alert": {
+        "alertRuleTags": {},
+        "conditions": [
+          {
+            "evaluator": {
+              "params": [
+                1
+              ],
+              "type": "gt"
+            },
+            "operator": {
+              "type": "and"
+            },
+            "query": {
+              "params": [
+                "B",
+                "10s",
+                "now"
+              ]
+            },
+            "reducer": {
+              "params": [],
+              "type": "avg"
+            },
+            "type": "query"
+          }
+        ],
+        "executionErrorState": "alerting",
+        "for": "5m",
+        "frequency": "1m",
+        "handler": 1,
+        "name": "Peers alert",
+        "noDataState": "no_data",
+        "notifications": []
+      },
       "aliasColors": {},
       "bars": false,
       "dashLength": 10,
@@ -196,13 +653,13 @@
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
-        "h": 4,
-        "w": 4,
-        "x": 16,
-        "y": 0
+        "h": 5,
+        "w": 12,
+        "x": 0,
+        "y": 3
       },
       "hiddenSeries": false,
-      "id": 8,
+      "id": 16,
       "legend": {
         "avg": false,
         "current": false,
@@ -219,6 +676,7 @@
         "dataLinks": []
       },
       "percentage": false,
+      "pluginVersion": "6.5.2",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
@@ -228,15 +686,27 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "oe_import_blocks",
+          "expr": "oe_net_peers",
           "refId": "A"
+        },
+        {
+          "expr": "oe_net_active_peers",
+          "refId": "B"
+        }
+      ],
+      "thresholds": [
+        {
+          "colorMode": "critical",
+          "fill": true,
+          "line": true,
+          "op": "gt",
+          "value": 1
         }
       ],
-      "thresholds": [],
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Block/s",
+      "title": "Peers",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -256,7 +726,7 @@
           "label": null,
           "logBase": 1,
           "max": null,
-          "min": "0",
+          "min": null,
           "show": true
         },
         {
@@ -264,7 +734,7 @@
           "label": null,
           "logBase": 1,
           "max": null,
-          "min": "0",
+          "min": null,
           "show": true
         }
       ],
@@ -283,12 +753,12 @@
       "fillGradient": 0,
       "gridPos": {
         "h": 4,
-        "w": 4,
-        "x": 20,
-        "y": 0
+        "w": 12,
+        "x": 12,
+        "y": 4
       },
       "hiddenSeries": false,
-      "id": 6,
+      "id": 12,
       "legend": {
         "avg": false,
         "current": false,
@@ -314,15 +784,23 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "oe_import_gas",
+          "expr": "rate(oe_io_bytes_read[1m])/60",
           "refId": "A"
+        },
+        {
+          "expr": "rate(oe_io_bytes_written[1m])/60",
+          "refId": "B"
+        },
+        {
+          "expr": "rate(oe_io_cache_read_bytes[1m])/60",
+          "refId": "C"
         }
       ],
       "thresholds": [],
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Gas/s",
+      "title": "DB IO",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -338,6 +816,7 @@
       },
       "yaxes": [
         {
+          "decimals": null,
           "format": "short",
           "label": null,
           "logBase": 1,
@@ -350,7 +829,7 @@
           "label": null,
           "logBase": 1,
           "max": null,
-          "min": "0",
+          "min": null,
           "show": true
         }
       ],
@@ -372,7 +851,7 @@
         "h": 4,
         "w": 12,
         "x": 0,
-        "y": 3
+        "y": 8
       },
       "hiddenSeries": false,
       "id": 22,
@@ -398,7 +877,7 @@
       "renderer": "flot",
       "seriesOverrides": [],
       "spaceLength": 10,
-      "stack": false,
+      "stack": true,
       "steppedLine": false,
       "targets": [
         {
@@ -443,7 +922,7 @@
       "yaxes": [
         {
           "decimals": 0,
-          "format": "short",
+          "format": "decbytes",
           "label": "",
           "logBase": 1,
           "max": null,
@@ -452,7 +931,7 @@
         },
         {
           "decimals": 0,
-          "format": "short",
+          "format": "bytes",
           "label": null,
           "logBase": 1,
           "max": null,
@@ -477,10 +956,10 @@
         "h": 4,
         "w": 12,
         "x": 12,
-        "y": 4
+        "y": 8
       },
       "hiddenSeries": false,
-      "id": 12,
+      "id": 2,
       "legend": {
         "avg": false,
         "current": false,
@@ -502,19 +981,19 @@
       "renderer": "flot",
       "seriesOverrides": [],
       "spaceLength": 10,
-      "stack": false,
+      "stack": true,
       "steppedLine": false,
       "targets": [
         {
-          "expr": "rate(oe_io_bytes_read[1m])",
+          "expr": "oe_queue_mem_used",
           "refId": "A"
         },
         {
-          "expr": "rate(oe_io_bytes_written[1m])",
+          "expr": "oe_sync_mem_used",
           "refId": "B"
         },
         {
-          "expr": "rate(oe_io_cache_read_bytes[1m])",
+          "expr": "oe_statedb_mem_used",
           "refId": "C"
         }
       ],
@@ -522,7 +1001,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "DB IO",
+      "title": "Memory",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -538,7 +1017,7 @@
       },
       "yaxes": [
         {
-          "format": "short",
+          "format": "bytes",
           "label": null,
           "logBase": 1,
           "max": null,
@@ -569,9 +1048,9 @@
       "fillGradient": 0,
       "gridPos": {
         "h": 4,
-        "w": 6,
+        "w": 3,
         "x": 0,
-        "y": 7
+        "y": 12
       },
       "hiddenSeries": false,
       "id": 4,
@@ -594,17 +1073,21 @@
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
-      "seriesOverrides": [],
+      "seriesOverrides": [
+        {}
+      ],
       "spaceLength": 10,
       "stack": false,
       "steppedLine": false,
       "targets": [
         {
-          "expr": "oe_sync_snapshot_chunks ",
+          "expr": "oe_snapshot_download_chunks - oe_snapshot_download_chunks_done",
+          "legendFormat": "Pending blocks",
           "refId": "A"
         },
         {
-          "expr": "oe_sync_snapshot_chunks_done",
+          "expr": "rate(oe_snapshot_download_chunks_done[5m])*3600",
+          "legendFormat": "Rate per hour",
           "refId": "B"
         }
       ],
@@ -612,7 +1095,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Snapshot sync",
+      "title": "Pending Snapshot download",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -628,19 +1111,21 @@
       },
       "yaxes": [
         {
+          "decimals": 0,
           "format": "short",
           "label": null,
           "logBase": 1,
           "max": null,
-          "min": null,
+          "min": "0",
           "show": true
         },
         {
+          "decimals": 0,
           "format": "short",
           "label": null,
           "logBase": 1,
           "max": null,
-          "min": null,
+          "min": "0",
           "show": true
         }
       ],
@@ -659,12 +1144,12 @@
       "fillGradient": 0,
       "gridPos": {
         "h": 4,
-        "w": 6,
-        "x": 6,
-        "y": 7
+        "w": 3,
+        "x": 3,
+        "y": 12
       },
       "hiddenSeries": false,
-      "id": 24,
+      "id": 26,
       "legend": {
         "avg": false,
         "current": false,
@@ -690,7 +1175,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "rate(oe_sync_snapshot_chunks_done[2m])",
+          "expr": "oe_snapshot_create_block",
           "refId": "A"
         }
       ],
@@ -698,7 +1183,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Snapshot Sync rate",
+      "title": "Snapshot create",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -714,19 +1199,21 @@
       },
       "yaxes": [
         {
+          "decimals": 0,
           "format": "short",
           "label": null,
           "logBase": 1,
           "max": null,
-          "min": null,
+          "min": "0",
           "show": true
         },
         {
+          "decimals": 0,
           "format": "short",
           "label": null,
           "logBase": 1,
           "max": null,
-          "min": null,
+          "min": "0",
           "show": true
         }
       ],
@@ -744,13 +1231,13 @@
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
-        "h": 3,
-        "w": 12,
-        "x": 12,
-        "y": 8
+        "h": 4,
+        "w": 3,
+        "x": 6,
+        "y": 12
       },
       "hiddenSeries": false,
-      "id": 2,
+      "id": 27,
       "legend": {
         "avg": false,
         "current": false,
@@ -772,27 +1259,19 @@
       "renderer": "flot",
       "seriesOverrides": [],
       "spaceLength": 10,
-      "stack": true,
+      "stack": false,
       "steppedLine": false,
       "targets": [
         {
-          "expr": "oe_queue_mem_used",
+          "expr": "oe_snapshot_restore_block",
           "refId": "A"
-        },
-        {
-          "expr": "oe_sync_mem_used",
-          "refId": "B"
-        },
-        {
-          "expr": "oe_statedb_mem_used",
-          "refId": "C"
         }
       ],
       "thresholds": [],
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Memory",
+      "title": "Snapshot restore",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -808,19 +1287,21 @@
       },
       "yaxes": [
         {
+          "decimals": 0,
           "format": "short",
           "label": null,
           "logBase": 1,
           "max": null,
-          "min": null,
+          "min": "0",
           "show": true
         },
         {
+          "decimals": 0,
           "format": "short",
           "label": null,
           "logBase": 1,
           "max": null,
-          "min": null,
+          "min": "0",
           "show": true
         }
       ],
@@ -830,41 +1311,6 @@
       }
     },
     {
-      "alert": {
-        "alertRuleTags": {},
-        "conditions": [
-          {
-            "evaluator": {
-              "params": [
-                1
-              ],
-              "type": "gt"
-            },
-            "operator": {
-              "type": "and"
-            },
-            "query": {
-              "params": [
-                "B",
-                "10s",
-                "now"
-              ]
-            },
-            "reducer": {
-              "params": [],
-              "type": "avg"
-            },
-            "type": "query"
-          }
-        ],
-        "executionErrorState": "alerting",
-        "for": "5m",
-        "frequency": "1m",
-        "handler": 1,
-        "name": "Peers alert",
-        "noDataState": "no_data",
-        "notifications": []
-      },
       "aliasColors": {},
       "bars": false,
       "dashLength": 10,
@@ -873,13 +1319,13 @@
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
-        "h": 5,
-        "w": 12,
-        "x": 0,
-        "y": 11
+        "h": 4,
+        "w": 3,
+        "x": 9,
+        "y": 12
       },
       "hiddenSeries": false,
-      "id": 16,
+      "id": 29,
       "legend": {
         "avg": false,
         "current": false,
@@ -896,7 +1342,6 @@
         "dataLinks": []
       },
       "percentage": false,
-      "pluginVersion": "6.5.2",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
@@ -906,27 +1351,15 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "oe_sync_peers",
+          "expr": "oe_prunning_earliest_state",
           "refId": "A"
-        },
-        {
-          "expr": "oe_sync_active_peers",
-          "refId": "B"
-        }
-      ],
-      "thresholds": [
-        {
-          "colorMode": "critical",
-          "fill": true,
-          "line": true,
-          "op": "gt",
-          "value": 1
         }
       ],
+      "thresholds": [],
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Peers",
+      "title": "Earliest State",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -942,19 +1375,21 @@
       },
       "yaxes": [
         {
+          "decimals": 0,
           "format": "short",
           "label": null,
           "logBase": 1,
           "max": null,
-          "min": null,
+          "min": "0",
           "show": true
         },
         {
+          "decimals": 0,
           "format": "short",
           "label": null,
           "logBase": 1,
           "max": null,
-          "min": null,
+          "min": "0",
           "show": true
         }
       ],
@@ -972,10 +1407,10 @@
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
-        "h": 5,
+        "h": 4,
         "w": 12,
         "x": 12,
-        "y": 11
+        "y": 12
       },
       "hiddenSeries": false,
       "id": 14,
@@ -1000,7 +1435,7 @@
       "renderer": "flot",
       "seriesOverrides": [],
       "spaceLength": 10,
-      "stack": false,
+      "stack": true,
       "steppedLine": false,
       "targets": [
         {
@@ -1086,7 +1521,7 @@
     ]
   },
   "timezone": "",
-  "title": "OE",
+  "title": "OpenEthereum",
   "uid": "uUkuLMmMz",
   "version": 1
-}
+}
\ No newline at end of file
diff --git a/scripts/prometheus/config/grafana/grafana.ini b/scripts/prometheus/config/grafana/grafana.ini
index 49e05c3b519..dba20ae99a3 100644
--- a/scripts/prometheus/config/grafana/grafana.ini
+++ b/scripts/prometheus/config/grafana/grafana.ini
@@ -300,7 +300,7 @@ api_key_max_seconds_to_live = -1
 #################################### Anonymous Auth ######################
 [auth.anonymous]
 # enable anonymous access
-enabled = false
+enabled = true
 
 # specify organization name that should be used for unauthenticated users
 org_name = Main Org.
diff --git a/scripts/prometheus/config/grafana/loki.yaml b/scripts/prometheus/config/grafana/loki.yaml
deleted file mode 100644
index 4722ec4e102..00000000000
--- a/scripts/prometheus/config/grafana/loki.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-apiVersion: 1
-
-datasources:
-  - name: Loki
-    type: loki
-    access: proxy
-    url: http://loki:3100
-    jsonData:
-      maxLines: 1000
-
diff --git a/scripts/prometheus/config/grafana/provisioning/dashboards/provider.yaml b/scripts/prometheus/config/grafana/provisioning/dashboards/provider.yaml
new file mode 100644
index 00000000000..bbf093bf7cb
--- /dev/null
+++ b/scripts/prometheus/config/grafana/provisioning/dashboards/provider.yaml
@@ -0,0 +1,24 @@
+apiVersion: 1
+
+providers:
+  # <string> an unique provider name. Required
+  - name: 'dashboardprovider'
+    # <int> Org id. Default to 1
+    orgId: 1
+    # <string> name of the dashboard folder.
+    folder: 'dashboards'
+    # <string> folder UID. will be automatically generated if not specified
+    folderUid: ''
+    # <string> provider type. Default to 'file'
+    type: file
+    # <bool> disable dashboard deletion
+    disableDeletion: false
+    # <bool> enable dashboard editing
+    editable: true
+    # <int> how often Grafana will scan for changed dashboards
+    updateIntervalSeconds: 10
+    # <bool> allow updating provisioned dashboards from the UI
+    allowUiUpdates: false
+    options:
+      # <string, required> path to dashboard files on disk. Required when using the 'file' type
+      path: /etc/grafana
\ No newline at end of file
diff --git a/scripts/prometheus/config/grafana/prometheus.yaml b/scripts/prometheus/config/grafana/provisioning/datasources/prometheus.yaml
similarity index 97%
rename from scripts/prometheus/config/grafana/prometheus.yaml
rename to scripts/prometheus/config/grafana/provisioning/datasources/prometheus.yaml
index c02bb38b3d3..bd0bcb50fed 100644
--- a/scripts/prometheus/config/grafana/prometheus.yaml
+++ b/scripts/prometheus/config/grafana/provisioning/datasources/prometheus.yaml
@@ -18,7 +18,7 @@ datasources:
   # <int> org id. will default to orgId 1 if not specified
   orgId: 1
   # <string> url
-  url: http://prometheus:9090
+  url: http://localhost:9090
   # <string> database password, if used
   password:
   # <string> database user, if used
diff --git a/scripts/prometheus/config/prometheus/prometheus.yml b/scripts/prometheus/config/prometheus/prometheus.yml
index 310c993df1c..a510f04370c 100644
--- a/scripts/prometheus/config/prometheus/prometheus.yml
+++ b/scripts/prometheus/config/prometheus/prometheus.yml
@@ -34,11 +34,5 @@ scrape_configs:
         replacement: "oe_${1}"
     static_configs:
     - targets:
-      - 10.0.1.1:8545
-
-  - job_name: cadvisor
-    scrape_interval: 5s
-    static_configs:
-    - targets:
-      - 10.0.10.4:8080
+      - localhost:8545
 
diff --git a/scripts/prometheus/config/promtail/config.yaml b/scripts/prometheus/config/promtail/config.yaml
deleted file mode 100644
index 1288cd97621..00000000000
--- a/scripts/prometheus/config/promtail/config.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-server:
-  http_listen_port: 9080
-  grpc_listen_port: 0
-
-positions:
-  filename: /tmp/positions.yaml
-
-scrape_configs:
-- job_name: openethereum
-  static_configs:
-  - targets:
-      - localhost
-    labels:
-      job: openethereum
-      __path__: /log/oe/*log
-
-
-
diff --git a/scripts/prometheus/docker-compose.yaml b/scripts/prometheus/docker-compose.yaml
index bcdd7379238..4a87340b1c0 100644
--- a/scripts/prometheus/docker-compose.yaml
+++ b/scripts/prometheus/docker-compose.yaml
@@ -1,34 +1,6 @@
 version: '3.5'
 services:
 
-  openethereum:
-    image: openethereum:prometheus
-    restart: always
-    ports:
-      - '8545:8545'
-      - '30303:30303'
-      - '30303:30303/udp'
-    dns: 1.1.1.1
-    networks:
-      scnetwork:
-        ipv4_address: 10.0.1.1
-    volumes:
-      - /tmp/oe:/log
-    entrypoint: ./openethereum  --no-warp --jsonrpc-port 8545 --jsonrpc-interface 10.0.1.1 --jsonrpc-hosts all
-
-  promtail:
-    image: grafana/promtail:latest
-    volumes:
-      - ./config/promtail/config.yaml:/etc/promtail/config.yaml
-      - /tmp/xdailogs:/log/xdai
-    command: -client.url=${LOKI_PUSH_URL} -config.file=/etc/promtail/config.yaml
-    dns: 1.1.1.1
-    networks:
-      scnetwork:
-        ipv4_address: 10.0.1.2
-    depends_on:
-      - openethereum
-
   prometheus:
     image: prom/prometheus
     container_name: prometheus
@@ -37,71 +9,17 @@ services:
       - ./config/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml 
     ports:
       - '9090:9090'
-    dns: 1.1.1.1
-    networks:
-      scnetwork:
-        ipv4_address: 10.0.10.1
-    logging:
-      options:
-        max-size: 10m
-        max-file: '3'
-
-
-  loki:
-    image: grafana/loki
-    container_name: loki
-    restart: always
-    ports:
-      - '3100:3100'
-    dns: 1.1.1.1
-    networks:
-      scnetwork:
-        ipv4_address: 10.0.10.2
-    logging:
-      options:
-        max-size: 10m
-        max-file: '3'
+    network_mode: host
 
   grafana:
     image: grafana/grafana
     container_name: grafana  
     restart: always
     volumes:
-      - ./config/grafana/grafana.ini:/etc/grafana/grafana.ini
-      - ./config/grafana/prometheus.yaml:/etc/grafana/provisioning/datasources/prometheus.yaml
-      - ./config/grafana/loki.yaml:/etc/grafana/provisioning/datasources/loki.yaml
+      - ./config/grafana:/etc/grafana
     ports:
       - '3000:3000'
     environment:
      - GF_SECURITY_ADMIN_PASSWORD:secret
-    dns: 1.1.1.1
-    networks:
-      scnetwork:
-        ipv4_address: 10.0.10.3
-    logging:
-      options:
-        max-size: 10m
-        max-file: '3'
-
-  cadvisor:
-    image: google/cadvisor:latest
-    container_name: cadvisor
-    ports:
-      - 8080:8080
-    volumes:
-      - /:/rootfs:ro
-      - /var/run:/var/run:rw
-      - /sys:/sys:ro
-      - /var/lib/docker/:/var/lib/docker:ro
-      - /dev/disk/:/dev/disk:ro
-    networks:
-      scnetwork:
-        ipv4_address: 10.0.10.4
-
-networks:
-  scnetwork:
-    driver: bridge
-    ipam:
-      config:
-        - subnet: 10.0.0.0/16
+    network_mode: host
 
diff --git a/util/stats/src/lib.rs b/util/stats/src/lib.rs
index 631d0553df7..f686f9cd13f 100644
--- a/util/stats/src/lib.rs
+++ b/util/stats/src/lib.rs
@@ -18,6 +18,7 @@
 
 use std::iter::FromIterator;
 use std::ops::{Add, Sub, Deref, Div};
+use std::time::Instant;
 
 #[macro_use]
 extern crate log;
@@ -39,6 +40,15 @@ pub fn prometheus_gauge(reg: &mut prometheus::Registry, name: &str, help: &str,
 	reg.register(Box::new(g)).expect("qed");
 }
 
+pub fn prometheus_optime<T>(r: &mut prometheus::Registry, name: &str, f: &dyn Fn()->T ) -> T {
+	let start = Instant::now();
+	let t = f();
+	let elapsed = start.elapsed();
+	let ms = (elapsed.as_secs() as i64)*1000 + (elapsed.subsec_millis() as i64);
+	prometheus_gauge(r,&format!("optime_{}",name),&format!("Time to perform {}",name),ms);
+	t
+}
+
 /// Sorted corpus of data.1
 #[derive(Debug, Clone, PartialEq)]
 pub struct Corpus<T>(Vec<T>);

From defa34839861e03e6b4b6d639cc784b2eff4103f Mon Sep 17 00:00:00 2001
From: adria0 <adria@codecontext.io>
Date: Wed, 10 Jun 2020 09:04:46 +0200
Subject: [PATCH 12/32] Fix tests

---
 ethcore/snapshot/snapshot-tests/src/service.rs | 12 ++++++------
 ethcore/sync/src/tests/snapshot.rs             |  8 ++++++--
 rpc/src/v1/tests/helpers/snapshot_service.rs   |  5 +++--
 rpc/src/v1/tests/helpers/sync_provider.rs      |  2 +-
 rpc/src/v1/tests/mocked/eth.rs                 |  1 +
 5 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/ethcore/snapshot/snapshot-tests/src/service.rs b/ethcore/snapshot/snapshot-tests/src/service.rs
index ba8878ba5b0..d7d2a1dfc9e 100644
--- a/ethcore/snapshot/snapshot-tests/src/service.rs
+++ b/ethcore/snapshot/snapshot-tests/src/service.rs
@@ -71,7 +71,7 @@ fn sends_async_messages() {
 
 	assert!(service.manifest().is_none());
 	assert!(service.chunk(Default::default()).is_none());
-	assert_eq!(service.status(), RestorationStatus::Inactive);
+	assert_eq!(service.restoration_status(), RestorationStatus::Inactive);
 
 	let manifest = ManifestData {
 		version: 2,
@@ -190,7 +190,7 @@ fn restored_is_equivalent() {
 		service.feed_block_chunk(hash, &chunk);
 	}
 
-	assert_eq!(service.status(), RestorationStatus::Inactive);
+	assert_eq!(service.restoration_status(), RestorationStatus::Inactive);
 
 	for x in 0..NUM_BLOCKS {
 		let block1 = client.block(BlockId::Number(x as u64)).unwrap();
@@ -347,7 +347,7 @@ fn keep_ancient_blocks() {
 		service.feed_state_chunk(*hash, &chunk);
 	}
 
-	match service.status() {
+	match service.restoration_status() {
 		RestorationStatus::Inactive => (),
 		RestorationStatus::Failed => panic!("Snapshot Restoration has failed."),
 		RestorationStatus::Ongoing { .. } => panic!("Snapshot Restoration should be done."),
@@ -409,7 +409,7 @@ fn recover_aborted_recovery() {
 		service.feed_state_chunk(*hash, &chunk);
 	}
 
-	match service.status() {
+	match service.restoration_status() {
 		RestorationStatus::Ongoing { block_chunks_done, state_chunks_done, .. } => {
 			assert_eq!(state_chunks_done, manifest.state_hashes.len() as u32);
 			assert_eq!(block_chunks_done, 0);
@@ -423,7 +423,7 @@ fn recover_aborted_recovery() {
 	// And try again!
 	service.init_restore(manifest.clone(), true).unwrap();
 
-	match service.status() {
+	match service.restoration_status() {
 		RestorationStatus::Ongoing { block_chunks_done, state_chunks_done, .. } => {
 			assert_eq!(state_chunks_done, manifest.state_hashes.len() as u32);
 			assert_eq!(block_chunks_done, 0);
@@ -438,7 +438,7 @@ fn recover_aborted_recovery() {
 	// And try again!
 	service.init_restore(manifest.clone(), true).unwrap();
 
-	match service.status() {
+	match service.restoration_status() {
 		RestorationStatus::Ongoing { block_chunks_done, state_chunks_done, .. } => {
 			assert_eq!(block_chunks_done, 0);
 			assert_eq!(state_chunks_done, 0);
diff --git a/ethcore/sync/src/tests/snapshot.rs b/ethcore/sync/src/tests/snapshot.rs
index d0f44857c5a..5e1e7a95af9 100644
--- a/ethcore/sync/src/tests/snapshot.rs
+++ b/ethcore/sync/src/tests/snapshot.rs
@@ -30,7 +30,7 @@ use parking_lot::Mutex;
 use snapshot::SnapshotService;
 use common_types::{
 	BlockNumber,
-	snapshot::{ManifestData, RestorationStatus},
+	snapshot::{ManifestData, CreationStatus, RestorationStatus},
 };
 
 #[derive(Default)]
@@ -89,11 +89,12 @@ impl SnapshotService for TestSnapshotService {
 		self.chunks.get(&hash).cloned()
 	}
 
-	fn status(&self) -> RestorationStatus {
+	fn restoration_status(&self) -> RestorationStatus {
 		match *self.restoration_manifest.lock() {
 			Some(ref manifest) if self.state_restoration_chunks.lock().len() == manifest.state_hashes.len() &&
 				self.block_restoration_chunks.lock().len() == manifest.block_hashes.len() => RestorationStatus::Inactive,
 			Some(ref manifest) => RestorationStatus::Ongoing {
+				block_number: 0,
 				state_chunks: manifest.state_hashes.len() as u32,
 				block_chunks: manifest.block_hashes.len() as u32,
 				state_chunks_done: self.state_restoration_chunks.lock().len() as u32,
@@ -102,6 +103,9 @@ impl SnapshotService for TestSnapshotService {
 			None => RestorationStatus::Inactive,
 		}
 	}
+	fn creation_status(&self) -> CreationStatus {
+		CreationStatus::Inactive
+	}
 
 	fn begin_restore(&self, manifest: ManifestData) {
 		let mut restoration_manifest = self.restoration_manifest.lock();
diff --git a/rpc/src/v1/tests/helpers/snapshot_service.rs b/rpc/src/v1/tests/helpers/snapshot_service.rs
index 7bf66d66127..c3dfbcfe0d7 100644
--- a/rpc/src/v1/tests/helpers/snapshot_service.rs
+++ b/rpc/src/v1/tests/helpers/snapshot_service.rs
@@ -19,7 +19,7 @@ use snapshot::SnapshotService;
 use bytes::Bytes;
 use ethereum_types::H256;
 use parking_lot::Mutex;
-use types::snapshot::{ManifestData, RestorationStatus};
+use types::snapshot::{ManifestData, CreationStatus, RestorationStatus};
 
 /// Mocked snapshot service (used for sync info extensions).
 pub struct TestSnapshotService {
@@ -46,7 +46,8 @@ impl SnapshotService for TestSnapshotService {
 	fn supported_versions(&self) -> Option<(u64, u64)> { None }
 	fn completed_chunks(&self) -> Option<Vec<H256>> { Some(vec![]) }
 	fn chunk(&self, _hash: H256) -> Option<Bytes> { None }
-	fn status(&self) -> RestorationStatus { self.status.lock().clone() }
+	fn restoration_status(&self) -> RestorationStatus { self.status.lock().clone() }
+	fn creation_status(&self) -> CreationStatus { CreationStatus::Inactive }
 	fn begin_restore(&self, _manifest: ManifestData) { }
 	fn abort_restore(&self) { }
 	fn restore_state_chunk(&self, _hash: H256, _chunk: Bytes) { }
diff --git a/rpc/src/v1/tests/helpers/sync_provider.rs b/rpc/src/v1/tests/helpers/sync_provider.rs
index 97863669ee5..4b6d4ebc453 100644
--- a/rpc/src/v1/tests/helpers/sync_provider.rs
+++ b/rpc/src/v1/tests/helpers/sync_provider.rs
@@ -74,7 +74,7 @@ impl TestSyncProvider {
 }
 
 impl PrometheusMetrics for TestSyncProvider {
-	fn prometheus_metrics(&self, r: &mut prometheus::Registry) {
+	fn prometheus_metrics(&self, _: &mut prometheus::Registry) {
 	}
 }
 
diff --git a/rpc/src/v1/tests/mocked/eth.rs b/rpc/src/v1/tests/mocked/eth.rs
index 5f81c1a65c0..2b8e6e02a9c 100644
--- a/rpc/src/v1/tests/mocked/eth.rs
+++ b/rpc/src/v1/tests/mocked/eth.rs
@@ -157,6 +157,7 @@ fn rpc_eth_syncing() {
 
 	let snap_res = r#"{"jsonrpc":"2.0","result":{"currentBlock":"0x3e8","highestBlock":"0x9c4","startingBlock":"0x0","warpChunksAmount":"0x32","warpChunksProcessed":"0x18"},"id":1}"#;
 	tester.snapshot.set_status(RestorationStatus::Ongoing {
+		block_number: 0,
 		state_chunks: 40,
 		block_chunks: 10,
 		state_chunks_done: 18,

From d747efb0e0e455e4f572b20eaf89b565f2e542b6 Mon Sep 17 00:00:00 2001
From: adria0 <adria@codecontext.io>
Date: Fri, 12 Jun 2020 09:43:23 +0200
Subject: [PATCH 13/32] Dev & Host docker-composes

---
 parity/run.rs                                 |     2 +-
 .../grafana/dashboards/openethereum.json      |     0
 .../{ => env/dev}/config/grafana/grafana.ini  |     0
 .../provisioning/dashboards/provider.yaml     |     0
 .../provisioning/datasources/prometheus.yaml  |     0
 .../dev}/config/prometheus/prometheus.yml     |     1 -
 .../{ => env/dev}/docker-compose.yaml         |     2 +-
 .../grafana/dashboards/openethereum.json      |  1527 ++
 .../env/host/config/grafana/grafana.ini       |   705 +
 .../provisioning/dashboards/provider.yaml     |    24 +
 .../provisioning/datasources/prometheus.yaml  |    50 +
 .../env/host/config/prometheus/prometheus.yml |    48 +
 .../prometheus/env/host/docker-compose.yaml   |    63 +
 scripts/prometheus/grafana/nodeexporter.json  | 13641 ++++++++++++++++
 scripts/prometheus/grafana/oe.json            |  1576 ++
 scripts/prometheus/start.sh                   |     1 -
 16 files changed, 17636 insertions(+), 4 deletions(-)
 rename scripts/prometheus/{ => env/dev}/config/grafana/dashboards/openethereum.json (100%)
 rename scripts/prometheus/{ => env/dev}/config/grafana/grafana.ini (100%)
 rename scripts/prometheus/{ => env/dev}/config/grafana/provisioning/dashboards/provider.yaml (100%)
 rename scripts/prometheus/{ => env/dev}/config/grafana/provisioning/datasources/prometheus.yaml (100%)
 rename scripts/prometheus/{ => env/dev}/config/prometheus/prometheus.yml (99%)
 rename scripts/prometheus/{ => env/dev}/docker-compose.yaml (93%)
 create mode 100644 scripts/prometheus/env/host/config/grafana/dashboards/openethereum.json
 create mode 100644 scripts/prometheus/env/host/config/grafana/grafana.ini
 create mode 100644 scripts/prometheus/env/host/config/grafana/provisioning/dashboards/provider.yaml
 create mode 100644 scripts/prometheus/env/host/config/grafana/provisioning/datasources/prometheus.yaml
 create mode 100644 scripts/prometheus/env/host/config/prometheus/prometheus.yml
 create mode 100644 scripts/prometheus/env/host/docker-compose.yaml
 create mode 100644 scripts/prometheus/grafana/nodeexporter.json
 create mode 100644 scripts/prometheus/grafana/oe.json
 delete mode 100755 scripts/prometheus/start.sh

diff --git a/parity/run.rs b/parity/run.rs
index 23687d66367..5d0f9cc8ff6 100644
--- a/parity/run.rs
+++ b/parity/run.rs
@@ -562,7 +562,7 @@ fn execute_impl<Cr, Rr>(
 	let private_tx_signer = account_utils::private_tx_signer(account_provider.clone(), &passwords)?;
 
 	// create client service.
-	let service = ClientService::start(
+	let service = ClientService::1(
 		client_config,
 		&spec,
 		client_db,
diff --git a/scripts/prometheus/config/grafana/dashboards/openethereum.json b/scripts/prometheus/env/dev/config/grafana/dashboards/openethereum.json
similarity index 100%
rename from scripts/prometheus/config/grafana/dashboards/openethereum.json
rename to scripts/prometheus/env/dev/config/grafana/dashboards/openethereum.json
diff --git a/scripts/prometheus/config/grafana/grafana.ini b/scripts/prometheus/env/dev/config/grafana/grafana.ini
similarity index 100%
rename from scripts/prometheus/config/grafana/grafana.ini
rename to scripts/prometheus/env/dev/config/grafana/grafana.ini
diff --git a/scripts/prometheus/config/grafana/provisioning/dashboards/provider.yaml b/scripts/prometheus/env/dev/config/grafana/provisioning/dashboards/provider.yaml
similarity index 100%
rename from scripts/prometheus/config/grafana/provisioning/dashboards/provider.yaml
rename to scripts/prometheus/env/dev/config/grafana/provisioning/dashboards/provider.yaml
diff --git a/scripts/prometheus/config/grafana/provisioning/datasources/prometheus.yaml b/scripts/prometheus/env/dev/config/grafana/provisioning/datasources/prometheus.yaml
similarity index 100%
rename from scripts/prometheus/config/grafana/provisioning/datasources/prometheus.yaml
rename to scripts/prometheus/env/dev/config/grafana/provisioning/datasources/prometheus.yaml
diff --git a/scripts/prometheus/config/prometheus/prometheus.yml b/scripts/prometheus/env/dev/config/prometheus/prometheus.yml
similarity index 99%
rename from scripts/prometheus/config/prometheus/prometheus.yml
rename to scripts/prometheus/env/dev/config/prometheus/prometheus.yml
index a510f04370c..eb064c43c74 100644
--- a/scripts/prometheus/config/prometheus/prometheus.yml
+++ b/scripts/prometheus/env/dev/config/prometheus/prometheus.yml
@@ -35,4 +35,3 @@ scrape_configs:
     static_configs:
     - targets:
       - localhost:8545
-
diff --git a/scripts/prometheus/docker-compose.yaml b/scripts/prometheus/env/dev/docker-compose.yaml
similarity index 93%
rename from scripts/prometheus/docker-compose.yaml
rename to scripts/prometheus/env/dev/docker-compose.yaml
index 4a87340b1c0..e38da597bad 100644
--- a/scripts/prometheus/docker-compose.yaml
+++ b/scripts/prometheus/env/dev/docker-compose.yaml
@@ -6,6 +6,7 @@ services:
     container_name: prometheus
     restart: always
     volumes:
+      - ../../grafana:/etc/grafana
       - ./config/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml 
     ports:
       - '9090:9090'
@@ -22,4 +23,3 @@ services:
     environment:
      - GF_SECURITY_ADMIN_PASSWORD:secret
     network_mode: host
-
diff --git a/scripts/prometheus/env/host/config/grafana/dashboards/openethereum.json b/scripts/prometheus/env/host/config/grafana/dashboards/openethereum.json
new file mode 100644
index 00000000000..3924c6bfe71
--- /dev/null
+++ b/scripts/prometheus/env/host/config/grafana/dashboards/openethereum.json
@@ -0,0 +1,1527 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": "-- Grafana --",
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
+  "links": [],
+  "panels": [
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": false,
+      "colors": [
+        "#299c46",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
+      "datasource": null,
+      "format": "none",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 3,
+        "w": 4,
+        "x": 0,
+        "y": 0
+      },
+      "id": 20,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "options": {},
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false,
+        "ymax": null,
+        "ymin": null
+      },
+      "tableColumn": "",
+      "targets": [
+        {
+          "expr": "oe_sync_blocks_highest",
+          "refId": "A"
+        }
+      ],
+      "thresholds": "",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Highest block",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "avg"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": false,
+      "colors": [
+        "#299c46",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
+      "datasource": null,
+      "format": "none",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 3,
+        "w": 4,
+        "x": 4,
+        "y": 0
+      },
+      "id": 24,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "options": {},
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false,
+        "ymax": null,
+        "ymin": null
+      },
+      "tableColumn": "",
+      "targets": [
+        {
+          "expr": "oe_sync_status",
+          "refId": "A"
+        }
+      ],
+      "thresholds": "",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Sync status",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "WaitingPeers",
+          "value": "0"
+        },
+        {
+          "op": "=",
+          "text": "Waiting",
+          "value": "6"
+        },
+        {
+          "op": "=",
+          "text": "SnapshotManifest",
+          "value": "1"
+        },
+        {
+          "op": "=",
+          "text": "SnapshotData",
+          "value": "2"
+        },
+        {
+          "op": "=",
+          "text": "SnapshotWaiting",
+          "value": "3"
+        },
+        {
+          "op": "=",
+          "text": "Blocks",
+          "value": "4"
+        },
+        {
+          "op": "=",
+          "text": "Idle",
+          "value": "5"
+        },
+        {
+          "op": "=",
+          "text": "NewBlocks",
+          "value": "7"
+        }
+      ],
+      "valueName": "current"
+    },
+    {
+      "alert": {
+        "alertRuleTags": {},
+        "conditions": [
+          {
+            "evaluator": {
+              "params": [
+                100
+              ],
+              "type": "gt"
+            },
+            "operator": {
+              "type": "and"
+            },
+            "query": {
+              "params": [
+                "A",
+                "5m",
+                "now"
+              ]
+            },
+            "reducer": {
+              "params": [],
+              "type": "avg"
+            },
+            "type": "query"
+          }
+        ],
+        "executionErrorState": "alerting",
+        "for": "5m",
+        "frequency": "1m",
+        "handler": 1,
+        "name": "RPC Metrics alert",
+        "noDataState": "no_data",
+        "notifications": []
+      },
+      "aliasColors": {},
+      "bars": true,
+      "cacheTimeout": null,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": null,
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 3,
+        "w": 4,
+        "x": 8,
+        "y": 0
+      },
+      "hiddenSeries": false,
+      "id": 28,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": false,
+        "total": false,
+        "values": false
+      },
+      "lines": false,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "oe_metrics_time",
+          "refId": "A"
+        }
+      ],
+      "thresholds": [
+        {
+          "colorMode": "critical",
+          "fill": true,
+          "line": true,
+          "op": "gt",
+          "value": 100,
+          "yaxis": "left"
+        }
+      ],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "RPC Metrics Reponse time",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": false,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "ms",
+          "label": null,
+          "logBase": 1,
+          "max": "1000",
+          "min": "0",
+          "show": false
+        },
+        {
+          "decimals": null,
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": false
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": null,
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 4,
+        "w": 4,
+        "x": 12,
+        "y": 0
+      },
+      "hiddenSeries": false,
+      "id": 8,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": false,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "rate(oe_import_blocks[1m])",
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Block/s",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": false,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": null,
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 4,
+        "w": 4,
+        "x": 16,
+        "y": 0
+      },
+      "hiddenSeries": false,
+      "id": 6,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": false,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "rate(oe_import_gas[1m])/1000000",
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "MGas/s",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": false,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": null,
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 4,
+        "w": 4,
+        "x": 20,
+        "y": 0
+      },
+      "hiddenSeries": false,
+      "id": 10,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": false,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "rate(oe_import_txs[1m])",
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Tx/s",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": false,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "alert": {
+        "alertRuleTags": {},
+        "conditions": [
+          {
+            "evaluator": {
+              "params": [
+                1
+              ],
+              "type": "gt"
+            },
+            "operator": {
+              "type": "and"
+            },
+            "query": {
+              "params": [
+                "B",
+                "10s",
+                "now"
+              ]
+            },
+            "reducer": {
+              "params": [],
+              "type": "avg"
+            },
+            "type": "query"
+          }
+        ],
+        "executionErrorState": "alerting",
+        "for": "5m",
+        "frequency": "1m",
+        "handler": 1,
+        "name": "Peers alert",
+        "noDataState": "no_data",
+        "notifications": []
+      },
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": null,
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 5,
+        "w": 12,
+        "x": 0,
+        "y": 3
+      },
+      "hiddenSeries": false,
+      "id": 16,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": false,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pluginVersion": "6.5.2",
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "oe_net_peers",
+          "refId": "A"
+        },
+        {
+          "expr": "oe_net_active_peers",
+          "refId": "B"
+        }
+      ],
+      "thresholds": [
+        {
+          "colorMode": "critical",
+          "fill": true,
+          "line": true,
+          "op": "gt",
+          "value": 1
+        }
+      ],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Peers",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": false,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": null,
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 4,
+        "w": 12,
+        "x": 12,
+        "y": 4
+      },
+      "hiddenSeries": false,
+      "id": 12,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": false,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "rate(oe_io_bytes_read[1m])/60",
+          "refId": "A"
+        },
+        {
+          "expr": "rate(oe_io_bytes_written[1m])/60",
+          "refId": "B"
+        },
+        {
+          "expr": "rate(oe_io_cache_read_bytes[1m])/60",
+          "refId": "C"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "DB IO",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": false,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "decimals": null,
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "cacheTimeout": null,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": null,
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 4,
+        "w": 12,
+        "x": 0,
+        "y": 8
+      },
+      "hiddenSeries": false,
+      "id": 22,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": false,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": true,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "oe_blockchaincache_block_details",
+          "refId": "A"
+        },
+        {
+          "expr": "oe_blockchaincache_block_recipts",
+          "refId": "B"
+        },
+        {
+          "expr": "oe_blockchaincache_blocks",
+          "refId": "C"
+        },
+        {
+          "expr": "oe_blockchaincache_txaddrs",
+          "refId": "D"
+        },
+        {
+          "expr": "",
+          "refId": "E"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Blockchain cache",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": false,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "decimals": 0,
+          "format": "decbytes",
+          "label": "",
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        },
+        {
+          "decimals": 0,
+          "format": "bytes",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": null,
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 4,
+        "w": 12,
+        "x": 12,
+        "y": 8
+      },
+      "hiddenSeries": false,
+      "id": 2,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": false,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": true,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "oe_queue_mem_used",
+          "refId": "A"
+        },
+        {
+          "expr": "oe_sync_mem_used",
+          "refId": "B"
+        },
+        {
+          "expr": "oe_statedb_mem_used",
+          "refId": "C"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Memory",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": false,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "bytes",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": null,
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 4,
+        "w": 3,
+        "x": 0,
+        "y": 12
+      },
+      "hiddenSeries": false,
+      "id": 4,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": false,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [
+        {}
+      ],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "oe_snapshot_download_chunks - oe_snapshot_download_chunks_done",
+          "legendFormat": "Pending blocks",
+          "refId": "A"
+        },
+        {
+          "expr": "rate(oe_snapshot_download_chunks_done[5m])*3600",
+          "legendFormat": "Rate per hour",
+          "refId": "B"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Pending Snapshot download",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": false,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "decimals": 0,
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        },
+        {
+          "decimals": 0,
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": null,
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 4,
+        "w": 3,
+        "x": 3,
+        "y": 12
+      },
+      "hiddenSeries": false,
+      "id": 26,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": false,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "oe_snapshot_create_block",
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Snapshot create",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": false,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "decimals": 0,
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        },
+        {
+          "decimals": 0,
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": null,
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 4,
+        "w": 3,
+        "x": 6,
+        "y": 12
+      },
+      "hiddenSeries": false,
+      "id": 27,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": false,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "oe_snapshot_restore_block",
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Snapshot restore",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": false,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "decimals": 0,
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        },
+        {
+          "decimals": 0,
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": null,
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 4,
+        "w": 3,
+        "x": 9,
+        "y": 12
+      },
+      "hiddenSeries": false,
+      "id": 29,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": false,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "oe_prunning_earliest_state",
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Earliest State",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": false,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "decimals": 0,
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        },
+        {
+          "decimals": 0,
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": null,
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 4,
+        "w": 12,
+        "x": 12,
+        "y": 12
+      },
+      "hiddenSeries": false,
+      "id": 14,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": false,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": true,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "oe_queue_size_unverified",
+          "refId": "A"
+        },
+        {
+          "expr": "oe_queue_size_verified",
+          "refId": "B"
+        },
+        {
+          "expr": "oe_queue_size_verifying",
+          "refId": "C"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Queue",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": false,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "decimals": 0,
+          "format": "short",
+          "label": "",
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        },
+        {
+          "decimals": 0,
+          "format": "short",
+          "label": "",
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    }
+  ],
+  "refresh": "5s",
+  "schemaVersion": 21,
+  "style": "dark",
+  "tags": [],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-15m",
+    "to": "now"
+  },
+  "timepicker": {
+    "refresh_intervals": [
+      "5s",
+      "10s",
+      "30s",
+      "1m",
+      "5m",
+      "15m",
+      "30m",
+      "1h",
+      "2h",
+      "1d"
+    ]
+  },
+  "timezone": "",
+  "title": "OpenEthereum",
+  "uid": "uUkuLMmMz",
+  "version": 1
+}
\ No newline at end of file
diff --git a/scripts/prometheus/env/host/config/grafana/grafana.ini b/scripts/prometheus/env/host/config/grafana/grafana.ini
new file mode 100644
index 00000000000..dba20ae99a3
--- /dev/null
+++ b/scripts/prometheus/env/host/config/grafana/grafana.ini
@@ -0,0 +1,705 @@
+##################### Grafana Configuration Defaults #####################
+#
+# Do not modify this file in grafana installs
+#
+
+# possible values : production, development
+app_mode = production
+
+# instance name, defaults to HOSTNAME environment variable value or hostname if HOSTNAME var is empty
+instance_name = ${HOSTNAME}
+
+#################################### Paths ###############################
+[paths]
+# Path to where grafana can store temp files, sessions, and the sqlite3 db (if that is used)
+data = data
+
+# Temporary files in `data` directory older than given duration will be removed
+temp_data_lifetime = 24h
+
+# Directory where grafana can store logs
+logs = data/log
+
+# Directory where grafana will automatically scan and look for plugins
+plugins = data/plugins
+
+# folder that contains provisioning config files that grafana will apply on startup and while running.
+provisioning = conf/provisioning
+
+#################################### Server ##############################
+[server]
+# Protocol (http, https, h2, socket)
+protocol = http
+
+# The ip address to bind to, empty will bind to all interfaces
+http_addr =
+
+# The http port to use
+http_port = 3000
+
+# The public facing domain name used to access grafana from a browser
+domain = localhost
+
+# Redirect to correct domain if host header does not match domain
+# Prevents DNS rebinding attacks
+enforce_domain = false
+
+# The full public facing url
+root_url = %(protocol)s://%(domain)s:%(http_port)s/
+
+# Serve Grafana from subpath specified in `root_url` setting. By default it is set to `false` for compatibility reasons.
+serve_from_sub_path = false
+
+# Log web requests
+router_logging = false
+
+# the path relative working path
+static_root_path = public
+
+# enable gzip
+enable_gzip = false
+
+# https certs & key file
+cert_file =
+cert_key =
+
+# Unix socket path
+socket = /tmp/grafana.sock
+
+#################################### Database ############################
+[database]
+# You can configure the database connection by specifying type, host, name, user and password
+# as separate properties or as on string using the url property.
+
+# Either "mysql", "postgres" or "sqlite3", it's your choice
+type = sqlite3
+host = 127.0.0.1:3306
+name = grafana
+user = root
+# If the password contains # or ; you have to wrap it with triple quotes. Ex """#password;"""
+password =
+# Use either URL or the previous fields to configure the database
+# Example: mysql://user:secret@host:port/database
+url =
+
+# Max idle conn setting default is 2
+max_idle_conn = 2
+
+# Max conn setting default is 0 (mean not set)
+max_open_conn =
+
+# Connection Max Lifetime default is 14400 (means 14400 seconds or 4 hours)
+conn_max_lifetime = 14400
+
+# Set to true to log the sql calls and execution times.
+log_queries =
+
+# For "postgres", use either "disable", "require" or "verify-full"
+# For "mysql", use either "true", "false", or "skip-verify".
+ssl_mode = disable
+
+ca_cert_path =
+client_key_path =
+client_cert_path =
+server_cert_name =
+
+# For "sqlite3" only, path relative to data_path setting
+path = grafana.db
+
+# For "sqlite3" only. cache mode setting used for connecting to the database
+cache_mode = private
+
+#################################### Cache server #############################
+[remote_cache]
+# Either "redis", "memcached" or "database" default is "database"
+type = database
+
+# cache connectionstring options
+# database: will use Grafana primary database.
+# redis: config like redis server e.g. `addr=127.0.0.1:6379,pool_size=100,db=0,ssl=false`. Only addr is required. ssl may be 'true', 'false', or 'insecure'.
+# memcache: 127.0.0.1:11211
+connstr =
+
+#################################### Data proxy ###########################
+[dataproxy]
+
+# This enables data proxy logging, default is false
+logging = false
+
+# How long the data proxy should wait before timing out default is 30 (seconds)
+timeout = 30
+
+# If enabled and user is not anonymous, data proxy will add X-Grafana-User header with username into the request, default is false.
+send_user_header = false
+
+#################################### Analytics ###########################
+[analytics]
+# Server reporting, sends usage counters to stats.grafana.org every 24 hours.
+# No ip addresses are being tracked, only simple counters to track
+# running instances, dashboard and error counts. It is very helpful to us.
+# Change this option to false to disable reporting.
+reporting_enabled = true
+
+# Set to false to disable all checks to https://grafana.com
+# for new versions (grafana itself and plugins), check is used
+# in some UI views to notify that grafana or plugin update exists
+# This option does not cause any auto updates, nor send any information
+# only a GET request to https://grafana.com to get latest versions
+check_for_updates = true
+
+# Google Analytics universal tracking code, only enabled if you specify an id here
+google_analytics_ua_id =
+
+# Google Tag Manager ID, only enabled if you specify an id here
+google_tag_manager_id =
+
+#################################### Security ############################
+[security]
+# disable creation of admin user on first start of grafana
+disable_initial_admin_creation = false
+
+# default admin user, created on startup
+admin_user = admin
+
+# default admin password, can be changed before first start of grafana, or in profile settings
+admin_password = admin
+
+# used for signing
+secret_key = SW2YcwTIb9zpOOhoPsMm
+
+# disable gravatar profile images
+disable_gravatar = false
+
+# data source proxy whitelist (ip_or_domain:port separated by spaces)
+data_source_proxy_whitelist =
+
+# disable protection against brute force login attempts
+disable_brute_force_login_protection = false
+
+# set to true if you host Grafana behind HTTPS. default is false.
+cookie_secure = false
+
+# set cookie SameSite attribute. defaults to `lax`. can be set to "lax", "strict" and "none"
+cookie_samesite = lax
+
+# set to true if you want to allow browsers to render Grafana in a <frame>, <iframe>, <embed> or <object>. default is false.
+allow_embedding = false
+
+# Set to true if you want to enable http strict transport security (HSTS) response header.
+# This is only sent when HTTPS is enabled in this configuration.
+# HSTS tells browsers that the site should only be accessed using HTTPS.
+# The default will change to true in the next minor release, 6.3.
+strict_transport_security = false
+
+# Sets how long a browser should cache HSTS. Only applied if strict_transport_security is enabled.
+strict_transport_security_max_age_seconds = 86400
+
+# Set to true if to enable HSTS preloading option. Only applied if strict_transport_security is enabled.
+strict_transport_security_preload = false
+
+# Set to true if to enable the HSTS includeSubDomains option. Only applied if strict_transport_security is enabled.
+strict_transport_security_subdomains = false
+
+# Set to true to enable the X-Content-Type-Options response header.
+# The X-Content-Type-Options response HTTP header is a marker used by the server to indicate that the MIME types advertised
+# in the Content-Type headers should not be changed and be followed. The default will change to true in the next minor release, 6.3.
+x_content_type_options = false
+
+# Set to true to enable the X-XSS-Protection header, which tells browsers to stop pages from loading
+# when they detect reflected cross-site scripting (XSS) attacks. The default will change to true in the next minor release, 6.3.
+x_xss_protection = false
+
+
+#################################### Snapshots ###########################
+[snapshots]
+# snapshot sharing options
+external_enabled = true
+external_snapshot_url = https://snapshots-origin.raintank.io
+external_snapshot_name = Publish to snapshot.raintank.io
+
+# Set to true to enable this Grafana instance act as an external snapshot server and allow unauthenticated requests for
+# creating and deleting snapshots.
+public_mode = false
+
+# remove expired snapshot
+snapshot_remove_expired = true
+
+#################################### Dashboards ##################
+
+[dashboards]
+# Number dashboard versions to keep (per dashboard). Default: 20, Minimum: 1
+versions_to_keep = 20
+
+#################################### Users ###############################
+[users]
+# disable user signup / registration
+allow_sign_up = false
+
+# Allow non admin users to create organizations
+allow_org_create = false
+
+# Set to true to automatically assign new users to the default organization (id 1)
+auto_assign_org = true
+
+# Set this value to automatically add new users to the provided organization (if auto_assign_org above is set to true)
+auto_assign_org_id = 1
+
+# Default role new users will be automatically assigned (if auto_assign_org above is set to true)
+auto_assign_org_role = Viewer
+
+# Require email validation before sign up completes
+verify_email_enabled = false
+
+# Background text for the user field on the login page
+login_hint = email or username
+password_hint = password
+
+# Default UI theme ("dark" or "light")
+default_theme = dark
+
+# External user management
+external_manage_link_url =
+external_manage_link_name =
+external_manage_info =
+
+# Viewers can edit/inspect dashboard settings in the browser. But not save the dashboard.
+viewers_can_edit = false
+
+# Editors can administrate dashboard, folders and teams they create
+editors_can_admin = false
+
+[auth]
+# Login cookie name
+login_cookie_name = grafana_session
+
+# The lifetime (days) an authenticated user can be inactive before being required to login at next visit. Default is 7 days.
+login_maximum_inactive_lifetime_days = 7
+
+# The maximum lifetime (days) an authenticated user can be logged in since login time before being required to login. Default is 30 days.
+login_maximum_lifetime_days = 30
+
+# How often should auth tokens be rotated for authenticated users when being active. The default is each 10 minutes.
+token_rotation_interval_minutes = 10
+
+# Set to true to disable (hide) the login form, useful if you use OAuth
+disable_login_form = false
+
+# Set to true to disable the signout link in the side menu. useful if you use auth.proxy
+disable_signout_menu = false
+
+# URL to redirect the user to after sign out
+signout_redirect_url =
+
+# Set to true to attempt login with OAuth automatically, skipping the login screen.
+# This setting is ignored if multiple OAuth providers are configured.
+oauth_auto_login = false
+
+# limit of api_key seconds to live before expiration
+api_key_max_seconds_to_live = -1
+
+#################################### Anonymous Auth ######################
+[auth.anonymous]
+# enable anonymous access
+enabled = true
+
+# specify organization name that should be used for unauthenticated users
+org_name = Main Org.
+
+# specify role for unauthenticated users
+org_role = Viewer
+
+#################################### Github Auth #########################
+[auth.github]
+enabled = false
+allow_sign_up = true
+client_id = some_id
+client_secret = some_secret
+scopes = user:email,read:org
+auth_url = https://github.com/login/oauth/authorize
+token_url = https://github.com/login/oauth/access_token
+api_url = https://api.github.com/user
+allowed_domains =
+team_ids =
+allowed_organizations =
+
+#################################### GitLab Auth #########################
+[auth.gitlab]
+enabled = false
+allow_sign_up = true
+client_id = some_id
+client_secret = some_secret
+scopes = api
+auth_url = https://gitlab.com/oauth/authorize
+token_url = https://gitlab.com/oauth/token
+api_url = https://gitlab.com/api/v4
+allowed_domains =
+allowed_groups =
+
+#################################### Google Auth #########################
+[auth.google]
+enabled = false
+allow_sign_up = true
+client_id = some_client_id
+client_secret = some_client_secret
+scopes = https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email
+auth_url = https://accounts.google.com/o/oauth2/auth
+token_url = https://accounts.google.com/o/oauth2/token
+api_url = https://www.googleapis.com/oauth2/v1/userinfo
+allowed_domains =
+hosted_domain =
+
+#################################### Grafana.com Auth ####################
+# legacy key names (so they work in env variables)
+[auth.grafananet]
+enabled = false
+allow_sign_up = true
+client_id = some_id
+client_secret = some_secret
+scopes = user:email
+allowed_organizations =
+
+[auth.grafana_com]
+enabled = false
+allow_sign_up = true
+client_id = some_id
+client_secret = some_secret
+scopes = user:email
+allowed_organizations =
+
+#################################### Generic OAuth #######################
+[auth.generic_oauth]
+name = OAuth
+enabled = false
+allow_sign_up = true
+client_id = some_id
+client_secret = some_secret
+scopes = user:email
+email_attribute_name = email:primary
+email_attribute_path =
+role_attribute_path =
+auth_url =
+token_url =
+api_url =
+allowed_domains =
+team_ids =
+allowed_organizations =
+tls_skip_verify_insecure = false
+tls_client_cert =
+tls_client_key =
+tls_client_ca =
+
+#################################### SAML Auth ###########################
+[auth.saml] # Enterprise only
+# Defaults to false. If true, the feature is enabled
+enabled = false
+
+# Base64-encoded public X.509 certificate. Used to sign requests to the IdP
+certificate =
+
+# Path to the public X.509 certificate. Used to sign requests to the IdP
+certificate_path =
+
+# Base64-encoded private key. Used to decrypt assertions from the IdP
+private_key =
+
+# Path to the private key. Used to decrypt assertions from the IdP
+private_key_path =
+
+# Base64-encoded IdP SAML metadata XML. Used to verify and obtain binding locations from the IdP
+idp_metadata =
+
+# Path to the SAML metadata XML. Used to verify and obtain binding locations from the IdP
+idp_metadata_path =
+
+# URL to fetch SAML IdP metadata. Used to verify and obtain binding locations from the IdP
+idp_metadata_url =
+
+# Duration, since the IdP issued a response and the SP is allowed to process it. Defaults to 90 seconds
+max_issue_delay = 90s
+
+# Duration, for how long the SP's metadata should be valid. Defaults to 48 hours
+metadata_valid_duration = 48h
+
+# Friendly name or name of the attribute within the SAML assertion to use as the user's name
+assertion_attribute_name = displayName
+
+# Friendly name or name of the attribute within the SAML assertion to use as the user's login handle
+assertion_attribute_login = mail
+
+# Friendly name or name of the attribute within the SAML assertion to use as the user's email
+assertion_attribute_email = mail
+
+#################################### Basic Auth ##########################
+[auth.basic]
+enabled = true
+
+#################################### Auth Proxy ##########################
+[auth.proxy]
+enabled = false
+header_name = X-WEBAUTH-USER
+header_property = username
+auto_sign_up = true
+# Deprecated, use sync_ttl instead
+ldap_sync_ttl = 60
+sync_ttl = 60
+whitelist =
+headers =
+enable_login_token = false
+
+#################################### Auth LDAP ###########################
+[auth.ldap]
+enabled = false
+config_file = /etc/grafana/ldap.toml
+allow_sign_up = true
+
+# LDAP backround sync (Enterprise only)
+# At 1 am every day
+sync_cron = "0 0 1 * * *"
+active_sync_enabled = true
+
+#################################### SMTP / Emailing #####################
+[smtp]
+enabled = false
+host = localhost:25
+user =
+# If the password contains # or ; you have to wrap it with triple quotes. Ex """#password;"""
+password =
+cert_file =
+key_file =
+skip_verify = false
+from_address = admin@grafana.localhost
+from_name = Grafana
+ehlo_identity =
+
+[emails]
+welcome_email_on_sign_up = false
+templates_pattern = emails/*.html
+
+#################################### Logging ##########################
+[log]
+# Either "console", "file", "syslog". Default is console and file
+# Use space to separate multiple modes, e.g. "console file"
+mode = console file
+
+# Either "debug", "info", "warn", "error", "critical", default is "info"
+level = info
+
+# optional settings to set different levels for specific loggers. Ex filters = sqlstore:debug
+filters =
+
+# For "console" mode only
+[log.console]
+level =
+
+# log line format, valid options are text, console and json
+format = console
+
+# For "file" mode only
+[log.file]
+level =
+
+# log line format, valid options are text, console and json
+format = text
+
+# This enables automated log rotate(switch of following options), default is true
+log_rotate = true
+
+# Max line number of single file, default is 1000000
+max_lines = 1000000
+
+# Max size shift of single file, default is 28 means 1 << 28, 256MB
+max_size_shift = 28
+
+# Segment log daily, default is true
+daily_rotate = true
+
+# Expired days of log file(delete after max days), default is 7
+max_days = 7
+
+[log.syslog]
+level =
+
+# log line format, valid options are text, console and json
+format = text
+
+# Syslog network type and address. This can be udp, tcp, or unix. If left blank, the default unix endpoints will be used.
+network =
+address =
+
+# Syslog facility. user, daemon and local0 through local7 are valid.
+facility =
+
+# Syslog tag. By default, the process' argv[0] is used.
+tag =
+
+#################################### Usage Quotas ########################
+[quota]
+enabled = false
+
+#### set quotas to -1 to make unlimited. ####
+# limit number of users per Org.
+org_user = 10
+
+# limit number of dashboards per Org.
+org_dashboard = 100
+
+# limit number of data_sources per Org.
+org_data_source = 10
+
+# limit number of api_keys per Org.
+org_api_key = 10
+
+# limit number of orgs a user can create.
+user_org = 10
+
+# Global limit of users.
+global_user = -1
+
+# global limit of orgs.
+global_org = -1
+
+# global limit of dashboards
+global_dashboard = -1
+
+# global limit of api_keys
+global_api_key = -1
+
+# global limit on number of logged in users.
+global_session = -1
+
+#################################### Alerting ############################
+[alerting]
+# Disable alerting engine & UI features
+enabled = true
+# Makes it possible to turn off alert rule execution but alerting UI is visible
+execute_alerts = true
+
+# Default setting for new alert rules. Defaults to categorize error and timeouts as alerting. (alerting, keep_state)
+error_or_timeout = alerting
+
+# Default setting for how Grafana handles nodata or null values in alerting. (alerting, no_data, keep_state, ok)
+nodata_or_nullvalues = no_data
+
+# Alert notifications can include images, but rendering many images at the same time can overload the server
+# This limit will protect the server from render overloading and make sure notifications are sent out quickly
+concurrent_render_limit = 5
+
+# Default setting for alert calculation timeout. Default value is 30
+evaluation_timeout_seconds = 30
+
+# Default setting for alert notification timeout. Default value is 30
+notification_timeout_seconds = 30
+
+# Default setting for max attempts to sending alert notifications. Default value is 3
+max_attempts = 3
+
+
+#################################### Explore #############################
+[explore]
+# Enable the Explore section
+enabled = true
+
+#################################### Internal Grafana Metrics ############
+# Metrics available at HTTP API Url /metrics
+[metrics]
+enabled              = true
+interval_seconds     = 10
+# Disable total stats (stat_totals_*) metrics to be generated
+disable_total_stats = false
+
+#If both are set, basic auth will be required for the metrics endpoint.
+basic_auth_username =
+basic_auth_password =
+
+# Send internal Grafana metrics to graphite
+[metrics.graphite]
+# Enable by setting the address setting (ex localhost:2003)
+address =
+prefix = prod.grafana.%(instance_name)s.
+
+#################################### Grafana.com integration  ##########################
+[grafana_net]
+url = https://grafana.com
+
+[grafana_com]
+url = https://grafana.com
+
+#################################### Distributed tracing ############
+[tracing.jaeger]
+# jaeger destination (ex localhost:6831)
+address =
+# tag that will always be included in when creating new spans. ex (tag1:value1,tag2:value2)
+always_included_tag =
+# Type specifies the type of the sampler: const, probabilistic, rateLimiting, or remote
+sampler_type = const
+# jaeger samplerconfig param
+# for "const" sampler, 0 or 1 for always false/true respectively
+# for "probabilistic" sampler, a probability between 0 and 1
+# for "rateLimiting" sampler, the number of spans per second
+# for "remote" sampler, param is the same as for "probabilistic"
+# and indicates the initial sampling rate before the actual one
+# is received from the mothership
+sampler_param = 1
+# Whether or not to use Zipkin span propagation (x-b3- HTTP headers).
+zipkin_propagation = false
+# Setting this to true disables shared RPC spans.
+# Not disabling is the most common setting when using Zipkin elsewhere in your infrastructure.
+disable_shared_zipkin_spans = false
+
+#################################### External Image Storage ##############
+[external_image_storage]
+# Used for uploading images to public servers so they can be included in slack/email messages.
+# You can choose between (s3, webdav, gcs, azure_blob, local)
+provider =
+
+[external_image_storage.s3]
+endpoint =
+path_style_access =
+bucket_url =
+bucket =
+region =
+path =
+access_key =
+secret_key =
+
+[external_image_storage.webdav]
+url =
+username =
+password =
+public_url =
+
+[external_image_storage.gcs]
+key_file =
+bucket =
+path =
+
+[external_image_storage.azure_blob]
+account_name =
+account_key =
+container_name =
+
+[external_image_storage.local]
+# does not require any configuration
+
+[rendering]
+# Options to configure a remote HTTP image rendering service, e.g. using https://github.com/grafana/grafana-image-renderer.
+# URL to a remote HTTP image renderer service, e.g. http://localhost:8081/render, will enable Grafana to render panels and dashboards to PNG-images using HTTP requests to an external service.
+server_url =
+# If the remote HTTP image renderer service runs on a different server than the Grafana server you may have to configure this to a URL where Grafana is reachable, e.g. http://grafana.domain/.
+callback_url =
+
+[panels]
+# here for to support old env variables, can remove after a few months
+enable_alpha = false
+disable_sanitize_html = false
+
+[plugins]
+enable_alpha = false
+app_tls_skip_verify_insecure = false
+
+[enterprise]
+license_path =
+
+[feature_toggles]
+# enable features, separated by spaces
+enable =
diff --git a/scripts/prometheus/env/host/config/grafana/provisioning/dashboards/provider.yaml b/scripts/prometheus/env/host/config/grafana/provisioning/dashboards/provider.yaml
new file mode 100644
index 00000000000..bbf093bf7cb
--- /dev/null
+++ b/scripts/prometheus/env/host/config/grafana/provisioning/dashboards/provider.yaml
@@ -0,0 +1,24 @@
+apiVersion: 1
+
+providers:
+  # <string> an unique provider name. Required
+  - name: 'dashboardprovider'
+    # <int> Org id. Default to 1
+    orgId: 1
+    # <string> name of the dashboard folder.
+    folder: 'dashboards'
+    # <string> folder UID. will be automatically generated if not specified
+    folderUid: ''
+    # <string> provider type. Default to 'file'
+    type: file
+    # <bool> disable dashboard deletion
+    disableDeletion: false
+    # <bool> enable dashboard editing
+    editable: true
+    # <int> how often Grafana will scan for changed dashboards
+    updateIntervalSeconds: 10
+    # <bool> allow updating provisioned dashboards from the UI
+    allowUiUpdates: false
+    options:
+      # <string, required> path to dashboard files on disk. Required when using the 'file' type
+      path: /etc/grafana
\ No newline at end of file
diff --git a/scripts/prometheus/env/host/config/grafana/provisioning/datasources/prometheus.yaml b/scripts/prometheus/env/host/config/grafana/provisioning/datasources/prometheus.yaml
new file mode 100644
index 00000000000..c02bb38b3d3
--- /dev/null
+++ b/scripts/prometheus/env/host/config/grafana/provisioning/datasources/prometheus.yaml
@@ -0,0 +1,50 @@
+# config file version
+apiVersion: 1
+
+# list of datasources that should be deleted from the database
+deleteDatasources:
+  - name: Prometheus
+    orgId: 1
+
+# list of datasources to insert/update depending
+# whats available in the database
+datasources:
+  # <string, required> name of the datasource. Required
+- name: Prometheus
+  # <string, required> datasource type. Required
+  type: prometheus
+  # <string, required> access mode. direct or proxy. Required
+  access: proxy
+  # <int> org id. will default to orgId 1 if not specified
+  orgId: 1
+  # <string> url
+  url: http://prometheus:9090
+  # <string> database password, if used
+  password:
+  # <string> database user, if used
+  user:
+  # <string> database name, if used
+  database:
+  # <bool> enable/disable basic auth
+  basicAuth: false
+  # <string> basic auth username, if used
+  basicAuthUser:
+  # <string> basic auth password, if used
+  basicAuthPassword:
+  # <bool> enable/disable with credentials headers
+  withCredentials:
+  # <bool> mark as default datasource. Max one per org
+  isDefault: true
+  # <map> fields that will be converted to json and stored in json_data
+  jsonData:
+     graphiteVersion: "1.1"
+     tlsAuth: false
+     tlsAuthWithCACert: false
+  # <string> json object of data that will be encrypted.
+  secureJsonData:
+    tlsCACert: "..."
+    tlsClientCert: "..."
+    tlsClientKey: "..."
+  version: 1
+  # <bool> allow users to edit datasources from the UI.
+  editable: true
diff --git a/scripts/prometheus/env/host/config/prometheus/prometheus.yml b/scripts/prometheus/env/host/config/prometheus/prometheus.yml
new file mode 100644
index 00000000000..561ab8f2282
--- /dev/null
+++ b/scripts/prometheus/env/host/config/prometheus/prometheus.yml
@@ -0,0 +1,48 @@
+# my global config
+global:
+  scrape_interval:     15s # Set the scrape interval to every 15 seconds. Default is every 1 minute.
+  evaluation_interval: 15s # Evaluate rules every 15 seconds. The default is every 1 minute.
+  # scrape_timeout is set to the global default (10s).
+
+# Alertmanager configuration
+alerting:
+  alertmanagers:
+  - static_configs:
+    - targets:
+      # - alertmanager:9093
+
+# Load rules once and periodically evaluate them according to the global 'evaluation_interval'.
+rule_files:
+  # - "first_rules.yml"
+  # - "second_rules.yml"
+
+# A scrape configuration containing exactly one endpoint to scrape:
+# Here it's Prometheus itself.
+scrape_configs:
+  # The job name is added as a label `job=<job_name>` to any timeseries scraped from this config.
+  - job_name: 'prometheus'
+    # metrics_path defaults to '/metrics'
+    # scheme defaults to 'http'.
+    static_configs:
+    - targets: ['localhost:9090']
+
+  - job_name: openethereum
+    scrape_interval: 10s
+    metric_relabel_configs:
+      - source_labels: [__name__]
+        target_label: __name__
+        replacement: "oe_${1}"
+    static_configs:
+    - targets:
+      - localhost:8545
+
+  - job_name: cadvisor
+    scrape_interval: 5s
+    static_configs:
+    - targets:
+      - cadvisor:8080
+
+  - job_name: nodeexporter
+    static_configs:
+    - targets:
+       - nodeexporter:9100
\ No newline at end of file
diff --git a/scripts/prometheus/env/host/docker-compose.yaml b/scripts/prometheus/env/host/docker-compose.yaml
new file mode 100644
index 00000000000..a3d628775ac
--- /dev/null
+++ b/scripts/prometheus/env/host/docker-compose.yaml
@@ -0,0 +1,63 @@
+version: '3.5'
+services:
+
+#  openethereum:
+#    build:
+#      dockerfile: scripts/docker/alpine/Dockerfile
+#      context: ../../../..
+#    ports:
+#      - '30303:30303'
+#      - '30303:30303/udp'
+#      - '8545:8545'
+
+  prometheus:
+    image: prom/prometheus
+    container_name: prometheus
+    restart: always
+    ports:
+      - '9090:9090'
+    volumes:
+      - ../../grafana:/etc/grafana
+      - ./config/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml 
+
+  grafana:
+    image: grafana/grafana
+    container_name: grafana
+    restart: always
+    volumes:
+      - ./config/grafana:/etc/grafana
+    ports:
+      - '3000:3000'
+    environment:
+     - GF_SECURITY_ADMIN_PASSWORD:secret
+
+  cadvisor:
+    image: google/cadvisor:latest
+    container_name: cadvisor
+    volumes:
+    - /:/rootfs:ro
+    - /var/run:/var/run:rw
+    - /sys:/sys:ro
+    - /var/lib/docker/:/var/lib/docker:ro
+    depends_on:
+    - redis
+
+  redis:
+    image: redis:latest
+    container_name: redis
+    network_mode: host
+
+  nodeexporter:
+    image: prom/node-exporter:latest
+    container_name: nodeexporter
+    user: root
+    privileged: true
+    volumes:
+      - /proc:/host/proc:ro
+      - /sys:/host/sys:ro
+      - /:/rootfs:ro
+    command:
+      - '--path.procfs=/host/proc'
+      - '--path.sysfs=/host/sys'
+      - '--collector.filesystem.ignored-mount-points=^/(sys|proc|dev|host|etc)($$|/)'
+    restart: unless-stopped
diff --git a/scripts/prometheus/grafana/nodeexporter.json b/scripts/prometheus/grafana/nodeexporter.json
new file mode 100644
index 00000000000..42df7b97b47
--- /dev/null
+++ b/scripts/prometheus/grafana/nodeexporter.json
@@ -0,0 +1,13641 @@
+{
+    "annotations": {
+      "list": [
+        {
+          "builtIn": 1,
+          "datasource": "-- Grafana --",
+          "enable": true,
+          "hide": true,
+          "iconColor": "rgba(0, 211, 255, 1)",
+          "name": "Annotations & Alerts",
+          "type": "dashboard"
+        }
+      ]
+    },
+    "description": "Complete Prometheus Node Exporter dashboard",
+    "editable": true,
+    "gnetId": 1860,
+    "graphTooltip": 0,
+    "id": 3,
+    "iteration": 1591885653871,
+    "links": [],
+    "panels": [
+      {
+        "collapsed": false,
+        "datasource": "Prometheus",
+        "gridPos": {
+          "h": 1,
+          "w": 24,
+          "x": 0,
+          "y": 0
+        },
+        "id": 261,
+        "panels": [],
+        "repeat": null,
+        "title": "Quick CPU / Mem / Disk",
+        "type": "row"
+      },
+      {
+        "cacheTimeout": null,
+        "datasource": "Prometheus",
+        "description": "Busy state of all CPU cores together",
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "thresholds"
+            },
+            "custom": {},
+            "mappings": [
+              {
+                "id": 0,
+                "op": "=",
+                "text": "N/A",
+                "type": 1,
+                "value": "null"
+              }
+            ],
+            "max": 100,
+            "min": 0,
+            "nullValueMode": "null",
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "rgba(50, 172, 45, 0.97)",
+                  "value": null
+                },
+                {
+                  "color": "rgba(237, 129, 40, 0.89)",
+                  "value": 85
+                },
+                {
+                  "color": "rgba(245, 54, 54, 0.9)",
+                  "value": 95
+                }
+              ]
+            },
+            "unit": "percent"
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 4,
+          "w": 3,
+          "x": 0,
+          "y": 1
+        },
+        "id": 20,
+        "links": [],
+        "options": {
+          "orientation": "horizontal",
+          "reduceOptions": {
+            "calcs": [
+              "lastNotNull"
+            ],
+            "fields": "",
+            "values": false
+          },
+          "showThresholdLabels": false,
+          "showThresholdMarkers": true
+        },
+        "pluginVersion": "7.0.3",
+        "targets": [
+          {
+            "expr": "(((count(count(node_cpu_seconds_total{instance=~\"$node:$port\",job=~\"$job\"}) by (cpu))) - avg(sum by (mode)(irate(node_cpu_seconds_total{mode='idle',instance=~\"$node:$port\",job=~\"$job\"}[5m])))) * 100) / count(count(node_cpu_seconds_total{instance=~\"$node:$port\",job=~\"$job\"}) by (cpu))",
+            "hide": false,
+            "intervalFactor": 1,
+            "legendFormat": "",
+            "refId": "A",
+            "step": 900
+          }
+        ],
+        "title": "CPU Busy",
+        "type": "gauge"
+      },
+      {
+        "cacheTimeout": null,
+        "datasource": "Prometheus",
+        "description": "Busy state of all CPU cores together (5 min average)",
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "thresholds"
+            },
+            "custom": {},
+            "mappings": [
+              {
+                "id": 0,
+                "op": "=",
+                "text": "N/A",
+                "type": 1,
+                "value": "null"
+              }
+            ],
+            "max": 100,
+            "min": 0,
+            "nullValueMode": "null",
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "rgba(50, 172, 45, 0.97)",
+                  "value": null
+                },
+                {
+                  "color": "rgba(237, 129, 40, 0.89)",
+                  "value": 85
+                },
+                {
+                  "color": "rgba(245, 54, 54, 0.9)",
+                  "value": 95
+                }
+              ]
+            },
+            "unit": "percent"
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 4,
+          "w": 3,
+          "x": 3,
+          "y": 1
+        },
+        "id": 155,
+        "links": [],
+        "options": {
+          "orientation": "horizontal",
+          "reduceOptions": {
+            "calcs": [
+              "lastNotNull"
+            ],
+            "fields": "",
+            "values": false
+          },
+          "showThresholdLabels": false,
+          "showThresholdMarkers": true
+        },
+        "pluginVersion": "7.0.3",
+        "targets": [
+          {
+            "expr": "avg(node_load5{instance=~\"$node:$port\",job=~\"$job\"}) /  count(count(node_cpu_seconds_total{instance=~\"$node:$port\",job=~\"$job\"}) by (cpu)) * 100",
+            "format": "time_series",
+            "hide": false,
+            "intervalFactor": 1,
+            "refId": "A",
+            "step": 900
+          }
+        ],
+        "title": "Sys Load (5m avg)",
+        "type": "gauge"
+      },
+      {
+        "cacheTimeout": null,
+        "datasource": "Prometheus",
+        "description": "Busy state of all CPU cores together (15 min average)",
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "thresholds"
+            },
+            "custom": {},
+            "mappings": [
+              {
+                "id": 0,
+                "op": "=",
+                "text": "N/A",
+                "type": 1,
+                "value": "null"
+              }
+            ],
+            "max": 100,
+            "min": 0,
+            "nullValueMode": "null",
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "rgba(50, 172, 45, 0.97)",
+                  "value": null
+                },
+                {
+                  "color": "rgba(237, 129, 40, 0.89)",
+                  "value": 85
+                },
+                {
+                  "color": "rgba(245, 54, 54, 0.9)",
+                  "value": 95
+                }
+              ]
+            },
+            "unit": "percent"
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 4,
+          "w": 3,
+          "x": 6,
+          "y": 1
+        },
+        "id": 19,
+        "links": [],
+        "options": {
+          "orientation": "horizontal",
+          "reduceOptions": {
+            "calcs": [
+              "lastNotNull"
+            ],
+            "fields": "",
+            "values": false
+          },
+          "showThresholdLabels": false,
+          "showThresholdMarkers": true
+        },
+        "pluginVersion": "7.0.3",
+        "targets": [
+          {
+            "expr": "avg(node_load15{instance=~\"$node:$port\",job=~\"$job\"}) /  count(count(node_cpu_seconds_total{instance=~\"$node:$port\",job=~\"$job\"}) by (cpu)) * 100",
+            "hide": false,
+            "intervalFactor": 1,
+            "refId": "A",
+            "step": 900
+          }
+        ],
+        "title": "Sys Load (15m avg)",
+        "type": "gauge"
+      },
+      {
+        "cacheTimeout": null,
+        "datasource": "Prometheus",
+        "description": "Non available RAM memory",
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "thresholds"
+            },
+            "custom": {},
+            "decimals": 0,
+            "mappings": [],
+            "max": 100,
+            "min": 0,
+            "nullValueMode": "null",
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "rgba(50, 172, 45, 0.97)",
+                  "value": null
+                },
+                {
+                  "color": "rgba(237, 129, 40, 0.89)",
+                  "value": 80
+                },
+                {
+                  "color": "rgba(245, 54, 54, 0.9)",
+                  "value": 90
+                }
+              ]
+            },
+            "unit": "percent"
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 4,
+          "w": 3,
+          "x": 9,
+          "y": 1
+        },
+        "hideTimeOverride": false,
+        "id": 16,
+        "links": [],
+        "options": {
+          "orientation": "horizontal",
+          "reduceOptions": {
+            "calcs": [
+              "lastNotNull"
+            ],
+            "fields": "",
+            "values": false
+          },
+          "showThresholdLabels": false,
+          "showThresholdMarkers": true
+        },
+        "pluginVersion": "7.0.3",
+        "targets": [
+          {
+            "expr": "((node_memory_MemTotal_bytes{instance=~\"$node:$port\",job=~\"$job\"} - node_memory_MemFree_bytes{instance=~\"$node:$port\",job=~\"$job\"}) / (node_memory_MemTotal_bytes{instance=~\"$node:$port\",job=~\"$job\"} )) * 100",
+            "format": "time_series",
+            "hide": true,
+            "intervalFactor": 1,
+            "refId": "A",
+            "step": 900
+          },
+          {
+            "expr": "100 - ((node_memory_MemAvailable_bytes{instance=~\"$node:$port\",job=~\"$job\"} * 100) / node_memory_MemTotal_bytes{instance=~\"$node:$port\",job=~\"$job\"})",
+            "format": "time_series",
+            "hide": false,
+            "intervalFactor": 1,
+            "refId": "B",
+            "step": 900
+          }
+        ],
+        "title": "RAM Used",
+        "type": "gauge"
+      },
+      {
+        "cacheTimeout": null,
+        "datasource": "Prometheus",
+        "description": "Used Swap",
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "thresholds"
+            },
+            "custom": {},
+            "mappings": [
+              {
+                "id": 0,
+                "op": "=",
+                "text": "N/A",
+                "type": 1,
+                "value": "null"
+              }
+            ],
+            "max": 100,
+            "min": 0,
+            "nullValueMode": "null",
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "rgba(50, 172, 45, 0.97)",
+                  "value": null
+                },
+                {
+                  "color": "rgba(237, 129, 40, 0.89)",
+                  "value": 10
+                },
+                {
+                  "color": "rgba(245, 54, 54, 0.9)",
+                  "value": 25
+                }
+              ]
+            },
+            "unit": "percent"
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 4,
+          "w": 3,
+          "x": 12,
+          "y": 1
+        },
+        "id": 21,
+        "links": [],
+        "options": {
+          "orientation": "horizontal",
+          "reduceOptions": {
+            "calcs": [
+              "lastNotNull"
+            ],
+            "fields": "",
+            "values": false
+          },
+          "showThresholdLabels": false,
+          "showThresholdMarkers": true
+        },
+        "pluginVersion": "7.0.3",
+        "targets": [
+          {
+            "expr": "((node_memory_SwapTotal_bytes{instance=~\"$node:$port\",job=~\"$job\"} - node_memory_SwapFree_bytes{instance=~\"$node:$port\",job=~\"$job\"}) / (node_memory_SwapTotal_bytes{instance=~\"$node:$port\",job=~\"$job\"} )) * 100",
+            "intervalFactor": 1,
+            "refId": "A",
+            "step": 900
+          }
+        ],
+        "title": "SWAP Used",
+        "type": "gauge"
+      },
+      {
+        "cacheTimeout": null,
+        "datasource": "Prometheus",
+        "description": "Used Root FS",
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "thresholds"
+            },
+            "custom": {},
+            "mappings": [
+              {
+                "id": 0,
+                "op": "=",
+                "text": "N/A",
+                "type": 1,
+                "value": "null"
+              }
+            ],
+            "max": 100,
+            "min": 0,
+            "nullValueMode": "null",
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "rgba(50, 172, 45, 0.97)",
+                  "value": null
+                },
+                {
+                  "color": "rgba(237, 129, 40, 0.89)",
+                  "value": 80
+                },
+                {
+                  "color": "rgba(245, 54, 54, 0.9)",
+                  "value": 90
+                }
+              ]
+            },
+            "unit": "percent"
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 4,
+          "w": 3,
+          "x": 15,
+          "y": 1
+        },
+        "id": 154,
+        "links": [],
+        "options": {
+          "orientation": "horizontal",
+          "reduceOptions": {
+            "calcs": [
+              "lastNotNull"
+            ],
+            "fields": "",
+            "values": false
+          },
+          "showThresholdLabels": false,
+          "showThresholdMarkers": true
+        },
+        "pluginVersion": "7.0.3",
+        "targets": [
+          {
+            "expr": "100 - ((node_filesystem_avail_bytes{instance=~\"$node:$port\",job=~\"$job\",mountpoint=\"/\",fstype!=\"rootfs\"} * 100) / node_filesystem_size_bytes{instance=~\"$node:$port\",job=~\"$job\",mountpoint=\"/\",fstype!=\"rootfs\"})",
+            "format": "time_series",
+            "intervalFactor": 1,
+            "refId": "A",
+            "step": 900
+          }
+        ],
+        "title": "Root FS Used",
+        "type": "gauge"
+      },
+      {
+        "cacheTimeout": null,
+        "colorBackground": false,
+        "colorValue": false,
+        "colors": [
+          "rgba(245, 54, 54, 0.9)",
+          "rgba(237, 129, 40, 0.89)",
+          "rgba(50, 172, 45, 0.97)"
+        ],
+        "datasource": "Prometheus",
+        "description": "Total number of CPU cores",
+        "fieldConfig": {
+          "defaults": {
+            "custom": {}
+          },
+          "overrides": []
+        },
+        "format": "short",
+        "gauge": {
+          "maxValue": 100,
+          "minValue": 0,
+          "show": false,
+          "thresholdLabels": false,
+          "thresholdMarkers": true
+        },
+        "gridPos": {
+          "h": 2,
+          "w": 2,
+          "x": 18,
+          "y": 1
+        },
+        "id": 14,
+        "interval": null,
+        "links": [],
+        "mappingType": 1,
+        "mappingTypes": [
+          {
+            "name": "value to text",
+            "value": 1
+          },
+          {
+            "name": "range to text",
+            "value": 2
+          }
+        ],
+        "maxDataPoints": 100,
+        "maxPerRow": 6,
+        "nullPointMode": "null",
+        "nullText": null,
+        "postfix": "",
+        "postfixFontSize": "50%",
+        "prefix": "",
+        "prefixFontSize": "50%",
+        "rangeMaps": [
+          {
+            "from": "null",
+            "text": "N/A",
+            "to": "null"
+          }
+        ],
+        "sparkline": {
+          "fillColor": "rgba(31, 118, 189, 0.18)",
+          "full": false,
+          "lineColor": "rgb(31, 120, 193)",
+          "show": false
+        },
+        "tableColumn": "",
+        "targets": [
+          {
+            "expr": "count(count(node_cpu_seconds_total{instance=~\"$node:$port\",job=~\"$job\"}) by (cpu))",
+            "interval": "",
+            "intervalFactor": 1,
+            "legendFormat": "",
+            "refId": "A",
+            "step": 900
+          }
+        ],
+        "thresholds": "",
+        "title": "CPU Cores",
+        "type": "singlestat",
+        "valueFontSize": "50%",
+        "valueMaps": [
+          {
+            "op": "=",
+            "text": "N/A",
+            "value": "null"
+          }
+        ],
+        "valueName": "current"
+      },
+      {
+        "cacheTimeout": null,
+        "colorBackground": false,
+        "colorValue": false,
+        "colors": [
+          "rgba(245, 54, 54, 0.9)",
+          "rgba(237, 129, 40, 0.89)",
+          "rgba(50, 172, 45, 0.97)"
+        ],
+        "datasource": "Prometheus",
+        "decimals": 1,
+        "description": "System uptime",
+        "fieldConfig": {
+          "defaults": {
+            "custom": {}
+          },
+          "overrides": []
+        },
+        "format": "s",
+        "gauge": {
+          "maxValue": 100,
+          "minValue": 0,
+          "show": false,
+          "thresholdLabels": false,
+          "thresholdMarkers": true
+        },
+        "gridPos": {
+          "h": 2,
+          "w": 4,
+          "x": 20,
+          "y": 1
+        },
+        "hideTimeOverride": true,
+        "id": 15,
+        "interval": null,
+        "links": [],
+        "mappingType": 1,
+        "mappingTypes": [
+          {
+            "name": "value to text",
+            "value": 1
+          },
+          {
+            "name": "range to text",
+            "value": 2
+          }
+        ],
+        "maxDataPoints": 100,
+        "nullPointMode": "null",
+        "nullText": null,
+        "postfix": "s",
+        "postfixFontSize": "50%",
+        "prefix": "",
+        "prefixFontSize": "50%",
+        "rangeMaps": [
+          {
+            "from": "null",
+            "text": "N/A",
+            "to": "null"
+          }
+        ],
+        "sparkline": {
+          "fillColor": "rgba(31, 118, 189, 0.18)",
+          "full": false,
+          "lineColor": "rgb(31, 120, 193)",
+          "show": false
+        },
+        "tableColumn": "",
+        "targets": [
+          {
+            "expr": "node_time_seconds{instance=~\"$node:$port\",job=~\"$job\"} - node_boot_time_seconds{instance=~\"$node:$port\",job=~\"$job\"}",
+            "intervalFactor": 2,
+            "refId": "A",
+            "step": 1800
+          }
+        ],
+        "thresholds": "",
+        "title": "Uptime",
+        "type": "singlestat",
+        "valueFontSize": "50%",
+        "valueMaps": [
+          {
+            "op": "=",
+            "text": "N/A",
+            "value": "null"
+          }
+        ],
+        "valueName": "current"
+      },
+      {
+        "cacheTimeout": null,
+        "colorBackground": false,
+        "colorValue": false,
+        "colors": [
+          "rgba(50, 172, 45, 0.97)",
+          "rgba(237, 129, 40, 0.89)",
+          "rgba(245, 54, 54, 0.9)"
+        ],
+        "datasource": "Prometheus",
+        "decimals": 0,
+        "description": "Total RootFS",
+        "fieldConfig": {
+          "defaults": {
+            "custom": {}
+          },
+          "overrides": []
+        },
+        "format": "bytes",
+        "gauge": {
+          "maxValue": 100,
+          "minValue": 0,
+          "show": false,
+          "thresholdLabels": false,
+          "thresholdMarkers": true
+        },
+        "gridPos": {
+          "h": 2,
+          "w": 2,
+          "x": 18,
+          "y": 3
+        },
+        "id": 23,
+        "interval": null,
+        "links": [],
+        "mappingType": 1,
+        "mappingTypes": [
+          {
+            "name": "value to text",
+            "value": 1
+          },
+          {
+            "name": "range to text",
+            "value": 2
+          }
+        ],
+        "maxDataPoints": 100,
+        "maxPerRow": 6,
+        "nullPointMode": "null",
+        "nullText": null,
+        "postfix": "",
+        "postfixFontSize": "50%",
+        "prefix": "",
+        "prefixFontSize": "50%",
+        "rangeMaps": [
+          {
+            "from": "null",
+            "text": "N/A",
+            "to": "null"
+          }
+        ],
+        "sparkline": {
+          "fillColor": "rgba(31, 118, 189, 0.18)",
+          "full": false,
+          "lineColor": "rgb(31, 120, 193)",
+          "show": false
+        },
+        "tableColumn": "",
+        "targets": [
+          {
+            "expr": "node_filesystem_size_bytes{instance=~\"$node:$port\",job=~\"$job\",mountpoint=\"/\",fstype!=\"rootfs\"}",
+            "format": "time_series",
+            "hide": false,
+            "intervalFactor": 1,
+            "refId": "A",
+            "step": 900
+          }
+        ],
+        "thresholds": "70,90",
+        "title": "RootFS Total",
+        "type": "singlestat",
+        "valueFontSize": "50%",
+        "valueMaps": [
+          {
+            "op": "=",
+            "text": "N/A",
+            "value": "null"
+          }
+        ],
+        "valueName": "current"
+      },
+      {
+        "cacheTimeout": null,
+        "colorBackground": false,
+        "colorValue": false,
+        "colors": [
+          "rgba(245, 54, 54, 0.9)",
+          "rgba(237, 129, 40, 0.89)",
+          "rgba(50, 172, 45, 0.97)"
+        ],
+        "datasource": "Prometheus",
+        "decimals": 0,
+        "description": "Total RAM",
+        "fieldConfig": {
+          "defaults": {
+            "custom": {}
+          },
+          "overrides": []
+        },
+        "format": "bytes",
+        "gauge": {
+          "maxValue": 100,
+          "minValue": 0,
+          "show": false,
+          "thresholdLabels": false,
+          "thresholdMarkers": true
+        },
+        "gridPos": {
+          "h": 2,
+          "w": 2,
+          "x": 20,
+          "y": 3
+        },
+        "id": 75,
+        "interval": null,
+        "links": [],
+        "mappingType": 1,
+        "mappingTypes": [
+          {
+            "name": "value to text",
+            "value": 1
+          },
+          {
+            "name": "range to text",
+            "value": 2
+          }
+        ],
+        "maxDataPoints": 100,
+        "maxPerRow": 6,
+        "nullPointMode": "null",
+        "nullText": null,
+        "postfix": "",
+        "postfixFontSize": "70%",
+        "prefix": "",
+        "prefixFontSize": "50%",
+        "rangeMaps": [
+          {
+            "from": "null",
+            "text": "N/A",
+            "to": "null"
+          }
+        ],
+        "sparkline": {
+          "fillColor": "rgba(31, 118, 189, 0.18)",
+          "full": false,
+          "lineColor": "rgb(31, 120, 193)",
+          "show": false
+        },
+        "tableColumn": "",
+        "targets": [
+          {
+            "expr": "node_memory_MemTotal_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
+            "intervalFactor": 1,
+            "refId": "A",
+            "step": 900
+          }
+        ],
+        "thresholds": "",
+        "title": "RAM Total",
+        "type": "singlestat",
+        "valueFontSize": "50%",
+        "valueMaps": [
+          {
+            "op": "=",
+            "text": "N/A",
+            "value": "null"
+          }
+        ],
+        "valueName": "current"
+      },
+      {
+        "cacheTimeout": null,
+        "colorBackground": false,
+        "colorValue": false,
+        "colors": [
+          "rgba(245, 54, 54, 0.9)",
+          "rgba(237, 129, 40, 0.89)",
+          "rgba(50, 172, 45, 0.97)"
+        ],
+        "datasource": "Prometheus",
+        "decimals": 0,
+        "description": "Total SWAP",
+        "fieldConfig": {
+          "defaults": {
+            "custom": {}
+          },
+          "overrides": []
+        },
+        "format": "bytes",
+        "gauge": {
+          "maxValue": 100,
+          "minValue": 0,
+          "show": false,
+          "thresholdLabels": false,
+          "thresholdMarkers": true
+        },
+        "gridPos": {
+          "h": 2,
+          "w": 2,
+          "x": 22,
+          "y": 3
+        },
+        "id": 18,
+        "interval": null,
+        "links": [],
+        "mappingType": 1,
+        "mappingTypes": [
+          {
+            "name": "value to text",
+            "value": 1
+          },
+          {
+            "name": "range to text",
+            "value": 2
+          }
+        ],
+        "maxDataPoints": 100,
+        "maxPerRow": 6,
+        "nullPointMode": "null",
+        "nullText": null,
+        "postfix": "",
+        "postfixFontSize": "70%",
+        "prefix": "",
+        "prefixFontSize": "50%",
+        "rangeMaps": [
+          {
+            "from": "null",
+            "text": "N/A",
+            "to": "null"
+          }
+        ],
+        "sparkline": {
+          "fillColor": "rgba(31, 118, 189, 0.18)",
+          "full": false,
+          "lineColor": "rgb(31, 120, 193)",
+          "show": false
+        },
+        "tableColumn": "",
+        "targets": [
+          {
+            "expr": "node_memory_SwapTotal_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
+            "intervalFactor": 1,
+            "refId": "A",
+            "step": 900
+          }
+        ],
+        "thresholds": "",
+        "title": "SWAP Total",
+        "type": "singlestat",
+        "valueFontSize": "50%",
+        "valueMaps": [
+          {
+            "op": "=",
+            "text": "N/A",
+            "value": "null"
+          }
+        ],
+        "valueName": "current"
+      },
+      {
+        "collapsed": false,
+        "datasource": "Prometheus",
+        "gridPos": {
+          "h": 1,
+          "w": 24,
+          "x": 0,
+          "y": 5
+        },
+        "id": 263,
+        "panels": [],
+        "repeat": null,
+        "title": "Basic CPU / Mem / Net / Disk",
+        "type": "row"
+      },
+      {
+        "aliasColors": {
+          "Busy": "#EAB839",
+          "Busy Iowait": "#890F02",
+          "Busy other": "#1F78C1",
+          "Idle": "#052B51",
+          "Idle - Waiting for something to happen": "#052B51",
+          "guest": "#9AC48A",
+          "idle": "#052B51",
+          "iowait": "#EAB839",
+          "irq": "#BF1B00",
+          "nice": "#C15C17",
+          "softirq": "#E24D42",
+          "steal": "#FCE2DE",
+          "system": "#508642",
+          "user": "#5195CE"
+        },
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "datasource": "Prometheus",
+        "decimals": 2,
+        "description": "Basic CPU info",
+        "fieldConfig": {
+          "defaults": {
+            "custom": {}
+          },
+          "overrides": []
+        },
+        "fill": 4,
+        "fillGradient": 0,
+        "gridPos": {
+          "h": 7,
+          "w": 12,
+          "x": 0,
+          "y": 6
+        },
+        "hiddenSeries": false,
+        "id": 77,
+        "legend": {
+          "alignAsTable": false,
+          "avg": false,
+          "current": false,
+          "max": false,
+          "min": false,
+          "rightSide": false,
+          "show": true,
+          "sideWidth": 250,
+          "sort": null,
+          "sortDesc": null,
+          "total": false,
+          "values": false
+        },
+        "lines": true,
+        "linewidth": 1,
+        "links": [],
+        "maxPerRow": 6,
+        "nullPointMode": "null",
+        "options": {
+          "dataLinks": []
+        },
+        "percentage": true,
+        "pointradius": 5,
+        "points": false,
+        "renderer": "flot",
+        "seriesOverrides": [
+          {
+            "alias": "Busy Iowait",
+            "color": "#890F02"
+          },
+          {
+            "alias": "Idle",
+            "color": "#7EB26D"
+          },
+          {
+            "alias": "Busy System",
+            "color": "#EAB839"
+          },
+          {
+            "alias": "Busy User",
+            "color": "#0A437C"
+          },
+          {
+            "alias": "Busy Other",
+            "color": "#6D1F62"
+          }
+        ],
+        "spaceLength": 10,
+        "stack": true,
+        "steppedLine": false,
+        "targets": [
+          {
+            "expr": "sum by (instance)(irate(node_cpu_seconds_total{mode=\"system\",instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
+            "format": "time_series",
+            "hide": false,
+            "intervalFactor": 2,
+            "legendFormat": "Busy System",
+            "refId": "A",
+            "step": 240
+          },
+          {
+            "expr": "sum by (instance)(irate(node_cpu_seconds_total{mode='user',instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
+            "format": "time_series",
+            "hide": false,
+            "intervalFactor": 2,
+            "legendFormat": "Busy User",
+            "refId": "B",
+            "step": 240
+          },
+          {
+            "expr": "sum by (instance)(irate(node_cpu_seconds_total{mode='iowait',instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
+            "format": "time_series",
+            "intervalFactor": 2,
+            "legendFormat": "Busy Iowait",
+            "refId": "C",
+            "step": 240
+          },
+          {
+            "expr": "sum by (instance)(irate(node_cpu_seconds_total{mode=~\".*irq\",instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
+            "format": "time_series",
+            "intervalFactor": 2,
+            "legendFormat": "Busy IRQs",
+            "refId": "D",
+            "step": 240
+          },
+          {
+            "expr": "sum (irate(node_cpu_seconds_total{mode!='idle',mode!='user',mode!='system',mode!='iowait',mode!='irq',mode!='softirq',instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
+            "format": "time_series",
+            "intervalFactor": 2,
+            "legendFormat": "Busy Other",
+            "refId": "E",
+            "step": 240
+          },
+          {
+            "expr": "sum by (mode)(irate(node_cpu_seconds_total{mode='idle',instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
+            "format": "time_series",
+            "intervalFactor": 2,
+            "legendFormat": "Idle",
+            "refId": "F",
+            "step": 240
+          }
+        ],
+        "thresholds": [],
+        "timeFrom": null,
+        "timeRegions": [],
+        "timeShift": null,
+        "title": "CPU Basic",
+        "tooltip": {
+          "shared": true,
+          "sort": 0,
+          "value_type": "individual"
+        },
+        "type": "graph",
+        "xaxis": {
+          "buckets": null,
+          "mode": "time",
+          "name": null,
+          "show": true,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "format": "short",
+            "label": "",
+            "logBase": 1,
+            "max": "100",
+            "min": "0",
+            "show": true
+          },
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": null,
+            "show": false
+          }
+        ],
+        "yaxis": {
+          "align": false,
+          "alignLevel": null
+        }
+      },
+      {
+        "aliasColors": {
+          "Apps": "#629E51",
+          "Buffers": "#614D93",
+          "Cache": "#6D1F62",
+          "Cached": "#511749",
+          "Committed": "#508642",
+          "Free": "#0A437C",
+          "Hardware Corrupted - Amount of RAM that the kernel identified as corrupted / not working": "#CFFAFF",
+          "Inactive": "#584477",
+          "PageTables": "#0A50A1",
+          "Page_Tables": "#0A50A1",
+          "RAM_Free": "#E0F9D7",
+          "SWAP Used": "#BF1B00",
+          "Slab": "#806EB7",
+          "Slab_Cache": "#E0752D",
+          "Swap": "#BF1B00",
+          "Swap Used": "#BF1B00",
+          "Swap_Cache": "#C15C17",
+          "Swap_Free": "#2F575E",
+          "Unused": "#EAB839"
+        },
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "datasource": "Prometheus",
+        "decimals": 2,
+        "description": "Basic memory usage",
+        "fieldConfig": {
+          "defaults": {
+            "custom": {}
+          },
+          "overrides": []
+        },
+        "fill": 4,
+        "fillGradient": 0,
+        "gridPos": {
+          "h": 7,
+          "w": 12,
+          "x": 12,
+          "y": 6
+        },
+        "hiddenSeries": false,
+        "id": 78,
+        "legend": {
+          "alignAsTable": false,
+          "avg": false,
+          "current": false,
+          "max": false,
+          "min": false,
+          "rightSide": false,
+          "show": true,
+          "sideWidth": 350,
+          "total": false,
+          "values": false
+        },
+        "lines": true,
+        "linewidth": 1,
+        "links": [],
+        "maxPerRow": 6,
+        "nullPointMode": "null",
+        "options": {
+          "dataLinks": []
+        },
+        "percentage": false,
+        "pointradius": 5,
+        "points": false,
+        "renderer": "flot",
+        "seriesOverrides": [
+          {
+            "alias": "RAM Total",
+            "color": "#E0F9D7",
+            "fill": 0,
+            "stack": false
+          },
+          {
+            "alias": "RAM Cache + Buffer",
+            "color": "#052B51"
+          },
+          {
+            "alias": "RAM Free",
+            "color": "#7EB26D"
+          },
+          {
+            "alias": "Avaliable",
+            "color": "#DEDAF7",
+            "fill": 0,
+            "stack": false
+          }
+        ],
+        "spaceLength": 10,
+        "stack": true,
+        "steppedLine": false,
+        "targets": [
+          {
+            "expr": "node_memory_MemTotal_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
+            "format": "time_series",
+            "hide": false,
+            "intervalFactor": 2,
+            "legendFormat": "RAM Total",
+            "refId": "A",
+            "step": 240
+          },
+          {
+            "expr": "node_memory_MemTotal_bytes{instance=~\"$node:$port\",job=~\"$job\"} - node_memory_MemFree_bytes{instance=~\"$node:$port\",job=~\"$job\"} - (node_memory_Cached_bytes{instance=~\"$node:$port\",job=~\"$job\"} + node_memory_Buffers_bytes{instance=~\"$node:$port\",job=~\"$job\"})",
+            "format": "time_series",
+            "hide": false,
+            "intervalFactor": 2,
+            "legendFormat": "RAM Used",
+            "refId": "B",
+            "step": 240
+          },
+          {
+            "expr": "node_memory_Cached_bytes{instance=~\"$node:$port\",job=~\"$job\"} + node_memory_Buffers_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
+            "format": "time_series",
+            "intervalFactor": 2,
+            "legendFormat": "RAM Cache + Buffer",
+            "refId": "C",
+            "step": 240
+          },
+          {
+            "expr": "node_memory_MemFree_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
+            "format": "time_series",
+            "intervalFactor": 2,
+            "legendFormat": "RAM Free",
+            "refId": "D",
+            "step": 240
+          },
+          {
+            "expr": "(node_memory_SwapTotal_bytes{instance=~\"$node:$port\",job=~\"$job\"} - node_memory_SwapFree_bytes{instance=~\"$node:$port\",job=~\"$job\"})",
+            "format": "time_series",
+            "intervalFactor": 2,
+            "legendFormat": "SWAP Used",
+            "refId": "E",
+            "step": 240
+          }
+        ],
+        "thresholds": [],
+        "timeFrom": null,
+        "timeRegions": [],
+        "timeShift": null,
+        "title": "Memory Basic",
+        "tooltip": {
+          "shared": true,
+          "sort": 0,
+          "value_type": "individual"
+        },
+        "type": "graph",
+        "xaxis": {
+          "buckets": null,
+          "mode": "time",
+          "name": null,
+          "show": true,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "format": "bytes",
+            "label": "",
+            "logBase": 1,
+            "max": null,
+            "min": "0",
+            "show": true
+          },
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": null,
+            "show": false
+          }
+        ],
+        "yaxis": {
+          "align": false,
+          "alignLevel": null
+        }
+      },
+      {
+        "aliasColors": {
+          "Recv_bytes_eth2": "#7EB26D",
+          "Recv_bytes_lo": "#0A50A1",
+          "Recv_drop_eth2": "#6ED0E0",
+          "Recv_drop_lo": "#E0F9D7",
+          "Recv_errs_eth2": "#BF1B00",
+          "Recv_errs_lo": "#CCA300",
+          "Trans_bytes_eth2": "#7EB26D",
+          "Trans_bytes_lo": "#0A50A1",
+          "Trans_drop_eth2": "#6ED0E0",
+          "Trans_drop_lo": "#E0F9D7",
+          "Trans_errs_eth2": "#BF1B00",
+          "Trans_errs_lo": "#CCA300",
+          "recv_bytes_lo": "#0A50A1",
+          "recv_drop_eth0": "#99440A",
+          "recv_drop_lo": "#967302",
+          "recv_errs_eth0": "#BF1B00",
+          "recv_errs_lo": "#890F02",
+          "trans_bytes_eth0": "#7EB26D",
+          "trans_bytes_lo": "#0A50A1",
+          "trans_drop_eth0": "#99440A",
+          "trans_drop_lo": "#967302",
+          "trans_errs_eth0": "#BF1B00",
+          "trans_errs_lo": "#890F02"
+        },
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "datasource": "Prometheus",
+        "description": "Basic network info per interface",
+        "fieldConfig": {
+          "defaults": {
+            "custom": {}
+          },
+          "overrides": []
+        },
+        "fill": 4,
+        "fillGradient": 0,
+        "gridPos": {
+          "h": 7,
+          "w": 12,
+          "x": 0,
+          "y": 13
+        },
+        "hiddenSeries": false,
+        "id": 74,
+        "legend": {
+          "alignAsTable": false,
+          "avg": false,
+          "current": false,
+          "hideEmpty": false,
+          "hideZero": false,
+          "max": false,
+          "min": false,
+          "rightSide": false,
+          "show": true,
+          "sort": "current",
+          "sortDesc": true,
+          "total": false,
+          "values": false
+        },
+        "lines": true,
+        "linewidth": 1,
+        "links": [],
+        "nullPointMode": "null",
+        "options": {
+          "dataLinks": []
+        },
+        "percentage": false,
+        "pointradius": 5,
+        "points": false,
+        "renderer": "flot",
+        "seriesOverrides": [
+          {
+            "alias": "/.*trans.*/",
+            "transform": "negative-Y"
+          }
+        ],
+        "spaceLength": 10,
+        "stack": false,
+        "steppedLine": false,
+        "targets": [
+          {
+            "expr": "irate(node_network_receive_bytes_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])*8",
+            "format": "time_series",
+            "intervalFactor": 2,
+            "legendFormat": "recv {{device}}",
+            "refId": "A",
+            "step": 240
+          },
+          {
+            "expr": "irate(node_network_transmit_bytes_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])*8",
+            "format": "time_series",
+            "intervalFactor": 2,
+            "legendFormat": "trans {{device}} ",
+            "refId": "B",
+            "step": 240
+          }
+        ],
+        "thresholds": [],
+        "timeFrom": null,
+        "timeRegions": [],
+        "timeShift": null,
+        "title": "Network Traffic Basic",
+        "tooltip": {
+          "shared": true,
+          "sort": 0,
+          "value_type": "individual"
+        },
+        "type": "graph",
+        "xaxis": {
+          "buckets": null,
+          "mode": "time",
+          "name": null,
+          "show": true,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "format": "bps",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": null,
+            "show": true
+          },
+          {
+            "format": "pps",
+            "label": "",
+            "logBase": 1,
+            "max": null,
+            "min": null,
+            "show": false
+          }
+        ],
+        "yaxis": {
+          "align": false,
+          "alignLevel": null
+        }
+      },
+      {
+        "aliasColors": {},
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "datasource": "Prometheus",
+        "decimals": 3,
+        "description": "Disk space used of all filesystems mounted",
+        "fieldConfig": {
+          "defaults": {
+            "custom": {}
+          },
+          "overrides": []
+        },
+        "fill": 4,
+        "fillGradient": 0,
+        "gridPos": {
+          "h": 7,
+          "w": 12,
+          "x": 12,
+          "y": 13
+        },
+        "height": "",
+        "hiddenSeries": false,
+        "id": 152,
+        "legend": {
+          "alignAsTable": false,
+          "avg": false,
+          "current": false,
+          "max": false,
+          "min": false,
+          "rightSide": false,
+          "show": true,
+          "sort": "current",
+          "sortDesc": false,
+          "total": false,
+          "values": false
+        },
+        "lines": true,
+        "linewidth": 1,
+        "links": [],
+        "maxPerRow": 6,
+        "nullPointMode": "null",
+        "options": {
+          "dataLinks": []
+        },
+        "percentage": false,
+        "pointradius": 5,
+        "points": false,
+        "renderer": "flot",
+        "seriesOverrides": [],
+        "spaceLength": 10,
+        "stack": false,
+        "steppedLine": false,
+        "targets": [
+          {
+            "expr": "100 - ((node_filesystem_avail_bytes{instance=~\"$node:$port\",job=~\"$job\",device!~'rootfs'} * 100) / node_filesystem_size_bytes{instance=~\"$node:$port\",job=~\"$job\",device!~'rootfs'})",
+            "format": "time_series",
+            "intervalFactor": 2,
+            "legendFormat": "{{mountpoint}}",
+            "refId": "A",
+            "step": 240
+          }
+        ],
+        "thresholds": [],
+        "timeFrom": null,
+        "timeRegions": [],
+        "timeShift": null,
+        "title": "Disk Space Used Basic",
+        "tooltip": {
+          "shared": true,
+          "sort": 0,
+          "value_type": "individual"
+        },
+        "type": "graph",
+        "xaxis": {
+          "buckets": null,
+          "mode": "time",
+          "name": null,
+          "show": true,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "format": "percent",
+            "label": null,
+            "logBase": 1,
+            "max": "100",
+            "min": "0",
+            "show": true
+          },
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": null,
+            "show": true
+          }
+        ],
+        "yaxis": {
+          "align": false,
+          "alignLevel": null
+        }
+      },
+      {
+        "collapsed": true,
+        "datasource": "Prometheus",
+        "gridPos": {
+          "h": 1,
+          "w": 24,
+          "x": 0,
+          "y": 20
+        },
+        "id": 265,
+        "panels": [
+          {
+            "aliasColors": {
+              "Idle - Waiting for something to happen": "#052B51",
+              "guest": "#9AC48A",
+              "idle": "#052B51",
+              "iowait": "#EAB839",
+              "irq": "#BF1B00",
+              "nice": "#C15C17",
+              "softirq": "#E24D42",
+              "steal": "#FCE2DE",
+              "system": "#508642",
+              "user": "#5195CE"
+            },
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "decimals": 2,
+            "description": "",
+            "fill": 4,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 12,
+              "w": 12,
+              "x": 0,
+              "y": 21
+            },
+            "hiddenSeries": false,
+            "id": 3,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sideWidth": 250,
+              "sort": null,
+              "sortDesc": null,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 6,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": true,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "repeat": null,
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": true,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "sum by (mode)(irate(node_cpu_seconds_total{mode=\"system\",instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
+                "format": "time_series",
+                "interval": "10s",
+                "intervalFactor": 2,
+                "legendFormat": "System - Processes executing in kernel mode",
+                "refId": "A",
+                "step": 20
+              },
+              {
+                "expr": "sum by (mode)(irate(node_cpu_seconds_total{mode='user',instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "User - Normal processes executing in user mode",
+                "refId": "B",
+                "step": 240
+              },
+              {
+                "expr": "sum by (mode)(irate(node_cpu_seconds_total{mode='nice',instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "Nice - Niced processes executing in user mode",
+                "refId": "C",
+                "step": 240
+              },
+              {
+                "expr": "sum by (mode)(irate(node_cpu_seconds_total{mode='idle',instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "Idle - Waiting for something to happen",
+                "refId": "D",
+                "step": 240
+              },
+              {
+                "expr": "sum by (mode)(irate(node_cpu_seconds_total{mode='iowait',instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "Iowait - Waiting for I/O to complete",
+                "refId": "E",
+                "step": 240
+              },
+              {
+                "expr": "sum by (mode)(irate(node_cpu_seconds_total{mode='irq',instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "Irq - Servicing interrupts",
+                "refId": "F",
+                "step": 240
+              },
+              {
+                "expr": "sum by (mode)(irate(node_cpu_seconds_total{mode='softirq',instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "Softirq - Servicing softirqs",
+                "refId": "G",
+                "step": 240
+              },
+              {
+                "expr": "sum by (mode)(irate(node_cpu_seconds_total{mode='steal',instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "Steal - Time spent in other operating systems when running in a virtualized environment",
+                "refId": "H",
+                "step": 240
+              },
+              {
+                "expr": "sum by (mode)(irate(node_cpu_seconds_total{mode='guest',instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "Guest - Time spent running a virtual CPU for a guest operating system",
+                "refId": "I",
+                "step": 240
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "CPU",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "short",
+                "label": "percentage",
+                "logBase": 1,
+                "max": "100",
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {
+              "Apps": "#629E51",
+              "Buffers": "#614D93",
+              "Cache": "#6D1F62",
+              "Cached": "#511749",
+              "Committed": "#508642",
+              "Free": "#0A437C",
+              "Hardware Corrupted - Amount of RAM that the kernel identified as corrupted / not working": "#CFFAFF",
+              "Inactive": "#584477",
+              "PageTables": "#0A50A1",
+              "Page_Tables": "#0A50A1",
+              "RAM_Free": "#E0F9D7",
+              "Slab": "#806EB7",
+              "Slab_Cache": "#E0752D",
+              "Swap": "#BF1B00",
+              "Swap - Swap memory usage": "#BF1B00",
+              "Swap_Cache": "#C15C17",
+              "Swap_Free": "#2F575E",
+              "Unused": "#EAB839",
+              "Unused - Free memory unassigned": "#052B51"
+            },
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "decimals": 2,
+            "description": "",
+            "fill": 4,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 12,
+              "w": 12,
+              "x": 12,
+              "y": 21
+            },
+            "hiddenSeries": false,
+            "id": 24,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sideWidth": 350,
+              "sort": null,
+              "sortDesc": null,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 6,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [
+              {
+                "alias": "/.*Hardware Corrupted - *./",
+                "stack": false
+              }
+            ],
+            "spaceLength": 10,
+            "stack": true,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "node_memory_MemTotal_bytes{instance=~\"$node:$port\",job=~\"$job\"} - node_memory_MemFree_bytes{instance=~\"$node:$port\",job=~\"$job\"} - node_memory_Buffers_bytes{instance=~\"$node:$port\",job=~\"$job\"} - node_memory_Cached_bytes{instance=~\"$node:$port\",job=~\"$job\"} - node_memory_Slab_bytes{instance=~\"$node:$port\",job=~\"$job\"} - node_memory_PageTables_bytes{instance=~\"$node:$port\",job=~\"$job\"} - node_memory_SwapCached_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "hide": false,
+                "intervalFactor": 2,
+                "legendFormat": "Apps - Memory used by user-space applications",
+                "refId": "A",
+                "step": 240
+              },
+              {
+                "expr": "node_memory_PageTables_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "hide": false,
+                "intervalFactor": 2,
+                "legendFormat": "PageTables - Memory used to map between virtual and physical memory addresses",
+                "refId": "B",
+                "step": 240
+              },
+              {
+                "expr": "node_memory_SwapCached_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "SwapCache - Memory that keeps track of pages that have been fetched from swap but not yet been modified",
+                "refId": "C",
+                "step": 240
+              },
+              {
+                "expr": "node_memory_Slab_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "hide": false,
+                "intervalFactor": 2,
+                "legendFormat": "Slab - Memory used by the kernel to cache data structures for its own use (caches like inode, dentry, etc)",
+                "refId": "D",
+                "step": 240
+              },
+              {
+                "expr": "node_memory_Cached_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "hide": false,
+                "intervalFactor": 2,
+                "legendFormat": "Cache - Parked file data (file content) cache",
+                "refId": "E",
+                "step": 240
+              },
+              {
+                "expr": "node_memory_Buffers_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "hide": false,
+                "intervalFactor": 2,
+                "legendFormat": "Buffers - Block device (e.g. harddisk) cache",
+                "refId": "F",
+                "step": 240
+              },
+              {
+                "expr": "node_memory_MemFree_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "hide": false,
+                "intervalFactor": 2,
+                "legendFormat": "Unused - Free memory unassigned",
+                "refId": "G",
+                "step": 240
+              },
+              {
+                "expr": "(node_memory_SwapTotal_bytes{instance=~\"$node:$port\",job=~\"$job\"} - node_memory_SwapFree_bytes{instance=~\"$node:$port\",job=~\"$job\"})",
+                "format": "time_series",
+                "hide": false,
+                "intervalFactor": 2,
+                "legendFormat": "Swap - Swap space used",
+                "refId": "H",
+                "step": 240
+              },
+              {
+                "expr": "node_memory_HardwareCorrupted_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "hide": false,
+                "intervalFactor": 2,
+                "legendFormat": "Hardware Corrupted - Amount of RAM that the kernel identified as corrupted / not working",
+                "refId": "I",
+                "step": 240
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Memory Stack",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "bytes",
+                "label": "bytes",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {
+              "receive_packets_eth0": "#7EB26D",
+              "receive_packets_lo": "#E24D42",
+              "transmit_packets_eth0": "#7EB26D",
+              "transmit_packets_lo": "#E24D42"
+            },
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 4,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 12,
+              "w": 12,
+              "x": 0,
+              "y": 33
+            },
+            "hiddenSeries": false,
+            "id": 84,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [
+              {
+                "alias": "/.*Trans.*/",
+                "transform": "negative-Y"
+              }
+            ],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "irate(node_network_receive_bytes_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])*8",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "{{device}} - Receive",
+                "refId": "A",
+                "step": 240
+              },
+              {
+                "expr": "irate(node_network_transmit_bytes_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])*8",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "{{device}} - Transmit",
+                "refId": "B",
+                "step": 240
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Network Traffic",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "bps",
+                "label": "bits out (-) / in (+)",
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "decimals": 3,
+            "description": "",
+            "fill": 4,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 12,
+              "w": 12,
+              "x": 12,
+              "y": 33
+            },
+            "height": "",
+            "hiddenSeries": false,
+            "id": 156,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sort": "current",
+              "sortDesc": false,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 6,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "node_filesystem_size_bytes{instance=~\"$node:$port\",job=~\"$job\",device!~'rootfs'} - node_filesystem_avail_bytes{instance=~\"$node:$port\",job=~\"$job\",device!~'rootfs'}",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "{{mountpoint}}",
+                "refId": "A",
+                "step": 240
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Disk Space Used",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "bytes",
+                "label": "bytes",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "description": "",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 12,
+              "w": 12,
+              "x": 0,
+              "y": 45
+            },
+            "hiddenSeries": false,
+            "id": 229,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "hideZero": true,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 6,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [
+              {
+                "alias": "/.*Read.*/",
+                "transform": "negative-Y"
+              },
+              {
+                "alias": "/.*sda_.*/",
+                "color": "#7EB26D"
+              },
+              {
+                "alias": "/.*sdb_.*/",
+                "color": "#EAB839"
+              },
+              {
+                "alias": "/.*sdc_.*/",
+                "color": "#6ED0E0"
+              },
+              {
+                "alias": "/.*sdd_.*/",
+                "color": "#EF843C"
+              },
+              {
+                "alias": "/.*sde_.*/",
+                "color": "#E24D42"
+              },
+              {
+                "alias": "/.*sda1.*/",
+                "color": "#584477"
+              },
+              {
+                "alias": "/.*sda2_.*/",
+                "color": "#BA43A9"
+              },
+              {
+                "alias": "/.*sda3_.*/",
+                "color": "#F4D598"
+              },
+              {
+                "alias": "/.*sdb1.*/",
+                "color": "#0A50A1"
+              },
+              {
+                "alias": "/.*sdb2.*/",
+                "color": "#BF1B00"
+              },
+              {
+                "alias": "/.*sdb2.*/",
+                "color": "#BF1B00"
+              },
+              {
+                "alias": "/.*sdb3.*/",
+                "color": "#E0752D"
+              },
+              {
+                "alias": "/.*sdc1.*/",
+                "color": "#962D82"
+              },
+              {
+                "alias": "/.*sdc2.*/",
+                "color": "#614D93"
+              },
+              {
+                "alias": "/.*sdc3.*/",
+                "color": "#9AC48A"
+              },
+              {
+                "alias": "/.*sdd1.*/",
+                "color": "#65C5DB"
+              },
+              {
+                "alias": "/.*sdd2.*/",
+                "color": "#F9934E"
+              },
+              {
+                "alias": "/.*sdd3.*/",
+                "color": "#EA6460"
+              },
+              {
+                "alias": "/.*sde1.*/",
+                "color": "#E0F9D7"
+              },
+              {
+                "alias": "/.*sdd2.*/",
+                "color": "#FCEACA"
+              },
+              {
+                "alias": "/.*sde3.*/",
+                "color": "#F9E2D2"
+              }
+            ],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "irate(node_disk_reads_completed_total{instance=~\"$node:$port\",job=~\"$job\",device=~\"[a-z]*[a-z]\"}[5m])",
+                "intervalFactor": 4,
+                "legendFormat": "{{device}} - Reads completed",
+                "refId": "A",
+                "step": 480
+              },
+              {
+                "expr": "irate(node_disk_writes_completed_total{instance=~\"$node:$port\",job=~\"$job\",device=~\"[a-z]*[a-z]\"}[5m])",
+                "intervalFactor": 2,
+                "legendFormat": "{{device}} - Writes completed",
+                "refId": "B",
+                "step": 240
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Disk IOps",
+            "tooltip": {
+              "shared": false,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "iops",
+                "label": "IO read (-) / write (+)",
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {
+              "io time": "#890F02"
+            },
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "decimals": 3,
+            "description": "",
+            "fill": 4,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 12,
+              "w": 12,
+              "x": 12,
+              "y": 45
+            },
+            "hiddenSeries": false,
+            "id": 42,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sort": null,
+              "sortDesc": null,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 6,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [
+              {
+                "alias": "/.*read*./",
+                "transform": "negative-Y"
+              },
+              {
+                "alias": "/.*sda.*/",
+                "color": "#7EB26D"
+              },
+              {
+                "alias": "/.*sdb.*/",
+                "color": "#EAB839"
+              },
+              {
+                "alias": "/.*sdc.*/",
+                "color": "#6ED0E0"
+              },
+              {
+                "alias": "/.*sdd.*/",
+                "color": "#EF843C"
+              },
+              {
+                "alias": "/.*sde.*/",
+                "color": "#E24D42"
+              }
+            ],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "irate(node_disk_read_bytes_total{instance=~\"$node:$port\",job=~\"$job\",device=~\"[a-z]*[a-z]\"}[5m])",
+                "format": "time_series",
+                "hide": false,
+                "intervalFactor": 2,
+                "legendFormat": "{{device}} - Successfully read bytes",
+                "refId": "A",
+                "step": 240
+              },
+              {
+                "expr": "irate(node_disk_written_bytes_total{instance=~\"$node:$port\",job=~\"$job\",device=~\"[a-z]*[a-z]\"}[5m])",
+                "format": "time_series",
+                "hide": false,
+                "intervalFactor": 2,
+                "legendFormat": "{{device}} - Successfully written bytes",
+                "refId": "B",
+                "step": 240
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "I/O Usage Read / Write",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": false,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "bytes",
+                "label": "bytes read (-) / write (+)",
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": true
+              },
+              {
+                "format": "ms",
+                "label": "",
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": true
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {
+              "io time": "#890F02"
+            },
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "decimals": 3,
+            "description": "",
+            "fill": 4,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 12,
+              "w": 12,
+              "x": 0,
+              "y": 57
+            },
+            "hiddenSeries": false,
+            "id": 127,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sort": null,
+              "sortDesc": null,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 6,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "irate(node_disk_io_time_seconds_total{instance=~\"$node:$port\",job=~\"$job\",device=~\"[a-z]*[a-z]\"} [5m])",
+                "format": "time_series",
+                "hide": false,
+                "intervalFactor": 2,
+                "legendFormat": "{{device}} - Time spent doing I/Os",
+                "refId": "A",
+                "step": 240
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "I/O Usage Times",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": false,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "s",
+                "label": "time",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "s",
+                "label": "",
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          }
+        ],
+        "repeat": null,
+        "title": "CPU / Memory / Net / Disk",
+        "type": "row"
+      },
+      {
+        "collapsed": true,
+        "datasource": "Prometheus",
+        "gridPos": {
+          "h": 1,
+          "w": 24,
+          "x": 0,
+          "y": 21
+        },
+        "id": 266,
+        "panels": [
+          {
+            "aliasColors": {
+              "Apps": "#629E51",
+              "Buffers": "#614D93",
+              "Cache": "#6D1F62",
+              "Cached": "#511749",
+              "Committed": "#508642",
+              "Free": "#0A437C",
+              "Hardware Corrupted - Amount of RAM that the kernel identified as corrupted / not working": "#CFFAFF",
+              "Inactive": "#584477",
+              "PageTables": "#0A50A1",
+              "Page_Tables": "#0A50A1",
+              "RAM_Free": "#E0F9D7",
+              "Slab": "#806EB7",
+              "Slab_Cache": "#E0752D",
+              "Swap": "#BF1B00",
+              "Swap_Cache": "#C15C17",
+              "Swap_Free": "#2F575E",
+              "Unused": "#EAB839"
+            },
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "decimals": 2,
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 0,
+              "y": 70
+            },
+            "hiddenSeries": false,
+            "id": 136,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sideWidth": 350,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 2,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": true,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "node_memory_Inactive_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "Inactive - Memory which has been less recently used.  It is more eligible to be reclaimed for other purposes",
+                "refId": "A",
+                "step": 4
+              },
+              {
+                "expr": "node_memory_Active_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "Active - Memory that has been used more recently and usually not reclaimed unless absolutely necessary",
+                "refId": "B",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Memory Active / Inactive",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "cumulative"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "bytes",
+                "label": "bytes",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {
+              "Apps": "#629E51",
+              "Buffers": "#614D93",
+              "Cache": "#6D1F62",
+              "Cached": "#511749",
+              "Committed": "#508642",
+              "Free": "#0A437C",
+              "Hardware Corrupted - Amount of RAM that the kernel identified as corrupted / not working": "#CFFAFF",
+              "Inactive": "#584477",
+              "PageTables": "#0A50A1",
+              "Page_Tables": "#0A50A1",
+              "RAM_Free": "#E0F9D7",
+              "Slab": "#806EB7",
+              "Slab_Cache": "#E0752D",
+              "Swap": "#BF1B00",
+              "Swap_Cache": "#C15C17",
+              "Swap_Free": "#2F575E",
+              "Unused": "#EAB839"
+            },
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "decimals": 2,
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 12,
+              "y": 70
+            },
+            "hiddenSeries": false,
+            "id": 135,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sideWidth": 350,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 6,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [
+              {
+                "alias": "/.*Committed_AS - *./"
+              },
+              {
+                "alias": "/.*CommitLimit - *./",
+                "color": "#BF1B00",
+                "fill": 0
+              }
+            ],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "node_memory_Committed_AS_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "Committed_AS - Amount of memory presently allocated on the system",
+                "refId": "A",
+                "step": 4
+              },
+              {
+                "expr": "node_memory_CommitLimit_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "CommitLimit - Amount of  memory currently available to be allocated on the system",
+                "refId": "B",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Memory Commited",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "cumulative"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "bytes",
+                "label": "bytes",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {
+              "Apps": "#629E51",
+              "Buffers": "#614D93",
+              "Cache": "#6D1F62",
+              "Cached": "#511749",
+              "Committed": "#508642",
+              "Free": "#0A437C",
+              "Hardware Corrupted - Amount of RAM that the kernel identified as corrupted / not working": "#CFFAFF",
+              "Inactive": "#584477",
+              "PageTables": "#0A50A1",
+              "Page_Tables": "#0A50A1",
+              "RAM_Free": "#E0F9D7",
+              "Slab": "#806EB7",
+              "Slab_Cache": "#E0752D",
+              "Swap": "#BF1B00",
+              "Swap_Cache": "#C15C17",
+              "Swap_Free": "#2F575E",
+              "Unused": "#EAB839"
+            },
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "decimals": 2,
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 0,
+              "y": 80
+            },
+            "hiddenSeries": false,
+            "id": 191,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sideWidth": 350,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 6,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": true,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "node_memory_Inactive_file_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "hide": false,
+                "intervalFactor": 2,
+                "legendFormat": "Inactive_file - File-backed memory on inactive LRU list",
+                "refId": "A",
+                "step": 4
+              },
+              {
+                "expr": "node_memory_Inactive_anon_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "hide": false,
+                "intervalFactor": 2,
+                "legendFormat": "Inactive_anon - Anonymous and swap cache on inactive LRU list, including tmpfs (shmem)",
+                "refId": "B",
+                "step": 4
+              },
+              {
+                "expr": "node_memory_Active_file_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "hide": false,
+                "intervalFactor": 2,
+                "legendFormat": "Active_file - File-backed memory on active LRU list",
+                "refId": "C",
+                "step": 4
+              },
+              {
+                "expr": "node_memory_Active_anon_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "hide": false,
+                "intervalFactor": 2,
+                "legendFormat": "Active_anon - Anonymous and swap cache on active least-recently-used (LRU) list, including tmpfs",
+                "refId": "D",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Memory Active / Inactive Detail",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "cumulative"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "bytes",
+                "label": "bytes",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "bytes",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": true
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {
+              "Active": "#99440A",
+              "Buffers": "#58140C",
+              "Cache": "#6D1F62",
+              "Cached": "#511749",
+              "Committed": "#508642",
+              "Dirty": "#6ED0E0",
+              "Free": "#B7DBAB",
+              "Inactive": "#EA6460",
+              "Mapped": "#052B51",
+              "PageTables": "#0A50A1",
+              "Page_Tables": "#0A50A1",
+              "Slab_Cache": "#EAB839",
+              "Swap": "#BF1B00",
+              "Swap_Cache": "#C15C17",
+              "Total": "#511749",
+              "Total RAM": "#052B51",
+              "Total RAM + Swap": "#052B51",
+              "Total Swap": "#614D93",
+              "VmallocUsed": "#EA6460"
+            },
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "decimals": 2,
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 12,
+              "y": 80
+            },
+            "hiddenSeries": false,
+            "id": 130,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sideWidth": null,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 2,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "node_memory_Writeback_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "Writeback - Memory which is actively being written back to disk",
+                "refId": "A",
+                "step": 4
+              },
+              {
+                "expr": "node_memory_WritebackTmp_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "WritebackTmp - Memory used by FUSE for temporary writeback buffers",
+                "refId": "B",
+                "step": 4
+              },
+              {
+                "expr": "node_memory_Dirty_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "Dirty - Memory which is waiting to get written back to the disk",
+                "refId": "C",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Memory Writeback and Dirty",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "bytes",
+                "label": "bytes",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {
+              "Apps": "#629E51",
+              "Buffers": "#614D93",
+              "Cache": "#6D1F62",
+              "Cached": "#511749",
+              "Committed": "#508642",
+              "Free": "#0A437C",
+              "Hardware Corrupted - Amount of RAM that the kernel identified as corrupted / not working": "#CFFAFF",
+              "Inactive": "#584477",
+              "PageTables": "#0A50A1",
+              "Page_Tables": "#0A50A1",
+              "RAM_Free": "#E0F9D7",
+              "Slab": "#806EB7",
+              "Slab_Cache": "#E0752D",
+              "Swap": "#BF1B00",
+              "Swap_Cache": "#C15C17",
+              "Swap_Free": "#2F575E",
+              "Unused": "#EAB839"
+            },
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "decimals": 2,
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 0,
+              "y": 90
+            },
+            "hiddenSeries": false,
+            "id": 138,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sideWidth": 350,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 6,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [
+              {
+                "alias": "ShmemHugePages - Memory used by shared memory (shmem) and tmpfs allocated  with huge pages",
+                "fill": 0
+              },
+              {
+                "alias": "ShmemHugePages - Memory used by shared memory (shmem) and tmpfs allocated  with huge pages",
+                "fill": 0
+              }
+            ],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "node_memory_Mapped_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "Mapped - Used memory in mapped pages files which have been mmaped, such as libraries",
+                "refId": "A",
+                "step": 4
+              },
+              {
+                "expr": "node_memory_Shmem_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "Shmem - Used shared memory (shared between several processes, thus including RAM disks)",
+                "refId": "B",
+                "step": 4
+              },
+              {
+                "expr": "node_memory_ShmemHugePages_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "ShmemHugePages - Memory used by shared memory (shmem) and tmpfs allocated  with huge pages",
+                "refId": "C",
+                "step": 4
+              },
+              {
+                "expr": "node_memory_ShmemPmdMapped_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "ShmemPmdMapped - Ammount of shared (shmem/tmpfs) memory backed by huge pages",
+                "refId": "D",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Memory Shared and Mapped",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "cumulative"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "bytes",
+                "label": "bytes",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {
+              "Active": "#99440A",
+              "Buffers": "#58140C",
+              "Cache": "#6D1F62",
+              "Cached": "#511749",
+              "Committed": "#508642",
+              "Dirty": "#6ED0E0",
+              "Free": "#B7DBAB",
+              "Inactive": "#EA6460",
+              "Mapped": "#052B51",
+              "PageTables": "#0A50A1",
+              "Page_Tables": "#0A50A1",
+              "Slab_Cache": "#EAB839",
+              "Swap": "#BF1B00",
+              "Swap_Cache": "#C15C17",
+              "Total": "#511749",
+              "Total RAM": "#052B51",
+              "Total RAM + Swap": "#052B51",
+              "Total Swap": "#614D93",
+              "VmallocUsed": "#EA6460"
+            },
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "decimals": 2,
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 12,
+              "y": 90
+            },
+            "hiddenSeries": false,
+            "id": 131,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sideWidth": null,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 2,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": true,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "node_memory_SUnreclaim_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "SUnreclaim - Part of Slab, that cannot be reclaimed on memory pressure",
+                "refId": "A",
+                "step": 4
+              },
+              {
+                "expr": "node_memory_SReclaimable_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "SReclaimable - Part of Slab, that might be reclaimed, such as caches",
+                "refId": "B",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Memory Slab",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "bytes",
+                "label": "bytes",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {
+              "Active": "#99440A",
+              "Buffers": "#58140C",
+              "Cache": "#6D1F62",
+              "Cached": "#511749",
+              "Committed": "#508642",
+              "Dirty": "#6ED0E0",
+              "Free": "#B7DBAB",
+              "Inactive": "#EA6460",
+              "Mapped": "#052B51",
+              "PageTables": "#0A50A1",
+              "Page_Tables": "#0A50A1",
+              "Slab_Cache": "#EAB839",
+              "Swap": "#BF1B00",
+              "Swap_Cache": "#C15C17",
+              "Total": "#511749",
+              "Total RAM": "#052B51",
+              "Total RAM + Swap": "#052B51",
+              "VmallocUsed": "#EA6460"
+            },
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "decimals": 2,
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 0,
+              "y": 100
+            },
+            "hiddenSeries": false,
+            "id": 70,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sideWidth": null,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 6,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "node_memory_VmallocChunk_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "hide": false,
+                "intervalFactor": 2,
+                "legendFormat": "VmallocChunk - Largest contigious block of vmalloc area which is free",
+                "refId": "A",
+                "step": 4
+              },
+              {
+                "expr": "node_memory_VmallocTotal_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "hide": false,
+                "intervalFactor": 2,
+                "legendFormat": "VmallocTotal - Total size of vmalloc memory area",
+                "refId": "B",
+                "step": 4
+              },
+              {
+                "expr": "node_memory_VmallocUsed_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "hide": false,
+                "intervalFactor": 2,
+                "legendFormat": "VmallocUsed - Amount of vmalloc area which is used",
+                "refId": "C",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Memory Vmalloc",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "bytes",
+                "label": "bytes",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {
+              "Apps": "#629E51",
+              "Buffers": "#614D93",
+              "Cache": "#6D1F62",
+              "Cached": "#511749",
+              "Committed": "#508642",
+              "Free": "#0A437C",
+              "Hardware Corrupted - Amount of RAM that the kernel identified as corrupted / not working": "#CFFAFF",
+              "Inactive": "#584477",
+              "PageTables": "#0A50A1",
+              "Page_Tables": "#0A50A1",
+              "RAM_Free": "#E0F9D7",
+              "Slab": "#806EB7",
+              "Slab_Cache": "#E0752D",
+              "Swap": "#BF1B00",
+              "Swap_Cache": "#C15C17",
+              "Swap_Free": "#2F575E",
+              "Unused": "#EAB839"
+            },
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "decimals": 2,
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 12,
+              "y": 100
+            },
+            "hiddenSeries": false,
+            "id": 159,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sideWidth": 350,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 6,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "node_memory_Bounce_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "Bounce - Memory used for block device bounce buffers",
+                "refId": "A",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Memory Bounce",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "cumulative"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "bytes",
+                "label": "bytes",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {
+              "Active": "#99440A",
+              "Buffers": "#58140C",
+              "Cache": "#6D1F62",
+              "Cached": "#511749",
+              "Committed": "#508642",
+              "Dirty": "#6ED0E0",
+              "Free": "#B7DBAB",
+              "Inactive": "#EA6460",
+              "Mapped": "#052B51",
+              "PageTables": "#0A50A1",
+              "Page_Tables": "#0A50A1",
+              "Slab_Cache": "#EAB839",
+              "Swap": "#BF1B00",
+              "Swap_Cache": "#C15C17",
+              "Total": "#511749",
+              "Total RAM": "#052B51",
+              "Total RAM + Swap": "#052B51",
+              "VmallocUsed": "#EA6460"
+            },
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "decimals": 2,
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 0,
+              "y": 110
+            },
+            "hiddenSeries": false,
+            "id": 129,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sideWidth": null,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 6,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [
+              {
+                "alias": "/.*Inactive *./",
+                "transform": "negative-Y"
+              }
+            ],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "node_memory_AnonHugePages_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "AnonHugePages - Memory in anonymous huge pages",
+                "refId": "A",
+                "step": 4
+              },
+              {
+                "expr": "node_memory_AnonPages_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "AnonPages - Memory in user pages not backed by files",
+                "refId": "B",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Memory Anonymous",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "bytes",
+                "label": "bytes",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {
+              "Apps": "#629E51",
+              "Buffers": "#614D93",
+              "Cache": "#6D1F62",
+              "Cached": "#511749",
+              "Committed": "#508642",
+              "Free": "#0A437C",
+              "Hardware Corrupted - Amount of RAM that the kernel identified as corrupted / not working": "#CFFAFF",
+              "Inactive": "#584477",
+              "PageTables": "#0A50A1",
+              "Page_Tables": "#0A50A1",
+              "RAM_Free": "#E0F9D7",
+              "Slab": "#806EB7",
+              "Slab_Cache": "#E0752D",
+              "Swap": "#BF1B00",
+              "Swap_Cache": "#C15C17",
+              "Swap_Free": "#2F575E",
+              "Unused": "#EAB839"
+            },
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "decimals": 2,
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 12,
+              "y": 110
+            },
+            "hiddenSeries": false,
+            "id": 160,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sideWidth": 350,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 2,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "node_memory_KernelStack_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "KernelStack - Kernel memory stack. This is not reclaimable",
+                "refId": "A",
+                "step": 4
+              },
+              {
+                "expr": "node_memory_Percpu_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "PerCPU - Per CPU memory allocated dynamically by loadable modules",
+                "refId": "B",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Memory Kernel / CPU",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "cumulative"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "bytes",
+                "label": "bytes",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {
+              "Active": "#99440A",
+              "Buffers": "#58140C",
+              "Cache": "#6D1F62",
+              "Cached": "#511749",
+              "Committed": "#508642",
+              "Dirty": "#6ED0E0",
+              "Free": "#B7DBAB",
+              "Inactive": "#EA6460",
+              "Mapped": "#052B51",
+              "PageTables": "#0A50A1",
+              "Page_Tables": "#0A50A1",
+              "Slab_Cache": "#EAB839",
+              "Swap": "#BF1B00",
+              "Swap_Cache": "#C15C17",
+              "Total": "#511749",
+              "Total RAM": "#806EB7",
+              "Total RAM + Swap": "#806EB7",
+              "VmallocUsed": "#EA6460"
+            },
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "decimals": 2,
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 0,
+              "y": 120
+            },
+            "hiddenSeries": false,
+            "id": 140,
+            "legend": {
+              "alignAsTable": true,
+              "avg": false,
+              "current": true,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sideWidth": null,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 6,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "node_memory_HugePages_Free{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "HugePages_Free - Huge pages in the pool that are not yet allocated",
+                "refId": "A",
+                "step": 4
+              },
+              {
+                "expr": "node_memory_HugePages_Rsvd{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "HugePages_Rsvd - Huge pages for which a commitment to allocate from the pool has been made, but no allocation has yet been made",
+                "refId": "B",
+                "step": 4
+              },
+              {
+                "expr": "node_memory_HugePages_Surp{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "HugePages_Surp - Huge pages in the pool above the value in /proc/sys/vm/nr_hugepages",
+                "refId": "C",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Memory HugePages Counter",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "short",
+                "label": "pages",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": "",
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {
+              "Active": "#99440A",
+              "Buffers": "#58140C",
+              "Cache": "#6D1F62",
+              "Cached": "#511749",
+              "Committed": "#508642",
+              "Dirty": "#6ED0E0",
+              "Free": "#B7DBAB",
+              "Inactive": "#EA6460",
+              "Mapped": "#052B51",
+              "PageTables": "#0A50A1",
+              "Page_Tables": "#0A50A1",
+              "Slab_Cache": "#EAB839",
+              "Swap": "#BF1B00",
+              "Swap_Cache": "#C15C17",
+              "Total": "#511749",
+              "Total RAM": "#806EB7",
+              "Total RAM + Swap": "#806EB7",
+              "VmallocUsed": "#EA6460"
+            },
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "decimals": 2,
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 12,
+              "y": 120
+            },
+            "hiddenSeries": false,
+            "id": 71,
+            "legend": {
+              "alignAsTable": true,
+              "avg": false,
+              "current": true,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sideWidth": null,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 2,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "node_memory_HugePages_Total{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "HugePages - Total size of the pool of huge pages",
+                "refId": "A",
+                "step": 4
+              },
+              {
+                "expr": "node_memory_Hugepagesize_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "Hugepagesize - Huge Page size",
+                "refId": "B",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Memory HugePages Size",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "bytes",
+                "label": "bytes",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": "",
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {
+              "Active": "#99440A",
+              "Buffers": "#58140C",
+              "Cache": "#6D1F62",
+              "Cached": "#511749",
+              "Committed": "#508642",
+              "Dirty": "#6ED0E0",
+              "Free": "#B7DBAB",
+              "Inactive": "#EA6460",
+              "Mapped": "#052B51",
+              "PageTables": "#0A50A1",
+              "Page_Tables": "#0A50A1",
+              "Slab_Cache": "#EAB839",
+              "Swap": "#BF1B00",
+              "Swap_Cache": "#C15C17",
+              "Total": "#511749",
+              "Total RAM": "#052B51",
+              "Total RAM + Swap": "#052B51",
+              "VmallocUsed": "#EA6460"
+            },
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "decimals": 2,
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 0,
+              "y": 130
+            },
+            "hiddenSeries": false,
+            "id": 128,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": false,
+              "hideEmpty": false,
+              "hideZero": false,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sideWidth": null,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 6,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "node_memory_DirectMap1G_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "DirectMap1G - Amount of pages mapped as this size",
+                "refId": "A",
+                "step": 4
+              },
+              {
+                "expr": "node_memory_DirectMap2M_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "DirectMap2M - Amount of pages mapped as this size",
+                "refId": "B",
+                "step": 4
+              },
+              {
+                "expr": "node_memory_DirectMap4k_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "DirectMap4K - Amount of pages mapped as this size",
+                "refId": "C",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Memory DirectMap",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "bytes",
+                "label": "bytes",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {
+              "Apps": "#629E51",
+              "Buffers": "#614D93",
+              "Cache": "#6D1F62",
+              "Cached": "#511749",
+              "Committed": "#508642",
+              "Free": "#0A437C",
+              "Hardware Corrupted - Amount of RAM that the kernel identified as corrupted / not working": "#CFFAFF",
+              "Inactive": "#584477",
+              "PageTables": "#0A50A1",
+              "Page_Tables": "#0A50A1",
+              "RAM_Free": "#E0F9D7",
+              "Slab": "#806EB7",
+              "Slab_Cache": "#E0752D",
+              "Swap": "#BF1B00",
+              "Swap_Cache": "#C15C17",
+              "Swap_Free": "#2F575E",
+              "Unused": "#EAB839"
+            },
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "decimals": 2,
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 12,
+              "y": 130
+            },
+            "hiddenSeries": false,
+            "id": 137,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sideWidth": 350,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 6,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "node_memory_Unevictable_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "Unevictable - Amount of unevictable memory that can't be swapped out for a variety of reasons",
+                "refId": "A",
+                "step": 4
+              },
+              {
+                "expr": "node_memory_Mlocked_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "MLocked - Size of pages locked to memory using the mlock() system call",
+                "refId": "B",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Memory Unevictable and MLocked",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "cumulative"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "bytes",
+                "label": "bytes",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {
+              "Active": "#99440A",
+              "Buffers": "#58140C",
+              "Cache": "#6D1F62",
+              "Cached": "#511749",
+              "Committed": "#508642",
+              "Dirty": "#6ED0E0",
+              "Free": "#B7DBAB",
+              "Inactive": "#EA6460",
+              "Mapped": "#052B51",
+              "PageTables": "#0A50A1",
+              "Page_Tables": "#0A50A1",
+              "Slab_Cache": "#EAB839",
+              "Swap": "#BF1B00",
+              "Swap_Cache": "#C15C17",
+              "Total": "#511749",
+              "Total RAM": "#052B51",
+              "Total RAM + Swap": "#052B51",
+              "Total Swap": "#614D93",
+              "VmallocUsed": "#EA6460"
+            },
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "decimals": 2,
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 0,
+              "y": 140
+            },
+            "hiddenSeries": false,
+            "id": 132,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sideWidth": null,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 6,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "node_memory_NFS_Unstable_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "NFS Unstable - Memory in NFS pages sent to the server, but not yet commited to the storage",
+                "refId": "A",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Memory NFS",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "bytes",
+                "label": "bytes",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          }
+        ],
+        "repeat": null,
+        "title": "Memory Meminfo",
+        "type": "row"
+      },
+      {
+        "collapsed": true,
+        "datasource": "Prometheus",
+        "gridPos": {
+          "h": 1,
+          "w": 24,
+          "x": 0,
+          "y": 22
+        },
+        "id": 267,
+        "panels": [
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 0,
+              "y": 23
+            },
+            "hiddenSeries": false,
+            "id": 176,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 6,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [
+              {
+                "alias": "/.*out/",
+                "transform": "negative-Y"
+              }
+            ],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "irate(node_vmstat_pgpgin{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "Pagesin - Page in operations",
+                "refId": "A",
+                "step": 4
+              },
+              {
+                "expr": "irate(node_vmstat_pgpgout{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "Pagesout - Page out operations",
+                "refId": "B",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Memory Pages In / Out",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "short",
+                "label": "pages out (-) / in (+)",
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 12,
+              "y": 23
+            },
+            "hiddenSeries": false,
+            "id": 22,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 6,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [
+              {
+                "alias": "/.*out/",
+                "transform": "negative-Y"
+              }
+            ],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "irate(node_vmstat_pswpin{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "Pswpin - Pages swapped in",
+                "refId": "A",
+                "step": 4
+              },
+              {
+                "expr": "irate(node_vmstat_pswpout{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "Pswpout - Pages swapped out",
+                "refId": "B",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Memory Pages Swap In / Out",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "short",
+                "label": "pages out (-) / in (+)",
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {
+              "Apps": "#629E51",
+              "Buffers": "#614D93",
+              "Cache": "#6D1F62",
+              "Cached": "#511749",
+              "Committed": "#508642",
+              "Free": "#0A437C",
+              "Hardware Corrupted - Amount of RAM that the kernel identified as corrupted / not working": "#CFFAFF",
+              "Inactive": "#584477",
+              "PageTables": "#0A50A1",
+              "Page_Tables": "#0A50A1",
+              "RAM_Free": "#E0F9D7",
+              "Slab": "#806EB7",
+              "Slab_Cache": "#E0752D",
+              "Swap": "#BF1B00",
+              "Swap_Cache": "#C15C17",
+              "Swap_Free": "#2F575E",
+              "Unused": "#EAB839"
+            },
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "decimals": 2,
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 0,
+              "y": 33
+            },
+            "hiddenSeries": false,
+            "id": 175,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sideWidth": 350,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 6,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [
+              {
+                "alias": "Pgfault - Page major and minor fault operations",
+                "fill": 0,
+                "stack": false
+              }
+            ],
+            "spaceLength": 10,
+            "stack": true,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "irate(node_vmstat_pgfault{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "Pgfault - Page major and minor fault operations",
+                "refId": "A",
+                "step": 4
+              },
+              {
+                "expr": "irate(node_vmstat_pgmajfault{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "Pgmajfault - Major page fault operations",
+                "refId": "B",
+                "step": 4
+              },
+              {
+                "expr": "irate(node_vmstat_pgfault{instance=~\"$node:$port\",job=~\"$job\"}[5m])  - irate(node_vmstat_pgmajfault{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "Pgminfault - Minor page fault operations",
+                "refId": "C",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Memory Page Faults",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "cumulative"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "short",
+                "label": "faults",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {
+              "Active": "#99440A",
+              "Buffers": "#58140C",
+              "Cache": "#6D1F62",
+              "Cached": "#511749",
+              "Committed": "#508642",
+              "Dirty": "#6ED0E0",
+              "Free": "#B7DBAB",
+              "Inactive": "#EA6460",
+              "Mapped": "#052B51",
+              "PageTables": "#0A50A1",
+              "Page_Tables": "#0A50A1",
+              "Slab_Cache": "#EAB839",
+              "Swap": "#BF1B00",
+              "Swap_Cache": "#C15C17",
+              "Total": "#511749",
+              "Total RAM": "#052B51",
+              "Total RAM + Swap": "#052B51",
+              "Total Swap": "#614D93",
+              "VmallocUsed": "#EA6460"
+            },
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "decimals": 2,
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 12,
+              "y": 33
+            },
+            "hiddenSeries": false,
+            "id": 307,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sideWidth": null,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 6,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "irate(node_vmstat_oom_kill{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "oom killer invocations ",
+                "refId": "A",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "OOM Killer",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "short",
+                "label": "counter",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          }
+        ],
+        "repeat": null,
+        "title": "Memory Vmstat",
+        "type": "row"
+      },
+      {
+        "collapsed": true,
+        "datasource": "Prometheus",
+        "gridPos": {
+          "h": 1,
+          "w": 24,
+          "x": 0,
+          "y": 23
+        },
+        "id": 293,
+        "panels": [
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "description": "",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 0,
+              "y": 24
+            },
+            "hiddenSeries": false,
+            "id": 260,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "show": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [
+              {
+                "alias": "/.*Variation*./",
+                "color": "#890F02"
+              }
+            ],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "node_timex_estimated_error_seconds{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "hide": false,
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "Estimated error in seconds",
+                "refId": "A",
+                "step": 240
+              },
+              {
+                "expr": "node_timex_offset_seconds{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "hide": false,
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "Time offset in between local system and reference clock",
+                "refId": "B",
+                "step": 240
+              },
+              {
+                "expr": "node_timex_maxerror_seconds{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "hide": false,
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "Maximum error in seconds",
+                "refId": "C",
+                "step": 240
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Time Syncronized Drift",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "s",
+                "label": "seconds",
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": "counter",
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "description": "",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 12,
+              "y": 24
+            },
+            "hiddenSeries": false,
+            "id": 291,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "show": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "node_timex_loop_time_constant{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "Phase-locked loop time adjust",
+                "refId": "A",
+                "step": 240
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Time PLL Adjust",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "short",
+                "label": "counter",
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "description": "",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 0,
+              "y": 34
+            },
+            "hiddenSeries": false,
+            "id": 168,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "show": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [
+              {
+                "alias": "/.*Variation*./",
+                "color": "#890F02"
+              }
+            ],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "node_timex_sync_status{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "Is clock synchronized to a reliable server (1 = yes, 0 = no)",
+                "refId": "A",
+                "step": 240
+              },
+              {
+                "expr": "node_timex_frequency_adjustment_ratio{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "Local clock frequency adjustment",
+                "refId": "B",
+                "step": 240
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Time Syncronized Status",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "short",
+                "label": "counter",
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "description": "",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 12,
+              "y": 34
+            },
+            "hiddenSeries": false,
+            "id": 294,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "show": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "node_timex_tick_seconds{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "Seconds between clock ticks",
+                "refId": "A",
+                "step": 240
+              },
+              {
+                "expr": "node_timex_tai_offset_seconds{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "International Atomic Time (TAI) offset",
+                "refId": "B",
+                "step": 240
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Time Misc",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "s",
+                "label": "seconds",
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          }
+        ],
+        "title": "System Timesync",
+        "type": "row"
+      },
+      {
+        "collapsed": true,
+        "datasource": "Prometheus",
+        "gridPos": {
+          "h": 1,
+          "w": 24,
+          "x": 0,
+          "y": 24
+        },
+        "id": 312,
+        "panels": [
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 0,
+              "y": 7
+            },
+            "hiddenSeries": false,
+            "id": 62,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "show": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 6,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "node_procs_blocked{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "Processes blocked waiting for I/O to complete",
+                "refId": "A",
+                "step": 240
+              },
+              {
+                "expr": "node_procs_running{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "Processes in runnable state",
+                "refId": "B",
+                "step": 240
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Processes Status",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "short",
+                "label": "counter",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 12,
+              "y": 7
+            },
+            "hiddenSeries": false,
+            "id": 315,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "show": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 6,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": true,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "node_processes_state{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "{{ state }}",
+                "refId": "A",
+                "step": 240
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Processes State",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "short",
+                "label": "counter",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 0,
+              "y": 17
+            },
+            "hiddenSeries": false,
+            "id": 148,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "show": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 6,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "irate(node_forks_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "hide": false,
+                "intervalFactor": 2,
+                "legendFormat": "Processes forks second",
+                "refId": "A",
+                "step": 240
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Processes  Forks",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "short",
+                "label": "forks / sec",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 12,
+              "y": 17
+            },
+            "hiddenSeries": false,
+            "id": 149,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "show": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [
+              {
+                "alias": "/.*Max.*/",
+                "fill": 0
+              }
+            ],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "irate(process_virtual_memory_bytes{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "hide": false,
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "Processes virtual memory size in bytes",
+                "refId": "A",
+                "step": 240
+              },
+              {
+                "expr": "process_resident_memory_max_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
+                "hide": false,
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "Maximum amount of virtual memory available in bytes",
+                "refId": "B",
+                "step": 240
+              },
+              {
+                "expr": "irate(process_virtual_memory_bytes{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "hide": false,
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "Processes virtual memory size in bytes",
+                "refId": "C",
+                "step": 240
+              },
+              {
+                "expr": "irate(process_virtual_memory_max_bytes{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "hide": false,
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "Maximum amount of virtual memory available in bytes",
+                "refId": "D",
+                "step": 240
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Processes Memory",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "decbytes",
+                "label": "bytes",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 0,
+              "y": 27
+            },
+            "hiddenSeries": false,
+            "id": 313,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "show": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 6,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [
+              {
+                "alias": "PIDs limit",
+                "color": "#F2495C",
+                "fill": 0
+              }
+            ],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "node_processes_pids{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "Number of PIDs",
+                "refId": "A",
+                "step": 240
+              },
+              {
+                "expr": "node_processes_max_processes{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "PIDs limit",
+                "refId": "B",
+                "step": 240
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "PIDs Number and Limit",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "short",
+                "label": "counter",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 12,
+              "y": 27
+            },
+            "hiddenSeries": false,
+            "id": 305,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "show": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 6,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [
+              {
+                "alias": "/.*waiting.*/",
+                "transform": "negative-Y"
+              }
+            ],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "irate(node_schedstat_running_seconds_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "CPU {{ cpu }} - seconds spent running a process",
+                "refId": "A",
+                "step": 240
+              },
+              {
+                "expr": "irate(node_schedstat_waiting_seconds_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "CPU {{ cpu }} - seconds spent by processing waiting for this CPU",
+                "refId": "B",
+                "step": 240
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Process schdeule stats Running / Waiting",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "s",
+                "label": "seconds",
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 12,
+              "y": 37
+            },
+            "hiddenSeries": false,
+            "id": 314,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "show": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 6,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [
+              {
+                "alias": "Threads limit",
+                "color": "#F2495C",
+                "fill": 0
+              }
+            ],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "node_processes_threads{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "Allocated threads",
+                "refId": "A",
+                "step": 240
+              },
+              {
+                "expr": "node_processes_max_threads{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "Threads limit",
+                "refId": "B",
+                "step": 240
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Threads Number and Limit",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "short",
+                "label": "counter",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          }
+        ],
+        "title": "System Processes",
+        "type": "row"
+      },
+      {
+        "collapsed": true,
+        "datasource": "Prometheus",
+        "gridPos": {
+          "h": 1,
+          "w": 24,
+          "x": 0,
+          "y": 25
+        },
+        "id": 269,
+        "panels": [
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 0,
+              "y": 8
+            },
+            "hiddenSeries": false,
+            "id": 8,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "show": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 6,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "repeat": null,
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "irate(node_context_switches_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "Context switches",
+                "refId": "A",
+                "step": 240
+              },
+              {
+                "expr": "irate(node_intr_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "hide": false,
+                "intervalFactor": 2,
+                "legendFormat": "Interrupts",
+                "refId": "B",
+                "step": 240
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Context Switches / Interrupts",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "short",
+                "label": "counter",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 12,
+              "y": 8
+            },
+            "hiddenSeries": false,
+            "id": 7,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "show": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 6,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "repeat": null,
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "node_load1{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "intervalFactor": 4,
+                "legendFormat": "Load 1m",
+                "refId": "A",
+                "step": 480
+              },
+              {
+                "expr": "node_load5{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "intervalFactor": 4,
+                "legendFormat": "Load 5m",
+                "refId": "B",
+                "step": 480
+              },
+              {
+                "expr": "node_load15{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "intervalFactor": 4,
+                "legendFormat": "Load 15m",
+                "refId": "C",
+                "step": 480
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "System Load",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "short",
+                "label": "counter",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 0,
+              "y": 18
+            },
+            "hiddenSeries": false,
+            "id": 259,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "show": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [
+              {
+                "alias": "/.*Critical*./",
+                "color": "#E24D42",
+                "fill": 0
+              },
+              {
+                "alias": "/.*Max*./",
+                "color": "#EF843C",
+                "fill": 0
+              }
+            ],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "irate(node_interrupts_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "{{ type }} - {{ info }}",
+                "refId": "A",
+                "step": 240
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Interrupts Detail",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "short",
+                "label": "counter",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 12,
+              "y": 18
+            },
+            "hiddenSeries": false,
+            "id": 306,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "show": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 6,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "irate(node_schedstat_timeslices_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "CPU {{ cpu }}",
+                "refId": "A",
+                "step": 240
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Schedule timeslices executed by each cpu",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "short",
+                "label": "counter",
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 0,
+              "y": 28
+            },
+            "hiddenSeries": false,
+            "id": 151,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "show": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 6,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "node_entropy_available_bits{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "Entropy available to random number generators",
+                "refId": "A",
+                "step": 240
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Entropy",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "short",
+                "label": "counter",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 12,
+              "y": 28
+            },
+            "hiddenSeries": false,
+            "id": 308,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "show": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 6,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "irate(process_cpu_seconds_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "Time spent",
+                "refId": "A",
+                "step": 240
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "CPU time spent in user and system contexts",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "s",
+                "label": "seconds",
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 0,
+              "y": 38
+            },
+            "hiddenSeries": false,
+            "id": 64,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "show": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [
+              {
+                "alias": "/.*Max*./",
+                "color": "#890F02",
+                "fill": 0
+              }
+            ],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "process_max_fds{instance=~\"$node:$port\",job=~\"$job\"}",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "Maximum open file descriptors",
+                "refId": "A",
+                "step": 240
+              },
+              {
+                "expr": "process_open_fds{instance=~\"$node:$port\",job=~\"$job\"}",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "Open file descriptors",
+                "refId": "B",
+                "step": 240
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "File Descriptors",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "short",
+                "label": "counter",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          }
+        ],
+        "repeat": null,
+        "title": "System Misc",
+        "type": "row"
+      },
+      {
+        "collapsed": true,
+        "datasource": "Prometheus",
+        "gridPos": {
+          "h": 1,
+          "w": 24,
+          "x": 0,
+          "y": 26
+        },
+        "id": 304,
+        "panels": [
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 0,
+              "y": 26
+            },
+            "hiddenSeries": false,
+            "id": 158,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "show": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [
+              {
+                "alias": "/.*Critical*./",
+                "color": "#E24D42",
+                "fill": 0
+              },
+              {
+                "alias": "/.*Max*./",
+                "color": "#EF843C",
+                "fill": 0
+              }
+            ],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "node_hwmon_temp_celsius{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "{{ chip }} {{ sensor }} temp",
+                "refId": "A",
+                "step": 240
+              },
+              {
+                "expr": "node_hwmon_temp_crit_alarm_celsius{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "hide": true,
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "{{ chip }} {{ sensor }} Critical Alarm",
+                "refId": "B",
+                "step": 240
+              },
+              {
+                "expr": "node_hwmon_temp_crit_celsius{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "{{ chip }} {{ sensor }} Critical",
+                "refId": "C",
+                "step": 240
+              },
+              {
+                "expr": "node_hwmon_temp_crit_hyst_celsius{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "hide": true,
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "{{ chip }} {{ sensor }} Critical Historical",
+                "refId": "D",
+                "step": 240
+              },
+              {
+                "expr": "node_hwmon_temp_max_celsius{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "hide": true,
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "{{ chip }} {{ sensor }} Max",
+                "refId": "E",
+                "step": 240
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Hardware temperature monitor",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "celsius",
+                "label": "temperature",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 12,
+              "y": 26
+            },
+            "hiddenSeries": false,
+            "id": 300,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "show": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [
+              {
+                "alias": "/.*Max*./",
+                "color": "#EF843C",
+                "fill": 0
+              }
+            ],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "node_cooling_device_cur_state{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "hide": false,
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "Current {{ name }} in {{ type }}",
+                "refId": "A",
+                "step": 240
+              },
+              {
+                "expr": "node_cooling_device_max_state{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "Max {{ name }} in {{ type }}",
+                "refId": "B",
+                "step": 240
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Throttle cooling device",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "short",
+                "label": "counter",
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 0,
+              "y": 36
+            },
+            "hiddenSeries": false,
+            "id": 302,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "show": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "node_power_supply_online{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "hide": false,
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "{{ power_supply }} online",
+                "refId": "A",
+                "step": 240
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Power supply",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "short",
+                "label": "counter",
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          }
+        ],
+        "title": "Hardware Misc",
+        "type": "row"
+      },
+      {
+        "collapsed": true,
+        "datasource": "Prometheus",
+        "gridPos": {
+          "h": 1,
+          "w": 24,
+          "x": 0,
+          "y": 27
+        },
+        "id": 296,
+        "panels": [
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 0,
+              "y": 10
+            },
+            "hiddenSeries": false,
+            "id": 297,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "show": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "irate(node_systemd_socket_accepted_connections_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "{{ name }} Connections",
+                "refId": "A",
+                "step": 240
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Systemd Sockets",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "short",
+                "label": "counter",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 12,
+              "y": 10
+            },
+            "hiddenSeries": false,
+            "id": 298,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "show": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [
+              {
+                "alias": "Failed",
+                "color": "#F2495C"
+              },
+              {
+                "alias": "Inactive",
+                "color": "#FF9830"
+              },
+              {
+                "alias": "Active",
+                "color": "#73BF69"
+              },
+              {
+                "alias": "Deactivating",
+                "color": "#FFCB7D"
+              },
+              {
+                "alias": "Activating",
+                "color": "#C8F2C2"
+              }
+            ],
+            "spaceLength": 10,
+            "stack": true,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "node_systemd_units{instance=~\"$node:$port\",job=~\"$job\",state=\"activating\"}",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "Activating",
+                "refId": "A",
+                "step": 240
+              },
+              {
+                "expr": "node_systemd_units{instance=~\"$node:$port\",job=~\"$job\",state=\"active\"}",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "Active",
+                "refId": "B",
+                "step": 240
+              },
+              {
+                "expr": "node_systemd_units{instance=~\"$node:$port\",job=~\"$job\",state=\"deactivating\"}",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "Deactivating",
+                "refId": "C",
+                "step": 240
+              },
+              {
+                "expr": "node_systemd_units{instance=~\"$node:$port\",job=~\"$job\",state=\"failed\"}",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "Failed",
+                "refId": "D",
+                "step": 240
+              },
+              {
+                "expr": "node_systemd_units{instance=~\"$node:$port\",job=~\"$job\",state=\"inactive\"}",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "Inactive",
+                "refId": "E",
+                "step": 240
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Systemd Units State",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "short",
+                "label": "counter",
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          }
+        ],
+        "title": "Systemd",
+        "type": "row"
+      },
+      {
+        "collapsed": true,
+        "datasource": "Prometheus",
+        "gridPos": {
+          "h": 1,
+          "w": 24,
+          "x": 0,
+          "y": 28
+        },
+        "id": 270,
+        "panels": [
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "description": "",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 0,
+              "y": 28
+            },
+            "hiddenSeries": false,
+            "id": 9,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "hideZero": true,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 6,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "repeat": null,
+            "seriesOverrides": [
+              {
+                "alias": "/.*Read.*/",
+                "transform": "negative-Y"
+              },
+              {
+                "alias": "/.*sda_.*/",
+                "color": "#7EB26D"
+              },
+              {
+                "alias": "/.*sdb_.*/",
+                "color": "#EAB839"
+              },
+              {
+                "alias": "/.*sdc_.*/",
+                "color": "#6ED0E0"
+              },
+              {
+                "alias": "/.*sdd_.*/",
+                "color": "#EF843C"
+              },
+              {
+                "alias": "/.*sde_.*/",
+                "color": "#E24D42"
+              },
+              {
+                "alias": "/.*sda1.*/",
+                "color": "#584477"
+              },
+              {
+                "alias": "/.*sda2_.*/",
+                "color": "#BA43A9"
+              },
+              {
+                "alias": "/.*sda3_.*/",
+                "color": "#F4D598"
+              },
+              {
+                "alias": "/.*sdb1.*/",
+                "color": "#0A50A1"
+              },
+              {
+                "alias": "/.*sdb2.*/",
+                "color": "#BF1B00"
+              },
+              {
+                "alias": "/.*sdb3.*/",
+                "color": "#E0752D"
+              },
+              {
+                "alias": "/.*sdc1.*/",
+                "color": "#962D82"
+              },
+              {
+                "alias": "/.*sdc2.*/",
+                "color": "#614D93"
+              },
+              {
+                "alias": "/.*sdc3.*/",
+                "color": "#9AC48A"
+              },
+              {
+                "alias": "/.*sdd1.*/",
+                "color": "#65C5DB"
+              },
+              {
+                "alias": "/.*sdd2.*/",
+                "color": "#F9934E"
+              },
+              {
+                "alias": "/.*sdd3.*/",
+                "color": "#EA6460"
+              },
+              {
+                "alias": "/.*sde1.*/",
+                "color": "#E0F9D7"
+              },
+              {
+                "alias": "/.*sdd2.*/",
+                "color": "#FCEACA"
+              },
+              {
+                "alias": "/.*sde3.*/",
+                "color": "#F9E2D2"
+              }
+            ],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "irate(node_disk_reads_completed_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "intervalFactor": 4,
+                "legendFormat": "{{device}} - Reads completed",
+                "refId": "A",
+                "step": 8
+              },
+              {
+                "expr": "irate(node_disk_writes_completed_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "intervalFactor": 2,
+                "legendFormat": "{{device}} - Writes completed",
+                "refId": "B",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Disk IOps Completed",
+            "tooltip": {
+              "shared": false,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "iops",
+                "label": "IO read (-) / write (+)",
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "description": "",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 12,
+              "y": 28
+            },
+            "hiddenSeries": false,
+            "id": 33,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "hideZero": true,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 6,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [
+              {
+                "alias": "/.*Read.*/",
+                "transform": "negative-Y"
+              },
+              {
+                "alias": "/.*sda_.*/",
+                "color": "#7EB26D"
+              },
+              {
+                "alias": "/.*sdb_.*/",
+                "color": "#EAB839"
+              },
+              {
+                "alias": "/.*sdc_.*/",
+                "color": "#6ED0E0"
+              },
+              {
+                "alias": "/.*sdd_.*/",
+                "color": "#EF843C"
+              },
+              {
+                "alias": "/.*sde_.*/",
+                "color": "#E24D42"
+              },
+              {
+                "alias": "/.*sda1.*/",
+                "color": "#584477"
+              },
+              {
+                "alias": "/.*sda2_.*/",
+                "color": "#BA43A9"
+              },
+              {
+                "alias": "/.*sda3_.*/",
+                "color": "#F4D598"
+              },
+              {
+                "alias": "/.*sdb1.*/",
+                "color": "#0A50A1"
+              },
+              {
+                "alias": "/.*sdb2.*/",
+                "color": "#BF1B00"
+              },
+              {
+                "alias": "/.*sdb3.*/",
+                "color": "#E0752D"
+              },
+              {
+                "alias": "/.*sdc1.*/",
+                "color": "#962D82"
+              },
+              {
+                "alias": "/.*sdc2.*/",
+                "color": "#614D93"
+              },
+              {
+                "alias": "/.*sdc3.*/",
+                "color": "#9AC48A"
+              },
+              {
+                "alias": "/.*sdd1.*/",
+                "color": "#65C5DB"
+              },
+              {
+                "alias": "/.*sdd2.*/",
+                "color": "#F9934E"
+              },
+              {
+                "alias": "/.*sdd3.*/",
+                "color": "#EA6460"
+              },
+              {
+                "alias": "/.*sde1.*/",
+                "color": "#E0F9D7"
+              },
+              {
+                "alias": "/.*sdd2.*/",
+                "color": "#FCEACA"
+              },
+              {
+                "alias": "/.*sde3.*/",
+                "color": "#F9E2D2"
+              }
+            ],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "irate(node_disk_read_bytes_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "intervalFactor": 4,
+                "legendFormat": "{{device}} - Read bytes",
+                "refId": "A",
+                "step": 8
+              },
+              {
+                "expr": "irate(node_disk_written_bytes_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "{{device}} - Written bytes",
+                "refId": "B",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Disk R/W Data",
+            "tooltip": {
+              "shared": false,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "Bps",
+                "label": "bytes read (-) / write (+)",
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "description": "",
+            "fill": 3,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 0,
+              "y": 38
+            },
+            "hiddenSeries": false,
+            "id": 37,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "hideZero": true,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sort": "current",
+              "sortDesc": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 6,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [
+              {
+                "alias": "/.*Read.*/",
+                "transform": "negative-Y"
+              },
+              {
+                "alias": "/.*sda_.*/",
+                "color": "#7EB26D"
+              },
+              {
+                "alias": "/.*sdb_.*/",
+                "color": "#EAB839"
+              },
+              {
+                "alias": "/.*sdc_.*/",
+                "color": "#6ED0E0"
+              },
+              {
+                "alias": "/.*sdd_.*/",
+                "color": "#EF843C"
+              },
+              {
+                "alias": "/.*sde_.*/",
+                "color": "#E24D42"
+              },
+              {
+                "alias": "/.*sda1.*/",
+                "color": "#584477"
+              },
+              {
+                "alias": "/.*sda2_.*/",
+                "color": "#BA43A9"
+              },
+              {
+                "alias": "/.*sda3_.*/",
+                "color": "#F4D598"
+              },
+              {
+                "alias": "/.*sdb1.*/",
+                "color": "#0A50A1"
+              },
+              {
+                "alias": "/.*sdb2.*/",
+                "color": "#BF1B00"
+              },
+              {
+                "alias": "/.*sdb3.*/",
+                "color": "#E0752D"
+              },
+              {
+                "alias": "/.*sdc1.*/",
+                "color": "#962D82"
+              },
+              {
+                "alias": "/.*sdc2.*/",
+                "color": "#614D93"
+              },
+              {
+                "alias": "/.*sdc3.*/",
+                "color": "#9AC48A"
+              },
+              {
+                "alias": "/.*sdd1.*/",
+                "color": "#65C5DB"
+              },
+              {
+                "alias": "/.*sdd2.*/",
+                "color": "#F9934E"
+              },
+              {
+                "alias": "/.*sdd3.*/",
+                "color": "#EA6460"
+              },
+              {
+                "alias": "/.*sde1.*/",
+                "color": "#E0F9D7"
+              },
+              {
+                "alias": "/.*sdd2.*/",
+                "color": "#FCEACA"
+              },
+              {
+                "alias": "/.*sde3.*/",
+                "color": "#F9E2D2"
+              }
+            ],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "irate(node_disk_read_time_seconds_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "hide": false,
+                "intervalFactor": 4,
+                "legendFormat": "{{device}} - Read time",
+                "refId": "A",
+                "step": 8
+              },
+              {
+                "expr": "irate(node_disk_write_time_seconds_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "hide": false,
+                "intervalFactor": 2,
+                "legendFormat": "{{device}} - Write time",
+                "refId": "B",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Disk R/W Time",
+            "tooltip": {
+              "shared": false,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "s",
+                "label": "time. read (-) / write (+)",
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "description": "",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 12,
+              "y": 38
+            },
+            "hiddenSeries": false,
+            "id": 35,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "hideZero": true,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sort": "current",
+              "sortDesc": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 6,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [
+              {
+                "alias": "/.*sda_.*/",
+                "color": "#7EB26D"
+              },
+              {
+                "alias": "/.*sdb_.*/",
+                "color": "#EAB839"
+              },
+              {
+                "alias": "/.*sdc_.*/",
+                "color": "#6ED0E0"
+              },
+              {
+                "alias": "/.*sdd_.*/",
+                "color": "#EF843C"
+              },
+              {
+                "alias": "/.*sde_.*/",
+                "color": "#E24D42"
+              },
+              {
+                "alias": "/.*sda1.*/",
+                "color": "#584477"
+              },
+              {
+                "alias": "/.*sda2_.*/",
+                "color": "#BA43A9"
+              },
+              {
+                "alias": "/.*sda3_.*/",
+                "color": "#F4D598"
+              },
+              {
+                "alias": "/.*sdb1.*/",
+                "color": "#0A50A1"
+              },
+              {
+                "alias": "/.*sdb2.*/",
+                "color": "#BF1B00"
+              },
+              {
+                "alias": "/.*sdb3.*/",
+                "color": "#E0752D"
+              },
+              {
+                "alias": "/.*sdc1.*/",
+                "color": "#962D82"
+              },
+              {
+                "alias": "/.*sdc2.*/",
+                "color": "#614D93"
+              },
+              {
+                "alias": "/.*sdc3.*/",
+                "color": "#9AC48A"
+              },
+              {
+                "alias": "/.*sdd1.*/",
+                "color": "#65C5DB"
+              },
+              {
+                "alias": "/.*sdd2.*/",
+                "color": "#F9934E"
+              },
+              {
+                "alias": "/.*sdd3.*/",
+                "color": "#EA6460"
+              },
+              {
+                "alias": "/.*sde1.*/",
+                "color": "#E0F9D7"
+              },
+              {
+                "alias": "/.*sdd2.*/",
+                "color": "#FCEACA"
+              },
+              {
+                "alias": "/.*sde3.*/",
+                "color": "#F9E2D2"
+              }
+            ],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "irate(node_disk_io_time_weighted_seconds_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "intervalFactor": 4,
+                "legendFormat": "{{device}} - IO time weighted",
+                "refId": "A",
+                "step": 8
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Disk IOs Weighted",
+            "tooltip": {
+              "shared": false,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "s",
+                "label": "time",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "description": "",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 0,
+              "y": 48
+            },
+            "hiddenSeries": false,
+            "id": 133,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "hideZero": true,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sort": "current",
+              "sortDesc": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 6,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [
+              {
+                "alias": "/.*Read.*/",
+                "transform": "negative-Y"
+              },
+              {
+                "alias": "/.*sda_.*/",
+                "color": "#7EB26D"
+              },
+              {
+                "alias": "/.*sdb_.*/",
+                "color": "#EAB839"
+              },
+              {
+                "alias": "/.*sdc_.*/",
+                "color": "#6ED0E0"
+              },
+              {
+                "alias": "/.*sdd_.*/",
+                "color": "#EF843C"
+              },
+              {
+                "alias": "/.*sde_.*/",
+                "color": "#E24D42"
+              },
+              {
+                "alias": "/.*sda1.*/",
+                "color": "#584477"
+              },
+              {
+                "alias": "/.*sda2_.*/",
+                "color": "#BA43A9"
+              },
+              {
+                "alias": "/.*sda3_.*/",
+                "color": "#F4D598"
+              },
+              {
+                "alias": "/.*sdb1.*/",
+                "color": "#0A50A1"
+              },
+              {
+                "alias": "/.*sdb2.*/",
+                "color": "#BF1B00"
+              },
+              {
+                "alias": "/.*sdb3.*/",
+                "color": "#E0752D"
+              },
+              {
+                "alias": "/.*sdc1.*/",
+                "color": "#962D82"
+              },
+              {
+                "alias": "/.*sdc2.*/",
+                "color": "#614D93"
+              },
+              {
+                "alias": "/.*sdc3.*/",
+                "color": "#9AC48A"
+              },
+              {
+                "alias": "/.*sdd1.*/",
+                "color": "#65C5DB"
+              },
+              {
+                "alias": "/.*sdd2.*/",
+                "color": "#F9934E"
+              },
+              {
+                "alias": "/.*sdd3.*/",
+                "color": "#EA6460"
+              },
+              {
+                "alias": "/.*sde1.*/",
+                "color": "#E0F9D7"
+              },
+              {
+                "alias": "/.*sdd2.*/",
+                "color": "#FCEACA"
+              },
+              {
+                "alias": "/.*sde3.*/",
+                "color": "#F9E2D2"
+              }
+            ],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "irate(node_disk_reads_merged_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "intervalFactor": 2,
+                "legendFormat": "{{device}} - Read merged",
+                "refId": "A",
+                "step": 4
+              },
+              {
+                "expr": "irate(node_disk_writes_merged_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "intervalFactor": 2,
+                "legendFormat": "{{device}} - Write merged",
+                "refId": "B",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Disk R/W Merged",
+            "tooltip": {
+              "shared": false,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "iops",
+                "label": "I/Os",
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "description": "",
+            "fill": 3,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 12,
+              "y": 48
+            },
+            "hiddenSeries": false,
+            "id": 36,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "hideZero": true,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sort": "current",
+              "sortDesc": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 6,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [
+              {
+                "alias": "/.*sda_.*/",
+                "color": "#7EB26D"
+              },
+              {
+                "alias": "/.*sdb_.*/",
+                "color": "#EAB839"
+              },
+              {
+                "alias": "/.*sdc_.*/",
+                "color": "#6ED0E0"
+              },
+              {
+                "alias": "/.*sdd_.*/",
+                "color": "#EF843C"
+              },
+              {
+                "alias": "/.*sde_.*/",
+                "color": "#E24D42"
+              },
+              {
+                "alias": "/.*sda1.*/",
+                "color": "#584477"
+              },
+              {
+                "alias": "/.*sda2_.*/",
+                "color": "#BA43A9"
+              },
+              {
+                "alias": "/.*sda3_.*/",
+                "color": "#F4D598"
+              },
+              {
+                "alias": "/.*sdb1.*/",
+                "color": "#0A50A1"
+              },
+              {
+                "alias": "/.*sdb2.*/",
+                "color": "#BF1B00"
+              },
+              {
+                "alias": "/.*sdb3.*/",
+                "color": "#E0752D"
+              },
+              {
+                "alias": "/.*sdc1.*/",
+                "color": "#962D82"
+              },
+              {
+                "alias": "/.*sdc2.*/",
+                "color": "#614D93"
+              },
+              {
+                "alias": "/.*sdc3.*/",
+                "color": "#9AC48A"
+              },
+              {
+                "alias": "/.*sdd1.*/",
+                "color": "#65C5DB"
+              },
+              {
+                "alias": "/.*sdd2.*/",
+                "color": "#F9934E"
+              },
+              {
+                "alias": "/.*sdd3.*/",
+                "color": "#EA6460"
+              },
+              {
+                "alias": "/.*sde1.*/",
+                "color": "#E0F9D7"
+              },
+              {
+                "alias": "/.*sdd2.*/",
+                "color": "#FCEACA"
+              },
+              {
+                "alias": "/.*sde3.*/",
+                "color": "#F9E2D2"
+              }
+            ],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "irate(node_disk_io_time_seconds_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "intervalFactor": 4,
+                "legendFormat": "{{device}} - IO time",
+                "refId": "A",
+                "step": 8
+              },
+              {
+                "expr": "irate(node_disk_discard_time_seconds_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "interval": "",
+                "intervalFactor": 4,
+                "legendFormat": "{{device}} - discard time",
+                "refId": "B",
+                "step": 8
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Time Spent Doing I/Os",
+            "tooltip": {
+              "shared": false,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "s",
+                "label": "time",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "description": "",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 0,
+              "y": 58
+            },
+            "hiddenSeries": false,
+            "id": 34,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "hideZero": true,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sort": "current",
+              "sortDesc": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 6,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [
+              {
+                "alias": "/.*sda_.*/",
+                "color": "#7EB26D"
+              },
+              {
+                "alias": "/.*sdb_.*/",
+                "color": "#EAB839"
+              },
+              {
+                "alias": "/.*sdc_.*/",
+                "color": "#6ED0E0"
+              },
+              {
+                "alias": "/.*sdd_.*/",
+                "color": "#EF843C"
+              },
+              {
+                "alias": "/.*sde_.*/",
+                "color": "#E24D42"
+              },
+              {
+                "alias": "/.*sda1.*/",
+                "color": "#584477"
+              },
+              {
+                "alias": "/.*sda2_.*/",
+                "color": "#BA43A9"
+              },
+              {
+                "alias": "/.*sda3_.*/",
+                "color": "#F4D598"
+              },
+              {
+                "alias": "/.*sdb1.*/",
+                "color": "#0A50A1"
+              },
+              {
+                "alias": "/.*sdb2.*/",
+                "color": "#BF1B00"
+              },
+              {
+                "alias": "/.*sdb3.*/",
+                "color": "#E0752D"
+              },
+              {
+                "alias": "/.*sdc1.*/",
+                "color": "#962D82"
+              },
+              {
+                "alias": "/.*sdc2.*/",
+                "color": "#614D93"
+              },
+              {
+                "alias": "/.*sdc3.*/",
+                "color": "#9AC48A"
+              },
+              {
+                "alias": "/.*sdd1.*/",
+                "color": "#65C5DB"
+              },
+              {
+                "alias": "/.*sdd2.*/",
+                "color": "#F9934E"
+              },
+              {
+                "alias": "/.*sdd3.*/",
+                "color": "#EA6460"
+              },
+              {
+                "alias": "/.*sde1.*/",
+                "color": "#E0F9D7"
+              },
+              {
+                "alias": "/.*sdd2.*/",
+                "color": "#FCEACA"
+              },
+              {
+                "alias": "/.*sde3.*/",
+                "color": "#F9E2D2"
+              }
+            ],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "irate(node_disk_io_now{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "intervalFactor": 4,
+                "legendFormat": "{{device}} - IO now",
+                "refId": "A",
+                "step": 8
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Disk IOs Current in Progress",
+            "tooltip": {
+              "shared": false,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "iops",
+                "label": "I/Os",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "description": "",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 12,
+              "y": 58
+            },
+            "hiddenSeries": false,
+            "id": 301,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "hideZero": true,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 6,
+            "nullPointMode": "null as zero",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [
+              {
+                "alias": "/.*sda_.*/",
+                "color": "#7EB26D"
+              },
+              {
+                "alias": "/.*sdb_.*/",
+                "color": "#EAB839"
+              },
+              {
+                "alias": "/.*sdc_.*/",
+                "color": "#6ED0E0"
+              },
+              {
+                "alias": "/.*sdd_.*/",
+                "color": "#EF843C"
+              },
+              {
+                "alias": "/.*sde_.*/",
+                "color": "#E24D42"
+              },
+              {
+                "alias": "/.*sda1.*/",
+                "color": "#584477"
+              },
+              {
+                "alias": "/.*sda2_.*/",
+                "color": "#BA43A9"
+              },
+              {
+                "alias": "/.*sda3_.*/",
+                "color": "#F4D598"
+              },
+              {
+                "alias": "/.*sdb1.*/",
+                "color": "#0A50A1"
+              },
+              {
+                "alias": "/.*sdb2.*/",
+                "color": "#BF1B00"
+              },
+              {
+                "alias": "/.*sdb3.*/",
+                "color": "#E0752D"
+              },
+              {
+                "alias": "/.*sdc1.*/",
+                "color": "#962D82"
+              },
+              {
+                "alias": "/.*sdc2.*/",
+                "color": "#614D93"
+              },
+              {
+                "alias": "/.*sdc3.*/",
+                "color": "#9AC48A"
+              },
+              {
+                "alias": "/.*sdd1.*/",
+                "color": "#65C5DB"
+              },
+              {
+                "alias": "/.*sdd2.*/",
+                "color": "#F9934E"
+              },
+              {
+                "alias": "/.*sdd3.*/",
+                "color": "#EA6460"
+              },
+              {
+                "alias": "/.*sde1.*/",
+                "color": "#E0F9D7"
+              },
+              {
+                "alias": "/.*sdd2.*/",
+                "color": "#FCEACA"
+              },
+              {
+                "alias": "/.*sde3.*/",
+                "color": "#F9E2D2"
+              }
+            ],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "irate(node_disk_discards_completed_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "interval": "",
+                "intervalFactor": 4,
+                "legendFormat": "{{device}} - Discards completed",
+                "refId": "A",
+                "step": 8
+              },
+              {
+                "expr": "irate(node_disk_discards_merged_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "{{device}} - Discards merged",
+                "refId": "B",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Disk IOps Discards completed / merged",
+            "tooltip": {
+              "shared": false,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "iops",
+                "label": "IOs",
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          }
+        ],
+        "repeat": null,
+        "title": "Storage Disk",
+        "type": "row"
+      },
+      {
+        "collapsed": true,
+        "datasource": "Prometheus",
+        "gridPos": {
+          "h": 1,
+          "w": 24,
+          "x": 0,
+          "y": 29
+        },
+        "id": 271,
+        "panels": [
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "decimals": 3,
+            "description": "",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 0,
+              "y": 29
+            },
+            "hiddenSeries": false,
+            "id": 43,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 6,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "node_filesystem_avail_bytes{instance=~\"$node:$port\",job=~\"$job\",device!~'rootfs'}",
+                "format": "time_series",
+                "hide": false,
+                "intervalFactor": 2,
+                "legendFormat": "{{mountpoint}} - Available",
+                "metric": "",
+                "refId": "A",
+                "step": 4
+              },
+              {
+                "expr": "node_filesystem_free_bytes{instance=~\"$node:$port\",job=~\"$job\",device!~'rootfs'}",
+                "format": "time_series",
+                "hide": true,
+                "intervalFactor": 2,
+                "legendFormat": "{{mountpoint}} - Free",
+                "refId": "B",
+                "step": 2
+              },
+              {
+                "expr": "node_filesystem_size_bytes{instance=~\"$node:$port\",job=~\"$job\",device!~'rootfs'}",
+                "format": "time_series",
+                "hide": true,
+                "intervalFactor": 2,
+                "legendFormat": "{{mountpoint}} - Size",
+                "refId": "C",
+                "step": 2
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Filesystem space available",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "bytes",
+                "label": "bytes",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "description": "",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 12,
+              "y": 29
+            },
+            "hiddenSeries": false,
+            "id": 41,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "hideZero": true,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "node_filesystem_files_free{instance=~\"$node:$port\",job=~\"$job\",device!~'rootfs'}",
+                "format": "time_series",
+                "hide": false,
+                "intervalFactor": 2,
+                "legendFormat": "{{mountpoint}} - Free file nodes",
+                "refId": "A",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "File Nodes Free",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "short",
+                "label": "file nodes",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "description": "",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 0,
+              "y": 39
+            },
+            "hiddenSeries": false,
+            "id": 28,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "show": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 6,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "node_filefd_maximum{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "intervalFactor": 4,
+                "legendFormat": "Max open files",
+                "refId": "A",
+                "step": 8
+              },
+              {
+                "expr": "node_filefd_allocated{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "Open files",
+                "refId": "B",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "File Descriptor",
+            "tooltip": {
+              "shared": false,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "short",
+                "label": "files",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "description": "",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 12,
+              "y": 39
+            },
+            "hiddenSeries": false,
+            "id": 219,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "hideZero": true,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "node_filesystem_files{instance=~\"$node:$port\",job=~\"$job\",device!~'rootfs'}",
+                "format": "time_series",
+                "hide": false,
+                "intervalFactor": 2,
+                "legendFormat": "{{mountpoint}} - File nodes total",
+                "refId": "A",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "File Nodes Size",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "short",
+                "label": "file Nodes",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {
+              "/ ReadOnly": "#890F02"
+            },
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "decimals": null,
+            "description": "",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 0,
+              "y": 49
+            },
+            "hiddenSeries": false,
+            "id": 44,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "hideEmpty": true,
+              "hideZero": true,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 6,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": true,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "node_filesystem_readonly{instance=~\"$node:$port\",job=~\"$job\",device!~'rootfs'}",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "{{mountpoint}} - ReadOnly",
+                "refId": "A",
+                "step": 4
+              },
+              {
+                "expr": "node_filesystem_device_error{instance=~\"$node:$port\",job=~\"$job\",device!~'rootfs'}",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "{{mountpoint}} - Device error",
+                "refId": "B",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Filesystem in ReadOnly / Error",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "short",
+                "label": "counter",
+                "logBase": 1,
+                "max": "1",
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          }
+        ],
+        "repeat": null,
+        "title": "Storage Filesystem",
+        "type": "row"
+      },
+      {
+        "collapsed": true,
+        "datasource": "Prometheus",
+        "gridPos": {
+          "h": 1,
+          "w": 24,
+          "x": 0,
+          "y": 30
+        },
+        "id": 272,
+        "panels": [
+          {
+            "aliasColors": {
+              "receive_packets_eth0": "#7EB26D",
+              "receive_packets_lo": "#E24D42",
+              "transmit_packets_eth0": "#7EB26D",
+              "transmit_packets_lo": "#E24D42"
+            },
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 0,
+              "y": 30
+            },
+            "hiddenSeries": false,
+            "id": 60,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sideWidth": 300,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [
+              {
+                "alias": "/.*Trans.*/",
+                "transform": "negative-Y"
+              }
+            ],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "irate(node_network_receive_packets_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "{{device}} - Receive",
+                "refId": "A",
+                "step": 4
+              },
+              {
+                "expr": "irate(node_network_transmit_packets_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "{{device}} - Transmit",
+                "refId": "B",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Network Traffic by Packets",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "pps",
+                "label": "packets out (-) / in (+)",
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 12,
+              "y": 30
+            },
+            "hiddenSeries": false,
+            "id": 142,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "hideEmpty": false,
+              "hideZero": false,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sideWidth": 300,
+              "sort": "current",
+              "sortDesc": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [
+              {
+                "alias": "/.*Trans.*/",
+                "transform": "negative-Y"
+              }
+            ],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "irate(node_network_receive_errs_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "{{device}} - Receive errors",
+                "refId": "A",
+                "step": 4
+              },
+              {
+                "expr": "irate(node_network_transmit_errs_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "{{device}} - Rransmit errors",
+                "refId": "B",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Network Traffic Errors",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "pps",
+                "label": "packets out (-) / in (+)",
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 0,
+              "y": 40
+            },
+            "hiddenSeries": false,
+            "id": 143,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "hideEmpty": false,
+              "hideZero": false,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sideWidth": 300,
+              "sort": "current",
+              "sortDesc": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [
+              {
+                "alias": "/.*Trans.*/",
+                "transform": "negative-Y"
+              }
+            ],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "irate(node_network_receive_drop_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "{{device}} - Receive drop",
+                "refId": "A",
+                "step": 4
+              },
+              {
+                "expr": "irate(node_network_transmit_drop_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "{{device}} - Transmit drop",
+                "refId": "B",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Network Traffic Drop",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "pps",
+                "label": "packets out (-) / in (+)",
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 12,
+              "y": 40
+            },
+            "hiddenSeries": false,
+            "id": 141,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "hideEmpty": false,
+              "hideZero": false,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sideWidth": 300,
+              "sort": "current",
+              "sortDesc": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [
+              {
+                "alias": "/.*Trans.*/",
+                "transform": "negative-Y"
+              }
+            ],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "irate(node_network_receive_compressed_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "{{device}} - Receive compressed",
+                "refId": "A",
+                "step": 4
+              },
+              {
+                "expr": "irate(node_network_transmit_compressed_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "{{device}} - Transmit compressed",
+                "refId": "B",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Network Traffic Compressed",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "pps",
+                "label": "packets out (-) / in (+)",
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 0,
+              "y": 50
+            },
+            "hiddenSeries": false,
+            "id": 146,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "hideEmpty": false,
+              "hideZero": false,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sideWidth": 300,
+              "sort": "current",
+              "sortDesc": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [
+              {
+                "alias": "/.*Trans.*/",
+                "transform": "negative-Y"
+              }
+            ],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "irate(node_network_receive_multicast_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "{{device}} - Receive multicast",
+                "refId": "A",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Network Traffic Multicast",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "pps",
+                "label": "packets out (-) / in (+)",
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 12,
+              "y": 50
+            },
+            "hiddenSeries": false,
+            "id": 144,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "hideEmpty": false,
+              "hideZero": false,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sideWidth": 300,
+              "sort": "current",
+              "sortDesc": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [
+              {
+                "alias": "/.*Trans.*/",
+                "transform": "negative-Y"
+              }
+            ],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "irate(node_network_receive_fifo_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "{{device}} - Receive fifo",
+                "refId": "A",
+                "step": 4
+              },
+              {
+                "expr": "irate(node_network_transmit_fifo_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "{{device}} - Transmit fifo",
+                "refId": "B",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Network Traffic Fifo",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "pps",
+                "label": "packets out (-) / in (+)",
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 0,
+              "y": 60
+            },
+            "hiddenSeries": false,
+            "id": 145,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "hideEmpty": false,
+              "hideZero": false,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sideWidth": 300,
+              "sort": "current",
+              "sortDesc": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [
+              {
+                "alias": "/.*Trans.*/",
+                "transform": "negative-Y"
+              }
+            ],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "irate(node_network_receive_frame_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "hide": false,
+                "intervalFactor": 2,
+                "legendFormat": "{{device}} - Receive frame",
+                "refId": "A",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Network Traffic Frame",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "pps",
+                "label": "packets out (-) / in (+)",
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 12,
+              "y": 60
+            },
+            "hiddenSeries": false,
+            "id": 231,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "hideEmpty": false,
+              "hideZero": false,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sideWidth": 300,
+              "sort": "current",
+              "sortDesc": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "irate(node_network_transmit_carrier_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "{{device}} - Statistic transmit_carrier",
+                "refId": "A",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Network Traffic Carrier",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "short",
+                "label": "counter",
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 0,
+              "y": 70
+            },
+            "hiddenSeries": false,
+            "id": 232,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "hideEmpty": false,
+              "hideZero": false,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sideWidth": 300,
+              "sort": "current",
+              "sortDesc": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [
+              {
+                "alias": "/.*Trans.*/",
+                "transform": "negative-Y"
+              }
+            ],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "irate(node_network_transmit_colls_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "{{device}} - Transmit colls",
+                "refId": "A",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Network Traffic Colls",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "short",
+                "label": "counter",
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 12,
+              "y": 70
+            },
+            "hiddenSeries": false,
+            "id": 61,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [
+              {
+                "alias": "NF conntrack limit",
+                "color": "#890F02",
+                "fill": 0
+              }
+            ],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "node_nf_conntrack_entries{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "NF conntrack entries",
+                "refId": "A",
+                "step": 4
+              },
+              {
+                "expr": "node_nf_conntrack_entries_limit{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "NF conntrack limit",
+                "refId": "B",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "NF Contrack",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "short",
+                "label": "entries",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 0,
+              "y": 80
+            },
+            "hiddenSeries": false,
+            "id": 230,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "node_arp_entries{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "{{ device }} - ARP entries",
+                "refId": "A",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "ARP Entries",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "short",
+                "label": "Entries",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 12,
+              "y": 80
+            },
+            "hiddenSeries": false,
+            "id": 288,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 1,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "node_network_mtu_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "{{ device }} - Bytes",
+                "refId": "A",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "MTU",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "decimals": 0,
+                "format": "bytes",
+                "label": "bytes",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 0,
+              "y": 90
+            },
+            "hiddenSeries": false,
+            "id": 280,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 1,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "node_network_speed_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "{{ device }} - Speed",
+                "refId": "A",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Speed",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "decimals": 0,
+                "format": "bytes",
+                "label": "bytes",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 12,
+              "y": 90
+            },
+            "hiddenSeries": false,
+            "id": 289,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 1,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "node_network_transmit_queue_length{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "{{ device }} -   Interface transmit queue length",
+                "refId": "A",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Queue Length",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "decimals": 0,
+                "format": "none",
+                "label": "packets",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 0,
+              "y": 100
+            },
+            "hiddenSeries": false,
+            "id": 290,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "hideEmpty": false,
+              "hideZero": false,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sideWidth": 300,
+              "sort": "current",
+              "sortDesc": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [
+              {
+                "alias": "/.*Dropped.*/",
+                "transform": "negative-Y"
+              }
+            ],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "irate(node_softnet_processed_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "CPU {{cpu}} - Processed",
+                "refId": "A",
+                "step": 4
+              },
+              {
+                "expr": "irate(node_softnet_dropped_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "CPU {{cpu}} - Dropped",
+                "refId": "B",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Softnet Packets",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "short",
+                "label": "packetes drop (-) / process (+)",
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 12,
+              "y": 100
+            },
+            "hiddenSeries": false,
+            "id": 310,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "hideEmpty": false,
+              "hideZero": false,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sideWidth": 300,
+              "sort": "current",
+              "sortDesc": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "irate(node_softnet_times_squeezed_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "CPU {{cpu}} - Squeezed",
+                "refId": "A",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Softnet Out of Quota",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "short",
+                "label": "counter",
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 0,
+              "y": 110
+            },
+            "hiddenSeries": false,
+            "id": 309,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "hideEmpty": false,
+              "hideZero": false,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sideWidth": 300,
+              "sort": "current",
+              "sortDesc": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "node_network_up{operstate=\"up\",instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "{{interface}} - Operational state UP",
+                "refId": "A",
+                "step": 4
+              },
+              {
+                "expr": "node_network_carrier{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "instant": false,
+                "legendFormat": "{{device}} - Physical link state",
+                "refId": "B"
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Network Operational Status",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "short",
+                "label": "counter",
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          }
+        ],
+        "repeat": null,
+        "title": "Network Traffic",
+        "type": "row"
+      },
+      {
+        "collapsed": true,
+        "datasource": "Prometheus",
+        "gridPos": {
+          "h": 1,
+          "w": 24,
+          "x": 0,
+          "y": 31
+        },
+        "id": 273,
+        "panels": [
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 0,
+              "y": 13
+            },
+            "hiddenSeries": false,
+            "id": 63,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "hideEmpty": false,
+              "hideZero": false,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sideWidth": 300,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "node_sockstat_TCP_alloc{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "TCP_alloc - Allocated sockets",
+                "refId": "A",
+                "step": 240
+              },
+              {
+                "expr": "node_sockstat_TCP_inuse{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "TCP_inuse - Tcp sockets currently in use",
+                "refId": "B",
+                "step": 240
+              },
+              {
+                "expr": "node_sockstat_TCP_mem{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "hide": true,
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "TCP_mem - Used memory for tcp",
+                "refId": "C",
+                "step": 240
+              },
+              {
+                "expr": "node_sockstat_TCP_orphan{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "TCP_orphan - Orphan sockets",
+                "refId": "D",
+                "step": 240
+              },
+              {
+                "expr": "node_sockstat_TCP_tw{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "TCP_tw - Sockets wating close",
+                "refId": "E",
+                "step": 240
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Sockstat TCP",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "short",
+                "label": "counter",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 12,
+              "y": 13
+            },
+            "hiddenSeries": false,
+            "id": 124,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "hideEmpty": false,
+              "hideZero": false,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sideWidth": 300,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "node_sockstat_UDPLITE_inuse{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "UDPLITE_inuse - Udplite sockets currently in use",
+                "refId": "A",
+                "step": 240
+              },
+              {
+                "expr": "node_sockstat_UDP_inuse{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "UDP_inuse - Udp sockets currently in use",
+                "refId": "B",
+                "step": 240
+              },
+              {
+                "expr": "node_sockstat_UDP_mem{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "UDP_mem - Used memory for udp",
+                "refId": "C",
+                "step": 240
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Sockstat UDP",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "short",
+                "label": "counter",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 0,
+              "y": 23
+            },
+            "hiddenSeries": false,
+            "id": 126,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "hideEmpty": false,
+              "hideZero": false,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sideWidth": 300,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "node_sockstat_sockets_used{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "Sockets_used - Sockets currently in use",
+                "refId": "A",
+                "step": 240
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Sockstat Used",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "short",
+                "label": "sockets",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 12,
+              "y": 23
+            },
+            "hiddenSeries": false,
+            "id": 220,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "hideEmpty": false,
+              "hideZero": false,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sideWidth": 300,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "node_sockstat_TCP_mem_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "mem_bytes - TCP sockets in that state",
+                "refId": "A",
+                "step": 240
+              },
+              {
+                "expr": "node_sockstat_UDP_mem_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "mem_bytes - UDP sockets in that state",
+                "refId": "B",
+                "step": 240
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Sockstat Memory Size",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "bytes",
+                "label": "bytes",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 0,
+              "y": 33
+            },
+            "hiddenSeries": false,
+            "id": 125,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "hideEmpty": false,
+              "hideZero": false,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sideWidth": 300,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "node_sockstat_FRAG_inuse{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "FRAG_inuse - Frag sockets currently in use",
+                "refId": "A",
+                "step": 240
+              },
+              {
+                "expr": "node_sockstat_FRAG_memory{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "FRAG_memory - Used memory for frag",
+                "refId": "B",
+                "step": 240
+              },
+              {
+                "expr": "node_sockstat_RAW_inuse{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "RAW_inuse - Raw sockets currently in use",
+                "refId": "C",
+                "step": 240
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Sockstat FRAG / RAW",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "short",
+                "label": "counter",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          }
+        ],
+        "repeat": null,
+        "title": "Network Sockstat",
+        "type": "row"
+      },
+      {
+        "collapsed": true,
+        "datasource": "Prometheus",
+        "gridPos": {
+          "h": 1,
+          "w": 24,
+          "x": 0,
+          "y": 32
+        },
+        "id": 274,
+        "panels": [
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 0,
+              "y": 32
+            },
+            "height": "",
+            "hiddenSeries": false,
+            "id": 221,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "hideEmpty": false,
+              "hideZero": false,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sideWidth": 300,
+              "sort": "current",
+              "sortDesc": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 12,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [
+              {
+                "alias": "/.*Out.*/",
+                "transform": "negative-Y"
+              }
+            ],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "irate(node_netstat_IpExt_InOctets{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "InOctets - Received octets",
+                "refId": "A",
+                "step": 4
+              },
+              {
+                "expr": "irate(node_netstat_IpExt_OutOctets{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "intervalFactor": 2,
+                "legendFormat": "OutOctets - Sent octets",
+                "refId": "B",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Netstat IP In / Out Octets",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "short",
+                "label": "octects out (-) / in (+)",
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 12,
+              "y": 32
+            },
+            "height": "",
+            "hiddenSeries": false,
+            "id": 81,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "hideEmpty": false,
+              "hideZero": false,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sideWidth": 300,
+              "sort": "current",
+              "sortDesc": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "irate(node_netstat_Ip_Forwarding{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "Forwarding - IP forwarding",
+                "refId": "A",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Netstat IP Forwarding",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "short",
+                "label": "datagrams",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "decimals": null,
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 0,
+              "y": 42
+            },
+            "height": "",
+            "hiddenSeries": false,
+            "id": 115,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "hideZero": false,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sort": "current",
+              "sortDesc": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 12,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [
+              {
+                "alias": "/.*Out.*/",
+                "transform": "negative-Y"
+              }
+            ],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "irate(node_netstat_Icmp_InMsgs{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "InMsgs -  Messages which the entity received. Note that this counter includes all those counted by icmpInErrors",
+                "refId": "A",
+                "step": 4
+              },
+              {
+                "expr": "irate(node_netstat_Icmp_OutMsgs{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "OutMsgs - Messages which this entity attempted to send. Note that this counter includes all those counted by icmpOutErrors",
+                "refId": "B",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "ICMP In / Out",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "short",
+                "label": "messages out (-) / in (+)",
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "decimals": null,
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 12,
+              "y": 42
+            },
+            "height": "",
+            "hiddenSeries": false,
+            "id": 50,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "hideZero": false,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sort": "current",
+              "sortDesc": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 12,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [
+              {
+                "alias": "/.*Out.*/",
+                "transform": "negative-Y"
+              }
+            ],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "irate(node_netstat_Icmp_InErrors{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "InErrors - Messages which the entity received but determined as having ICMP-specific errors (bad ICMP checksums, bad length, etc.)",
+                "refId": "A",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "ICMP Errors",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "short",
+                "label": "messages out (-) / in (+)",
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "decimals": null,
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 0,
+              "y": 52
+            },
+            "height": "",
+            "hiddenSeries": false,
+            "id": 55,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "hideZero": false,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sort": "current",
+              "sortDesc": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 12,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [
+              {
+                "alias": "/.*Out.*/",
+                "transform": "negative-Y"
+              },
+              {
+                "alias": "/.*Snd.*/",
+                "transform": "negative-Y"
+              }
+            ],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "irate(node_netstat_Udp_InDatagrams{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "InDatagrams - Datagrams received",
+                "refId": "A",
+                "step": 4
+              },
+              {
+                "expr": "irate(node_netstat_Udp_OutDatagrams{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "OutDatagrams - Datagrams sent",
+                "refId": "B",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "UDP In / Out",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "short",
+                "label": "datagrams out (-) / in (+)",
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 12,
+              "y": 52
+            },
+            "height": "",
+            "hiddenSeries": false,
+            "id": 109,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "hideZero": false,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sort": "current",
+              "sortDesc": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 12,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "irate(node_netstat_Udp_InErrors{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "InErrors - UDP Datagrams that could not be delivered to an application",
+                "refId": "A",
+                "step": 4
+              },
+              {
+                "expr": "irate(node_netstat_Udp_NoPorts{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "NoPorts - UDP Datagrams received on a port with no listener",
+                "refId": "B",
+                "step": 4
+              },
+              {
+                "expr": "irate(node_netstat_UdpLite_InErrors{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "interval": "",
+                "legendFormat": "InErrors Lite - UDPLite Datagrams that could not be delivered to an application",
+                "refId": "C"
+              },
+              {
+                "expr": "irate(node_netstat_Udp_RcvbufErrors{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "RcvbufErrors - UDP buffer errors received",
+                "refId": "D",
+                "step": 4
+              },
+              {
+                "expr": "irate(node_netstat_Udp_SndbufErrors{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "SndbufErrors - UDP buffer errors send",
+                "refId": "E",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "UDP Errors",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "short",
+                "label": "datagrams",
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "decimals": null,
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 0,
+              "y": 62
+            },
+            "height": "",
+            "hiddenSeries": false,
+            "id": 299,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "hideZero": false,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sort": "current",
+              "sortDesc": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 12,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [
+              {
+                "alias": "/.*Out.*/",
+                "transform": "negative-Y"
+              },
+              {
+                "alias": "/.*Snd.*/",
+                "transform": "negative-Y"
+              }
+            ],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "irate(node_netstat_Tcp_InSegs{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "instant": false,
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "InSegs - Segments received, including those received in error. This count includes segments received on currently established connections",
+                "refId": "A",
+                "step": 4
+              },
+              {
+                "expr": "irate(node_netstat_Tcp_OutSegs{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "OutSegs - Segments sent, including those on current connections but excluding those containing only retransmitted octets",
+                "refId": "B",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "TCP In / Out",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "short",
+                "label": "datagrams out (-) / in (+)",
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "description": "",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 12,
+              "y": 62
+            },
+            "height": "",
+            "hiddenSeries": false,
+            "id": 104,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "hideEmpty": false,
+              "hideZero": false,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sort": "current",
+              "sortDesc": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 12,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "irate(node_netstat_TcpExt_ListenOverflows{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "hide": false,
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "ListenOverflows - Times the listen queue of a socket overflowed",
+                "refId": "A",
+                "step": 4
+              },
+              {
+                "expr": "irate(node_netstat_TcpExt_ListenDrops{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "hide": false,
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "ListenDrops - SYNs to LISTEN sockets ignored",
+                "refId": "B",
+                "step": 4
+              },
+              {
+                "expr": "irate(node_netstat_TcpExt_TCPSynRetrans{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "TCPSynRetrans - SYN-SYN/ACK retransmits to break down retransmissions in SYN, fast/timeout retransmits",
+                "refId": "C",
+                "step": 4
+              },
+              {
+                "expr": "irate(node_netstat_Tcp_RetransSegs{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "interval": "",
+                "legendFormat": "RetransSegs - Segments retransmitted - that is, the number of TCP segments transmitted containing one or more previously transmitted octets",
+                "refId": "D"
+              },
+              {
+                "expr": "irate(node_netstat_Tcp_InErrs{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "interval": "",
+                "legendFormat": "InErrs - Segments received in error (e.g., bad TCP checksums)",
+                "refId": "E"
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "TCP Errors",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "short",
+                "label": "counter",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 0,
+              "y": 72
+            },
+            "height": "",
+            "hiddenSeries": false,
+            "id": 85,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "hideZero": false,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sortDesc": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 12,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [
+              {
+                "alias": "/.*MaxConn *./",
+                "color": "#890F02",
+                "fill": 0
+              }
+            ],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "node_netstat_Tcp_CurrEstab{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "hide": false,
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "CurrEstab - TCP connections for which the current state is either ESTABLISHED or CLOSE- WAIT",
+                "refId": "A",
+                "step": 4
+              },
+              {
+                "expr": "node_netstat_Tcp_MaxConn{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "hide": false,
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "MaxConn - Limit on the total number of TCP connections the entity can support (Dinamic is \"-1\")",
+                "refId": "B",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "TCP Connections",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "short",
+                "label": "connections",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "description": "",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 12,
+              "y": 72
+            },
+            "height": "",
+            "hiddenSeries": false,
+            "id": 91,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "hideEmpty": false,
+              "hideZero": false,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sort": "current",
+              "sortDesc": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 12,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [
+              {
+                "alias": "/.*Sent.*/",
+                "transform": "negative-Y"
+              }
+            ],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "irate(node_netstat_TcpExt_SyncookiesFailed{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "hide": false,
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "SyncookiesFailed - Invalid SYN cookies received",
+                "refId": "A",
+                "step": 4
+              },
+              {
+                "expr": "irate(node_netstat_TcpExt_SyncookiesRecv{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "hide": false,
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "SyncookiesRecv - SYN cookies received",
+                "refId": "B",
+                "step": 4
+              },
+              {
+                "expr": "irate(node_netstat_TcpExt_SyncookiesSent{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "hide": false,
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "SyncookiesSent - SYN cookies sent",
+                "refId": "C",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "TCP SynCookie",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "short",
+                "label": "counter out (-) / in (+)",
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 0,
+              "y": 82
+            },
+            "height": "",
+            "hiddenSeries": false,
+            "id": 82,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "hideZero": false,
+              "max": true,
+              "min": true,
+              "rightSide": false,
+              "show": true,
+              "sortDesc": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "maxPerRow": 12,
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": false,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "irate(node_netstat_Tcp_ActiveOpens{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "ActiveOpens - TCP connections that have made a direct transition to the SYN-SENT state from the CLOSED state",
+                "refId": "A",
+                "step": 4
+              },
+              {
+                "expr": "irate(node_netstat_Tcp_PassiveOpens{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
+                "format": "time_series",
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "PassiveOpens - TCP connections that have made a direct transition to the SYN-RCVD state from the LISTEN state",
+                "refId": "B",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "TCP Direct Transition",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "short",
+                "label": "connections",
+                "logBase": 1,
+                "max": null,
+                "min": "0",
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          }
+        ],
+        "repeat": null,
+        "title": "Network Netstat",
+        "type": "row"
+      },
+      {
+        "collapsed": true,
+        "datasource": "Prometheus",
+        "gridPos": {
+          "h": 1,
+          "w": 24,
+          "x": 0,
+          "y": 33
+        },
+        "id": 279,
+        "panels": [
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "description": "",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 0,
+              "y": 54
+            },
+            "hiddenSeries": false,
+            "id": 40,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "show": true,
+              "sort": "current",
+              "sortDesc": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [],
+            "spaceLength": 10,
+            "stack": true,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "node_scrape_collector_duration_seconds{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "hide": false,
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "{{collector}} - Scrape duration",
+                "refId": "A",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Node Exporter Scrape Time",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "s",
+                "label": "seconds",
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          },
+          {
+            "aliasColors": {},
+            "bars": false,
+            "dashLength": 10,
+            "dashes": false,
+            "datasource": "Prometheus",
+            "description": "",
+            "fill": 2,
+            "fillGradient": 0,
+            "gridPos": {
+              "h": 10,
+              "w": 12,
+              "x": 12,
+              "y": 54
+            },
+            "hiddenSeries": false,
+            "id": 157,
+            "legend": {
+              "alignAsTable": true,
+              "avg": true,
+              "current": true,
+              "max": true,
+              "min": true,
+              "show": true,
+              "total": false,
+              "values": true
+            },
+            "lines": true,
+            "linewidth": 1,
+            "links": [],
+            "nullPointMode": "null",
+            "options": {
+              "dataLinks": []
+            },
+            "percentage": false,
+            "pointradius": 5,
+            "points": false,
+            "renderer": "flot",
+            "seriesOverrides": [
+              {
+                "alias": "/.*error.*/",
+                "color": "#F2495C",
+                "transform": "negative-Y"
+              }
+            ],
+            "spaceLength": 10,
+            "stack": true,
+            "steppedLine": false,
+            "targets": [
+              {
+                "expr": "node_scrape_collector_success{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "hide": false,
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "{{collector}} - Scrape success",
+                "refId": "A",
+                "step": 4
+              },
+              {
+                "expr": "node_textfile_scrape_error{instance=~\"$node:$port\",job=~\"$job\"}",
+                "format": "time_series",
+                "hide": false,
+                "interval": "",
+                "intervalFactor": 2,
+                "legendFormat": "{{collector}} - Scrape textfile error (1 = true)",
+                "refId": "B",
+                "step": 4
+              }
+            ],
+            "thresholds": [],
+            "timeFrom": null,
+            "timeRegions": [],
+            "timeShift": null,
+            "title": "Node Exporter Scrape",
+            "tooltip": {
+              "shared": true,
+              "sort": 0,
+              "value_type": "individual"
+            },
+            "type": "graph",
+            "xaxis": {
+              "buckets": null,
+              "mode": "time",
+              "name": null,
+              "show": true,
+              "values": []
+            },
+            "yaxes": [
+              {
+                "format": "short",
+                "label": "counter",
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": true
+              },
+              {
+                "format": "short",
+                "label": null,
+                "logBase": 1,
+                "max": null,
+                "min": null,
+                "show": false
+              }
+            ],
+            "yaxis": {
+              "align": false,
+              "alignLevel": null
+            }
+          }
+        ],
+        "repeat": null,
+        "title": "Node Exporter",
+        "type": "row"
+      }
+    ],
+    "refresh": "1m",
+    "schemaVersion": 25,
+    "style": "dark",
+    "tags": [
+      "linux"
+    ],
+    "templating": {
+      "list": [
+        {
+          "current": {
+            "selected": true,
+            "text": "Prometheus",
+            "value": "Prometheus"
+          },
+          "hide": 0,
+          "includeAll": false,
+          "label": "datasource",
+          "multi": false,
+          "name": "DS_PROMETHEUS",
+          "options": [],
+          "query": "prometheus",
+          "queryValue": "",
+          "refresh": 1,
+          "regex": "",
+          "skipUrlSync": false,
+          "type": "datasource"
+        },
+        {
+          "allValue": null,
+          "current": {
+            "selected": true,
+            "text": "nodeexporter",
+            "value": "nodeexporter"
+          },
+          "datasource": "Prometheus",
+          "definition": "",
+          "hide": 0,
+          "includeAll": false,
+          "label": "Job",
+          "multi": false,
+          "name": "job",
+          "options": [],
+          "query": "label_values(node_uname_info, job)",
+          "refresh": 1,
+          "regex": "",
+          "skipUrlSync": false,
+          "sort": 1,
+          "tagValuesQuery": "",
+          "tags": [],
+          "tagsQuery": "",
+          "type": "query",
+          "useTags": false
+        },
+        {
+          "allValue": null,
+          "current": {
+            "selected": true,
+            "text": "4d564edf4c3d",
+            "value": "4d564edf4c3d"
+          },
+          "datasource": "Prometheus",
+          "definition": "",
+          "hide": 0,
+          "includeAll": false,
+          "label": "Host:",
+          "multi": false,
+          "name": "name",
+          "options": [],
+          "query": "label_values(node_uname_info{job=~\"$job\"}, nodename)",
+          "refresh": 1,
+          "regex": "",
+          "skipUrlSync": false,
+          "sort": 1,
+          "tagValuesQuery": "",
+          "tags": [],
+          "tagsQuery": "",
+          "type": "query",
+          "useTags": false
+        },
+        {
+          "allValue": null,
+          "current": {
+            "selected": false,
+            "text": "nodeexporter",
+            "value": "nodeexporter"
+          },
+          "datasource": "Prometheus",
+          "definition": "",
+          "hide": 2,
+          "includeAll": false,
+          "label": "Host:",
+          "multi": false,
+          "name": "node",
+          "options": [],
+          "query": "label_values(node_uname_info{nodename=\"$name\"}, instance)",
+          "refresh": 1,
+          "regex": "/([^:]+):.*/",
+          "skipUrlSync": false,
+          "sort": 1,
+          "tagValuesQuery": "",
+          "tags": [],
+          "tagsQuery": "",
+          "type": "query",
+          "useTags": false
+        },
+        {
+          "allValue": null,
+          "current": {
+            "selected": false,
+            "text": "9100",
+            "value": "9100"
+          },
+          "datasource": "Prometheus",
+          "definition": "",
+          "hide": 0,
+          "includeAll": false,
+          "label": "Port",
+          "multi": false,
+          "name": "port",
+          "options": [],
+          "query": "label_values(node_uname_info{instance=~\"$node:(.*)\"}, instance)",
+          "refresh": 1,
+          "regex": "/[^:]+:(.*)/",
+          "skipUrlSync": false,
+          "sort": 3,
+          "tagValuesQuery": "",
+          "tags": [],
+          "tagsQuery": "",
+          "type": "query",
+          "useTags": false
+        }
+      ]
+    },
+    "time": {
+      "from": "now-24h",
+      "to": "now"
+    },
+    "timepicker": {
+      "refresh_intervals": [
+        "10s",
+        "30s",
+        "1m",
+        "5m",
+        "15m",
+        "30m",
+        "1h",
+        "2h",
+        "1d"
+      ],
+      "time_options": [
+        "5m",
+        "15m",
+        "1h",
+        "6h",
+        "12h",
+        "24h",
+        "2d",
+        "7d",
+        "30d"
+      ]
+    },
+    "timezone": "browser",
+    "title": "Node Exporter Full",
+    "uid": "rYdddlPWk",
+    "version": 1
+  }
\ No newline at end of file
diff --git a/scripts/prometheus/grafana/oe.json b/scripts/prometheus/grafana/oe.json
new file mode 100644
index 00000000000..8071f8d6afc
--- /dev/null
+++ b/scripts/prometheus/grafana/oe.json
@@ -0,0 +1,1576 @@
+{
+    "annotations": {
+      "list": [
+        {
+          "builtIn": 1,
+          "datasource": "-- Grafana --",
+          "enable": true,
+          "hide": true,
+          "iconColor": "rgba(0, 211, 255, 1)",
+          "name": "Annotations & Alerts",
+          "type": "dashboard"
+        }
+      ]
+    },
+    "editable": true,
+    "gnetId": null,
+    "graphTooltip": 0,
+    "id": 3,
+    "links": [],
+    "panels": [
+      {
+        "cacheTimeout": null,
+        "datasource": null,
+        "fieldConfig": {
+          "defaults": {
+            "custom": {
+              "align": null
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 3,
+          "w": 4,
+          "x": 0,
+          "y": 0
+        },
+        "id": 20,
+        "interval": "",
+        "links": [],
+        "maxDataPoints": 0,
+        "options": {
+          "colorMode": "value",
+          "graphMode": "area",
+          "justifyMode": "auto",
+          "orientation": "auto",
+          "reduceOptions": {
+            "calcs": [
+              "mean"
+            ],
+            "fields": "",
+            "values": false
+          }
+        },
+        "pluginVersion": "7.0.3",
+        "targets": [
+          {
+            "expr": "oe_sync_blocks_highest",
+            "interval": "",
+            "legendFormat": "",
+            "refId": "A"
+          }
+        ],
+        "timeFrom": null,
+        "timeShift": null,
+        "title": "Highest block",
+        "transformations": [
+          {
+            "id": "reduce",
+            "options": {}
+          }
+        ],
+        "type": "stat"
+      },
+      {
+        "datasource": null,
+        "fieldConfig": {
+          "defaults": {
+            "custom": {},
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 3,
+          "w": 2,
+          "x": 4,
+          "y": 0
+        },
+        "id": 29,
+        "options": {
+          "colorMode": "value",
+          "graphMode": "area",
+          "justifyMode": "auto",
+          "orientation": "auto",
+          "reduceOptions": {
+            "calcs": [
+              "mean"
+            ],
+            "fields": "",
+            "values": false
+          }
+        },
+        "pluginVersion": "7.0.3",
+        "targets": [
+          {
+            "expr": "oe_prunning_earliest_state",
+            "interval": "",
+            "legendFormat": "",
+            "refId": "A"
+          }
+        ],
+        "timeFrom": null,
+        "timeShift": null,
+        "title": "Earliest non pruned state",
+        "transformations": [
+          {
+            "id": "reduce",
+            "options": {}
+          }
+        ],
+        "type": "stat"
+      },
+      {
+        "cacheTimeout": null,
+        "colorBackground": false,
+        "colorValue": false,
+        "colors": [
+          "#299c46",
+          "rgba(237, 129, 40, 0.89)",
+          "#d44a3a"
+        ],
+        "datasource": null,
+        "fieldConfig": {
+          "defaults": {
+            "custom": {}
+          },
+          "overrides": []
+        },
+        "format": "none",
+        "gauge": {
+          "maxValue": 100,
+          "minValue": 0,
+          "show": false,
+          "thresholdLabels": false,
+          "thresholdMarkers": true
+        },
+        "gridPos": {
+          "h": 2,
+          "w": 3,
+          "x": 6,
+          "y": 0
+        },
+        "id": 24,
+        "interval": null,
+        "links": [],
+        "mappingType": 1,
+        "mappingTypes": [
+          {
+            "name": "value to text",
+            "value": 1
+          },
+          {
+            "name": "range to text",
+            "value": 2
+          }
+        ],
+        "maxDataPoints": 100,
+        "nullPointMode": "connected",
+        "nullText": null,
+        "postfix": "",
+        "postfixFontSize": "50%",
+        "prefix": "",
+        "prefixFontSize": "50%",
+        "rangeMaps": [
+          {
+            "from": "null",
+            "text": "N/A",
+            "to": "null"
+          }
+        ],
+        "sparkline": {
+          "fillColor": "rgba(31, 118, 189, 0.18)",
+          "full": false,
+          "lineColor": "rgb(31, 120, 193)",
+          "show": false,
+          "ymax": null,
+          "ymin": null
+        },
+        "tableColumn": "oe_sync_status{instance=\"localhost:8545\", job=\"openethereum\"}",
+        "targets": [
+          {
+            "expr": "oe_sync_status",
+            "refId": "A"
+          }
+        ],
+        "thresholds": "",
+        "timeFrom": null,
+        "timeShift": null,
+        "title": "Sync status",
+        "type": "singlestat",
+        "valueFontSize": "80%",
+        "valueMaps": [
+          {
+            "op": "=",
+            "text": "WaitingPeers",
+            "value": "0"
+          },
+          {
+            "op": "=",
+            "text": "Waiting",
+            "value": "6"
+          },
+          {
+            "op": "=",
+            "text": "SnapshotManifest",
+            "value": "1"
+          },
+          {
+            "op": "=",
+            "text": "SnapshotData",
+            "value": "2"
+          },
+          {
+            "op": "=",
+            "text": "SnapshotWaiting",
+            "value": "3"
+          },
+          {
+            "op": "=",
+            "text": "Blocks",
+            "value": "4"
+          },
+          {
+            "op": "=",
+            "text": "Idle",
+            "value": "5"
+          },
+          {
+            "op": "=",
+            "text": "NewBlocks",
+            "value": "7"
+          }
+        ],
+        "valueName": "current"
+      },
+      {
+        "aliasColors": {},
+        "bars": true,
+        "cacheTimeout": null,
+        "dashLength": 10,
+        "dashes": false,
+        "datasource": null,
+        "fieldConfig": {
+          "defaults": {
+            "custom": {}
+          },
+          "overrides": []
+        },
+        "fill": 1,
+        "fillGradient": 0,
+        "gridPos": {
+          "h": 3,
+          "w": 3,
+          "x": 9,
+          "y": 0
+        },
+        "hiddenSeries": false,
+        "id": 28,
+        "legend": {
+          "avg": false,
+          "current": false,
+          "max": false,
+          "min": false,
+          "show": false,
+          "total": false,
+          "values": false
+        },
+        "lines": false,
+        "linewidth": 1,
+        "links": [],
+        "nullPointMode": "null",
+        "options": {
+          "dataLinks": []
+        },
+        "percentage": false,
+        "pointradius": 2,
+        "points": false,
+        "renderer": "flot",
+        "seriesOverrides": [],
+        "spaceLength": 10,
+        "stack": false,
+        "steppedLine": false,
+        "targets": [
+          {
+            "expr": "oe_metrics_time",
+            "refId": "A"
+          }
+        ],
+        "thresholds": [],
+        "timeFrom": null,
+        "timeRegions": [],
+        "timeShift": null,
+        "title": "RPC Metrics Reponse time",
+        "tooltip": {
+          "shared": true,
+          "sort": 0,
+          "value_type": "individual"
+        },
+        "type": "graph",
+        "xaxis": {
+          "buckets": null,
+          "mode": "time",
+          "name": null,
+          "show": false,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "format": "ms",
+            "label": null,
+            "logBase": 1,
+            "max": "1000",
+            "min": "0",
+            "show": false
+          },
+          {
+            "decimals": null,
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": "0",
+            "show": false
+          }
+        ],
+        "yaxis": {
+          "align": false,
+          "alignLevel": null
+        }
+      },
+      {
+        "aliasColors": {},
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "datasource": null,
+        "fieldConfig": {
+          "defaults": {
+            "custom": {}
+          },
+          "overrides": []
+        },
+        "fill": 1,
+        "fillGradient": 0,
+        "gridPos": {
+          "h": 4,
+          "w": 4,
+          "x": 12,
+          "y": 0
+        },
+        "hiddenSeries": false,
+        "id": 8,
+        "legend": {
+          "avg": false,
+          "current": false,
+          "max": false,
+          "min": false,
+          "show": false,
+          "total": false,
+          "values": false
+        },
+        "lines": true,
+        "linewidth": 1,
+        "nullPointMode": "null",
+        "options": {
+          "dataLinks": []
+        },
+        "percentage": false,
+        "pointradius": 2,
+        "points": false,
+        "renderer": "flot",
+        "seriesOverrides": [],
+        "spaceLength": 10,
+        "stack": false,
+        "steppedLine": false,
+        "targets": [
+          {
+            "expr": "rate(oe_import_blocks[1m])",
+            "interval": "",
+            "legendFormat": "",
+            "refId": "A"
+          }
+        ],
+        "thresholds": [],
+        "timeFrom": null,
+        "timeRegions": [],
+        "timeShift": null,
+        "title": "Block/s",
+        "tooltip": {
+          "shared": true,
+          "sort": 0,
+          "value_type": "individual"
+        },
+        "type": "graph",
+        "xaxis": {
+          "buckets": null,
+          "mode": "time",
+          "name": null,
+          "show": false,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": "0",
+            "show": true
+          },
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": "0",
+            "show": true
+          }
+        ],
+        "yaxis": {
+          "align": false,
+          "alignLevel": null
+        }
+      },
+      {
+        "aliasColors": {},
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "datasource": null,
+        "fieldConfig": {
+          "defaults": {
+            "custom": {}
+          },
+          "overrides": []
+        },
+        "fill": 1,
+        "fillGradient": 0,
+        "gridPos": {
+          "h": 4,
+          "w": 4,
+          "x": 16,
+          "y": 0
+        },
+        "hiddenSeries": false,
+        "id": 6,
+        "legend": {
+          "avg": false,
+          "current": false,
+          "max": false,
+          "min": false,
+          "show": false,
+          "total": false,
+          "values": false
+        },
+        "lines": true,
+        "linewidth": 1,
+        "nullPointMode": "null",
+        "options": {
+          "dataLinks": []
+        },
+        "percentage": false,
+        "pointradius": 2,
+        "points": false,
+        "renderer": "flot",
+        "seriesOverrides": [],
+        "spaceLength": 10,
+        "stack": false,
+        "steppedLine": false,
+        "targets": [
+          {
+            "expr": "rate(oe_import_gas[1m])/1000000",
+            "refId": "A"
+          }
+        ],
+        "thresholds": [],
+        "timeFrom": null,
+        "timeRegions": [],
+        "timeShift": null,
+        "title": "MGas/s",
+        "tooltip": {
+          "shared": true,
+          "sort": 0,
+          "value_type": "individual"
+        },
+        "type": "graph",
+        "xaxis": {
+          "buckets": null,
+          "mode": "time",
+          "name": null,
+          "show": false,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": "0",
+            "show": true
+          },
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": "0",
+            "show": true
+          }
+        ],
+        "yaxis": {
+          "align": false,
+          "alignLevel": null
+        }
+      },
+      {
+        "aliasColors": {},
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "datasource": null,
+        "fieldConfig": {
+          "defaults": {
+            "custom": {}
+          },
+          "overrides": []
+        },
+        "fill": 1,
+        "fillGradient": 0,
+        "gridPos": {
+          "h": 4,
+          "w": 4,
+          "x": 20,
+          "y": 0
+        },
+        "hiddenSeries": false,
+        "id": 10,
+        "legend": {
+          "avg": false,
+          "current": false,
+          "max": false,
+          "min": false,
+          "show": false,
+          "total": false,
+          "values": false
+        },
+        "lines": true,
+        "linewidth": 1,
+        "nullPointMode": "null",
+        "options": {
+          "dataLinks": []
+        },
+        "percentage": false,
+        "pointradius": 2,
+        "points": false,
+        "renderer": "flot",
+        "seriesOverrides": [],
+        "spaceLength": 10,
+        "stack": false,
+        "steppedLine": false,
+        "targets": [
+          {
+            "expr": "rate(oe_import_txs[1m])",
+            "refId": "A"
+          }
+        ],
+        "thresholds": [],
+        "timeFrom": null,
+        "timeRegions": [],
+        "timeShift": null,
+        "title": "Tx/s",
+        "tooltip": {
+          "shared": true,
+          "sort": 0,
+          "value_type": "individual"
+        },
+        "type": "graph",
+        "xaxis": {
+          "buckets": null,
+          "mode": "time",
+          "name": null,
+          "show": false,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": "0",
+            "show": true
+          },
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": "0",
+            "show": true
+          }
+        ],
+        "yaxis": {
+          "align": false,
+          "alignLevel": null
+        }
+      },
+      {
+        "aliasColors": {},
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "datasource": null,
+        "fieldConfig": {
+          "defaults": {
+            "custom": {}
+          },
+          "overrides": []
+        },
+        "fill": 1,
+        "fillGradient": 0,
+        "gridPos": {
+          "h": 5,
+          "w": 12,
+          "x": 0,
+          "y": 3
+        },
+        "hiddenSeries": false,
+        "id": 16,
+        "legend": {
+          "avg": false,
+          "current": false,
+          "max": false,
+          "min": false,
+          "show": false,
+          "total": false,
+          "values": false
+        },
+        "lines": true,
+        "linewidth": 1,
+        "nullPointMode": "null",
+        "options": {
+          "dataLinks": []
+        },
+        "percentage": false,
+        "pluginVersion": "6.5.2",
+        "pointradius": 2,
+        "points": false,
+        "renderer": "flot",
+        "seriesOverrides": [],
+        "spaceLength": 10,
+        "stack": false,
+        "steppedLine": false,
+        "targets": [
+          {
+            "expr": "oe_net_peers",
+            "refId": "A"
+          },
+          {
+            "expr": "oe_net_active_peers",
+            "refId": "B"
+          }
+        ],
+        "thresholds": [],
+        "timeFrom": null,
+        "timeRegions": [],
+        "timeShift": null,
+        "title": "Peers",
+        "tooltip": {
+          "shared": true,
+          "sort": 0,
+          "value_type": "individual"
+        },
+        "type": "graph",
+        "xaxis": {
+          "buckets": null,
+          "mode": "time",
+          "name": null,
+          "show": false,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": null,
+            "show": true
+          },
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": null,
+            "show": true
+          }
+        ],
+        "yaxis": {
+          "align": false,
+          "alignLevel": null
+        }
+      },
+      {
+        "aliasColors": {},
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "datasource": null,
+        "fieldConfig": {
+          "defaults": {
+            "custom": {}
+          },
+          "overrides": []
+        },
+        "fill": 1,
+        "fillGradient": 0,
+        "gridPos": {
+          "h": 4,
+          "w": 6,
+          "x": 12,
+          "y": 4
+        },
+        "hiddenSeries": false,
+        "id": 12,
+        "legend": {
+          "avg": false,
+          "current": false,
+          "max": false,
+          "min": false,
+          "show": false,
+          "total": false,
+          "values": false
+        },
+        "lines": true,
+        "linewidth": 1,
+        "nullPointMode": "null",
+        "options": {
+          "dataLinks": []
+        },
+        "percentage": false,
+        "pointradius": 2,
+        "points": false,
+        "renderer": "flot",
+        "seriesOverrides": [],
+        "spaceLength": 10,
+        "stack": false,
+        "steppedLine": false,
+        "targets": [
+          {
+            "expr": "rate(oe_io_bytes_read[1m])",
+            "interval": "",
+            "legendFormat": "",
+            "refId": "A"
+          },
+          {
+            "expr": "rate(oe_io_bytes_written[1m])",
+            "interval": "",
+            "legendFormat": "",
+            "refId": "B"
+          },
+          {
+            "expr": "rate(oe_io_cache_read_bytes[1m])/60",
+            "refId": "C"
+          }
+        ],
+        "thresholds": [],
+        "timeFrom": null,
+        "timeRegions": [],
+        "timeShift": null,
+        "title": "DB IO",
+        "tooltip": {
+          "shared": true,
+          "sort": 0,
+          "value_type": "individual"
+        },
+        "type": "graph",
+        "xaxis": {
+          "buckets": null,
+          "mode": "time",
+          "name": null,
+          "show": false,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "decimals": null,
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": "0",
+            "show": true
+          },
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": null,
+            "show": true
+          }
+        ],
+        "yaxis": {
+          "align": false,
+          "alignLevel": null
+        }
+      },
+      {
+        "aliasColors": {},
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "datasource": null,
+        "fieldConfig": {
+          "defaults": {
+            "custom": {}
+          },
+          "overrides": []
+        },
+        "fill": 1,
+        "fillGradient": 0,
+        "gridPos": {
+          "h": 4,
+          "w": 6,
+          "x": 18,
+          "y": 4
+        },
+        "hiddenSeries": false,
+        "id": 14,
+        "legend": {
+          "avg": false,
+          "current": false,
+          "max": false,
+          "min": false,
+          "show": false,
+          "total": false,
+          "values": false
+        },
+        "lines": true,
+        "linewidth": 1,
+        "nullPointMode": "null",
+        "options": {
+          "dataLinks": []
+        },
+        "percentage": false,
+        "pointradius": 2,
+        "points": false,
+        "renderer": "flot",
+        "seriesOverrides": [],
+        "spaceLength": 10,
+        "stack": true,
+        "steppedLine": false,
+        "targets": [
+          {
+            "expr": "oe_queue_size_unverified",
+            "refId": "A"
+          },
+          {
+            "expr": "oe_queue_size_verified",
+            "refId": "B"
+          },
+          {
+            "expr": "oe_queue_size_verifying",
+            "refId": "C"
+          }
+        ],
+        "thresholds": [],
+        "timeFrom": null,
+        "timeRegions": [],
+        "timeShift": null,
+        "title": "Queue",
+        "tooltip": {
+          "shared": true,
+          "sort": 0,
+          "value_type": "individual"
+        },
+        "type": "graph",
+        "xaxis": {
+          "buckets": null,
+          "mode": "time",
+          "name": null,
+          "show": false,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "decimals": 0,
+            "format": "short",
+            "label": "",
+            "logBase": 1,
+            "max": null,
+            "min": "0",
+            "show": true
+          },
+          {
+            "decimals": 0,
+            "format": "short",
+            "label": "",
+            "logBase": 1,
+            "max": null,
+            "min": "0",
+            "show": true
+          }
+        ],
+        "yaxis": {
+          "align": false,
+          "alignLevel": null
+        }
+      },
+      {
+        "aliasColors": {},
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "datasource": null,
+        "fieldConfig": {
+          "defaults": {
+            "custom": {}
+          },
+          "overrides": []
+        },
+        "fill": 1,
+        "fillGradient": 0,
+        "gridPos": {
+          "h": 4,
+          "w": 3,
+          "x": 0,
+          "y": 8
+        },
+        "hiddenSeries": false,
+        "id": 4,
+        "legend": {
+          "avg": false,
+          "current": false,
+          "max": false,
+          "min": false,
+          "show": false,
+          "total": false,
+          "values": false
+        },
+        "lines": true,
+        "linewidth": 1,
+        "nullPointMode": "null",
+        "options": {
+          "dataLinks": []
+        },
+        "percentage": false,
+        "pointradius": 2,
+        "points": false,
+        "renderer": "flot",
+        "seriesOverrides": [
+          {}
+        ],
+        "spaceLength": 10,
+        "stack": false,
+        "steppedLine": false,
+        "targets": [
+          {
+            "expr": "oe_snapshot_download_chunks - oe_snapshot_download_chunks_done",
+            "legendFormat": "Pending blocks",
+            "refId": "A"
+          },
+          {
+            "expr": "rate(oe_snapshot_download_chunks_done[5m])*3600",
+            "legendFormat": "Rate per hour",
+            "refId": "B"
+          }
+        ],
+        "thresholds": [],
+        "timeFrom": null,
+        "timeRegions": [],
+        "timeShift": null,
+        "title": "Pending Snapshot download",
+        "tooltip": {
+          "shared": true,
+          "sort": 0,
+          "value_type": "individual"
+        },
+        "type": "graph",
+        "xaxis": {
+          "buckets": null,
+          "mode": "time",
+          "name": null,
+          "show": false,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "decimals": 0,
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": "0",
+            "show": true
+          },
+          {
+            "decimals": 0,
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": "0",
+            "show": true
+          }
+        ],
+        "yaxis": {
+          "align": false,
+          "alignLevel": null
+        }
+      },
+      {
+        "aliasColors": {},
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "datasource": null,
+        "fieldConfig": {
+          "defaults": {
+            "custom": {}
+          },
+          "overrides": []
+        },
+        "fill": 1,
+        "fillGradient": 0,
+        "gridPos": {
+          "h": 4,
+          "w": 3,
+          "x": 3,
+          "y": 8
+        },
+        "hiddenSeries": false,
+        "id": 27,
+        "legend": {
+          "avg": false,
+          "current": false,
+          "max": false,
+          "min": false,
+          "show": false,
+          "total": false,
+          "values": false
+        },
+        "lines": true,
+        "linewidth": 1,
+        "nullPointMode": "null",
+        "options": {
+          "dataLinks": []
+        },
+        "percentage": false,
+        "pointradius": 2,
+        "points": false,
+        "renderer": "flot",
+        "seriesOverrides": [],
+        "spaceLength": 10,
+        "stack": false,
+        "steppedLine": false,
+        "targets": [
+          {
+            "expr": "oe_snapshot_restore_block",
+            "refId": "A"
+          }
+        ],
+        "thresholds": [],
+        "timeFrom": null,
+        "timeRegions": [],
+        "timeShift": null,
+        "title": "Snapshot restore",
+        "tooltip": {
+          "shared": true,
+          "sort": 0,
+          "value_type": "individual"
+        },
+        "type": "graph",
+        "xaxis": {
+          "buckets": null,
+          "mode": "time",
+          "name": null,
+          "show": false,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "decimals": 0,
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": "0",
+            "show": true
+          },
+          {
+            "decimals": 0,
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": "0",
+            "show": true
+          }
+        ],
+        "yaxis": {
+          "align": false,
+          "alignLevel": null
+        }
+      },
+      {
+        "aliasColors": {},
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "datasource": null,
+        "fieldConfig": {
+          "defaults": {
+            "custom": {}
+          },
+          "overrides": []
+        },
+        "fill": 1,
+        "fillGradient": 0,
+        "gridPos": {
+          "h": 4,
+          "w": 3,
+          "x": 6,
+          "y": 8
+        },
+        "hiddenSeries": false,
+        "id": 31,
+        "legend": {
+          "avg": false,
+          "current": false,
+          "max": false,
+          "min": false,
+          "show": false,
+          "total": false,
+          "values": false
+        },
+        "lines": true,
+        "linewidth": 1,
+        "nullPointMode": "null",
+        "options": {
+          "dataLinks": []
+        },
+        "percentage": false,
+        "pointradius": 2,
+        "points": false,
+        "renderer": "flot",
+        "seriesOverrides": [],
+        "spaceLength": 10,
+        "stack": false,
+        "steppedLine": false,
+        "targets": [
+          {
+            "expr": "oe_chain_block - oe_chain_warpsync_gap_last",
+            "interval": "",
+            "legendFormat": "",
+            "refId": "A"
+          }
+        ],
+        "thresholds": [],
+        "timeFrom": null,
+        "timeRegions": [],
+        "timeShift": null,
+        "title": "Snapshot GAP",
+        "tooltip": {
+          "shared": true,
+          "sort": 0,
+          "value_type": "individual"
+        },
+        "type": "graph",
+        "xaxis": {
+          "buckets": null,
+          "mode": "time",
+          "name": null,
+          "show": false,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": null,
+            "show": true
+          },
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": null,
+            "show": true
+          }
+        ],
+        "yaxis": {
+          "align": false,
+          "alignLevel": null
+        }
+      },
+      {
+        "aliasColors": {},
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "datasource": null,
+        "fieldConfig": {
+          "defaults": {
+            "custom": {}
+          },
+          "overrides": []
+        },
+        "fill": 1,
+        "fillGradient": 0,
+        "gridPos": {
+          "h": 4,
+          "w": 3,
+          "x": 9,
+          "y": 8
+        },
+        "hiddenSeries": false,
+        "id": 26,
+        "legend": {
+          "avg": false,
+          "current": false,
+          "max": false,
+          "min": false,
+          "show": false,
+          "total": false,
+          "values": false
+        },
+        "lines": true,
+        "linewidth": 1,
+        "nullPointMode": "null",
+        "options": {
+          "dataLinks": []
+        },
+        "percentage": false,
+        "pointradius": 2,
+        "points": false,
+        "renderer": "flot",
+        "seriesOverrides": [],
+        "spaceLength": 10,
+        "stack": false,
+        "steppedLine": false,
+        "targets": [
+          {
+            "expr": "oe_snapshot_create_block",
+            "refId": "A"
+          }
+        ],
+        "thresholds": [],
+        "timeFrom": null,
+        "timeRegions": [],
+        "timeShift": null,
+        "title": "Snapshot create",
+        "tooltip": {
+          "shared": true,
+          "sort": 0,
+          "value_type": "individual"
+        },
+        "type": "graph",
+        "xaxis": {
+          "buckets": null,
+          "mode": "time",
+          "name": null,
+          "show": false,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "decimals": 0,
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": "0",
+            "show": true
+          },
+          {
+            "decimals": 0,
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": "0",
+            "show": true
+          }
+        ],
+        "yaxis": {
+          "align": false,
+          "alignLevel": null
+        }
+      },
+      {
+        "aliasColors": {},
+        "bars": false,
+        "cacheTimeout": null,
+        "dashLength": 10,
+        "dashes": false,
+        "datasource": null,
+        "fieldConfig": {
+          "defaults": {
+            "custom": {}
+          },
+          "overrides": []
+        },
+        "fill": 1,
+        "fillGradient": 0,
+        "gridPos": {
+          "h": 4,
+          "w": 6,
+          "x": 12,
+          "y": 8
+        },
+        "hiddenSeries": false,
+        "id": 22,
+        "legend": {
+          "avg": false,
+          "current": false,
+          "max": false,
+          "min": false,
+          "show": false,
+          "total": false,
+          "values": false
+        },
+        "lines": true,
+        "linewidth": 1,
+        "links": [],
+        "nullPointMode": "null",
+        "options": {
+          "dataLinks": []
+        },
+        "percentage": false,
+        "pointradius": 2,
+        "points": false,
+        "renderer": "flot",
+        "seriesOverrides": [],
+        "spaceLength": 10,
+        "stack": true,
+        "steppedLine": false,
+        "targets": [
+          {
+            "expr": "oe_blockchaincache_block_details",
+            "refId": "A"
+          },
+          {
+            "expr": "oe_blockchaincache_block_recipts",
+            "refId": "B"
+          },
+          {
+            "expr": "oe_blockchaincache_blocks",
+            "refId": "C"
+          },
+          {
+            "expr": "oe_blockchaincache_txaddrs",
+            "refId": "D"
+          },
+          {
+            "expr": "",
+            "refId": "E"
+          }
+        ],
+        "thresholds": [],
+        "timeFrom": null,
+        "timeRegions": [],
+        "timeShift": null,
+        "title": "Blockchain cache",
+        "tooltip": {
+          "shared": true,
+          "sort": 0,
+          "value_type": "individual"
+        },
+        "type": "graph",
+        "xaxis": {
+          "buckets": null,
+          "mode": "time",
+          "name": null,
+          "show": false,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "decimals": 0,
+            "format": "decbytes",
+            "label": "",
+            "logBase": 1,
+            "max": null,
+            "min": "0",
+            "show": true
+          },
+          {
+            "decimals": 0,
+            "format": "bytes",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": "0",
+            "show": true
+          }
+        ],
+        "yaxis": {
+          "align": false,
+          "alignLevel": null
+        }
+      },
+      {
+        "aliasColors": {},
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "datasource": null,
+        "fieldConfig": {
+          "defaults": {
+            "custom": {}
+          },
+          "overrides": []
+        },
+        "fill": 1,
+        "fillGradient": 0,
+        "gridPos": {
+          "h": 4,
+          "w": 6,
+          "x": 18,
+          "y": 8
+        },
+        "hiddenSeries": false,
+        "id": 2,
+        "legend": {
+          "avg": false,
+          "current": false,
+          "max": false,
+          "min": false,
+          "show": false,
+          "total": false,
+          "values": false
+        },
+        "lines": true,
+        "linewidth": 1,
+        "nullPointMode": "null",
+        "options": {
+          "dataLinks": []
+        },
+        "percentage": false,
+        "pointradius": 2,
+        "points": false,
+        "renderer": "flot",
+        "seriesOverrides": [],
+        "spaceLength": 10,
+        "stack": true,
+        "steppedLine": false,
+        "targets": [
+          {
+            "expr": "oe_queue_mem_used",
+            "refId": "A"
+          },
+          {
+            "expr": "oe_sync_mem_used",
+            "refId": "B"
+          },
+          {
+            "expr": "oe_statedb_mem_used",
+            "refId": "C"
+          }
+        ],
+        "thresholds": [],
+        "timeFrom": null,
+        "timeRegions": [],
+        "timeShift": null,
+        "title": "Memory",
+        "tooltip": {
+          "shared": true,
+          "sort": 0,
+          "value_type": "individual"
+        },
+        "type": "graph",
+        "xaxis": {
+          "buckets": null,
+          "mode": "time",
+          "name": null,
+          "show": false,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "format": "bytes",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": null,
+            "show": true
+          },
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": null,
+            "show": true
+          }
+        ],
+        "yaxis": {
+          "align": false,
+          "alignLevel": null
+        }
+      }
+    ],
+    "refresh": false,
+    "schemaVersion": 25,
+    "style": "dark",
+    "tags": [],
+    "templating": {
+      "list": []
+    },
+    "time": {
+      "from": "2020-06-10T16:05:07.848Z",
+      "to": "2020-06-10T16:08:24.212Z"
+    },
+    "timepicker": {
+      "refresh_intervals": [
+        "10s",
+        "30s",
+        "1m",
+        "5m",
+        "15m",
+        "30m",
+        "1h",
+        "2h",
+        "1d"
+      ]
+    },
+    "timezone": "",
+    "title": "OpenEthereum_1",
+    "uid": "fH2SyJiMz",
+    "version": 2
+  }
\ No newline at end of file
diff --git a/scripts/prometheus/start.sh b/scripts/prometheus/start.sh
deleted file mode 100755
index 83ed0d06d37..00000000000
--- a/scripts/prometheus/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-docker-compose up

From d213ec0364c8776ce80997b248c778225c3499f7 Mon Sep 17 00:00:00 2001
From: adria0 <adria@codecontext.io>
Date: Fri, 19 Jun 2020 17:52:00 +0200
Subject: [PATCH 14/32] Use hyper instead rpc

---
 Cargo.lock                       |  90 +++++++++++----------------
 Cargo.toml                       |   4 +-
 cli-signer/rpc-client/Cargo.toml |   4 +-
 miner/stratum/Cargo.toml         |   4 +-
 parity/cli/mod.rs                |  28 +++++++++
 parity/configuration.rs          |  21 +++++++
 parity/lib.rs                    |   3 +
 parity/metrics.rs                | 101 +++++++++++++++++++++++++++++++
 parity/run.rs                    |   7 ++-
 rpc/Cargo.toml                   |  12 ++--
 rpc/src/lib.rs                   |   1 -
 rpc/src/v1/impls/light/parity.rs |   4 --
 rpc/src/v1/impls/parity.rs       |  25 +-------
 rpc/src/v1/traits/parity.rs      |   4 --
 14 files changed, 208 insertions(+), 100 deletions(-)
 create mode 100644 parity/metrics.rs

diff --git a/Cargo.lock b/Cargo.lock
index 26162ff989b..19b44d6dda4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1562,7 +1562,7 @@ version = "1.12.0"
 dependencies = [
  "env_logger 0.5.13",
  "ethereum-types",
- "jsonrpc-core 14.1.0",
+ "jsonrpc-core",
  "jsonrpc-tcp-server",
  "keccak-hash",
  "log",
@@ -2431,22 +2431,11 @@ dependencies = [
  "serde_json",
 ]
 
-[[package]]
-name = "jsonrpc-core"
-version = "14.1.0"
-source = "git+https://github.com/adria0/jsonrpc?branch=adria0/rawapi#2707b08fb757cdc83697ef6bc5b8127b53d317c4"
-dependencies = [
- "futures",
- "log",
- "serde",
- "serde_derive",
- "serde_json",
-]
-
 [[package]]
 name = "jsonrpc-derive"
-version = "14.1.0"
-source = "git+https://github.com/adria0/jsonrpc?branch=adria0/rawapi#2707b08fb757cdc83697ef6bc5b8127b53d317c4"
+version = "14.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8609af8f63b626e8e211f52441fcdb6ec54f1a446606b10d5c89ae9bf8a20058"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.9",
@@ -2456,12 +2445,13 @@ dependencies = [
 
 [[package]]
 name = "jsonrpc-http-server"
-version = "14.1.0"
-source = "git+https://github.com/adria0/jsonrpc?branch=adria0/rawapi#2707b08fb757cdc83697ef6bc5b8127b53d317c4"
+version = "14.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "816d63997ea45d3634608edbef83ddb35e661f7c0b27b5b72f237e321f0e9807"
 dependencies = [
  "hyper",
- "jsonrpc-core 14.1.0",
- "jsonrpc-server-utils 14.1.0",
+ "jsonrpc-core",
+ "jsonrpc-server-utils",
  "log",
  "net2",
  "parking_lot 0.10.0",
@@ -2470,11 +2460,12 @@ dependencies = [
 
 [[package]]
 name = "jsonrpc-ipc-server"
-version = "14.1.0"
-source = "git+https://github.com/adria0/jsonrpc?branch=adria0/rawapi#2707b08fb757cdc83697ef6bc5b8127b53d317c4"
+version = "14.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3cc22b91e6e92e7925110c080bfa0dfdc731b156ccb2a3ce0561e902a33a9cf"
 dependencies = [
- "jsonrpc-core 14.1.0",
- "jsonrpc-server-utils 14.1.0",
+ "jsonrpc-core",
+ "jsonrpc-server-utils",
  "log",
  "parity-tokio-ipc",
  "parking_lot 0.10.0",
@@ -2483,13 +2474,13 @@ dependencies = [
 
 [[package]]
 name = "jsonrpc-pubsub"
-version = "14.1.0"
-source = "git+https://github.com/adria0/jsonrpc?branch=adria0/rawapi#2707b08fb757cdc83697ef6bc5b8127b53d317c4"
+version = "14.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b31c9b90731276fdd24d896f31bb10aecf2e5151733364ae81123186643d939"
 dependencies = [
- "jsonrpc-core 14.1.0",
+ "jsonrpc-core",
  "log",
  "parking_lot 0.10.0",
- "rand 0.7.3",
  "serde",
 ]
 
@@ -2501,22 +2492,7 @@ checksum = "95b7635e618a0edbbe0d2a2bbbc69874277c49383fcf6c3c0414491cfb517d22"
 dependencies = [
  "bytes",
  "globset",
- "jsonrpc-core 14.0.5",
- "lazy_static",
- "log",
- "tokio",
- "tokio-codec",
- "unicase",
-]
-
-[[package]]
-name = "jsonrpc-server-utils"
-version = "14.1.0"
-source = "git+https://github.com/adria0/jsonrpc?branch=adria0/rawapi#2707b08fb757cdc83697ef6bc5b8127b53d317c4"
-dependencies = [
- "bytes",
- "globset",
- "jsonrpc-core 14.1.0",
+ "jsonrpc-core",
  "lazy_static",
  "log",
  "tokio",
@@ -2526,11 +2502,12 @@ dependencies = [
 
 [[package]]
 name = "jsonrpc-tcp-server"
-version = "14.1.0"
-source = "git+https://github.com/adria0/jsonrpc?branch=adria0/rawapi#2707b08fb757cdc83697ef6bc5b8127b53d317c4"
+version = "14.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a03d03b8eccd463b8f1c675d5e5febff5055291b82235c8ec0af973e6d7b84fc"
 dependencies = [
- "jsonrpc-core 14.1.0",
- "jsonrpc-server-utils 14.1.0",
+ "jsonrpc-core",
+ "jsonrpc-server-utils",
  "log",
  "parking_lot 0.10.0",
  "tokio-service",
@@ -2538,11 +2515,12 @@ dependencies = [
 
 [[package]]
 name = "jsonrpc-ws-server"
-version = "14.1.0"
-source = "git+https://github.com/adria0/jsonrpc?branch=adria0/rawapi#2707b08fb757cdc83697ef6bc5b8127b53d317c4"
+version = "14.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b94e5773b2ae66e0e02c80775ce6bbba6f15d5bb47c14ec36a36fcf94f8df851"
 dependencies = [
- "jsonrpc-core 14.1.0",
- "jsonrpc-server-utils 14.1.0",
+ "jsonrpc-core",
+ "jsonrpc-server-utils",
  "log",
  "parking_lot 0.10.0",
  "slab",
@@ -3226,9 +3204,10 @@ dependencies = [
  "fake-fetch",
  "fdlimit",
  "futures",
+ "hyper",
  "ipnetwork",
  "journaldb",
- "jsonrpc-core 14.1.0",
+ "jsonrpc-core",
  "keccak-hash",
  "kvdb",
  "kvdb-rocksdb",
@@ -3265,6 +3244,7 @@ dependencies = [
  "serde_json",
  "snapshot",
  "spec",
+ "stats",
  "tempfile",
  "term_size",
  "textwrap",
@@ -3431,7 +3411,7 @@ dependencies = [
  "fetch",
  "futures",
  "itertools",
- "jsonrpc-core 14.1.0",
+ "jsonrpc-core",
  "jsonrpc-derive",
  "jsonrpc-http-server",
  "jsonrpc-ipc-server",
@@ -3476,7 +3456,7 @@ version = "1.4.0"
 dependencies = [
  "ethereum-types",
  "futures",
- "jsonrpc-core 14.1.0",
+ "jsonrpc-core",
  "jsonrpc-ws-server",
  "keccak-hash",
  "log",
@@ -3522,7 +3502,7 @@ dependencies = [
  "ethereum-types",
  "futures",
  "hyper",
- "jsonrpc-server-utils 14.0.5",
+ "jsonrpc-server-utils",
  "keccak-hash",
  "kvdb",
  "kvdb-rocksdb",
diff --git a/Cargo.toml b/Cargo.toml
index 845a729c273..d06e0539851 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -40,8 +40,9 @@ ethkey = { path = "accounts/ethkey" }
 ethstore = { path = "accounts/ethstore" }
 fdlimit = "0.1"
 futures = "0.1"
+hyper = { version = "0.12" }
 journaldb = { path = "util/journaldb" }
-jsonrpc-core = { git = "https://github.com/adria0/jsonrpc", branch="adria0/rawapi"} 
+jsonrpc-core = "14.0.3"
 keccak-hash = "0.5.0"
 kvdb = "0.5.0"
 kvdb-rocksdb = "0.7.0"
@@ -75,6 +76,7 @@ serde_derive = "1.0"
 serde_json = "1.0"
 snapshot = { path = "ethcore/snapshot" }
 spec = { path = "ethcore/spec" }
+stats = { path = "util/stats" }
 term_size = "0.3"
 textwrap = "0.11.0"
 toml = "0.5.6"
diff --git a/cli-signer/rpc-client/Cargo.toml b/cli-signer/rpc-client/Cargo.toml
index bf2f9905a63..f1931921f57 100644
--- a/cli-signer/rpc-client/Cargo.toml
+++ b/cli-signer/rpc-client/Cargo.toml
@@ -15,7 +15,7 @@ serde_json = "1.0"
 url = "2.1.1"
 matches = "0.1"
 parking_lot = "0.10.0"
-jsonrpc-core = { git = "https://github.com/adria0/jsonrpc", branch="adria0/rawapi"} 
-jsonrpc-ws-server = { git = "https://github.com/adria0/jsonrpc", branch="adria0/rawapi"}
+jsonrpc-core = "14.0.3"
+jsonrpc-ws-server = "14.0.3"
 parity-rpc = { path = "../../rpc" }
 keccak-hash = "0.5.0"
diff --git a/miner/stratum/Cargo.toml b/miner/stratum/Cargo.toml
index b96134a80b8..c681e52db24 100644
--- a/miner/stratum/Cargo.toml
+++ b/miner/stratum/Cargo.toml
@@ -8,8 +8,8 @@ authors = ["Parity Technologies <admin@parity.io>"]
 [dependencies]
 ethereum-types = "0.9.0"
 keccak-hash = "0.5.0"
-jsonrpc-core = { git = "https://github.com/adria0/jsonrpc", branch="adria0/rawapi"} 
-jsonrpc-tcp-server = { git = "https://github.com/adria0/jsonrpc", branch="adria0/rawapi"}
+jsonrpc-core = "14.0.3"
+jsonrpc-tcp-server = "14.0.3"
 log = "0.4"
 parking_lot = "0.10.0"
 
diff --git a/parity/cli/mod.rs b/parity/cli/mod.rs
index 6fa642deece..235d22b6729 100644
--- a/parity/cli/mod.rs
+++ b/parity/cli/mod.rs
@@ -563,6 +563,19 @@ usage! {
 			"--ws-max-connections=[CONN]",
 			"Maximum number of allowed concurrent WebSockets JSON-RPC connections.",
 
+		["Metrics"]
+			FLAG flag_metrics: (bool) = false, or |c: &Config| c.metrics.as_ref()?.enable.clone(),
+			"--metrics",
+			"Enable prometheus metrics.",
+
+			ARG arg_metrics_port: (u16) = 3000u16, or |c: &Config| c.metrics.as_ref()?.port.clone(),
+			"--metrics-port=[PORT]",
+			"Specify the port portion of the metrics server.",
+
+			ARG arg_metrics_interface: (String) = "local", or |c: &Config| c.metrics.as_ref()?.interface.clone(),
+			"--metrics-interface=[IP]",
+			"Specify the hostname portion of the metrics server, IP should be an interface's IP address, or all (all interfaces) or local.",
+
 		["API and Console Options – IPC"]
 			FLAG flag_no_ipc: (bool) = false, or |c: &Config| c.ipc.as_ref()?.disable.clone(),
 			"--no-ipc",
@@ -1153,6 +1166,7 @@ struct Config {
 	stratum: Option<Stratum>,
 	whisper: Option<Whisper>,
 	light: Option<Light>,
+	metrics: Option<Metrics>,
 }
 
 #[derive(Default, Debug, PartialEq, Deserialize)]
@@ -1282,6 +1296,14 @@ struct Ipc {
 	apis: Option<Vec<String>>,
 }
 
+#[derive(Default, Debug, PartialEq, Deserialize)]
+#[serde(deny_unknown_fields)]
+struct Metrics {
+	enable: Option<bool>,
+	port: Option<u16>,
+	interface: Option<String>,
+}
+
 #[derive(Default, Debug, PartialEq, Deserialize)]
 #[serde(deny_unknown_fields)]
 struct Dapps {
@@ -1820,6 +1842,12 @@ mod tests {
 			arg_ipc_path: "$HOME/.parity/jsonrpc.ipc".into(),
 			arg_ipc_apis: "web3,eth,net,parity,parity_accounts,personal,traces,rpc,secretstore".into(),
 			arg_ipc_chmod: "660".into(),
+
+			// METRICS
+			flag_metrics: false,
+			arg_metrics_port: 3000u16,
+			arg_metrics_interface: "local".into(),
+
 			// DAPPS
 			arg_dapps_path: Some("$HOME/.parity/dapps".into()),
 			flag_no_dapps: false,
diff --git a/parity/configuration.rs b/parity/configuration.rs
index d04265c535e..e7819c38fe2 100644
--- a/parity/configuration.rs
+++ b/parity/configuration.rs
@@ -53,6 +53,7 @@ use presale::ImportWallet;
 use account::{AccountCmd, NewAccount, ListAccounts, ImportAccounts, ImportFromGethAccounts};
 use snapshot_cmd::{self, SnapshotCommand};
 use network::{IpFilter, NatType};
+use metrics::MetricsConfiguration;
 
 const DEFAULT_MAX_PEERS: u16 = 50;
 const DEFAULT_MIN_PEERS: u16 = 25;
@@ -140,6 +141,7 @@ impl Configuration {
 		let experimental_rpcs = self.args.flag_jsonrpc_experimental;
 		let secretstore_conf = self.secretstore_config()?;
 		let format = self.format()?;
+		let metrics_conf = self.metrics_config()?;
 
 		let key_iterations = self.args.arg_keys_iterations;
 		if key_iterations == 0 {
@@ -414,6 +416,7 @@ impl Configuration {
 				on_demand_request_backoff_rounds_max: self.args.arg_on_demand_request_backoff_rounds_max,
 				on_demand_request_consecutive_failures: self.args.arg_on_demand_request_consecutive_failures,
 				sync_until: self.args.arg_sync_until,
+				metrics_conf,
 			};
 			Cmd::Run(run_cmd)
 		};
@@ -902,6 +905,15 @@ impl Configuration {
 		Ok(conf)
 	}
 
+	fn metrics_config(&self) -> Result<MetricsConfiguration, String> {
+		let conf = MetricsConfiguration {
+			enabled: self.metrics_enabled(),
+			interface: self.metrics_interface(),
+			port: self.args.arg_ports_shift + self.args.arg_metrics_port,
+		};
+		Ok(conf)
+	}
+
 	fn private_provider_config(&self) -> Result<(ProviderConfig, EncryptorConfig, bool), String> {
 		let dirs = self.directories();
 		let provider_conf = ProviderConfig {
@@ -1040,6 +1052,10 @@ impl Configuration {
 		self.interface(&self.args.arg_ws_interface)
 	}
 
+	fn metrics_interface(&self) -> String {
+		self.interface(&self.args.arg_metrics_interface)
+	}
+
 	fn secretstore_interface(&self) -> String {
 		self.interface(&self.args.arg_secretstore_interface)
 	}
@@ -1107,6 +1123,10 @@ impl Configuration {
 		!self.args.flag_no_ws
 	}
 
+	fn metrics_enabled(&self) -> bool {
+		self.args.flag_metrics
+	}
+
 	fn secretstore_enabled(&self) -> bool {
 		!self.args.flag_no_secretstore && cfg!(feature = "secretstore")
 	}
@@ -1455,6 +1475,7 @@ mod tests {
 			on_demand_request_backoff_rounds_max: None,
 			on_demand_request_consecutive_failures: None,
 			sync_until: None,
+			metrics_conf: MetricsConfiguration::default(),
 		};
 		expected.secretstore_conf.enabled = cfg!(feature = "secretstore");
 		expected.secretstore_conf.http_enabled = cfg!(feature = "secretstore");
diff --git a/parity/lib.rs b/parity/lib.rs
index 5fe34004a8b..4bad1be5c90 100644
--- a/parity/lib.rs
+++ b/parity/lib.rs
@@ -58,6 +58,7 @@ extern crate ethcore_sync as sync;
 extern crate ethereum_types;
 extern crate ethkey;
 extern crate ethstore;
+extern crate hyper;
 extern crate journaldb;
 extern crate keccak_hash as hash;
 extern crate kvdb;
@@ -74,6 +75,7 @@ extern crate parity_version;
 extern crate registrar;
 extern crate snapshot;
 extern crate spec;
+extern crate stats;
 extern crate verification;
 extern crate prometheus;
 
@@ -110,6 +112,7 @@ mod deprecated;
 mod helpers;
 mod informant;
 mod light_helpers;
+mod metrics;
 mod modules;
 mod params;
 mod presale;
diff --git a/parity/metrics.rs b/parity/metrics.rs
new file mode 100644
index 00000000000..00b37850445
--- /dev/null
+++ b/parity/metrics.rs
@@ -0,0 +1,101 @@
+use std::{
+    time::Instant,
+    sync::{Mutex, Arc}
+};
+
+use hyper::{Method, Body, Request, Response, service::service_fn_ok};
+
+use rpc;
+use rpc_apis;
+use futures::*;
+
+use stats::{
+	PrometheusMetrics,
+	prometheus_gauge,
+	prometheus::{self, Encoder}
+};
+
+#[derive(Debug, Clone, PartialEq)]
+pub struct MetricsConfiguration {
+	/// Are metrics enabled (default is false)?
+	pub enabled: bool,
+	/// The IP of the network interface used (default is 127.0.0.1).
+	pub interface: String,
+	/// The network port (default is 3000).
+	pub port: u16,
+}
+
+impl Default for MetricsConfiguration {
+	fn default() -> Self {
+		MetricsConfiguration {
+			enabled: false,
+			interface: "127.0.0.1".into(),
+			port: 3000,
+		}
+	}
+}
+
+struct State {
+	rpc_apis: Arc<rpc_apis::FullDependencies>,
+}
+
+fn handle_request(req: Request<Body>, state: &Arc<Mutex<State>>) -> Response<Body> {
+    let (parts, _body) = req.into_parts();
+    match (parts.method, parts.uri.path()) {
+        (Method::GET, "/metrics") => {
+            let start = Instant::now();
+            let mut reg = prometheus::Registry::new();
+
+            let state = state.lock().unwrap();
+
+            state.rpc_apis.client.prometheus_metrics(&mut reg);
+            state.rpc_apis.sync.prometheus_metrics(&mut reg);
+
+            let elapsed = start.elapsed();
+            let ms = (elapsed.as_secs() as i64)*1000 + (elapsed.subsec_millis() as i64);
+            prometheus_gauge(&mut reg,"metrics_time","Time to perform rpc metrics",ms);
+
+            let mut buffer = vec![];
+            let encoder = prometheus::TextEncoder::new();
+            let metric_families = reg.gather();
+            encoder.encode(&metric_families, &mut buffer).unwrap();
+            let text = String::from_utf8(buffer).unwrap();
+
+            Response::new(hyper::Body::from(text))
+        },
+        (_, _) => {
+            let mut res = hyper::Response::new(hyper::Body::from("not found"));
+            *res.status_mut() = hyper::StatusCode::NOT_FOUND;
+            res
+        }
+    }
+}
+
+/// Start the prometheus metrics server accessible via GET <host>:<port>/metrics
+pub fn start_prometheus_metrics(conf: &MetricsConfiguration, deps: &rpc::Dependencies<rpc_apis::FullDependencies>) -> Result<(), String> {
+
+    if !conf.enabled {
+        return Ok(());
+    }
+
+    let addr = format!("{}:{}",conf.interface,conf.port);
+    let addr = addr 
+        .parse()
+        .map_err(|err| format!("Failed to parse address '{}': {}", addr,err))?;
+
+    let state = State {
+        rpc_apis: deps.apis.clone(),
+    };
+    let state = Arc::new(Mutex::new(state));
+
+    let hyper = hyper::Server::bind(&addr)
+    .serve(move || {
+        let inner = Arc::clone(&state);
+        service_fn_ok(move |req| handle_request(req, &inner))
+    })
+    .map_err(|err| eprintln!("server error: {}", err));
+
+    deps.executor.spawn(hyper);
+
+    Ok(())
+}
\ No newline at end of file
diff --git a/parity/run.rs b/parity/run.rs
index 5d0f9cc8ff6..b18e6998f74 100644
--- a/parity/run.rs
+++ b/parity/run.rs
@@ -33,6 +33,7 @@ use hash_fetch::{self, fetch};
 use informant::{Informant, LightNodeInformantData, FullNodeInformantData};
 use journaldb::Algorithm;
 use light::Cache as LightDataCache;
+use metrics::{MetricsConfiguration,start_prometheus_metrics};
 use miner::external::ExternalMiner;
 use miner::work_notify::WorkPoster;
 use node_filter::NodeFilter;
@@ -138,6 +139,7 @@ pub struct RunCmd {
 	pub on_demand_request_backoff_rounds_max: Option<usize>,
 	pub on_demand_request_consecutive_failures: Option<usize>,
 	pub sync_until: Option<u64>,
+	pub metrics_conf: MetricsConfiguration,
 }
 
 // node info fetcher for the local store.
@@ -562,7 +564,7 @@ fn execute_impl<Cr, Rr>(
 	let private_tx_signer = account_utils::private_tx_signer(account_provider.clone(), &passwords)?;
 
 	// create client service.
-	let service = ClientService::1(
+	let service = ClientService::start(
 		client_config,
 		&spec,
 		client_db,
@@ -759,6 +761,9 @@ fn execute_impl<Cr, Rr>(
 	let ipc_server = rpc::new_ipc(cmd.ipc_conf, &dependencies)?;
 	let http_server = rpc::new_http("HTTP JSON-RPC", "jsonrpc", cmd.http_conf.clone(), &dependencies)?;
 
+	// start the prometheus metrics server
+	start_prometheus_metrics(&cmd.metrics_conf, &dependencies)?;
+
 	// secret store key server
 	let secretstore_deps = secretstore::Dependencies {
 		client: client.clone(),
diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
index 90dacf2f4a2..13caa4069f4 100644
--- a/rpc/Cargo.toml
+++ b/rpc/Cargo.toml
@@ -26,12 +26,12 @@ tokio-timer = "0.2.13"
 transient-hashmap = "0.4"
 itertools = "0.8.2"
 
-jsonrpc-core ={ git = "https://github.com/adria0/jsonrpc", branch="adria0/rawapi"}
-jsonrpc-derive = { git = "https://github.com/adria0/jsonrpc", branch="adria0/rawapi"}
-jsonrpc-http-server = { git = "https://github.com/adria0/jsonrpc", branch="adria0/rawapi"}
-jsonrpc-ws-server = { git = "https://github.com/adria0/jsonrpc", branch="adria0/rawapi"}
-jsonrpc-ipc-server = { git = "https://github.com/adria0/jsonrpc", branch="adria0/rawapi"}
-jsonrpc-pubsub ={ git = "https://github.com/adria0/jsonrpc", branch="adria0/rawapi"}
+jsonrpc-core = "14.0.3"
+jsonrpc-derive = "14.0.3"
+jsonrpc-http-server = "14.0.3"
+jsonrpc-ws-server = "14.0.3"
+jsonrpc-ipc-server = "14.0.3"
+jsonrpc-pubsub = "14.0.3"
 
 client-traits = { path = "../ethcore/client-traits" }
 common-types = { path = "../ethcore/types" }
diff --git a/rpc/src/lib.rs b/rpc/src/lib.rs
index 8ef813cad37..3a3673b7b5d 100644
--- a/rpc/src/lib.rs
+++ b/rpc/src/lib.rs
@@ -188,7 +188,6 @@ pub fn start_http<M, S, H, T>(
 		.cors(cors_domains)
 		.allowed_hosts(allowed_hosts)
 		.health_api(("/api/health", "parity_nodeStatus"))
-		.raw_api(("/metrics", "parity_nodeMetrics"))
 		.cors_allow_headers(AccessControlAllowHeaders::Any)
 		.max_request_body_size(max_payload * 1024 * 1024)
 		.start_http(addr)?)
diff --git a/rpc/src/v1/impls/light/parity.rs b/rpc/src/v1/impls/light/parity.rs
index 8ed10c58207..4168abd9717 100644
--- a/rpc/src/v1/impls/light/parity.rs
+++ b/rpc/src/v1/impls/light/parity.rs
@@ -391,10 +391,6 @@ where
 		}
 	}
 
-	fn metrics(&self) -> Result<String> {
-		Ok(String::from("none"))
-	}
-
 	fn logs_no_tx_hash(&self, filter: Filter) -> BoxFuture<Vec<Log>> {
 		let filter = match filter.try_into() {
 			Ok(value) => value,
diff --git a/rpc/src/v1/impls/parity.rs b/rpc/src/v1/impls/parity.rs
index 792d1243832..dc63831dadf 100644
--- a/rpc/src/v1/impls/parity.rs
+++ b/rpc/src/v1/impls/parity.rs
@@ -17,7 +17,6 @@
 //! Parity-specific rpc implementation.
 use std::sync::Arc;
 use std::collections::BTreeMap;
-use std::time::Instant;
 
 use crypto::DEFAULT_MAC;
 use ethereum_types::{H64, H160, H256, H512, U64, U256};
@@ -40,11 +39,7 @@ use types::{
 };
 use updater::{Service as UpdateService};
 use version::version_data;
-use stats::{
-	PrometheusMetrics,
-	prometheus_gauge,
-	prometheus::{self, Encoder}
-};
+use stats::PrometheusMetrics;
 
 use v1::helpers::{self, errors, fake_sign, NetworkSettings, verify_signature};
 use v1::helpers::external_signer::{SigningQueue, SignerService};
@@ -459,24 +454,6 @@ impl<C, M, U, S> Parity for ParityClient<C, M, U> where
 		}
 	}
 
-	fn metrics(&self) -> Result<String> {
-		let start = Instant::now();
-		let mut reg = prometheus::Registry::new();
-
-		self.client.prometheus_metrics(&mut reg);
-		self.sync.prometheus_metrics(&mut reg);
-
-		let elapsed = start.elapsed();
-		let ms = (elapsed.as_secs() as i64)*1000 + (elapsed.subsec_millis() as i64);
-		prometheus_gauge(&mut reg,"metrics_time","Time to perform rpc metrics",ms);
-
-		let mut buffer = vec![];
-		let encoder = prometheus::TextEncoder::new();
-		let metric_families = reg.gather();
-		encoder.encode(&metric_families, &mut buffer).unwrap();
-		Ok(String::from_utf8(buffer).unwrap())
-	}
-
 	fn logs_no_tx_hash(&self, filter: Filter) -> BoxFuture<Vec<Log>> {
 		use v1::impls::eth::base_logs;
 		// only specific impl for lightclient
diff --git a/rpc/src/v1/traits/parity.rs b/rpc/src/v1/traits/parity.rs
index 2983b0165a6..1eeb2fd5b79 100644
--- a/rpc/src/v1/traits/parity.rs
+++ b/rpc/src/v1/traits/parity.rs
@@ -226,10 +226,6 @@ pub trait Parity {
 	#[rpc(name = "parity_nodeStatus")]
 	fn status(&self) -> Result<()>;
 
-	/// [adria0] document
-	#[rpc(name = "parity_nodeMetrics")]
-	fn metrics(&self) -> Result<String>;
-
 	/// Extracts Address and public key from signature using the r, s and v params. Equivalent to Solidity erecover
 	/// as well as checks the signature for chain replay protection
 	#[rpc(name = "parity_verifySignature")]

From 3d9e9f03c23a08f59b2c2491ecee29d93409a390 Mon Sep 17 00:00:00 2001
From: adria0 <adria@codecontext.io>
Date: Fri, 19 Jun 2020 18:21:15 +0200
Subject: [PATCH 15/32] Minor changes

---
 ethcore/src/client/client.rs                  | 56 +++++++++----------
 ethcore/src/test_helpers/test_client.rs       |  2 +-
 ethcore/sync/src/api.rs                       | 24 ++++----
 parity/run.rs                                 |  2 +-
 rpc/Cargo.toml                                | 12 ++--
 .../env/host/config/prometheus/prometheus.yml |  2 +-
 util/stats/Cargo.toml                         |  2 +-
 util/stats/src/lib.rs                         | 14 +++--
 8 files changed, 59 insertions(+), 55 deletions(-)

diff --git a/ethcore/src/client/client.rs b/ethcore/src/client/client.rs
index 8ef960702db..c3a6f27147a 100644
--- a/ethcore/src/client/client.rs
+++ b/ethcore/src/client/client.rs
@@ -136,7 +136,7 @@ use types::data_format::DataFormat;
 use verification::{self, BlockQueue};
 use verification::queue::kind::BlockLike;
 use vm::{CreateContractAddress, EnvInfo, LastHashes};
-use stats::{prometheus_counter,prometheus_gauge,prometheus,PrometheusMetrics};
+use stats::{prometheus_counter, prometheus_gauge, prometheus, PrometheusMetrics};
 
 const MAX_ANCIENT_BLOCKS_QUEUE_SIZE: usize = 4096;
 // Max number of blocks imported at once.
@@ -2864,31 +2864,31 @@ impl PrometheusMetrics for Client {
 		// gas, tx & blocks
 		let report = self.report();
 
-		prometheus_counter(r,"import_gas","Gas processed",report.gas_processed.as_u64() as i64);
-		prometheus_counter(r,"import_blocks","Blocks imported",report.blocks_imported as i64);
-		prometheus_counter(r,"import_txs","Transactions applied",report.transactions_applied as i64);
+		prometheus_counter(r, "import_gas", "Gas processed", report.gas_processed.as_u64() as i64);
+		prometheus_counter(r, "import_blocks", "Blocks imported", report.blocks_imported as i64);
+		prometheus_counter(r, "import_txs", "Transactions applied", report.transactions_applied as i64);
 
 		let state_db = self.state_db.read();
-		prometheus_gauge(r,"statedb_mem_used","State DB memory used",state_db.mem_used() as i64);
-		prometheus_gauge(r,"statedb_cache_size","State DB cache size",state_db.cache_size() as i64);
+		prometheus_gauge(r, "statedb_mem_used", "State DB memory used", state_db.mem_used() as i64);
+		prometheus_gauge(r, "statedb_cache_size", "State DB cache size", state_db.cache_size() as i64);
 
 		// blockchain caché
 		let blockchain_cache_info = self.blockchain_cache_info();
-		prometheus_gauge(r,"blockchaincache_block_details","BlockDetails cache size",blockchain_cache_info.block_details as i64);
-		prometheus_gauge(r,"blockchaincache_block_recipts","Block receipts size",blockchain_cache_info.block_receipts as i64);
-		prometheus_gauge(r,"blockchaincache_blocks","Blocks cache size",blockchain_cache_info.blocks as i64);
-		prometheus_gauge(r,"blockchaincache_txaddrs","Transaction addresses cache size",blockchain_cache_info.transaction_addresses as i64);
-		prometheus_gauge(r,"blockchaincache_size","Total blockchain cache size",blockchain_cache_info.total() as i64);
+		prometheus_gauge(r, "blockchaincache_block_details", "BlockDetails cache size", blockchain_cache_info.block_details as i64);
+		prometheus_gauge(r, "blockchaincache_block_recipts", "Block receipts size", blockchain_cache_info.block_receipts as i64);
+		prometheus_gauge(r, "blockchaincache_blocks", "Blocks cache size", blockchain_cache_info.blocks as i64);
+		prometheus_gauge(r, "blockchaincache_txaddrs", "Transaction addresses cache size", blockchain_cache_info.transaction_addresses as i64);
+		prometheus_gauge(r, "blockchaincache_size", "Total blockchain cache size", blockchain_cache_info.total() as i64);
 
 		// io
 		let io_stats = self.db.read().key_value().io_stats(kvdb::IoStatsKind::Overall);
-		prometheus_counter(r,"io_transactions","Number of transactions", io_stats.transactions as i64);
-		prometheus_counter(r,"io_reads","Number of read operations", io_stats.reads as i64);
-		prometheus_counter(r,"io_writes","Number of write operations", io_stats.writes as i64);
-		prometheus_counter(r,"io_cache_reads","Number of reads resulted in a read from cache", io_stats.cache_reads as i64);
-		prometheus_counter(r,"io_bytes_read","Number of bytes read", io_stats.bytes_read as i64);
-		prometheus_counter(r,"io_cache_read_bytes",".", io_stats.cache_read_bytes as i64);
-		prometheus_counter(r,"io_bytes_written","Number of bytes written", io_stats.bytes_written as i64);
+		prometheus_counter(r, "io_transactions", "Number of transactions", io_stats.transactions as i64);
+		prometheus_counter(r, "io_reads", "Number of read operations", io_stats.reads as i64);
+		prometheus_counter(r, "io_writes", "Number of write operations", io_stats.writes as i64);
+		prometheus_counter(r, "io_cache_reads", "Number of reads resulted in a read from cache", io_stats.cache_reads as i64);
+		prometheus_counter(r, "io_bytes_read", "Number of bytes read", io_stats.bytes_read as i64);
+		prometheus_counter(r, "io_cache_read_bytes", "Number of cache bytes read", io_stats.cache_read_bytes as i64);
+		prometheus_counter(r, "io_bytes_written", "Number of bytes written", io_stats.bytes_written as i64);
 
 		// chain info
 		let chain = self.chain_info();
@@ -2896,24 +2896,24 @@ impl PrometheusMetrics for Client {
 		let gap = chain.ancient_block_number.map(|x| U256::from(x + 1))
 			.and_then(|first| chain.first_block_number.map(|last| (first, U256::from(last))));
 		if let Some((first,last)) = gap  {
-			prometheus_gauge(r,"chain_warpsync_gap_first","Warp sync gap, first block",first.as_u64() as i64);
-			prometheus_gauge(r,"chain_warpsync_gap_last","Warp sync gap, last block",last.as_u64() as i64);
+			prometheus_gauge(r, "chain_warpsync_gap_first", "Warp sync gap, first block", first.as_u64() as i64);
+			prometheus_gauge(r, "chain_warpsync_gap_last", "Warp sync gap, last block", last.as_u64() as i64);
 		}
 
-		prometheus_gauge(r,"chain_block","Best block number",chain.best_block_number as i64);
+		prometheus_gauge(r, "chain_block", "Best block number", chain.best_block_number as i64);
 
 		// prunning info
 		let prunning = self.pruning_info();
-		prometheus_gauge(r,"prunning_earliest_chain","The first block which everything can be served after",prunning.earliest_chain as i64);
-		prometheus_gauge(r,"prunning_earliest_state","The first block where state requests may be served",prunning.earliest_state as i64);
+		prometheus_gauge(r, "prunning_earliest_chain", "The first block which everything can be served after", prunning.earliest_chain as i64);
+		prometheus_gauge(r, "prunning_earliest_state", "The first block where state requests may be served", prunning.earliest_state as i64);
 
 		// queue info
 		let queue = self.queue_info();
-		prometheus_gauge(r,"queue_mem_used","Queue heap memory used in bytes",queue.mem_used as i64);
-		prometheus_gauge(r,"queue_size_total","The total size of the queues",queue.total_queue_size() as i64);
-		prometheus_gauge(r,"queue_size_unverified","Number of queued items pending verification",queue.unverified_queue_size as i64);
-		prometheus_gauge(r,"queue_size_verified","Number of verified queued items pending import",queue.verified_queue_size as i64);
-		prometheus_gauge(r,"queue_size_verifying","Number of items being verified",queue.verifying_queue_size as i64);
+		prometheus_gauge(r, "queue_mem_used", "Queue heap memory used in bytes", queue.mem_used as i64);
+		prometheus_gauge(r, "queue_size_total", "The total size of the queues", queue.total_queue_size() as i64);
+		prometheus_gauge(r, "queue_size_unverified", "Number of queued items pending verification", queue.unverified_queue_size as i64);
+		prometheus_gauge(r, "queue_size_verified", "Number of verified queued items pending import", queue.verified_queue_size as i64);
+		prometheus_gauge(r, "queue_size_verifying", "Number of items being verified", queue.verifying_queue_size as i64);
 
 	}
 }
diff --git a/ethcore/src/test_helpers/test_client.rs b/ethcore/src/test_helpers/test_client.rs
index bc800723394..230b9a04bd1 100644
--- a/ethcore/src/test_helpers/test_client.rs
+++ b/ethcore/src/test_helpers/test_client.rs
@@ -1000,4 +1000,4 @@ impl client_traits::EngineClient for TestBlockChainClient {
 impl PrometheusMetrics for TestBlockChainClient {
 	fn prometheus_metrics(&self, r: &mut prometheus::Registry) {
 	}
-}
\ No newline at end of file
+}
diff --git a/ethcore/sync/src/api.rs b/ethcore/sync/src/api.rs
index 31648274e8c..930c594191f 100644
--- a/ethcore/sync/src/api.rs
+++ b/ethcore/sync/src/api.rs
@@ -432,25 +432,25 @@ impl PrometheusMetrics for EthSync {
 			SyncState::NewBlocks => 7,
 		});
 
-		prometheus_gauge(r,"net_peers","Total number of connected peers",sync_status.num_peers as i64);
-		prometheus_gauge(r,"net_active_peers","Total number of active peers",sync_status.num_active_peers as i64);
-		prometheus_counter(r,"sync_blocks_recieved","Number of blocks downloaded so far",sync_status.blocks_received as i64);
-		prometheus_counter(r,"sync_blocks_total","Total number of blocks for the sync process",sync_status.blocks_total as i64);
-		prometheus_gauge(r,"sync_blocks_highest","Highest block number in the download queue",sync_status.highest_block_number.unwrap_or(0) as i64);
-		prometheus_gauge(r,"sync_is_majorsync","Are we in the middle of a major sync?",scalar(self.is_major_syncing()));
-		prometheus_gauge(r,"sync_mem_used","Heap memory used in bytes",sync_status.mem_used  as i64);
-		prometheus_gauge(r,"snapshot_download_active","1 if downloading snapshots",scalar(sync_status.is_snapshot_syncing()));
-		prometheus_gauge(r,"snapshot_download_chunks","Snapshot chunks",sync_status.num_snapshot_chunks as i64);
-		prometheus_gauge(r,"snapshot_download_chunks_done","Snapshot chunks downloaded",sync_status.snapshot_chunks_done as i64);
+		prometheus_gauge(r, "net_peers", "Total number of connected peers", sync_status.num_peers as i64);
+		prometheus_gauge(r, "net_active_peers", "Total number of active peers", sync_status.num_active_peers as i64);
+		prometheus_counter(r, "sync_blocks_recieved", "Number of blocks downloaded so far", sync_status.blocks_received as i64);
+		prometheus_counter(r, "sync_blocks_total", "Total number of blocks for the sync process", sync_status.blocks_total as i64);
+		prometheus_gauge(r, "sync_blocks_highest", "Highest block number in the download queue", sync_status.highest_block_number.unwrap_or(0) as i64);
+		prometheus_gauge(r, "sync_is_majorsync", "Are we in the middle of a major sync?", scalar(self.is_major_syncing()));
+		prometheus_gauge(r, "sync_mem_used", "Heap memory used in bytes", sync_status.mem_used  as i64);
+		prometheus_gauge(r, "snapshot_download_active", "1 if downloading snapshots", scalar(sync_status.is_snapshot_syncing()));
+		prometheus_gauge(r, "snapshot_download_chunks", "Snapshot chunks", sync_status.num_snapshot_chunks as i64);
+		prometheus_gauge(r, "snapshot_download_chunks_done", "Snapshot chunks downloaded", sync_status.snapshot_chunks_done as i64);
 
 		let restoration = self.eth_handler.snapshot_service.restoration_status();
 		let creation = self.eth_handler.snapshot_service.creation_status();
 
-		prometheus_gauge(r,"snapshot_create_block", "First block of the current snapshot creation", match creation {
+		prometheus_gauge(r, "snapshot_create_block",  "First block of the current snapshot creation",  match creation {
 			CreationStatus::Ongoing{block_number} => block_number as i64,
 			_ => 0,
 		});
-		prometheus_gauge(r,"snapshot_restore_block", "First block of the current snapshot restoration", match restoration {
+		prometheus_gauge(r, "snapshot_restore_block",  "First block of the current snapshot restoration",  match restoration {
 			RestorationStatus::Ongoing{block_number, ..} => block_number as i64,
 			_ => 0,
 		});
diff --git a/parity/run.rs b/parity/run.rs
index b18e6998f74..ea395148861 100644
--- a/parity/run.rs
+++ b/parity/run.rs
@@ -33,7 +33,7 @@ use hash_fetch::{self, fetch};
 use informant::{Informant, LightNodeInformantData, FullNodeInformantData};
 use journaldb::Algorithm;
 use light::Cache as LightDataCache;
-use metrics::{MetricsConfiguration,start_prometheus_metrics};
+use metrics::{MetricsConfiguration, start_prometheus_metrics};
 use miner::external::ExternalMiner;
 use miner::work_notify::WorkPoster;
 use node_filter::NodeFilter;
diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
index 13caa4069f4..bbb3500556c 100644
--- a/rpc/Cargo.toml
+++ b/rpc/Cargo.toml
@@ -26,12 +26,12 @@ tokio-timer = "0.2.13"
 transient-hashmap = "0.4"
 itertools = "0.8.2"
 
-jsonrpc-core = "14.0.3"
-jsonrpc-derive = "14.0.3"
-jsonrpc-http-server = "14.0.3"
-jsonrpc-ws-server = "14.0.3"
-jsonrpc-ipc-server = "14.0.3"
-jsonrpc-pubsub = "14.0.3"
+jsonrpc-core = "14.0.5"
+jsonrpc-derive = "14.0.5"
+jsonrpc-http-server = "14.0.5"
+jsonrpc-ws-server = "14.0.5"
+jsonrpc-ipc-server = "14.0.5"
+jsonrpc-pubsub = "14.0.5"
 
 client-traits = { path = "../ethcore/client-traits" }
 common-types = { path = "../ethcore/types" }
diff --git a/scripts/prometheus/env/host/config/prometheus/prometheus.yml b/scripts/prometheus/env/host/config/prometheus/prometheus.yml
index 561ab8f2282..6d4ff7a4093 100644
--- a/scripts/prometheus/env/host/config/prometheus/prometheus.yml
+++ b/scripts/prometheus/env/host/config/prometheus/prometheus.yml
@@ -34,7 +34,7 @@ scrape_configs:
         replacement: "oe_${1}"
     static_configs:
     - targets:
-      - localhost:8545
+      - localhost:3000
 
   - job_name: cadvisor
     scrape_interval: 5s
diff --git a/util/stats/Cargo.toml b/util/stats/Cargo.toml
index 52c7cae728a..328b6f7b251 100644
--- a/util/stats/Cargo.toml
+++ b/util/stats/Cargo.toml
@@ -5,4 +5,4 @@ authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
 log = "0.4"
-prometheus = "0.9.0"
\ No newline at end of file
+prometheus = "0.9.0"
diff --git a/util/stats/src/lib.rs b/util/stats/src/lib.rs
index f686f9cd13f..292a4b46dc6 100644
--- a/util/stats/src/lib.rs
+++ b/util/stats/src/lib.rs
@@ -24,28 +24,32 @@ use std::time::Instant;
 extern crate log;
 pub extern crate prometheus;
 
+/// Implements a prometheus metrics collector
 pub trait PrometheusMetrics {
 	fn prometheus_metrics(&self, registry: &mut prometheus::Registry);
 }
 
+/// Adds a new prometheus counter with the specified value
 pub fn prometheus_counter(reg: &mut prometheus::Registry, name: &str, help: &str, value: i64) {
-	let c = prometheus::IntCounter::new(name,help).expect("does not fail. qed.");
+	let c = prometheus::IntCounter::new(name,help).expect("name and help must be non-empty");
 	c.inc_by(value);
-	reg.register(Box::new(c)).expect("qed");
+	reg.register(Box::new(c)).expect("prometheus identifiers must be unique");
 }
 
+/// Adds a new prometheus gauge with the specified gauge
 pub fn prometheus_gauge(reg: &mut prometheus::Registry, name: &str, help: &str, value: i64) {
-	let g = prometheus::IntGauge::new(name,help).expect("does not fail. qed.");
+	let g = prometheus::IntGauge::new(name,help).expect("name and help must be non-empty");
 	g.set(value);
-	reg.register(Box::new(g)).expect("qed");
+	reg.register(Box::new(g)).expect("prometheus identifiers must be are unique");
 }
 
+/// Adds a new prometheus counter with the time spent in running the specified function
 pub fn prometheus_optime<T>(r: &mut prometheus::Registry, name: &str, f: &dyn Fn()->T ) -> T {
 	let start = Instant::now();
 	let t = f();
 	let elapsed = start.elapsed();
 	let ms = (elapsed.as_secs() as i64)*1000 + (elapsed.subsec_millis() as i64);
-	prometheus_gauge(r,&format!("optime_{}",name),&format!("Time to perform {}",name),ms);
+	prometheus_gauge(r, &format!("optime_{}",name), &format!("Time to perform {}",name), ms);
 	t
 }
 

From b1c052746db3633b1f7f24b62952e10d3122f076 Mon Sep 17 00:00:00 2001
From: adria0 <adria@codecontext.io>
Date: Fri, 19 Jun 2020 18:56:59 +0200
Subject: [PATCH 16/32] Fix tests

---
 ethcore/src/test_helpers/test_client.rs | 2 +-
 parity/cli/mod.rs                       | 7 ++++++-
 parity/cli/tests/config.toml            | 5 +++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ethcore/src/test_helpers/test_client.rs b/ethcore/src/test_helpers/test_client.rs
index 230b9a04bd1..29887e5f556 100644
--- a/ethcore/src/test_helpers/test_client.rs
+++ b/ethcore/src/test_helpers/test_client.rs
@@ -998,6 +998,6 @@ impl client_traits::EngineClient for TestBlockChainClient {
 }
 
 impl PrometheusMetrics for TestBlockChainClient {
-	fn prometheus_metrics(&self, r: &mut prometheus::Registry) {
+	fn prometheus_metrics(&self, _r: &mut prometheus::Registry) {
 	}
 }
diff --git a/parity/cli/mod.rs b/parity/cli/mod.rs
index 235d22b6729..a518ebfe4f2 100644
--- a/parity/cli/mod.rs
+++ b/parity/cli/mod.rs
@@ -1454,7 +1454,7 @@ mod tests {
 	use super::{
 		Args, ArgsError,
 		Config, Operating, Account, Ui, Network, Ws, Rpc, Ipc, Dapps, Mining, Footprint,
-		Snapshots, Misc, Whisper, SecretStore, Light,
+		Snapshots, Misc, Whisper, SecretStore, Light, Metrics
 	};
 	use toml;
 	use clap::{ErrorKind as ClapErrorKind};
@@ -2115,6 +2115,11 @@ mod tests {
 				chmod: None,
 				apis: Some(vec!["rpc".into(), "eth".into()]),
 			}),
+			metrics: Some(Metrics {
+				enable: Some(true),
+				interface: Some("local".to_string()),
+				port: Some(4000),
+			}),
 			dapps: Some(Dapps {
 				_legacy_disable: None,
 				_legacy_port: Some(8080),
diff --git a/parity/cli/tests/config.toml b/parity/cli/tests/config.toml
index 111f09e5c2e..9e46a146921 100644
--- a/parity/cli/tests/config.toml
+++ b/parity/cli/tests/config.toml
@@ -37,6 +37,11 @@ server_threads = 13
 [ipc]
 apis = ["rpc", "eth"]
 
+[metrics]
+enable = true
+interface = "local"
+port = 4000
+
 [dapps]
 port = 8080
 user = "username"

From 53cc9eaeff87334c3786194387431d450e05aa0e Mon Sep 17 00:00:00 2001
From: adria0 <adria@codecontext.io>
Date: Fri, 19 Jun 2020 20:04:41 +0200
Subject: [PATCH 17/32] Metrics only for full client ci-build-docker

---
 ethcore/snapshot/src/service.rs               |     2 +-
 ethcore/src/test_helpers/test_client.rs       |     2 +-
 ethcore/sync/src/api.rs                       |     4 +-
 parity/cli/mod.rs                             |     2 +-
 parity/metrics.rs                             |     6 +-
 rpc/Cargo.toml                                |     2 +-
 rpc/src/v1/tests/helpers/sync_provider.rs     |     2 +-
 .../grafana/dashboards}/oe.json               |     2 +-
 .../{env/dev => }/config/grafana/grafana.ini  |     0
 .../provisioning/dashboards/provider.yaml     |     2 +-
 .../provisioning/datasources/prometheus.yaml  |     0
 .../dev => }/config/prometheus/prometheus.yml |     4 +-
 .../{env/dev => }/docker-compose.yaml         |    20 +-
 .../grafana/dashboards/openethereum.json      |  1527 --
 .../provisioning/datasources/prometheus.yaml  |    50 -
 .../grafana/dashboards/openethereum.json      |  1527 --
 .../env/host/config/grafana/grafana.ini       |   705 -
 .../provisioning/dashboards/provider.yaml     |    24 -
 .../env/host/config/prometheus/prometheus.yml |    48 -
 .../prometheus/env/host/docker-compose.yaml   |    63 -
 scripts/prometheus/grafana/nodeexporter.json  | 13641 ----------------
 21 files changed, 30 insertions(+), 17603 deletions(-)
 rename scripts/prometheus/{grafana => config/grafana/dashboards}/oe.json (99%)
 rename scripts/prometheus/{env/dev => }/config/grafana/grafana.ini (100%)
 rename scripts/prometheus/{env/dev => }/config/grafana/provisioning/dashboards/provider.yaml (95%)
 rename scripts/prometheus/{env/host => }/config/grafana/provisioning/datasources/prometheus.yaml (100%)
 rename scripts/prometheus/{env/dev => }/config/prometheus/prometheus.yml (95%)
 rename scripts/prometheus/{env/dev => }/docker-compose.yaml (54%)
 delete mode 100644 scripts/prometheus/env/dev/config/grafana/dashboards/openethereum.json
 delete mode 100644 scripts/prometheus/env/dev/config/grafana/provisioning/datasources/prometheus.yaml
 delete mode 100644 scripts/prometheus/env/host/config/grafana/dashboards/openethereum.json
 delete mode 100644 scripts/prometheus/env/host/config/grafana/grafana.ini
 delete mode 100644 scripts/prometheus/env/host/config/grafana/provisioning/dashboards/provider.yaml
 delete mode 100644 scripts/prometheus/env/host/config/prometheus/prometheus.yml
 delete mode 100644 scripts/prometheus/env/host/docker-compose.yaml
 delete mode 100644 scripts/prometheus/grafana/nodeexporter.json

diff --git a/ethcore/snapshot/src/service.rs b/ethcore/snapshot/src/service.rs
index b0980ae4b92..84e4d20eb9f 100644
--- a/ethcore/snapshot/src/service.rs
+++ b/ethcore/snapshot/src/service.rs
@@ -267,7 +267,7 @@ pub struct Service<C: Send + Sync + 'static> {
 	client: Arc<C>,
 	progress: RwLock<Progress>,
 	taking_snapshot: AtomicBool,
-	taking_snapshot_num : AtomicUsize,
+	taking_snapshot_num: AtomicUsize,
 	restoring_snapshot: AtomicBool,
 }
 
diff --git a/ethcore/src/test_helpers/test_client.rs b/ethcore/src/test_helpers/test_client.rs
index 29887e5f556..29eb04f1252 100644
--- a/ethcore/src/test_helpers/test_client.rs
+++ b/ethcore/src/test_helpers/test_client.rs
@@ -81,7 +81,7 @@ use spec::{Spec, self};
 use account_state::state::StateInfo;
 use state_db::StateDB;
 use trace::LocalizedTrace;
-use stats::{PrometheusMetrics,prometheus};
+use stats::{PrometheusMetrics, prometheus};
 
 /// Test client.
 pub struct TestBlockChainClient {
diff --git a/ethcore/sync/src/api.rs b/ethcore/sync/src/api.rs
index 930c594191f..ae6ad32b1e3 100644
--- a/ethcore/sync/src/api.rs
+++ b/ethcore/sync/src/api.rs
@@ -446,11 +446,11 @@ impl PrometheusMetrics for EthSync {
 		let restoration = self.eth_handler.snapshot_service.restoration_status();
 		let creation = self.eth_handler.snapshot_service.creation_status();
 
-		prometheus_gauge(r, "snapshot_create_block",  "First block of the current snapshot creation",  match creation {
+		prometheus_gauge(r, "snapshot_create_block", "First block of the current snapshot creation",  match creation {
 			CreationStatus::Ongoing{block_number} => block_number as i64,
 			_ => 0,
 		});
-		prometheus_gauge(r, "snapshot_restore_block",  "First block of the current snapshot restoration",  match restoration {
+		prometheus_gauge(r, "snapshot_restore_block", "First block of the current snapshot restoration",  match restoration {
 			RestorationStatus::Ongoing{block_number, ..} => block_number as i64,
 			_ => 0,
 		});
diff --git a/parity/cli/mod.rs b/parity/cli/mod.rs
index a518ebfe4f2..547075aea44 100644
--- a/parity/cli/mod.rs
+++ b/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]",
diff --git a/parity/metrics.rs b/parity/metrics.rs
index 00b37850445..7856d993495 100644
--- a/parity/metrics.rs
+++ b/parity/metrics.rs
@@ -53,7 +53,7 @@ fn handle_request(req: Request<Body>, state: &Arc<Mutex<State>>) -> Response<Bod
 
             let elapsed = start.elapsed();
             let ms = (elapsed.as_secs() as i64)*1000 + (elapsed.subsec_millis() as i64);
-            prometheus_gauge(&mut reg,"metrics_time","Time to perform rpc metrics",ms);
+            prometheus_gauge(&mut reg, "metrics_time", "Time to perform rpc metrics", ms);
 
             let mut buffer = vec![];
             let encoder = prometheus::TextEncoder::new();
@@ -78,7 +78,7 @@ pub fn start_prometheus_metrics(conf: &MetricsConfiguration, deps: &rpc::Depende
         return Ok(());
     }
 
-    let addr = format!("{}:{}",conf.interface,conf.port);
+    let addr = format!("{}:{}", conf.interface, conf.port);
     let addr = addr 
         .parse()
         .map_err(|err| format!("Failed to parse address '{}': {}", addr,err))?;
@@ -98,4 +98,4 @@ pub fn start_prometheus_metrics(conf: &MetricsConfiguration, deps: &rpc::Depende
     deps.executor.spawn(hyper);
 
     Ok(())
-}
\ No newline at end of file
+}
diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
index bbb3500556c..19208fa8328 100644
--- a/rpc/Cargo.toml
+++ b/rpc/Cargo.toml
@@ -30,7 +30,7 @@ jsonrpc-core = "14.0.5"
 jsonrpc-derive = "14.0.5"
 jsonrpc-http-server = "14.0.5"
 jsonrpc-ws-server = "14.0.5"
-jsonrpc-ipc-server = "14.0.5"
+jsonrpc-ipc-server = "14.0.6"
 jsonrpc-pubsub = "14.0.5"
 
 client-traits = { path = "../ethcore/client-traits" }
diff --git a/rpc/src/v1/tests/helpers/sync_provider.rs b/rpc/src/v1/tests/helpers/sync_provider.rs
index 4b6d4ebc453..5952f48a1be 100644
--- a/rpc/src/v1/tests/helpers/sync_provider.rs
+++ b/rpc/src/v1/tests/helpers/sync_provider.rs
@@ -22,7 +22,7 @@ use parking_lot::RwLock;
 use network::client_version::ClientVersion;
 use futures::sync::mpsc;
 use sync::{SyncProvider, EthProtocolInfo, SyncStatus, PeerInfo, TransactionStats, SyncState};
-use stats::{PrometheusMetrics,prometheus};
+use stats::{PrometheusMetrics, prometheus};
 
 /// TestSyncProvider config.
 pub struct Config {
diff --git a/scripts/prometheus/grafana/oe.json b/scripts/prometheus/config/grafana/dashboards/oe.json
similarity index 99%
rename from scripts/prometheus/grafana/oe.json
rename to scripts/prometheus/config/grafana/dashboards/oe.json
index 8071f8d6afc..17beec651ba 100644
--- a/scripts/prometheus/grafana/oe.json
+++ b/scripts/prometheus/config/grafana/dashboards/oe.json
@@ -1570,7 +1570,7 @@
       ]
     },
     "timezone": "",
-    "title": "OpenEthereum_1",
+    "title": "OpenEthereum",
     "uid": "fH2SyJiMz",
     "version": 2
   }
\ No newline at end of file
diff --git a/scripts/prometheus/env/dev/config/grafana/grafana.ini b/scripts/prometheus/config/grafana/grafana.ini
similarity index 100%
rename from scripts/prometheus/env/dev/config/grafana/grafana.ini
rename to scripts/prometheus/config/grafana/grafana.ini
diff --git a/scripts/prometheus/env/dev/config/grafana/provisioning/dashboards/provider.yaml b/scripts/prometheus/config/grafana/provisioning/dashboards/provider.yaml
similarity index 95%
rename from scripts/prometheus/env/dev/config/grafana/provisioning/dashboards/provider.yaml
rename to scripts/prometheus/config/grafana/provisioning/dashboards/provider.yaml
index bbf093bf7cb..c7ab0aaf0ff 100644
--- a/scripts/prometheus/env/dev/config/grafana/provisioning/dashboards/provider.yaml
+++ b/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
\ No newline at end of file
+      path: /etc/grafana/dashboards
\ No newline at end of file
diff --git a/scripts/prometheus/env/host/config/grafana/provisioning/datasources/prometheus.yaml b/scripts/prometheus/config/grafana/provisioning/datasources/prometheus.yaml
similarity index 100%
rename from scripts/prometheus/env/host/config/grafana/provisioning/datasources/prometheus.yaml
rename to scripts/prometheus/config/grafana/provisioning/datasources/prometheus.yaml
diff --git a/scripts/prometheus/env/dev/config/prometheus/prometheus.yml b/scripts/prometheus/config/prometheus/prometheus.yml
similarity index 95%
rename from scripts/prometheus/env/dev/config/prometheus/prometheus.yml
rename to scripts/prometheus/config/prometheus/prometheus.yml
index eb064c43c74..79d098b9547 100644
--- a/scripts/prometheus/env/dev/config/prometheus/prometheus.yml
+++ b/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
diff --git a/scripts/prometheus/env/dev/docker-compose.yaml b/scripts/prometheus/docker-compose.yaml
similarity index 54%
rename from scripts/prometheus/env/dev/docker-compose.yaml
rename to scripts/prometheus/docker-compose.yaml
index e38da597bad..97567930e70 100644
--- a/scripts/prometheus/env/dev/docker-compose.yaml
+++ b/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
diff --git a/scripts/prometheus/env/dev/config/grafana/dashboards/openethereum.json b/scripts/prometheus/env/dev/config/grafana/dashboards/openethereum.json
deleted file mode 100644
index 3924c6bfe71..00000000000
--- a/scripts/prometheus/env/dev/config/grafana/dashboards/openethereum.json
+++ /dev/null
@@ -1,1527 +0,0 @@
-{
-  "annotations": {
-    "list": [
-      {
-        "builtIn": 1,
-        "datasource": "-- Grafana --",
-        "enable": true,
-        "hide": true,
-        "iconColor": "rgba(0, 211, 255, 1)",
-        "name": "Annotations & Alerts",
-        "type": "dashboard"
-      }
-    ]
-  },
-  "editable": true,
-  "gnetId": null,
-  "graphTooltip": 0,
-  "links": [],
-  "panels": [
-    {
-      "cacheTimeout": null,
-      "colorBackground": false,
-      "colorValue": false,
-      "colors": [
-        "#299c46",
-        "rgba(237, 129, 40, 0.89)",
-        "#d44a3a"
-      ],
-      "datasource": null,
-      "format": "none",
-      "gauge": {
-        "maxValue": 100,
-        "minValue": 0,
-        "show": false,
-        "thresholdLabels": false,
-        "thresholdMarkers": true
-      },
-      "gridPos": {
-        "h": 3,
-        "w": 4,
-        "x": 0,
-        "y": 0
-      },
-      "id": 20,
-      "interval": null,
-      "links": [],
-      "mappingType": 1,
-      "mappingTypes": [
-        {
-          "name": "value to text",
-          "value": 1
-        },
-        {
-          "name": "range to text",
-          "value": 2
-        }
-      ],
-      "maxDataPoints": 100,
-      "nullPointMode": "connected",
-      "nullText": null,
-      "options": {},
-      "postfix": "",
-      "postfixFontSize": "50%",
-      "prefix": "",
-      "prefixFontSize": "50%",
-      "rangeMaps": [
-        {
-          "from": "null",
-          "text": "N/A",
-          "to": "null"
-        }
-      ],
-      "sparkline": {
-        "fillColor": "rgba(31, 118, 189, 0.18)",
-        "full": false,
-        "lineColor": "rgb(31, 120, 193)",
-        "show": false,
-        "ymax": null,
-        "ymin": null
-      },
-      "tableColumn": "",
-      "targets": [
-        {
-          "expr": "oe_sync_blocks_highest",
-          "refId": "A"
-        }
-      ],
-      "thresholds": "",
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Highest block",
-      "type": "singlestat",
-      "valueFontSize": "80%",
-      "valueMaps": [
-        {
-          "op": "=",
-          "text": "N/A",
-          "value": "null"
-        }
-      ],
-      "valueName": "avg"
-    },
-    {
-      "cacheTimeout": null,
-      "colorBackground": false,
-      "colorValue": false,
-      "colors": [
-        "#299c46",
-        "rgba(237, 129, 40, 0.89)",
-        "#d44a3a"
-      ],
-      "datasource": null,
-      "format": "none",
-      "gauge": {
-        "maxValue": 100,
-        "minValue": 0,
-        "show": false,
-        "thresholdLabels": false,
-        "thresholdMarkers": true
-      },
-      "gridPos": {
-        "h": 3,
-        "w": 4,
-        "x": 4,
-        "y": 0
-      },
-      "id": 24,
-      "interval": null,
-      "links": [],
-      "mappingType": 1,
-      "mappingTypes": [
-        {
-          "name": "value to text",
-          "value": 1
-        },
-        {
-          "name": "range to text",
-          "value": 2
-        }
-      ],
-      "maxDataPoints": 100,
-      "nullPointMode": "connected",
-      "nullText": null,
-      "options": {},
-      "postfix": "",
-      "postfixFontSize": "50%",
-      "prefix": "",
-      "prefixFontSize": "50%",
-      "rangeMaps": [
-        {
-          "from": "null",
-          "text": "N/A",
-          "to": "null"
-        }
-      ],
-      "sparkline": {
-        "fillColor": "rgba(31, 118, 189, 0.18)",
-        "full": false,
-        "lineColor": "rgb(31, 120, 193)",
-        "show": false,
-        "ymax": null,
-        "ymin": null
-      },
-      "tableColumn": "",
-      "targets": [
-        {
-          "expr": "oe_sync_status",
-          "refId": "A"
-        }
-      ],
-      "thresholds": "",
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Sync status",
-      "type": "singlestat",
-      "valueFontSize": "80%",
-      "valueMaps": [
-        {
-          "op": "=",
-          "text": "WaitingPeers",
-          "value": "0"
-        },
-        {
-          "op": "=",
-          "text": "Waiting",
-          "value": "6"
-        },
-        {
-          "op": "=",
-          "text": "SnapshotManifest",
-          "value": "1"
-        },
-        {
-          "op": "=",
-          "text": "SnapshotData",
-          "value": "2"
-        },
-        {
-          "op": "=",
-          "text": "SnapshotWaiting",
-          "value": "3"
-        },
-        {
-          "op": "=",
-          "text": "Blocks",
-          "value": "4"
-        },
-        {
-          "op": "=",
-          "text": "Idle",
-          "value": "5"
-        },
-        {
-          "op": "=",
-          "text": "NewBlocks",
-          "value": "7"
-        }
-      ],
-      "valueName": "current"
-    },
-    {
-      "alert": {
-        "alertRuleTags": {},
-        "conditions": [
-          {
-            "evaluator": {
-              "params": [
-                100
-              ],
-              "type": "gt"
-            },
-            "operator": {
-              "type": "and"
-            },
-            "query": {
-              "params": [
-                "A",
-                "5m",
-                "now"
-              ]
-            },
-            "reducer": {
-              "params": [],
-              "type": "avg"
-            },
-            "type": "query"
-          }
-        ],
-        "executionErrorState": "alerting",
-        "for": "5m",
-        "frequency": "1m",
-        "handler": 1,
-        "name": "RPC Metrics alert",
-        "noDataState": "no_data",
-        "notifications": []
-      },
-      "aliasColors": {},
-      "bars": true,
-      "cacheTimeout": null,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": null,
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 3,
-        "w": 4,
-        "x": 8,
-        "y": 0
-      },
-      "hiddenSeries": false,
-      "id": 28,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": false,
-        "total": false,
-        "values": false
-      },
-      "lines": false,
-      "linewidth": 1,
-      "links": [],
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "oe_metrics_time",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [
-        {
-          "colorMode": "critical",
-          "fill": true,
-          "line": true,
-          "op": "gt",
-          "value": 100,
-          "yaxis": "left"
-        }
-      ],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "RPC Metrics Reponse time",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": false,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "ms",
-          "label": null,
-          "logBase": 1,
-          "max": "1000",
-          "min": "0",
-          "show": false
-        },
-        {
-          "decimals": null,
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": false
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": null,
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 4,
-        "w": 4,
-        "x": 12,
-        "y": 0
-      },
-      "hiddenSeries": false,
-      "id": 8,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": false,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "rate(oe_import_blocks[1m])",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Block/s",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": false,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": null,
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 4,
-        "w": 4,
-        "x": 16,
-        "y": 0
-      },
-      "hiddenSeries": false,
-      "id": 6,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": false,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "rate(oe_import_gas[1m])/1000000",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "MGas/s",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": false,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": null,
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 4,
-        "w": 4,
-        "x": 20,
-        "y": 0
-      },
-      "hiddenSeries": false,
-      "id": 10,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": false,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "rate(oe_import_txs[1m])",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Tx/s",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": false,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "alert": {
-        "alertRuleTags": {},
-        "conditions": [
-          {
-            "evaluator": {
-              "params": [
-                1
-              ],
-              "type": "gt"
-            },
-            "operator": {
-              "type": "and"
-            },
-            "query": {
-              "params": [
-                "B",
-                "10s",
-                "now"
-              ]
-            },
-            "reducer": {
-              "params": [],
-              "type": "avg"
-            },
-            "type": "query"
-          }
-        ],
-        "executionErrorState": "alerting",
-        "for": "5m",
-        "frequency": "1m",
-        "handler": 1,
-        "name": "Peers alert",
-        "noDataState": "no_data",
-        "notifications": []
-      },
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": null,
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 5,
-        "w": 12,
-        "x": 0,
-        "y": 3
-      },
-      "hiddenSeries": false,
-      "id": 16,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": false,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pluginVersion": "6.5.2",
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "oe_net_peers",
-          "refId": "A"
-        },
-        {
-          "expr": "oe_net_active_peers",
-          "refId": "B"
-        }
-      ],
-      "thresholds": [
-        {
-          "colorMode": "critical",
-          "fill": true,
-          "line": true,
-          "op": "gt",
-          "value": 1
-        }
-      ],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Peers",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": false,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": null,
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 4,
-        "w": 12,
-        "x": 12,
-        "y": 4
-      },
-      "hiddenSeries": false,
-      "id": 12,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": false,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "rate(oe_io_bytes_read[1m])/60",
-          "refId": "A"
-        },
-        {
-          "expr": "rate(oe_io_bytes_written[1m])/60",
-          "refId": "B"
-        },
-        {
-          "expr": "rate(oe_io_cache_read_bytes[1m])/60",
-          "refId": "C"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "DB IO",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": false,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "decimals": null,
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "cacheTimeout": null,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": null,
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 4,
-        "w": 12,
-        "x": 0,
-        "y": 8
-      },
-      "hiddenSeries": false,
-      "id": 22,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": false,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "links": [],
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": true,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "oe_blockchaincache_block_details",
-          "refId": "A"
-        },
-        {
-          "expr": "oe_blockchaincache_block_recipts",
-          "refId": "B"
-        },
-        {
-          "expr": "oe_blockchaincache_blocks",
-          "refId": "C"
-        },
-        {
-          "expr": "oe_blockchaincache_txaddrs",
-          "refId": "D"
-        },
-        {
-          "expr": "",
-          "refId": "E"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Blockchain cache",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": false,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "decimals": 0,
-          "format": "decbytes",
-          "label": "",
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        },
-        {
-          "decimals": 0,
-          "format": "bytes",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": null,
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 4,
-        "w": 12,
-        "x": 12,
-        "y": 8
-      },
-      "hiddenSeries": false,
-      "id": 2,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": false,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": true,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "oe_queue_mem_used",
-          "refId": "A"
-        },
-        {
-          "expr": "oe_sync_mem_used",
-          "refId": "B"
-        },
-        {
-          "expr": "oe_statedb_mem_used",
-          "refId": "C"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Memory",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": false,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "bytes",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": null,
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 4,
-        "w": 3,
-        "x": 0,
-        "y": 12
-      },
-      "hiddenSeries": false,
-      "id": 4,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": false,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [
-        {}
-      ],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "oe_snapshot_download_chunks - oe_snapshot_download_chunks_done",
-          "legendFormat": "Pending blocks",
-          "refId": "A"
-        },
-        {
-          "expr": "rate(oe_snapshot_download_chunks_done[5m])*3600",
-          "legendFormat": "Rate per hour",
-          "refId": "B"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Pending Snapshot download",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": false,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "decimals": 0,
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        },
-        {
-          "decimals": 0,
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": null,
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 4,
-        "w": 3,
-        "x": 3,
-        "y": 12
-      },
-      "hiddenSeries": false,
-      "id": 26,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": false,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "oe_snapshot_create_block",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Snapshot create",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": false,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "decimals": 0,
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        },
-        {
-          "decimals": 0,
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": null,
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 4,
-        "w": 3,
-        "x": 6,
-        "y": 12
-      },
-      "hiddenSeries": false,
-      "id": 27,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": false,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "oe_snapshot_restore_block",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Snapshot restore",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": false,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "decimals": 0,
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        },
-        {
-          "decimals": 0,
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": null,
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 4,
-        "w": 3,
-        "x": 9,
-        "y": 12
-      },
-      "hiddenSeries": false,
-      "id": 29,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": false,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "oe_prunning_earliest_state",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Earliest State",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": false,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "decimals": 0,
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        },
-        {
-          "decimals": 0,
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": null,
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 4,
-        "w": 12,
-        "x": 12,
-        "y": 12
-      },
-      "hiddenSeries": false,
-      "id": 14,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": false,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": true,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "oe_queue_size_unverified",
-          "refId": "A"
-        },
-        {
-          "expr": "oe_queue_size_verified",
-          "refId": "B"
-        },
-        {
-          "expr": "oe_queue_size_verifying",
-          "refId": "C"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Queue",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": false,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "decimals": 0,
-          "format": "short",
-          "label": "",
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        },
-        {
-          "decimals": 0,
-          "format": "short",
-          "label": "",
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    }
-  ],
-  "refresh": "5s",
-  "schemaVersion": 21,
-  "style": "dark",
-  "tags": [],
-  "templating": {
-    "list": []
-  },
-  "time": {
-    "from": "now-15m",
-    "to": "now"
-  },
-  "timepicker": {
-    "refresh_intervals": [
-      "5s",
-      "10s",
-      "30s",
-      "1m",
-      "5m",
-      "15m",
-      "30m",
-      "1h",
-      "2h",
-      "1d"
-    ]
-  },
-  "timezone": "",
-  "title": "OpenEthereum",
-  "uid": "uUkuLMmMz",
-  "version": 1
-}
\ No newline at end of file
diff --git a/scripts/prometheus/env/dev/config/grafana/provisioning/datasources/prometheus.yaml b/scripts/prometheus/env/dev/config/grafana/provisioning/datasources/prometheus.yaml
deleted file mode 100644
index bd0bcb50fed..00000000000
--- a/scripts/prometheus/env/dev/config/grafana/provisioning/datasources/prometheus.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-# config file version
-apiVersion: 1
-
-# list of datasources that should be deleted from the database
-deleteDatasources:
-  - name: Prometheus
-    orgId: 1
-
-# list of datasources to insert/update depending
-# whats available in the database
-datasources:
-  # <string, required> name of the datasource. Required
-- name: Prometheus
-  # <string, required> datasource type. Required
-  type: prometheus
-  # <string, required> access mode. direct or proxy. Required
-  access: proxy
-  # <int> org id. will default to orgId 1 if not specified
-  orgId: 1
-  # <string> url
-  url: http://localhost:9090
-  # <string> database password, if used
-  password:
-  # <string> database user, if used
-  user:
-  # <string> database name, if used
-  database:
-  # <bool> enable/disable basic auth
-  basicAuth: false
-  # <string> basic auth username, if used
-  basicAuthUser:
-  # <string> basic auth password, if used
-  basicAuthPassword:
-  # <bool> enable/disable with credentials headers
-  withCredentials:
-  # <bool> mark as default datasource. Max one per org
-  isDefault: true
-  # <map> fields that will be converted to json and stored in json_data
-  jsonData:
-     graphiteVersion: "1.1"
-     tlsAuth: false
-     tlsAuthWithCACert: false
-  # <string> json object of data that will be encrypted.
-  secureJsonData:
-    tlsCACert: "..."
-    tlsClientCert: "..."
-    tlsClientKey: "..."
-  version: 1
-  # <bool> allow users to edit datasources from the UI.
-  editable: true
diff --git a/scripts/prometheus/env/host/config/grafana/dashboards/openethereum.json b/scripts/prometheus/env/host/config/grafana/dashboards/openethereum.json
deleted file mode 100644
index 3924c6bfe71..00000000000
--- a/scripts/prometheus/env/host/config/grafana/dashboards/openethereum.json
+++ /dev/null
@@ -1,1527 +0,0 @@
-{
-  "annotations": {
-    "list": [
-      {
-        "builtIn": 1,
-        "datasource": "-- Grafana --",
-        "enable": true,
-        "hide": true,
-        "iconColor": "rgba(0, 211, 255, 1)",
-        "name": "Annotations & Alerts",
-        "type": "dashboard"
-      }
-    ]
-  },
-  "editable": true,
-  "gnetId": null,
-  "graphTooltip": 0,
-  "links": [],
-  "panels": [
-    {
-      "cacheTimeout": null,
-      "colorBackground": false,
-      "colorValue": false,
-      "colors": [
-        "#299c46",
-        "rgba(237, 129, 40, 0.89)",
-        "#d44a3a"
-      ],
-      "datasource": null,
-      "format": "none",
-      "gauge": {
-        "maxValue": 100,
-        "minValue": 0,
-        "show": false,
-        "thresholdLabels": false,
-        "thresholdMarkers": true
-      },
-      "gridPos": {
-        "h": 3,
-        "w": 4,
-        "x": 0,
-        "y": 0
-      },
-      "id": 20,
-      "interval": null,
-      "links": [],
-      "mappingType": 1,
-      "mappingTypes": [
-        {
-          "name": "value to text",
-          "value": 1
-        },
-        {
-          "name": "range to text",
-          "value": 2
-        }
-      ],
-      "maxDataPoints": 100,
-      "nullPointMode": "connected",
-      "nullText": null,
-      "options": {},
-      "postfix": "",
-      "postfixFontSize": "50%",
-      "prefix": "",
-      "prefixFontSize": "50%",
-      "rangeMaps": [
-        {
-          "from": "null",
-          "text": "N/A",
-          "to": "null"
-        }
-      ],
-      "sparkline": {
-        "fillColor": "rgba(31, 118, 189, 0.18)",
-        "full": false,
-        "lineColor": "rgb(31, 120, 193)",
-        "show": false,
-        "ymax": null,
-        "ymin": null
-      },
-      "tableColumn": "",
-      "targets": [
-        {
-          "expr": "oe_sync_blocks_highest",
-          "refId": "A"
-        }
-      ],
-      "thresholds": "",
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Highest block",
-      "type": "singlestat",
-      "valueFontSize": "80%",
-      "valueMaps": [
-        {
-          "op": "=",
-          "text": "N/A",
-          "value": "null"
-        }
-      ],
-      "valueName": "avg"
-    },
-    {
-      "cacheTimeout": null,
-      "colorBackground": false,
-      "colorValue": false,
-      "colors": [
-        "#299c46",
-        "rgba(237, 129, 40, 0.89)",
-        "#d44a3a"
-      ],
-      "datasource": null,
-      "format": "none",
-      "gauge": {
-        "maxValue": 100,
-        "minValue": 0,
-        "show": false,
-        "thresholdLabels": false,
-        "thresholdMarkers": true
-      },
-      "gridPos": {
-        "h": 3,
-        "w": 4,
-        "x": 4,
-        "y": 0
-      },
-      "id": 24,
-      "interval": null,
-      "links": [],
-      "mappingType": 1,
-      "mappingTypes": [
-        {
-          "name": "value to text",
-          "value": 1
-        },
-        {
-          "name": "range to text",
-          "value": 2
-        }
-      ],
-      "maxDataPoints": 100,
-      "nullPointMode": "connected",
-      "nullText": null,
-      "options": {},
-      "postfix": "",
-      "postfixFontSize": "50%",
-      "prefix": "",
-      "prefixFontSize": "50%",
-      "rangeMaps": [
-        {
-          "from": "null",
-          "text": "N/A",
-          "to": "null"
-        }
-      ],
-      "sparkline": {
-        "fillColor": "rgba(31, 118, 189, 0.18)",
-        "full": false,
-        "lineColor": "rgb(31, 120, 193)",
-        "show": false,
-        "ymax": null,
-        "ymin": null
-      },
-      "tableColumn": "",
-      "targets": [
-        {
-          "expr": "oe_sync_status",
-          "refId": "A"
-        }
-      ],
-      "thresholds": "",
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Sync status",
-      "type": "singlestat",
-      "valueFontSize": "80%",
-      "valueMaps": [
-        {
-          "op": "=",
-          "text": "WaitingPeers",
-          "value": "0"
-        },
-        {
-          "op": "=",
-          "text": "Waiting",
-          "value": "6"
-        },
-        {
-          "op": "=",
-          "text": "SnapshotManifest",
-          "value": "1"
-        },
-        {
-          "op": "=",
-          "text": "SnapshotData",
-          "value": "2"
-        },
-        {
-          "op": "=",
-          "text": "SnapshotWaiting",
-          "value": "3"
-        },
-        {
-          "op": "=",
-          "text": "Blocks",
-          "value": "4"
-        },
-        {
-          "op": "=",
-          "text": "Idle",
-          "value": "5"
-        },
-        {
-          "op": "=",
-          "text": "NewBlocks",
-          "value": "7"
-        }
-      ],
-      "valueName": "current"
-    },
-    {
-      "alert": {
-        "alertRuleTags": {},
-        "conditions": [
-          {
-            "evaluator": {
-              "params": [
-                100
-              ],
-              "type": "gt"
-            },
-            "operator": {
-              "type": "and"
-            },
-            "query": {
-              "params": [
-                "A",
-                "5m",
-                "now"
-              ]
-            },
-            "reducer": {
-              "params": [],
-              "type": "avg"
-            },
-            "type": "query"
-          }
-        ],
-        "executionErrorState": "alerting",
-        "for": "5m",
-        "frequency": "1m",
-        "handler": 1,
-        "name": "RPC Metrics alert",
-        "noDataState": "no_data",
-        "notifications": []
-      },
-      "aliasColors": {},
-      "bars": true,
-      "cacheTimeout": null,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": null,
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 3,
-        "w": 4,
-        "x": 8,
-        "y": 0
-      },
-      "hiddenSeries": false,
-      "id": 28,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": false,
-        "total": false,
-        "values": false
-      },
-      "lines": false,
-      "linewidth": 1,
-      "links": [],
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "oe_metrics_time",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [
-        {
-          "colorMode": "critical",
-          "fill": true,
-          "line": true,
-          "op": "gt",
-          "value": 100,
-          "yaxis": "left"
-        }
-      ],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "RPC Metrics Reponse time",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": false,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "ms",
-          "label": null,
-          "logBase": 1,
-          "max": "1000",
-          "min": "0",
-          "show": false
-        },
-        {
-          "decimals": null,
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": false
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": null,
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 4,
-        "w": 4,
-        "x": 12,
-        "y": 0
-      },
-      "hiddenSeries": false,
-      "id": 8,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": false,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "rate(oe_import_blocks[1m])",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Block/s",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": false,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": null,
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 4,
-        "w": 4,
-        "x": 16,
-        "y": 0
-      },
-      "hiddenSeries": false,
-      "id": 6,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": false,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "rate(oe_import_gas[1m])/1000000",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "MGas/s",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": false,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": null,
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 4,
-        "w": 4,
-        "x": 20,
-        "y": 0
-      },
-      "hiddenSeries": false,
-      "id": 10,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": false,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "rate(oe_import_txs[1m])",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Tx/s",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": false,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "alert": {
-        "alertRuleTags": {},
-        "conditions": [
-          {
-            "evaluator": {
-              "params": [
-                1
-              ],
-              "type": "gt"
-            },
-            "operator": {
-              "type": "and"
-            },
-            "query": {
-              "params": [
-                "B",
-                "10s",
-                "now"
-              ]
-            },
-            "reducer": {
-              "params": [],
-              "type": "avg"
-            },
-            "type": "query"
-          }
-        ],
-        "executionErrorState": "alerting",
-        "for": "5m",
-        "frequency": "1m",
-        "handler": 1,
-        "name": "Peers alert",
-        "noDataState": "no_data",
-        "notifications": []
-      },
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": null,
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 5,
-        "w": 12,
-        "x": 0,
-        "y": 3
-      },
-      "hiddenSeries": false,
-      "id": 16,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": false,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pluginVersion": "6.5.2",
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "oe_net_peers",
-          "refId": "A"
-        },
-        {
-          "expr": "oe_net_active_peers",
-          "refId": "B"
-        }
-      ],
-      "thresholds": [
-        {
-          "colorMode": "critical",
-          "fill": true,
-          "line": true,
-          "op": "gt",
-          "value": 1
-        }
-      ],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Peers",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": false,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": null,
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 4,
-        "w": 12,
-        "x": 12,
-        "y": 4
-      },
-      "hiddenSeries": false,
-      "id": 12,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": false,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "rate(oe_io_bytes_read[1m])/60",
-          "refId": "A"
-        },
-        {
-          "expr": "rate(oe_io_bytes_written[1m])/60",
-          "refId": "B"
-        },
-        {
-          "expr": "rate(oe_io_cache_read_bytes[1m])/60",
-          "refId": "C"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "DB IO",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": false,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "decimals": null,
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "cacheTimeout": null,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": null,
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 4,
-        "w": 12,
-        "x": 0,
-        "y": 8
-      },
-      "hiddenSeries": false,
-      "id": 22,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": false,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "links": [],
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": true,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "oe_blockchaincache_block_details",
-          "refId": "A"
-        },
-        {
-          "expr": "oe_blockchaincache_block_recipts",
-          "refId": "B"
-        },
-        {
-          "expr": "oe_blockchaincache_blocks",
-          "refId": "C"
-        },
-        {
-          "expr": "oe_blockchaincache_txaddrs",
-          "refId": "D"
-        },
-        {
-          "expr": "",
-          "refId": "E"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Blockchain cache",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": false,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "decimals": 0,
-          "format": "decbytes",
-          "label": "",
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        },
-        {
-          "decimals": 0,
-          "format": "bytes",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": null,
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 4,
-        "w": 12,
-        "x": 12,
-        "y": 8
-      },
-      "hiddenSeries": false,
-      "id": 2,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": false,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": true,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "oe_queue_mem_used",
-          "refId": "A"
-        },
-        {
-          "expr": "oe_sync_mem_used",
-          "refId": "B"
-        },
-        {
-          "expr": "oe_statedb_mem_used",
-          "refId": "C"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Memory",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": false,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "bytes",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": null,
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 4,
-        "w": 3,
-        "x": 0,
-        "y": 12
-      },
-      "hiddenSeries": false,
-      "id": 4,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": false,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [
-        {}
-      ],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "oe_snapshot_download_chunks - oe_snapshot_download_chunks_done",
-          "legendFormat": "Pending blocks",
-          "refId": "A"
-        },
-        {
-          "expr": "rate(oe_snapshot_download_chunks_done[5m])*3600",
-          "legendFormat": "Rate per hour",
-          "refId": "B"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Pending Snapshot download",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": false,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "decimals": 0,
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        },
-        {
-          "decimals": 0,
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": null,
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 4,
-        "w": 3,
-        "x": 3,
-        "y": 12
-      },
-      "hiddenSeries": false,
-      "id": 26,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": false,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "oe_snapshot_create_block",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Snapshot create",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": false,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "decimals": 0,
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        },
-        {
-          "decimals": 0,
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": null,
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 4,
-        "w": 3,
-        "x": 6,
-        "y": 12
-      },
-      "hiddenSeries": false,
-      "id": 27,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": false,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "oe_snapshot_restore_block",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Snapshot restore",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": false,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "decimals": 0,
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        },
-        {
-          "decimals": 0,
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": null,
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 4,
-        "w": 3,
-        "x": 9,
-        "y": 12
-      },
-      "hiddenSeries": false,
-      "id": 29,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": false,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "oe_prunning_earliest_state",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Earliest State",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": false,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "decimals": 0,
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        },
-        {
-          "decimals": 0,
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": null,
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 4,
-        "w": 12,
-        "x": 12,
-        "y": 12
-      },
-      "hiddenSeries": false,
-      "id": 14,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": false,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": true,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "oe_queue_size_unverified",
-          "refId": "A"
-        },
-        {
-          "expr": "oe_queue_size_verified",
-          "refId": "B"
-        },
-        {
-          "expr": "oe_queue_size_verifying",
-          "refId": "C"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Queue",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": false,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "decimals": 0,
-          "format": "short",
-          "label": "",
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        },
-        {
-          "decimals": 0,
-          "format": "short",
-          "label": "",
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    }
-  ],
-  "refresh": "5s",
-  "schemaVersion": 21,
-  "style": "dark",
-  "tags": [],
-  "templating": {
-    "list": []
-  },
-  "time": {
-    "from": "now-15m",
-    "to": "now"
-  },
-  "timepicker": {
-    "refresh_intervals": [
-      "5s",
-      "10s",
-      "30s",
-      "1m",
-      "5m",
-      "15m",
-      "30m",
-      "1h",
-      "2h",
-      "1d"
-    ]
-  },
-  "timezone": "",
-  "title": "OpenEthereum",
-  "uid": "uUkuLMmMz",
-  "version": 1
-}
\ No newline at end of file
diff --git a/scripts/prometheus/env/host/config/grafana/grafana.ini b/scripts/prometheus/env/host/config/grafana/grafana.ini
deleted file mode 100644
index dba20ae99a3..00000000000
--- a/scripts/prometheus/env/host/config/grafana/grafana.ini
+++ /dev/null
@@ -1,705 +0,0 @@
-##################### Grafana Configuration Defaults #####################
-#
-# Do not modify this file in grafana installs
-#
-
-# possible values : production, development
-app_mode = production
-
-# instance name, defaults to HOSTNAME environment variable value or hostname if HOSTNAME var is empty
-instance_name = ${HOSTNAME}
-
-#################################### Paths ###############################
-[paths]
-# Path to where grafana can store temp files, sessions, and the sqlite3 db (if that is used)
-data = data
-
-# Temporary files in `data` directory older than given duration will be removed
-temp_data_lifetime = 24h
-
-# Directory where grafana can store logs
-logs = data/log
-
-# Directory where grafana will automatically scan and look for plugins
-plugins = data/plugins
-
-# folder that contains provisioning config files that grafana will apply on startup and while running.
-provisioning = conf/provisioning
-
-#################################### Server ##############################
-[server]
-# Protocol (http, https, h2, socket)
-protocol = http
-
-# The ip address to bind to, empty will bind to all interfaces
-http_addr =
-
-# The http port to use
-http_port = 3000
-
-# The public facing domain name used to access grafana from a browser
-domain = localhost
-
-# Redirect to correct domain if host header does not match domain
-# Prevents DNS rebinding attacks
-enforce_domain = false
-
-# The full public facing url
-root_url = %(protocol)s://%(domain)s:%(http_port)s/
-
-# Serve Grafana from subpath specified in `root_url` setting. By default it is set to `false` for compatibility reasons.
-serve_from_sub_path = false
-
-# Log web requests
-router_logging = false
-
-# the path relative working path
-static_root_path = public
-
-# enable gzip
-enable_gzip = false
-
-# https certs & key file
-cert_file =
-cert_key =
-
-# Unix socket path
-socket = /tmp/grafana.sock
-
-#################################### Database ############################
-[database]
-# You can configure the database connection by specifying type, host, name, user and password
-# as separate properties or as on string using the url property.
-
-# Either "mysql", "postgres" or "sqlite3", it's your choice
-type = sqlite3
-host = 127.0.0.1:3306
-name = grafana
-user = root
-# If the password contains # or ; you have to wrap it with triple quotes. Ex """#password;"""
-password =
-# Use either URL or the previous fields to configure the database
-# Example: mysql://user:secret@host:port/database
-url =
-
-# Max idle conn setting default is 2
-max_idle_conn = 2
-
-# Max conn setting default is 0 (mean not set)
-max_open_conn =
-
-# Connection Max Lifetime default is 14400 (means 14400 seconds or 4 hours)
-conn_max_lifetime = 14400
-
-# Set to true to log the sql calls and execution times.
-log_queries =
-
-# For "postgres", use either "disable", "require" or "verify-full"
-# For "mysql", use either "true", "false", or "skip-verify".
-ssl_mode = disable
-
-ca_cert_path =
-client_key_path =
-client_cert_path =
-server_cert_name =
-
-# For "sqlite3" only, path relative to data_path setting
-path = grafana.db
-
-# For "sqlite3" only. cache mode setting used for connecting to the database
-cache_mode = private
-
-#################################### Cache server #############################
-[remote_cache]
-# Either "redis", "memcached" or "database" default is "database"
-type = database
-
-# cache connectionstring options
-# database: will use Grafana primary database.
-# redis: config like redis server e.g. `addr=127.0.0.1:6379,pool_size=100,db=0,ssl=false`. Only addr is required. ssl may be 'true', 'false', or 'insecure'.
-# memcache: 127.0.0.1:11211
-connstr =
-
-#################################### Data proxy ###########################
-[dataproxy]
-
-# This enables data proxy logging, default is false
-logging = false
-
-# How long the data proxy should wait before timing out default is 30 (seconds)
-timeout = 30
-
-# If enabled and user is not anonymous, data proxy will add X-Grafana-User header with username into the request, default is false.
-send_user_header = false
-
-#################################### Analytics ###########################
-[analytics]
-# Server reporting, sends usage counters to stats.grafana.org every 24 hours.
-# No ip addresses are being tracked, only simple counters to track
-# running instances, dashboard and error counts. It is very helpful to us.
-# Change this option to false to disable reporting.
-reporting_enabled = true
-
-# Set to false to disable all checks to https://grafana.com
-# for new versions (grafana itself and plugins), check is used
-# in some UI views to notify that grafana or plugin update exists
-# This option does not cause any auto updates, nor send any information
-# only a GET request to https://grafana.com to get latest versions
-check_for_updates = true
-
-# Google Analytics universal tracking code, only enabled if you specify an id here
-google_analytics_ua_id =
-
-# Google Tag Manager ID, only enabled if you specify an id here
-google_tag_manager_id =
-
-#################################### Security ############################
-[security]
-# disable creation of admin user on first start of grafana
-disable_initial_admin_creation = false
-
-# default admin user, created on startup
-admin_user = admin
-
-# default admin password, can be changed before first start of grafana, or in profile settings
-admin_password = admin
-
-# used for signing
-secret_key = SW2YcwTIb9zpOOhoPsMm
-
-# disable gravatar profile images
-disable_gravatar = false
-
-# data source proxy whitelist (ip_or_domain:port separated by spaces)
-data_source_proxy_whitelist =
-
-# disable protection against brute force login attempts
-disable_brute_force_login_protection = false
-
-# set to true if you host Grafana behind HTTPS. default is false.
-cookie_secure = false
-
-# set cookie SameSite attribute. defaults to `lax`. can be set to "lax", "strict" and "none"
-cookie_samesite = lax
-
-# set to true if you want to allow browsers to render Grafana in a <frame>, <iframe>, <embed> or <object>. default is false.
-allow_embedding = false
-
-# Set to true if you want to enable http strict transport security (HSTS) response header.
-# This is only sent when HTTPS is enabled in this configuration.
-# HSTS tells browsers that the site should only be accessed using HTTPS.
-# The default will change to true in the next minor release, 6.3.
-strict_transport_security = false
-
-# Sets how long a browser should cache HSTS. Only applied if strict_transport_security is enabled.
-strict_transport_security_max_age_seconds = 86400
-
-# Set to true if to enable HSTS preloading option. Only applied if strict_transport_security is enabled.
-strict_transport_security_preload = false
-
-# Set to true if to enable the HSTS includeSubDomains option. Only applied if strict_transport_security is enabled.
-strict_transport_security_subdomains = false
-
-# Set to true to enable the X-Content-Type-Options response header.
-# The X-Content-Type-Options response HTTP header is a marker used by the server to indicate that the MIME types advertised
-# in the Content-Type headers should not be changed and be followed. The default will change to true in the next minor release, 6.3.
-x_content_type_options = false
-
-# Set to true to enable the X-XSS-Protection header, which tells browsers to stop pages from loading
-# when they detect reflected cross-site scripting (XSS) attacks. The default will change to true in the next minor release, 6.3.
-x_xss_protection = false
-
-
-#################################### Snapshots ###########################
-[snapshots]
-# snapshot sharing options
-external_enabled = true
-external_snapshot_url = https://snapshots-origin.raintank.io
-external_snapshot_name = Publish to snapshot.raintank.io
-
-# Set to true to enable this Grafana instance act as an external snapshot server and allow unauthenticated requests for
-# creating and deleting snapshots.
-public_mode = false
-
-# remove expired snapshot
-snapshot_remove_expired = true
-
-#################################### Dashboards ##################
-
-[dashboards]
-# Number dashboard versions to keep (per dashboard). Default: 20, Minimum: 1
-versions_to_keep = 20
-
-#################################### Users ###############################
-[users]
-# disable user signup / registration
-allow_sign_up = false
-
-# Allow non admin users to create organizations
-allow_org_create = false
-
-# Set to true to automatically assign new users to the default organization (id 1)
-auto_assign_org = true
-
-# Set this value to automatically add new users to the provided organization (if auto_assign_org above is set to true)
-auto_assign_org_id = 1
-
-# Default role new users will be automatically assigned (if auto_assign_org above is set to true)
-auto_assign_org_role = Viewer
-
-# Require email validation before sign up completes
-verify_email_enabled = false
-
-# Background text for the user field on the login page
-login_hint = email or username
-password_hint = password
-
-# Default UI theme ("dark" or "light")
-default_theme = dark
-
-# External user management
-external_manage_link_url =
-external_manage_link_name =
-external_manage_info =
-
-# Viewers can edit/inspect dashboard settings in the browser. But not save the dashboard.
-viewers_can_edit = false
-
-# Editors can administrate dashboard, folders and teams they create
-editors_can_admin = false
-
-[auth]
-# Login cookie name
-login_cookie_name = grafana_session
-
-# The lifetime (days) an authenticated user can be inactive before being required to login at next visit. Default is 7 days.
-login_maximum_inactive_lifetime_days = 7
-
-# The maximum lifetime (days) an authenticated user can be logged in since login time before being required to login. Default is 30 days.
-login_maximum_lifetime_days = 30
-
-# How often should auth tokens be rotated for authenticated users when being active. The default is each 10 minutes.
-token_rotation_interval_minutes = 10
-
-# Set to true to disable (hide) the login form, useful if you use OAuth
-disable_login_form = false
-
-# Set to true to disable the signout link in the side menu. useful if you use auth.proxy
-disable_signout_menu = false
-
-# URL to redirect the user to after sign out
-signout_redirect_url =
-
-# Set to true to attempt login with OAuth automatically, skipping the login screen.
-# This setting is ignored if multiple OAuth providers are configured.
-oauth_auto_login = false
-
-# limit of api_key seconds to live before expiration
-api_key_max_seconds_to_live = -1
-
-#################################### Anonymous Auth ######################
-[auth.anonymous]
-# enable anonymous access
-enabled = true
-
-# specify organization name that should be used for unauthenticated users
-org_name = Main Org.
-
-# specify role for unauthenticated users
-org_role = Viewer
-
-#################################### Github Auth #########################
-[auth.github]
-enabled = false
-allow_sign_up = true
-client_id = some_id
-client_secret = some_secret
-scopes = user:email,read:org
-auth_url = https://github.com/login/oauth/authorize
-token_url = https://github.com/login/oauth/access_token
-api_url = https://api.github.com/user
-allowed_domains =
-team_ids =
-allowed_organizations =
-
-#################################### GitLab Auth #########################
-[auth.gitlab]
-enabled = false
-allow_sign_up = true
-client_id = some_id
-client_secret = some_secret
-scopes = api
-auth_url = https://gitlab.com/oauth/authorize
-token_url = https://gitlab.com/oauth/token
-api_url = https://gitlab.com/api/v4
-allowed_domains =
-allowed_groups =
-
-#################################### Google Auth #########################
-[auth.google]
-enabled = false
-allow_sign_up = true
-client_id = some_client_id
-client_secret = some_client_secret
-scopes = https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email
-auth_url = https://accounts.google.com/o/oauth2/auth
-token_url = https://accounts.google.com/o/oauth2/token
-api_url = https://www.googleapis.com/oauth2/v1/userinfo
-allowed_domains =
-hosted_domain =
-
-#################################### Grafana.com Auth ####################
-# legacy key names (so they work in env variables)
-[auth.grafananet]
-enabled = false
-allow_sign_up = true
-client_id = some_id
-client_secret = some_secret
-scopes = user:email
-allowed_organizations =
-
-[auth.grafana_com]
-enabled = false
-allow_sign_up = true
-client_id = some_id
-client_secret = some_secret
-scopes = user:email
-allowed_organizations =
-
-#################################### Generic OAuth #######################
-[auth.generic_oauth]
-name = OAuth
-enabled = false
-allow_sign_up = true
-client_id = some_id
-client_secret = some_secret
-scopes = user:email
-email_attribute_name = email:primary
-email_attribute_path =
-role_attribute_path =
-auth_url =
-token_url =
-api_url =
-allowed_domains =
-team_ids =
-allowed_organizations =
-tls_skip_verify_insecure = false
-tls_client_cert =
-tls_client_key =
-tls_client_ca =
-
-#################################### SAML Auth ###########################
-[auth.saml] # Enterprise only
-# Defaults to false. If true, the feature is enabled
-enabled = false
-
-# Base64-encoded public X.509 certificate. Used to sign requests to the IdP
-certificate =
-
-# Path to the public X.509 certificate. Used to sign requests to the IdP
-certificate_path =
-
-# Base64-encoded private key. Used to decrypt assertions from the IdP
-private_key =
-
-# Path to the private key. Used to decrypt assertions from the IdP
-private_key_path =
-
-# Base64-encoded IdP SAML metadata XML. Used to verify and obtain binding locations from the IdP
-idp_metadata =
-
-# Path to the SAML metadata XML. Used to verify and obtain binding locations from the IdP
-idp_metadata_path =
-
-# URL to fetch SAML IdP metadata. Used to verify and obtain binding locations from the IdP
-idp_metadata_url =
-
-# Duration, since the IdP issued a response and the SP is allowed to process it. Defaults to 90 seconds
-max_issue_delay = 90s
-
-# Duration, for how long the SP's metadata should be valid. Defaults to 48 hours
-metadata_valid_duration = 48h
-
-# Friendly name or name of the attribute within the SAML assertion to use as the user's name
-assertion_attribute_name = displayName
-
-# Friendly name or name of the attribute within the SAML assertion to use as the user's login handle
-assertion_attribute_login = mail
-
-# Friendly name or name of the attribute within the SAML assertion to use as the user's email
-assertion_attribute_email = mail
-
-#################################### Basic Auth ##########################
-[auth.basic]
-enabled = true
-
-#################################### Auth Proxy ##########################
-[auth.proxy]
-enabled = false
-header_name = X-WEBAUTH-USER
-header_property = username
-auto_sign_up = true
-# Deprecated, use sync_ttl instead
-ldap_sync_ttl = 60
-sync_ttl = 60
-whitelist =
-headers =
-enable_login_token = false
-
-#################################### Auth LDAP ###########################
-[auth.ldap]
-enabled = false
-config_file = /etc/grafana/ldap.toml
-allow_sign_up = true
-
-# LDAP backround sync (Enterprise only)
-# At 1 am every day
-sync_cron = "0 0 1 * * *"
-active_sync_enabled = true
-
-#################################### SMTP / Emailing #####################
-[smtp]
-enabled = false
-host = localhost:25
-user =
-# If the password contains # or ; you have to wrap it with triple quotes. Ex """#password;"""
-password =
-cert_file =
-key_file =
-skip_verify = false
-from_address = admin@grafana.localhost
-from_name = Grafana
-ehlo_identity =
-
-[emails]
-welcome_email_on_sign_up = false
-templates_pattern = emails/*.html
-
-#################################### Logging ##########################
-[log]
-# Either "console", "file", "syslog". Default is console and file
-# Use space to separate multiple modes, e.g. "console file"
-mode = console file
-
-# Either "debug", "info", "warn", "error", "critical", default is "info"
-level = info
-
-# optional settings to set different levels for specific loggers. Ex filters = sqlstore:debug
-filters =
-
-# For "console" mode only
-[log.console]
-level =
-
-# log line format, valid options are text, console and json
-format = console
-
-# For "file" mode only
-[log.file]
-level =
-
-# log line format, valid options are text, console and json
-format = text
-
-# This enables automated log rotate(switch of following options), default is true
-log_rotate = true
-
-# Max line number of single file, default is 1000000
-max_lines = 1000000
-
-# Max size shift of single file, default is 28 means 1 << 28, 256MB
-max_size_shift = 28
-
-# Segment log daily, default is true
-daily_rotate = true
-
-# Expired days of log file(delete after max days), default is 7
-max_days = 7
-
-[log.syslog]
-level =
-
-# log line format, valid options are text, console and json
-format = text
-
-# Syslog network type and address. This can be udp, tcp, or unix. If left blank, the default unix endpoints will be used.
-network =
-address =
-
-# Syslog facility. user, daemon and local0 through local7 are valid.
-facility =
-
-# Syslog tag. By default, the process' argv[0] is used.
-tag =
-
-#################################### Usage Quotas ########################
-[quota]
-enabled = false
-
-#### set quotas to -1 to make unlimited. ####
-# limit number of users per Org.
-org_user = 10
-
-# limit number of dashboards per Org.
-org_dashboard = 100
-
-# limit number of data_sources per Org.
-org_data_source = 10
-
-# limit number of api_keys per Org.
-org_api_key = 10
-
-# limit number of orgs a user can create.
-user_org = 10
-
-# Global limit of users.
-global_user = -1
-
-# global limit of orgs.
-global_org = -1
-
-# global limit of dashboards
-global_dashboard = -1
-
-# global limit of api_keys
-global_api_key = -1
-
-# global limit on number of logged in users.
-global_session = -1
-
-#################################### Alerting ############################
-[alerting]
-# Disable alerting engine & UI features
-enabled = true
-# Makes it possible to turn off alert rule execution but alerting UI is visible
-execute_alerts = true
-
-# Default setting for new alert rules. Defaults to categorize error and timeouts as alerting. (alerting, keep_state)
-error_or_timeout = alerting
-
-# Default setting for how Grafana handles nodata or null values in alerting. (alerting, no_data, keep_state, ok)
-nodata_or_nullvalues = no_data
-
-# Alert notifications can include images, but rendering many images at the same time can overload the server
-# This limit will protect the server from render overloading and make sure notifications are sent out quickly
-concurrent_render_limit = 5
-
-# Default setting for alert calculation timeout. Default value is 30
-evaluation_timeout_seconds = 30
-
-# Default setting for alert notification timeout. Default value is 30
-notification_timeout_seconds = 30
-
-# Default setting for max attempts to sending alert notifications. Default value is 3
-max_attempts = 3
-
-
-#################################### Explore #############################
-[explore]
-# Enable the Explore section
-enabled = true
-
-#################################### Internal Grafana Metrics ############
-# Metrics available at HTTP API Url /metrics
-[metrics]
-enabled              = true
-interval_seconds     = 10
-# Disable total stats (stat_totals_*) metrics to be generated
-disable_total_stats = false
-
-#If both are set, basic auth will be required for the metrics endpoint.
-basic_auth_username =
-basic_auth_password =
-
-# Send internal Grafana metrics to graphite
-[metrics.graphite]
-# Enable by setting the address setting (ex localhost:2003)
-address =
-prefix = prod.grafana.%(instance_name)s.
-
-#################################### Grafana.com integration  ##########################
-[grafana_net]
-url = https://grafana.com
-
-[grafana_com]
-url = https://grafana.com
-
-#################################### Distributed tracing ############
-[tracing.jaeger]
-# jaeger destination (ex localhost:6831)
-address =
-# tag that will always be included in when creating new spans. ex (tag1:value1,tag2:value2)
-always_included_tag =
-# Type specifies the type of the sampler: const, probabilistic, rateLimiting, or remote
-sampler_type = const
-# jaeger samplerconfig param
-# for "const" sampler, 0 or 1 for always false/true respectively
-# for "probabilistic" sampler, a probability between 0 and 1
-# for "rateLimiting" sampler, the number of spans per second
-# for "remote" sampler, param is the same as for "probabilistic"
-# and indicates the initial sampling rate before the actual one
-# is received from the mothership
-sampler_param = 1
-# Whether or not to use Zipkin span propagation (x-b3- HTTP headers).
-zipkin_propagation = false
-# Setting this to true disables shared RPC spans.
-# Not disabling is the most common setting when using Zipkin elsewhere in your infrastructure.
-disable_shared_zipkin_spans = false
-
-#################################### External Image Storage ##############
-[external_image_storage]
-# Used for uploading images to public servers so they can be included in slack/email messages.
-# You can choose between (s3, webdav, gcs, azure_blob, local)
-provider =
-
-[external_image_storage.s3]
-endpoint =
-path_style_access =
-bucket_url =
-bucket =
-region =
-path =
-access_key =
-secret_key =
-
-[external_image_storage.webdav]
-url =
-username =
-password =
-public_url =
-
-[external_image_storage.gcs]
-key_file =
-bucket =
-path =
-
-[external_image_storage.azure_blob]
-account_name =
-account_key =
-container_name =
-
-[external_image_storage.local]
-# does not require any configuration
-
-[rendering]
-# Options to configure a remote HTTP image rendering service, e.g. using https://github.com/grafana/grafana-image-renderer.
-# URL to a remote HTTP image renderer service, e.g. http://localhost:8081/render, will enable Grafana to render panels and dashboards to PNG-images using HTTP requests to an external service.
-server_url =
-# If the remote HTTP image renderer service runs on a different server than the Grafana server you may have to configure this to a URL where Grafana is reachable, e.g. http://grafana.domain/.
-callback_url =
-
-[panels]
-# here for to support old env variables, can remove after a few months
-enable_alpha = false
-disable_sanitize_html = false
-
-[plugins]
-enable_alpha = false
-app_tls_skip_verify_insecure = false
-
-[enterprise]
-license_path =
-
-[feature_toggles]
-# enable features, separated by spaces
-enable =
diff --git a/scripts/prometheus/env/host/config/grafana/provisioning/dashboards/provider.yaml b/scripts/prometheus/env/host/config/grafana/provisioning/dashboards/provider.yaml
deleted file mode 100644
index bbf093bf7cb..00000000000
--- a/scripts/prometheus/env/host/config/grafana/provisioning/dashboards/provider.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-apiVersion: 1
-
-providers:
-  # <string> an unique provider name. Required
-  - name: 'dashboardprovider'
-    # <int> Org id. Default to 1
-    orgId: 1
-    # <string> name of the dashboard folder.
-    folder: 'dashboards'
-    # <string> folder UID. will be automatically generated if not specified
-    folderUid: ''
-    # <string> provider type. Default to 'file'
-    type: file
-    # <bool> disable dashboard deletion
-    disableDeletion: false
-    # <bool> enable dashboard editing
-    editable: true
-    # <int> how often Grafana will scan for changed dashboards
-    updateIntervalSeconds: 10
-    # <bool> allow updating provisioned dashboards from the UI
-    allowUiUpdates: false
-    options:
-      # <string, required> path to dashboard files on disk. Required when using the 'file' type
-      path: /etc/grafana
\ No newline at end of file
diff --git a/scripts/prometheus/env/host/config/prometheus/prometheus.yml b/scripts/prometheus/env/host/config/prometheus/prometheus.yml
deleted file mode 100644
index 6d4ff7a4093..00000000000
--- a/scripts/prometheus/env/host/config/prometheus/prometheus.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-# my global config
-global:
-  scrape_interval:     15s # Set the scrape interval to every 15 seconds. Default is every 1 minute.
-  evaluation_interval: 15s # Evaluate rules every 15 seconds. The default is every 1 minute.
-  # scrape_timeout is set to the global default (10s).
-
-# Alertmanager configuration
-alerting:
-  alertmanagers:
-  - static_configs:
-    - targets:
-      # - alertmanager:9093
-
-# Load rules once and periodically evaluate them according to the global 'evaluation_interval'.
-rule_files:
-  # - "first_rules.yml"
-  # - "second_rules.yml"
-
-# A scrape configuration containing exactly one endpoint to scrape:
-# Here it's Prometheus itself.
-scrape_configs:
-  # The job name is added as a label `job=<job_name>` to any timeseries scraped from this config.
-  - job_name: 'prometheus'
-    # metrics_path defaults to '/metrics'
-    # scheme defaults to 'http'.
-    static_configs:
-    - targets: ['localhost:9090']
-
-  - job_name: openethereum
-    scrape_interval: 10s
-    metric_relabel_configs:
-      - source_labels: [__name__]
-        target_label: __name__
-        replacement: "oe_${1}"
-    static_configs:
-    - targets:
-      - localhost:3000
-
-  - job_name: cadvisor
-    scrape_interval: 5s
-    static_configs:
-    - targets:
-      - cadvisor:8080
-
-  - job_name: nodeexporter
-    static_configs:
-    - targets:
-       - nodeexporter:9100
\ No newline at end of file
diff --git a/scripts/prometheus/env/host/docker-compose.yaml b/scripts/prometheus/env/host/docker-compose.yaml
deleted file mode 100644
index a3d628775ac..00000000000
--- a/scripts/prometheus/env/host/docker-compose.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
-version: '3.5'
-services:
-
-#  openethereum:
-#    build:
-#      dockerfile: scripts/docker/alpine/Dockerfile
-#      context: ../../../..
-#    ports:
-#      - '30303:30303'
-#      - '30303:30303/udp'
-#      - '8545:8545'
-
-  prometheus:
-    image: prom/prometheus
-    container_name: prometheus
-    restart: always
-    ports:
-      - '9090:9090'
-    volumes:
-      - ../../grafana:/etc/grafana
-      - ./config/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml 
-
-  grafana:
-    image: grafana/grafana
-    container_name: grafana
-    restart: always
-    volumes:
-      - ./config/grafana:/etc/grafana
-    ports:
-      - '3000:3000'
-    environment:
-     - GF_SECURITY_ADMIN_PASSWORD:secret
-
-  cadvisor:
-    image: google/cadvisor:latest
-    container_name: cadvisor
-    volumes:
-    - /:/rootfs:ro
-    - /var/run:/var/run:rw
-    - /sys:/sys:ro
-    - /var/lib/docker/:/var/lib/docker:ro
-    depends_on:
-    - redis
-
-  redis:
-    image: redis:latest
-    container_name: redis
-    network_mode: host
-
-  nodeexporter:
-    image: prom/node-exporter:latest
-    container_name: nodeexporter
-    user: root
-    privileged: true
-    volumes:
-      - /proc:/host/proc:ro
-      - /sys:/host/sys:ro
-      - /:/rootfs:ro
-    command:
-      - '--path.procfs=/host/proc'
-      - '--path.sysfs=/host/sys'
-      - '--collector.filesystem.ignored-mount-points=^/(sys|proc|dev|host|etc)($$|/)'
-    restart: unless-stopped
diff --git a/scripts/prometheus/grafana/nodeexporter.json b/scripts/prometheus/grafana/nodeexporter.json
deleted file mode 100644
index 42df7b97b47..00000000000
--- a/scripts/prometheus/grafana/nodeexporter.json
+++ /dev/null
@@ -1,13641 +0,0 @@
-{
-    "annotations": {
-      "list": [
-        {
-          "builtIn": 1,
-          "datasource": "-- Grafana --",
-          "enable": true,
-          "hide": true,
-          "iconColor": "rgba(0, 211, 255, 1)",
-          "name": "Annotations & Alerts",
-          "type": "dashboard"
-        }
-      ]
-    },
-    "description": "Complete Prometheus Node Exporter dashboard",
-    "editable": true,
-    "gnetId": 1860,
-    "graphTooltip": 0,
-    "id": 3,
-    "iteration": 1591885653871,
-    "links": [],
-    "panels": [
-      {
-        "collapsed": false,
-        "datasource": "Prometheus",
-        "gridPos": {
-          "h": 1,
-          "w": 24,
-          "x": 0,
-          "y": 0
-        },
-        "id": 261,
-        "panels": [],
-        "repeat": null,
-        "title": "Quick CPU / Mem / Disk",
-        "type": "row"
-      },
-      {
-        "cacheTimeout": null,
-        "datasource": "Prometheus",
-        "description": "Busy state of all CPU cores together",
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "thresholds"
-            },
-            "custom": {},
-            "mappings": [
-              {
-                "id": 0,
-                "op": "=",
-                "text": "N/A",
-                "type": 1,
-                "value": "null"
-              }
-            ],
-            "max": 100,
-            "min": 0,
-            "nullValueMode": "null",
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "rgba(50, 172, 45, 0.97)",
-                  "value": null
-                },
-                {
-                  "color": "rgba(237, 129, 40, 0.89)",
-                  "value": 85
-                },
-                {
-                  "color": "rgba(245, 54, 54, 0.9)",
-                  "value": 95
-                }
-              ]
-            },
-            "unit": "percent"
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 4,
-          "w": 3,
-          "x": 0,
-          "y": 1
-        },
-        "id": 20,
-        "links": [],
-        "options": {
-          "orientation": "horizontal",
-          "reduceOptions": {
-            "calcs": [
-              "lastNotNull"
-            ],
-            "fields": "",
-            "values": false
-          },
-          "showThresholdLabels": false,
-          "showThresholdMarkers": true
-        },
-        "pluginVersion": "7.0.3",
-        "targets": [
-          {
-            "expr": "(((count(count(node_cpu_seconds_total{instance=~\"$node:$port\",job=~\"$job\"}) by (cpu))) - avg(sum by (mode)(irate(node_cpu_seconds_total{mode='idle',instance=~\"$node:$port\",job=~\"$job\"}[5m])))) * 100) / count(count(node_cpu_seconds_total{instance=~\"$node:$port\",job=~\"$job\"}) by (cpu))",
-            "hide": false,
-            "intervalFactor": 1,
-            "legendFormat": "",
-            "refId": "A",
-            "step": 900
-          }
-        ],
-        "title": "CPU Busy",
-        "type": "gauge"
-      },
-      {
-        "cacheTimeout": null,
-        "datasource": "Prometheus",
-        "description": "Busy state of all CPU cores together (5 min average)",
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "thresholds"
-            },
-            "custom": {},
-            "mappings": [
-              {
-                "id": 0,
-                "op": "=",
-                "text": "N/A",
-                "type": 1,
-                "value": "null"
-              }
-            ],
-            "max": 100,
-            "min": 0,
-            "nullValueMode": "null",
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "rgba(50, 172, 45, 0.97)",
-                  "value": null
-                },
-                {
-                  "color": "rgba(237, 129, 40, 0.89)",
-                  "value": 85
-                },
-                {
-                  "color": "rgba(245, 54, 54, 0.9)",
-                  "value": 95
-                }
-              ]
-            },
-            "unit": "percent"
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 4,
-          "w": 3,
-          "x": 3,
-          "y": 1
-        },
-        "id": 155,
-        "links": [],
-        "options": {
-          "orientation": "horizontal",
-          "reduceOptions": {
-            "calcs": [
-              "lastNotNull"
-            ],
-            "fields": "",
-            "values": false
-          },
-          "showThresholdLabels": false,
-          "showThresholdMarkers": true
-        },
-        "pluginVersion": "7.0.3",
-        "targets": [
-          {
-            "expr": "avg(node_load5{instance=~\"$node:$port\",job=~\"$job\"}) /  count(count(node_cpu_seconds_total{instance=~\"$node:$port\",job=~\"$job\"}) by (cpu)) * 100",
-            "format": "time_series",
-            "hide": false,
-            "intervalFactor": 1,
-            "refId": "A",
-            "step": 900
-          }
-        ],
-        "title": "Sys Load (5m avg)",
-        "type": "gauge"
-      },
-      {
-        "cacheTimeout": null,
-        "datasource": "Prometheus",
-        "description": "Busy state of all CPU cores together (15 min average)",
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "thresholds"
-            },
-            "custom": {},
-            "mappings": [
-              {
-                "id": 0,
-                "op": "=",
-                "text": "N/A",
-                "type": 1,
-                "value": "null"
-              }
-            ],
-            "max": 100,
-            "min": 0,
-            "nullValueMode": "null",
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "rgba(50, 172, 45, 0.97)",
-                  "value": null
-                },
-                {
-                  "color": "rgba(237, 129, 40, 0.89)",
-                  "value": 85
-                },
-                {
-                  "color": "rgba(245, 54, 54, 0.9)",
-                  "value": 95
-                }
-              ]
-            },
-            "unit": "percent"
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 4,
-          "w": 3,
-          "x": 6,
-          "y": 1
-        },
-        "id": 19,
-        "links": [],
-        "options": {
-          "orientation": "horizontal",
-          "reduceOptions": {
-            "calcs": [
-              "lastNotNull"
-            ],
-            "fields": "",
-            "values": false
-          },
-          "showThresholdLabels": false,
-          "showThresholdMarkers": true
-        },
-        "pluginVersion": "7.0.3",
-        "targets": [
-          {
-            "expr": "avg(node_load15{instance=~\"$node:$port\",job=~\"$job\"}) /  count(count(node_cpu_seconds_total{instance=~\"$node:$port\",job=~\"$job\"}) by (cpu)) * 100",
-            "hide": false,
-            "intervalFactor": 1,
-            "refId": "A",
-            "step": 900
-          }
-        ],
-        "title": "Sys Load (15m avg)",
-        "type": "gauge"
-      },
-      {
-        "cacheTimeout": null,
-        "datasource": "Prometheus",
-        "description": "Non available RAM memory",
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "thresholds"
-            },
-            "custom": {},
-            "decimals": 0,
-            "mappings": [],
-            "max": 100,
-            "min": 0,
-            "nullValueMode": "null",
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "rgba(50, 172, 45, 0.97)",
-                  "value": null
-                },
-                {
-                  "color": "rgba(237, 129, 40, 0.89)",
-                  "value": 80
-                },
-                {
-                  "color": "rgba(245, 54, 54, 0.9)",
-                  "value": 90
-                }
-              ]
-            },
-            "unit": "percent"
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 4,
-          "w": 3,
-          "x": 9,
-          "y": 1
-        },
-        "hideTimeOverride": false,
-        "id": 16,
-        "links": [],
-        "options": {
-          "orientation": "horizontal",
-          "reduceOptions": {
-            "calcs": [
-              "lastNotNull"
-            ],
-            "fields": "",
-            "values": false
-          },
-          "showThresholdLabels": false,
-          "showThresholdMarkers": true
-        },
-        "pluginVersion": "7.0.3",
-        "targets": [
-          {
-            "expr": "((node_memory_MemTotal_bytes{instance=~\"$node:$port\",job=~\"$job\"} - node_memory_MemFree_bytes{instance=~\"$node:$port\",job=~\"$job\"}) / (node_memory_MemTotal_bytes{instance=~\"$node:$port\",job=~\"$job\"} )) * 100",
-            "format": "time_series",
-            "hide": true,
-            "intervalFactor": 1,
-            "refId": "A",
-            "step": 900
-          },
-          {
-            "expr": "100 - ((node_memory_MemAvailable_bytes{instance=~\"$node:$port\",job=~\"$job\"} * 100) / node_memory_MemTotal_bytes{instance=~\"$node:$port\",job=~\"$job\"})",
-            "format": "time_series",
-            "hide": false,
-            "intervalFactor": 1,
-            "refId": "B",
-            "step": 900
-          }
-        ],
-        "title": "RAM Used",
-        "type": "gauge"
-      },
-      {
-        "cacheTimeout": null,
-        "datasource": "Prometheus",
-        "description": "Used Swap",
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "thresholds"
-            },
-            "custom": {},
-            "mappings": [
-              {
-                "id": 0,
-                "op": "=",
-                "text": "N/A",
-                "type": 1,
-                "value": "null"
-              }
-            ],
-            "max": 100,
-            "min": 0,
-            "nullValueMode": "null",
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "rgba(50, 172, 45, 0.97)",
-                  "value": null
-                },
-                {
-                  "color": "rgba(237, 129, 40, 0.89)",
-                  "value": 10
-                },
-                {
-                  "color": "rgba(245, 54, 54, 0.9)",
-                  "value": 25
-                }
-              ]
-            },
-            "unit": "percent"
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 4,
-          "w": 3,
-          "x": 12,
-          "y": 1
-        },
-        "id": 21,
-        "links": [],
-        "options": {
-          "orientation": "horizontal",
-          "reduceOptions": {
-            "calcs": [
-              "lastNotNull"
-            ],
-            "fields": "",
-            "values": false
-          },
-          "showThresholdLabels": false,
-          "showThresholdMarkers": true
-        },
-        "pluginVersion": "7.0.3",
-        "targets": [
-          {
-            "expr": "((node_memory_SwapTotal_bytes{instance=~\"$node:$port\",job=~\"$job\"} - node_memory_SwapFree_bytes{instance=~\"$node:$port\",job=~\"$job\"}) / (node_memory_SwapTotal_bytes{instance=~\"$node:$port\",job=~\"$job\"} )) * 100",
-            "intervalFactor": 1,
-            "refId": "A",
-            "step": 900
-          }
-        ],
-        "title": "SWAP Used",
-        "type": "gauge"
-      },
-      {
-        "cacheTimeout": null,
-        "datasource": "Prometheus",
-        "description": "Used Root FS",
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "thresholds"
-            },
-            "custom": {},
-            "mappings": [
-              {
-                "id": 0,
-                "op": "=",
-                "text": "N/A",
-                "type": 1,
-                "value": "null"
-              }
-            ],
-            "max": 100,
-            "min": 0,
-            "nullValueMode": "null",
-            "thresholds": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "rgba(50, 172, 45, 0.97)",
-                  "value": null
-                },
-                {
-                  "color": "rgba(237, 129, 40, 0.89)",
-                  "value": 80
-                },
-                {
-                  "color": "rgba(245, 54, 54, 0.9)",
-                  "value": 90
-                }
-              ]
-            },
-            "unit": "percent"
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 4,
-          "w": 3,
-          "x": 15,
-          "y": 1
-        },
-        "id": 154,
-        "links": [],
-        "options": {
-          "orientation": "horizontal",
-          "reduceOptions": {
-            "calcs": [
-              "lastNotNull"
-            ],
-            "fields": "",
-            "values": false
-          },
-          "showThresholdLabels": false,
-          "showThresholdMarkers": true
-        },
-        "pluginVersion": "7.0.3",
-        "targets": [
-          {
-            "expr": "100 - ((node_filesystem_avail_bytes{instance=~\"$node:$port\",job=~\"$job\",mountpoint=\"/\",fstype!=\"rootfs\"} * 100) / node_filesystem_size_bytes{instance=~\"$node:$port\",job=~\"$job\",mountpoint=\"/\",fstype!=\"rootfs\"})",
-            "format": "time_series",
-            "intervalFactor": 1,
-            "refId": "A",
-            "step": 900
-          }
-        ],
-        "title": "Root FS Used",
-        "type": "gauge"
-      },
-      {
-        "cacheTimeout": null,
-        "colorBackground": false,
-        "colorValue": false,
-        "colors": [
-          "rgba(245, 54, 54, 0.9)",
-          "rgba(237, 129, 40, 0.89)",
-          "rgba(50, 172, 45, 0.97)"
-        ],
-        "datasource": "Prometheus",
-        "description": "Total number of CPU cores",
-        "fieldConfig": {
-          "defaults": {
-            "custom": {}
-          },
-          "overrides": []
-        },
-        "format": "short",
-        "gauge": {
-          "maxValue": 100,
-          "minValue": 0,
-          "show": false,
-          "thresholdLabels": false,
-          "thresholdMarkers": true
-        },
-        "gridPos": {
-          "h": 2,
-          "w": 2,
-          "x": 18,
-          "y": 1
-        },
-        "id": 14,
-        "interval": null,
-        "links": [],
-        "mappingType": 1,
-        "mappingTypes": [
-          {
-            "name": "value to text",
-            "value": 1
-          },
-          {
-            "name": "range to text",
-            "value": 2
-          }
-        ],
-        "maxDataPoints": 100,
-        "maxPerRow": 6,
-        "nullPointMode": "null",
-        "nullText": null,
-        "postfix": "",
-        "postfixFontSize": "50%",
-        "prefix": "",
-        "prefixFontSize": "50%",
-        "rangeMaps": [
-          {
-            "from": "null",
-            "text": "N/A",
-            "to": "null"
-          }
-        ],
-        "sparkline": {
-          "fillColor": "rgba(31, 118, 189, 0.18)",
-          "full": false,
-          "lineColor": "rgb(31, 120, 193)",
-          "show": false
-        },
-        "tableColumn": "",
-        "targets": [
-          {
-            "expr": "count(count(node_cpu_seconds_total{instance=~\"$node:$port\",job=~\"$job\"}) by (cpu))",
-            "interval": "",
-            "intervalFactor": 1,
-            "legendFormat": "",
-            "refId": "A",
-            "step": 900
-          }
-        ],
-        "thresholds": "",
-        "title": "CPU Cores",
-        "type": "singlestat",
-        "valueFontSize": "50%",
-        "valueMaps": [
-          {
-            "op": "=",
-            "text": "N/A",
-            "value": "null"
-          }
-        ],
-        "valueName": "current"
-      },
-      {
-        "cacheTimeout": null,
-        "colorBackground": false,
-        "colorValue": false,
-        "colors": [
-          "rgba(245, 54, 54, 0.9)",
-          "rgba(237, 129, 40, 0.89)",
-          "rgba(50, 172, 45, 0.97)"
-        ],
-        "datasource": "Prometheus",
-        "decimals": 1,
-        "description": "System uptime",
-        "fieldConfig": {
-          "defaults": {
-            "custom": {}
-          },
-          "overrides": []
-        },
-        "format": "s",
-        "gauge": {
-          "maxValue": 100,
-          "minValue": 0,
-          "show": false,
-          "thresholdLabels": false,
-          "thresholdMarkers": true
-        },
-        "gridPos": {
-          "h": 2,
-          "w": 4,
-          "x": 20,
-          "y": 1
-        },
-        "hideTimeOverride": true,
-        "id": 15,
-        "interval": null,
-        "links": [],
-        "mappingType": 1,
-        "mappingTypes": [
-          {
-            "name": "value to text",
-            "value": 1
-          },
-          {
-            "name": "range to text",
-            "value": 2
-          }
-        ],
-        "maxDataPoints": 100,
-        "nullPointMode": "null",
-        "nullText": null,
-        "postfix": "s",
-        "postfixFontSize": "50%",
-        "prefix": "",
-        "prefixFontSize": "50%",
-        "rangeMaps": [
-          {
-            "from": "null",
-            "text": "N/A",
-            "to": "null"
-          }
-        ],
-        "sparkline": {
-          "fillColor": "rgba(31, 118, 189, 0.18)",
-          "full": false,
-          "lineColor": "rgb(31, 120, 193)",
-          "show": false
-        },
-        "tableColumn": "",
-        "targets": [
-          {
-            "expr": "node_time_seconds{instance=~\"$node:$port\",job=~\"$job\"} - node_boot_time_seconds{instance=~\"$node:$port\",job=~\"$job\"}",
-            "intervalFactor": 2,
-            "refId": "A",
-            "step": 1800
-          }
-        ],
-        "thresholds": "",
-        "title": "Uptime",
-        "type": "singlestat",
-        "valueFontSize": "50%",
-        "valueMaps": [
-          {
-            "op": "=",
-            "text": "N/A",
-            "value": "null"
-          }
-        ],
-        "valueName": "current"
-      },
-      {
-        "cacheTimeout": null,
-        "colorBackground": false,
-        "colorValue": false,
-        "colors": [
-          "rgba(50, 172, 45, 0.97)",
-          "rgba(237, 129, 40, 0.89)",
-          "rgba(245, 54, 54, 0.9)"
-        ],
-        "datasource": "Prometheus",
-        "decimals": 0,
-        "description": "Total RootFS",
-        "fieldConfig": {
-          "defaults": {
-            "custom": {}
-          },
-          "overrides": []
-        },
-        "format": "bytes",
-        "gauge": {
-          "maxValue": 100,
-          "minValue": 0,
-          "show": false,
-          "thresholdLabels": false,
-          "thresholdMarkers": true
-        },
-        "gridPos": {
-          "h": 2,
-          "w": 2,
-          "x": 18,
-          "y": 3
-        },
-        "id": 23,
-        "interval": null,
-        "links": [],
-        "mappingType": 1,
-        "mappingTypes": [
-          {
-            "name": "value to text",
-            "value": 1
-          },
-          {
-            "name": "range to text",
-            "value": 2
-          }
-        ],
-        "maxDataPoints": 100,
-        "maxPerRow": 6,
-        "nullPointMode": "null",
-        "nullText": null,
-        "postfix": "",
-        "postfixFontSize": "50%",
-        "prefix": "",
-        "prefixFontSize": "50%",
-        "rangeMaps": [
-          {
-            "from": "null",
-            "text": "N/A",
-            "to": "null"
-          }
-        ],
-        "sparkline": {
-          "fillColor": "rgba(31, 118, 189, 0.18)",
-          "full": false,
-          "lineColor": "rgb(31, 120, 193)",
-          "show": false
-        },
-        "tableColumn": "",
-        "targets": [
-          {
-            "expr": "node_filesystem_size_bytes{instance=~\"$node:$port\",job=~\"$job\",mountpoint=\"/\",fstype!=\"rootfs\"}",
-            "format": "time_series",
-            "hide": false,
-            "intervalFactor": 1,
-            "refId": "A",
-            "step": 900
-          }
-        ],
-        "thresholds": "70,90",
-        "title": "RootFS Total",
-        "type": "singlestat",
-        "valueFontSize": "50%",
-        "valueMaps": [
-          {
-            "op": "=",
-            "text": "N/A",
-            "value": "null"
-          }
-        ],
-        "valueName": "current"
-      },
-      {
-        "cacheTimeout": null,
-        "colorBackground": false,
-        "colorValue": false,
-        "colors": [
-          "rgba(245, 54, 54, 0.9)",
-          "rgba(237, 129, 40, 0.89)",
-          "rgba(50, 172, 45, 0.97)"
-        ],
-        "datasource": "Prometheus",
-        "decimals": 0,
-        "description": "Total RAM",
-        "fieldConfig": {
-          "defaults": {
-            "custom": {}
-          },
-          "overrides": []
-        },
-        "format": "bytes",
-        "gauge": {
-          "maxValue": 100,
-          "minValue": 0,
-          "show": false,
-          "thresholdLabels": false,
-          "thresholdMarkers": true
-        },
-        "gridPos": {
-          "h": 2,
-          "w": 2,
-          "x": 20,
-          "y": 3
-        },
-        "id": 75,
-        "interval": null,
-        "links": [],
-        "mappingType": 1,
-        "mappingTypes": [
-          {
-            "name": "value to text",
-            "value": 1
-          },
-          {
-            "name": "range to text",
-            "value": 2
-          }
-        ],
-        "maxDataPoints": 100,
-        "maxPerRow": 6,
-        "nullPointMode": "null",
-        "nullText": null,
-        "postfix": "",
-        "postfixFontSize": "70%",
-        "prefix": "",
-        "prefixFontSize": "50%",
-        "rangeMaps": [
-          {
-            "from": "null",
-            "text": "N/A",
-            "to": "null"
-          }
-        ],
-        "sparkline": {
-          "fillColor": "rgba(31, 118, 189, 0.18)",
-          "full": false,
-          "lineColor": "rgb(31, 120, 193)",
-          "show": false
-        },
-        "tableColumn": "",
-        "targets": [
-          {
-            "expr": "node_memory_MemTotal_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
-            "intervalFactor": 1,
-            "refId": "A",
-            "step": 900
-          }
-        ],
-        "thresholds": "",
-        "title": "RAM Total",
-        "type": "singlestat",
-        "valueFontSize": "50%",
-        "valueMaps": [
-          {
-            "op": "=",
-            "text": "N/A",
-            "value": "null"
-          }
-        ],
-        "valueName": "current"
-      },
-      {
-        "cacheTimeout": null,
-        "colorBackground": false,
-        "colorValue": false,
-        "colors": [
-          "rgba(245, 54, 54, 0.9)",
-          "rgba(237, 129, 40, 0.89)",
-          "rgba(50, 172, 45, 0.97)"
-        ],
-        "datasource": "Prometheus",
-        "decimals": 0,
-        "description": "Total SWAP",
-        "fieldConfig": {
-          "defaults": {
-            "custom": {}
-          },
-          "overrides": []
-        },
-        "format": "bytes",
-        "gauge": {
-          "maxValue": 100,
-          "minValue": 0,
-          "show": false,
-          "thresholdLabels": false,
-          "thresholdMarkers": true
-        },
-        "gridPos": {
-          "h": 2,
-          "w": 2,
-          "x": 22,
-          "y": 3
-        },
-        "id": 18,
-        "interval": null,
-        "links": [],
-        "mappingType": 1,
-        "mappingTypes": [
-          {
-            "name": "value to text",
-            "value": 1
-          },
-          {
-            "name": "range to text",
-            "value": 2
-          }
-        ],
-        "maxDataPoints": 100,
-        "maxPerRow": 6,
-        "nullPointMode": "null",
-        "nullText": null,
-        "postfix": "",
-        "postfixFontSize": "70%",
-        "prefix": "",
-        "prefixFontSize": "50%",
-        "rangeMaps": [
-          {
-            "from": "null",
-            "text": "N/A",
-            "to": "null"
-          }
-        ],
-        "sparkline": {
-          "fillColor": "rgba(31, 118, 189, 0.18)",
-          "full": false,
-          "lineColor": "rgb(31, 120, 193)",
-          "show": false
-        },
-        "tableColumn": "",
-        "targets": [
-          {
-            "expr": "node_memory_SwapTotal_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
-            "intervalFactor": 1,
-            "refId": "A",
-            "step": 900
-          }
-        ],
-        "thresholds": "",
-        "title": "SWAP Total",
-        "type": "singlestat",
-        "valueFontSize": "50%",
-        "valueMaps": [
-          {
-            "op": "=",
-            "text": "N/A",
-            "value": "null"
-          }
-        ],
-        "valueName": "current"
-      },
-      {
-        "collapsed": false,
-        "datasource": "Prometheus",
-        "gridPos": {
-          "h": 1,
-          "w": 24,
-          "x": 0,
-          "y": 5
-        },
-        "id": 263,
-        "panels": [],
-        "repeat": null,
-        "title": "Basic CPU / Mem / Net / Disk",
-        "type": "row"
-      },
-      {
-        "aliasColors": {
-          "Busy": "#EAB839",
-          "Busy Iowait": "#890F02",
-          "Busy other": "#1F78C1",
-          "Idle": "#052B51",
-          "Idle - Waiting for something to happen": "#052B51",
-          "guest": "#9AC48A",
-          "idle": "#052B51",
-          "iowait": "#EAB839",
-          "irq": "#BF1B00",
-          "nice": "#C15C17",
-          "softirq": "#E24D42",
-          "steal": "#FCE2DE",
-          "system": "#508642",
-          "user": "#5195CE"
-        },
-        "bars": false,
-        "dashLength": 10,
-        "dashes": false,
-        "datasource": "Prometheus",
-        "decimals": 2,
-        "description": "Basic CPU info",
-        "fieldConfig": {
-          "defaults": {
-            "custom": {}
-          },
-          "overrides": []
-        },
-        "fill": 4,
-        "fillGradient": 0,
-        "gridPos": {
-          "h": 7,
-          "w": 12,
-          "x": 0,
-          "y": 6
-        },
-        "hiddenSeries": false,
-        "id": 77,
-        "legend": {
-          "alignAsTable": false,
-          "avg": false,
-          "current": false,
-          "max": false,
-          "min": false,
-          "rightSide": false,
-          "show": true,
-          "sideWidth": 250,
-          "sort": null,
-          "sortDesc": null,
-          "total": false,
-          "values": false
-        },
-        "lines": true,
-        "linewidth": 1,
-        "links": [],
-        "maxPerRow": 6,
-        "nullPointMode": "null",
-        "options": {
-          "dataLinks": []
-        },
-        "percentage": true,
-        "pointradius": 5,
-        "points": false,
-        "renderer": "flot",
-        "seriesOverrides": [
-          {
-            "alias": "Busy Iowait",
-            "color": "#890F02"
-          },
-          {
-            "alias": "Idle",
-            "color": "#7EB26D"
-          },
-          {
-            "alias": "Busy System",
-            "color": "#EAB839"
-          },
-          {
-            "alias": "Busy User",
-            "color": "#0A437C"
-          },
-          {
-            "alias": "Busy Other",
-            "color": "#6D1F62"
-          }
-        ],
-        "spaceLength": 10,
-        "stack": true,
-        "steppedLine": false,
-        "targets": [
-          {
-            "expr": "sum by (instance)(irate(node_cpu_seconds_total{mode=\"system\",instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
-            "format": "time_series",
-            "hide": false,
-            "intervalFactor": 2,
-            "legendFormat": "Busy System",
-            "refId": "A",
-            "step": 240
-          },
-          {
-            "expr": "sum by (instance)(irate(node_cpu_seconds_total{mode='user',instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
-            "format": "time_series",
-            "hide": false,
-            "intervalFactor": 2,
-            "legendFormat": "Busy User",
-            "refId": "B",
-            "step": 240
-          },
-          {
-            "expr": "sum by (instance)(irate(node_cpu_seconds_total{mode='iowait',instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
-            "format": "time_series",
-            "intervalFactor": 2,
-            "legendFormat": "Busy Iowait",
-            "refId": "C",
-            "step": 240
-          },
-          {
-            "expr": "sum by (instance)(irate(node_cpu_seconds_total{mode=~\".*irq\",instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
-            "format": "time_series",
-            "intervalFactor": 2,
-            "legendFormat": "Busy IRQs",
-            "refId": "D",
-            "step": 240
-          },
-          {
-            "expr": "sum (irate(node_cpu_seconds_total{mode!='idle',mode!='user',mode!='system',mode!='iowait',mode!='irq',mode!='softirq',instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
-            "format": "time_series",
-            "intervalFactor": 2,
-            "legendFormat": "Busy Other",
-            "refId": "E",
-            "step": 240
-          },
-          {
-            "expr": "sum by (mode)(irate(node_cpu_seconds_total{mode='idle',instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
-            "format": "time_series",
-            "intervalFactor": 2,
-            "legendFormat": "Idle",
-            "refId": "F",
-            "step": 240
-          }
-        ],
-        "thresholds": [],
-        "timeFrom": null,
-        "timeRegions": [],
-        "timeShift": null,
-        "title": "CPU Basic",
-        "tooltip": {
-          "shared": true,
-          "sort": 0,
-          "value_type": "individual"
-        },
-        "type": "graph",
-        "xaxis": {
-          "buckets": null,
-          "mode": "time",
-          "name": null,
-          "show": true,
-          "values": []
-        },
-        "yaxes": [
-          {
-            "format": "short",
-            "label": "",
-            "logBase": 1,
-            "max": "100",
-            "min": "0",
-            "show": true
-          },
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": false
-          }
-        ],
-        "yaxis": {
-          "align": false,
-          "alignLevel": null
-        }
-      },
-      {
-        "aliasColors": {
-          "Apps": "#629E51",
-          "Buffers": "#614D93",
-          "Cache": "#6D1F62",
-          "Cached": "#511749",
-          "Committed": "#508642",
-          "Free": "#0A437C",
-          "Hardware Corrupted - Amount of RAM that the kernel identified as corrupted / not working": "#CFFAFF",
-          "Inactive": "#584477",
-          "PageTables": "#0A50A1",
-          "Page_Tables": "#0A50A1",
-          "RAM_Free": "#E0F9D7",
-          "SWAP Used": "#BF1B00",
-          "Slab": "#806EB7",
-          "Slab_Cache": "#E0752D",
-          "Swap": "#BF1B00",
-          "Swap Used": "#BF1B00",
-          "Swap_Cache": "#C15C17",
-          "Swap_Free": "#2F575E",
-          "Unused": "#EAB839"
-        },
-        "bars": false,
-        "dashLength": 10,
-        "dashes": false,
-        "datasource": "Prometheus",
-        "decimals": 2,
-        "description": "Basic memory usage",
-        "fieldConfig": {
-          "defaults": {
-            "custom": {}
-          },
-          "overrides": []
-        },
-        "fill": 4,
-        "fillGradient": 0,
-        "gridPos": {
-          "h": 7,
-          "w": 12,
-          "x": 12,
-          "y": 6
-        },
-        "hiddenSeries": false,
-        "id": 78,
-        "legend": {
-          "alignAsTable": false,
-          "avg": false,
-          "current": false,
-          "max": false,
-          "min": false,
-          "rightSide": false,
-          "show": true,
-          "sideWidth": 350,
-          "total": false,
-          "values": false
-        },
-        "lines": true,
-        "linewidth": 1,
-        "links": [],
-        "maxPerRow": 6,
-        "nullPointMode": "null",
-        "options": {
-          "dataLinks": []
-        },
-        "percentage": false,
-        "pointradius": 5,
-        "points": false,
-        "renderer": "flot",
-        "seriesOverrides": [
-          {
-            "alias": "RAM Total",
-            "color": "#E0F9D7",
-            "fill": 0,
-            "stack": false
-          },
-          {
-            "alias": "RAM Cache + Buffer",
-            "color": "#052B51"
-          },
-          {
-            "alias": "RAM Free",
-            "color": "#7EB26D"
-          },
-          {
-            "alias": "Avaliable",
-            "color": "#DEDAF7",
-            "fill": 0,
-            "stack": false
-          }
-        ],
-        "spaceLength": 10,
-        "stack": true,
-        "steppedLine": false,
-        "targets": [
-          {
-            "expr": "node_memory_MemTotal_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
-            "format": "time_series",
-            "hide": false,
-            "intervalFactor": 2,
-            "legendFormat": "RAM Total",
-            "refId": "A",
-            "step": 240
-          },
-          {
-            "expr": "node_memory_MemTotal_bytes{instance=~\"$node:$port\",job=~\"$job\"} - node_memory_MemFree_bytes{instance=~\"$node:$port\",job=~\"$job\"} - (node_memory_Cached_bytes{instance=~\"$node:$port\",job=~\"$job\"} + node_memory_Buffers_bytes{instance=~\"$node:$port\",job=~\"$job\"})",
-            "format": "time_series",
-            "hide": false,
-            "intervalFactor": 2,
-            "legendFormat": "RAM Used",
-            "refId": "B",
-            "step": 240
-          },
-          {
-            "expr": "node_memory_Cached_bytes{instance=~\"$node:$port\",job=~\"$job\"} + node_memory_Buffers_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
-            "format": "time_series",
-            "intervalFactor": 2,
-            "legendFormat": "RAM Cache + Buffer",
-            "refId": "C",
-            "step": 240
-          },
-          {
-            "expr": "node_memory_MemFree_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
-            "format": "time_series",
-            "intervalFactor": 2,
-            "legendFormat": "RAM Free",
-            "refId": "D",
-            "step": 240
-          },
-          {
-            "expr": "(node_memory_SwapTotal_bytes{instance=~\"$node:$port\",job=~\"$job\"} - node_memory_SwapFree_bytes{instance=~\"$node:$port\",job=~\"$job\"})",
-            "format": "time_series",
-            "intervalFactor": 2,
-            "legendFormat": "SWAP Used",
-            "refId": "E",
-            "step": 240
-          }
-        ],
-        "thresholds": [],
-        "timeFrom": null,
-        "timeRegions": [],
-        "timeShift": null,
-        "title": "Memory Basic",
-        "tooltip": {
-          "shared": true,
-          "sort": 0,
-          "value_type": "individual"
-        },
-        "type": "graph",
-        "xaxis": {
-          "buckets": null,
-          "mode": "time",
-          "name": null,
-          "show": true,
-          "values": []
-        },
-        "yaxes": [
-          {
-            "format": "bytes",
-            "label": "",
-            "logBase": 1,
-            "max": null,
-            "min": "0",
-            "show": true
-          },
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": false
-          }
-        ],
-        "yaxis": {
-          "align": false,
-          "alignLevel": null
-        }
-      },
-      {
-        "aliasColors": {
-          "Recv_bytes_eth2": "#7EB26D",
-          "Recv_bytes_lo": "#0A50A1",
-          "Recv_drop_eth2": "#6ED0E0",
-          "Recv_drop_lo": "#E0F9D7",
-          "Recv_errs_eth2": "#BF1B00",
-          "Recv_errs_lo": "#CCA300",
-          "Trans_bytes_eth2": "#7EB26D",
-          "Trans_bytes_lo": "#0A50A1",
-          "Trans_drop_eth2": "#6ED0E0",
-          "Trans_drop_lo": "#E0F9D7",
-          "Trans_errs_eth2": "#BF1B00",
-          "Trans_errs_lo": "#CCA300",
-          "recv_bytes_lo": "#0A50A1",
-          "recv_drop_eth0": "#99440A",
-          "recv_drop_lo": "#967302",
-          "recv_errs_eth0": "#BF1B00",
-          "recv_errs_lo": "#890F02",
-          "trans_bytes_eth0": "#7EB26D",
-          "trans_bytes_lo": "#0A50A1",
-          "trans_drop_eth0": "#99440A",
-          "trans_drop_lo": "#967302",
-          "trans_errs_eth0": "#BF1B00",
-          "trans_errs_lo": "#890F02"
-        },
-        "bars": false,
-        "dashLength": 10,
-        "dashes": false,
-        "datasource": "Prometheus",
-        "description": "Basic network info per interface",
-        "fieldConfig": {
-          "defaults": {
-            "custom": {}
-          },
-          "overrides": []
-        },
-        "fill": 4,
-        "fillGradient": 0,
-        "gridPos": {
-          "h": 7,
-          "w": 12,
-          "x": 0,
-          "y": 13
-        },
-        "hiddenSeries": false,
-        "id": 74,
-        "legend": {
-          "alignAsTable": false,
-          "avg": false,
-          "current": false,
-          "hideEmpty": false,
-          "hideZero": false,
-          "max": false,
-          "min": false,
-          "rightSide": false,
-          "show": true,
-          "sort": "current",
-          "sortDesc": true,
-          "total": false,
-          "values": false
-        },
-        "lines": true,
-        "linewidth": 1,
-        "links": [],
-        "nullPointMode": "null",
-        "options": {
-          "dataLinks": []
-        },
-        "percentage": false,
-        "pointradius": 5,
-        "points": false,
-        "renderer": "flot",
-        "seriesOverrides": [
-          {
-            "alias": "/.*trans.*/",
-            "transform": "negative-Y"
-          }
-        ],
-        "spaceLength": 10,
-        "stack": false,
-        "steppedLine": false,
-        "targets": [
-          {
-            "expr": "irate(node_network_receive_bytes_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])*8",
-            "format": "time_series",
-            "intervalFactor": 2,
-            "legendFormat": "recv {{device}}",
-            "refId": "A",
-            "step": 240
-          },
-          {
-            "expr": "irate(node_network_transmit_bytes_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])*8",
-            "format": "time_series",
-            "intervalFactor": 2,
-            "legendFormat": "trans {{device}} ",
-            "refId": "B",
-            "step": 240
-          }
-        ],
-        "thresholds": [],
-        "timeFrom": null,
-        "timeRegions": [],
-        "timeShift": null,
-        "title": "Network Traffic Basic",
-        "tooltip": {
-          "shared": true,
-          "sort": 0,
-          "value_type": "individual"
-        },
-        "type": "graph",
-        "xaxis": {
-          "buckets": null,
-          "mode": "time",
-          "name": null,
-          "show": true,
-          "values": []
-        },
-        "yaxes": [
-          {
-            "format": "bps",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          },
-          {
-            "format": "pps",
-            "label": "",
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": false
-          }
-        ],
-        "yaxis": {
-          "align": false,
-          "alignLevel": null
-        }
-      },
-      {
-        "aliasColors": {},
-        "bars": false,
-        "dashLength": 10,
-        "dashes": false,
-        "datasource": "Prometheus",
-        "decimals": 3,
-        "description": "Disk space used of all filesystems mounted",
-        "fieldConfig": {
-          "defaults": {
-            "custom": {}
-          },
-          "overrides": []
-        },
-        "fill": 4,
-        "fillGradient": 0,
-        "gridPos": {
-          "h": 7,
-          "w": 12,
-          "x": 12,
-          "y": 13
-        },
-        "height": "",
-        "hiddenSeries": false,
-        "id": 152,
-        "legend": {
-          "alignAsTable": false,
-          "avg": false,
-          "current": false,
-          "max": false,
-          "min": false,
-          "rightSide": false,
-          "show": true,
-          "sort": "current",
-          "sortDesc": false,
-          "total": false,
-          "values": false
-        },
-        "lines": true,
-        "linewidth": 1,
-        "links": [],
-        "maxPerRow": 6,
-        "nullPointMode": "null",
-        "options": {
-          "dataLinks": []
-        },
-        "percentage": false,
-        "pointradius": 5,
-        "points": false,
-        "renderer": "flot",
-        "seriesOverrides": [],
-        "spaceLength": 10,
-        "stack": false,
-        "steppedLine": false,
-        "targets": [
-          {
-            "expr": "100 - ((node_filesystem_avail_bytes{instance=~\"$node:$port\",job=~\"$job\",device!~'rootfs'} * 100) / node_filesystem_size_bytes{instance=~\"$node:$port\",job=~\"$job\",device!~'rootfs'})",
-            "format": "time_series",
-            "intervalFactor": 2,
-            "legendFormat": "{{mountpoint}}",
-            "refId": "A",
-            "step": 240
-          }
-        ],
-        "thresholds": [],
-        "timeFrom": null,
-        "timeRegions": [],
-        "timeShift": null,
-        "title": "Disk Space Used Basic",
-        "tooltip": {
-          "shared": true,
-          "sort": 0,
-          "value_type": "individual"
-        },
-        "type": "graph",
-        "xaxis": {
-          "buckets": null,
-          "mode": "time",
-          "name": null,
-          "show": true,
-          "values": []
-        },
-        "yaxes": [
-          {
-            "format": "percent",
-            "label": null,
-            "logBase": 1,
-            "max": "100",
-            "min": "0",
-            "show": true
-          },
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          }
-        ],
-        "yaxis": {
-          "align": false,
-          "alignLevel": null
-        }
-      },
-      {
-        "collapsed": true,
-        "datasource": "Prometheus",
-        "gridPos": {
-          "h": 1,
-          "w": 24,
-          "x": 0,
-          "y": 20
-        },
-        "id": 265,
-        "panels": [
-          {
-            "aliasColors": {
-              "Idle - Waiting for something to happen": "#052B51",
-              "guest": "#9AC48A",
-              "idle": "#052B51",
-              "iowait": "#EAB839",
-              "irq": "#BF1B00",
-              "nice": "#C15C17",
-              "softirq": "#E24D42",
-              "steal": "#FCE2DE",
-              "system": "#508642",
-              "user": "#5195CE"
-            },
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "decimals": 2,
-            "description": "",
-            "fill": 4,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 12,
-              "w": 12,
-              "x": 0,
-              "y": 21
-            },
-            "hiddenSeries": false,
-            "id": 3,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sideWidth": 250,
-              "sort": null,
-              "sortDesc": null,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 6,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": true,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "repeat": null,
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": true,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "sum by (mode)(irate(node_cpu_seconds_total{mode=\"system\",instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
-                "format": "time_series",
-                "interval": "10s",
-                "intervalFactor": 2,
-                "legendFormat": "System - Processes executing in kernel mode",
-                "refId": "A",
-                "step": 20
-              },
-              {
-                "expr": "sum by (mode)(irate(node_cpu_seconds_total{mode='user',instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "User - Normal processes executing in user mode",
-                "refId": "B",
-                "step": 240
-              },
-              {
-                "expr": "sum by (mode)(irate(node_cpu_seconds_total{mode='nice',instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "Nice - Niced processes executing in user mode",
-                "refId": "C",
-                "step": 240
-              },
-              {
-                "expr": "sum by (mode)(irate(node_cpu_seconds_total{mode='idle',instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "Idle - Waiting for something to happen",
-                "refId": "D",
-                "step": 240
-              },
-              {
-                "expr": "sum by (mode)(irate(node_cpu_seconds_total{mode='iowait',instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "Iowait - Waiting for I/O to complete",
-                "refId": "E",
-                "step": 240
-              },
-              {
-                "expr": "sum by (mode)(irate(node_cpu_seconds_total{mode='irq',instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "Irq - Servicing interrupts",
-                "refId": "F",
-                "step": 240
-              },
-              {
-                "expr": "sum by (mode)(irate(node_cpu_seconds_total{mode='softirq',instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "Softirq - Servicing softirqs",
-                "refId": "G",
-                "step": 240
-              },
-              {
-                "expr": "sum by (mode)(irate(node_cpu_seconds_total{mode='steal',instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "Steal - Time spent in other operating systems when running in a virtualized environment",
-                "refId": "H",
-                "step": 240
-              },
-              {
-                "expr": "sum by (mode)(irate(node_cpu_seconds_total{mode='guest',instance=~\"$node:$port\",job=~\"$job\"}[5m])) * 100",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "Guest - Time spent running a virtual CPU for a guest operating system",
-                "refId": "I",
-                "step": 240
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "CPU",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": "percentage",
-                "logBase": 1,
-                "max": "100",
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {
-              "Apps": "#629E51",
-              "Buffers": "#614D93",
-              "Cache": "#6D1F62",
-              "Cached": "#511749",
-              "Committed": "#508642",
-              "Free": "#0A437C",
-              "Hardware Corrupted - Amount of RAM that the kernel identified as corrupted / not working": "#CFFAFF",
-              "Inactive": "#584477",
-              "PageTables": "#0A50A1",
-              "Page_Tables": "#0A50A1",
-              "RAM_Free": "#E0F9D7",
-              "Slab": "#806EB7",
-              "Slab_Cache": "#E0752D",
-              "Swap": "#BF1B00",
-              "Swap - Swap memory usage": "#BF1B00",
-              "Swap_Cache": "#C15C17",
-              "Swap_Free": "#2F575E",
-              "Unused": "#EAB839",
-              "Unused - Free memory unassigned": "#052B51"
-            },
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "decimals": 2,
-            "description": "",
-            "fill": 4,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 12,
-              "w": 12,
-              "x": 12,
-              "y": 21
-            },
-            "hiddenSeries": false,
-            "id": 24,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sideWidth": 350,
-              "sort": null,
-              "sortDesc": null,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 6,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [
-              {
-                "alias": "/.*Hardware Corrupted - *./",
-                "stack": false
-              }
-            ],
-            "spaceLength": 10,
-            "stack": true,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "node_memory_MemTotal_bytes{instance=~\"$node:$port\",job=~\"$job\"} - node_memory_MemFree_bytes{instance=~\"$node:$port\",job=~\"$job\"} - node_memory_Buffers_bytes{instance=~\"$node:$port\",job=~\"$job\"} - node_memory_Cached_bytes{instance=~\"$node:$port\",job=~\"$job\"} - node_memory_Slab_bytes{instance=~\"$node:$port\",job=~\"$job\"} - node_memory_PageTables_bytes{instance=~\"$node:$port\",job=~\"$job\"} - node_memory_SwapCached_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 2,
-                "legendFormat": "Apps - Memory used by user-space applications",
-                "refId": "A",
-                "step": 240
-              },
-              {
-                "expr": "node_memory_PageTables_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 2,
-                "legendFormat": "PageTables - Memory used to map between virtual and physical memory addresses",
-                "refId": "B",
-                "step": 240
-              },
-              {
-                "expr": "node_memory_SwapCached_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "SwapCache - Memory that keeps track of pages that have been fetched from swap but not yet been modified",
-                "refId": "C",
-                "step": 240
-              },
-              {
-                "expr": "node_memory_Slab_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 2,
-                "legendFormat": "Slab - Memory used by the kernel to cache data structures for its own use (caches like inode, dentry, etc)",
-                "refId": "D",
-                "step": 240
-              },
-              {
-                "expr": "node_memory_Cached_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 2,
-                "legendFormat": "Cache - Parked file data (file content) cache",
-                "refId": "E",
-                "step": 240
-              },
-              {
-                "expr": "node_memory_Buffers_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 2,
-                "legendFormat": "Buffers - Block device (e.g. harddisk) cache",
-                "refId": "F",
-                "step": 240
-              },
-              {
-                "expr": "node_memory_MemFree_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 2,
-                "legendFormat": "Unused - Free memory unassigned",
-                "refId": "G",
-                "step": 240
-              },
-              {
-                "expr": "(node_memory_SwapTotal_bytes{instance=~\"$node:$port\",job=~\"$job\"} - node_memory_SwapFree_bytes{instance=~\"$node:$port\",job=~\"$job\"})",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 2,
-                "legendFormat": "Swap - Swap space used",
-                "refId": "H",
-                "step": 240
-              },
-              {
-                "expr": "node_memory_HardwareCorrupted_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 2,
-                "legendFormat": "Hardware Corrupted - Amount of RAM that the kernel identified as corrupted / not working",
-                "refId": "I",
-                "step": 240
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Memory Stack",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "bytes",
-                "label": "bytes",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {
-              "receive_packets_eth0": "#7EB26D",
-              "receive_packets_lo": "#E24D42",
-              "transmit_packets_eth0": "#7EB26D",
-              "transmit_packets_lo": "#E24D42"
-            },
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "fill": 4,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 12,
-              "w": 12,
-              "x": 0,
-              "y": 33
-            },
-            "hiddenSeries": false,
-            "id": 84,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [
-              {
-                "alias": "/.*Trans.*/",
-                "transform": "negative-Y"
-              }
-            ],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "irate(node_network_receive_bytes_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])*8",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "{{device}} - Receive",
-                "refId": "A",
-                "step": 240
-              },
-              {
-                "expr": "irate(node_network_transmit_bytes_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])*8",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "{{device}} - Transmit",
-                "refId": "B",
-                "step": 240
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Network Traffic",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "bps",
-                "label": "bits out (-) / in (+)",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "decimals": 3,
-            "description": "",
-            "fill": 4,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 12,
-              "w": 12,
-              "x": 12,
-              "y": 33
-            },
-            "height": "",
-            "hiddenSeries": false,
-            "id": 156,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sort": "current",
-              "sortDesc": false,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 6,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "node_filesystem_size_bytes{instance=~\"$node:$port\",job=~\"$job\",device!~'rootfs'} - node_filesystem_avail_bytes{instance=~\"$node:$port\",job=~\"$job\",device!~'rootfs'}",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "{{mountpoint}}",
-                "refId": "A",
-                "step": 240
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Disk Space Used",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "bytes",
-                "label": "bytes",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "description": "",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 12,
-              "w": 12,
-              "x": 0,
-              "y": 45
-            },
-            "hiddenSeries": false,
-            "id": 229,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "hideZero": true,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 6,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [
-              {
-                "alias": "/.*Read.*/",
-                "transform": "negative-Y"
-              },
-              {
-                "alias": "/.*sda_.*/",
-                "color": "#7EB26D"
-              },
-              {
-                "alias": "/.*sdb_.*/",
-                "color": "#EAB839"
-              },
-              {
-                "alias": "/.*sdc_.*/",
-                "color": "#6ED0E0"
-              },
-              {
-                "alias": "/.*sdd_.*/",
-                "color": "#EF843C"
-              },
-              {
-                "alias": "/.*sde_.*/",
-                "color": "#E24D42"
-              },
-              {
-                "alias": "/.*sda1.*/",
-                "color": "#584477"
-              },
-              {
-                "alias": "/.*sda2_.*/",
-                "color": "#BA43A9"
-              },
-              {
-                "alias": "/.*sda3_.*/",
-                "color": "#F4D598"
-              },
-              {
-                "alias": "/.*sdb1.*/",
-                "color": "#0A50A1"
-              },
-              {
-                "alias": "/.*sdb2.*/",
-                "color": "#BF1B00"
-              },
-              {
-                "alias": "/.*sdb2.*/",
-                "color": "#BF1B00"
-              },
-              {
-                "alias": "/.*sdb3.*/",
-                "color": "#E0752D"
-              },
-              {
-                "alias": "/.*sdc1.*/",
-                "color": "#962D82"
-              },
-              {
-                "alias": "/.*sdc2.*/",
-                "color": "#614D93"
-              },
-              {
-                "alias": "/.*sdc3.*/",
-                "color": "#9AC48A"
-              },
-              {
-                "alias": "/.*sdd1.*/",
-                "color": "#65C5DB"
-              },
-              {
-                "alias": "/.*sdd2.*/",
-                "color": "#F9934E"
-              },
-              {
-                "alias": "/.*sdd3.*/",
-                "color": "#EA6460"
-              },
-              {
-                "alias": "/.*sde1.*/",
-                "color": "#E0F9D7"
-              },
-              {
-                "alias": "/.*sdd2.*/",
-                "color": "#FCEACA"
-              },
-              {
-                "alias": "/.*sde3.*/",
-                "color": "#F9E2D2"
-              }
-            ],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "irate(node_disk_reads_completed_total{instance=~\"$node:$port\",job=~\"$job\",device=~\"[a-z]*[a-z]\"}[5m])",
-                "intervalFactor": 4,
-                "legendFormat": "{{device}} - Reads completed",
-                "refId": "A",
-                "step": 480
-              },
-              {
-                "expr": "irate(node_disk_writes_completed_total{instance=~\"$node:$port\",job=~\"$job\",device=~\"[a-z]*[a-z]\"}[5m])",
-                "intervalFactor": 2,
-                "legendFormat": "{{device}} - Writes completed",
-                "refId": "B",
-                "step": 240
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Disk IOps",
-            "tooltip": {
-              "shared": false,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "iops",
-                "label": "IO read (-) / write (+)",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {
-              "io time": "#890F02"
-            },
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "decimals": 3,
-            "description": "",
-            "fill": 4,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 12,
-              "w": 12,
-              "x": 12,
-              "y": 45
-            },
-            "hiddenSeries": false,
-            "id": 42,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sort": null,
-              "sortDesc": null,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 6,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [
-              {
-                "alias": "/.*read*./",
-                "transform": "negative-Y"
-              },
-              {
-                "alias": "/.*sda.*/",
-                "color": "#7EB26D"
-              },
-              {
-                "alias": "/.*sdb.*/",
-                "color": "#EAB839"
-              },
-              {
-                "alias": "/.*sdc.*/",
-                "color": "#6ED0E0"
-              },
-              {
-                "alias": "/.*sdd.*/",
-                "color": "#EF843C"
-              },
-              {
-                "alias": "/.*sde.*/",
-                "color": "#E24D42"
-              }
-            ],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "irate(node_disk_read_bytes_total{instance=~\"$node:$port\",job=~\"$job\",device=~\"[a-z]*[a-z]\"}[5m])",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 2,
-                "legendFormat": "{{device}} - Successfully read bytes",
-                "refId": "A",
-                "step": 240
-              },
-              {
-                "expr": "irate(node_disk_written_bytes_total{instance=~\"$node:$port\",job=~\"$job\",device=~\"[a-z]*[a-z]\"}[5m])",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 2,
-                "legendFormat": "{{device}} - Successfully written bytes",
-                "refId": "B",
-                "step": 240
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "I/O Usage Read / Write",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": false,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "bytes",
-                "label": "bytes read (-) / write (+)",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              },
-              {
-                "format": "ms",
-                "label": "",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {
-              "io time": "#890F02"
-            },
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "decimals": 3,
-            "description": "",
-            "fill": 4,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 12,
-              "w": 12,
-              "x": 0,
-              "y": 57
-            },
-            "hiddenSeries": false,
-            "id": 127,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sort": null,
-              "sortDesc": null,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 6,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "irate(node_disk_io_time_seconds_total{instance=~\"$node:$port\",job=~\"$job\",device=~\"[a-z]*[a-z]\"} [5m])",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 2,
-                "legendFormat": "{{device}} - Time spent doing I/Os",
-                "refId": "A",
-                "step": 240
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "I/O Usage Times",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": false,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "s",
-                "label": "time",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "s",
-                "label": "",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          }
-        ],
-        "repeat": null,
-        "title": "CPU / Memory / Net / Disk",
-        "type": "row"
-      },
-      {
-        "collapsed": true,
-        "datasource": "Prometheus",
-        "gridPos": {
-          "h": 1,
-          "w": 24,
-          "x": 0,
-          "y": 21
-        },
-        "id": 266,
-        "panels": [
-          {
-            "aliasColors": {
-              "Apps": "#629E51",
-              "Buffers": "#614D93",
-              "Cache": "#6D1F62",
-              "Cached": "#511749",
-              "Committed": "#508642",
-              "Free": "#0A437C",
-              "Hardware Corrupted - Amount of RAM that the kernel identified as corrupted / not working": "#CFFAFF",
-              "Inactive": "#584477",
-              "PageTables": "#0A50A1",
-              "Page_Tables": "#0A50A1",
-              "RAM_Free": "#E0F9D7",
-              "Slab": "#806EB7",
-              "Slab_Cache": "#E0752D",
-              "Swap": "#BF1B00",
-              "Swap_Cache": "#C15C17",
-              "Swap_Free": "#2F575E",
-              "Unused": "#EAB839"
-            },
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "decimals": 2,
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 0,
-              "y": 70
-            },
-            "hiddenSeries": false,
-            "id": 136,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sideWidth": 350,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 2,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": true,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "node_memory_Inactive_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "Inactive - Memory which has been less recently used.  It is more eligible to be reclaimed for other purposes",
-                "refId": "A",
-                "step": 4
-              },
-              {
-                "expr": "node_memory_Active_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "Active - Memory that has been used more recently and usually not reclaimed unless absolutely necessary",
-                "refId": "B",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Memory Active / Inactive",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "cumulative"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "bytes",
-                "label": "bytes",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {
-              "Apps": "#629E51",
-              "Buffers": "#614D93",
-              "Cache": "#6D1F62",
-              "Cached": "#511749",
-              "Committed": "#508642",
-              "Free": "#0A437C",
-              "Hardware Corrupted - Amount of RAM that the kernel identified as corrupted / not working": "#CFFAFF",
-              "Inactive": "#584477",
-              "PageTables": "#0A50A1",
-              "Page_Tables": "#0A50A1",
-              "RAM_Free": "#E0F9D7",
-              "Slab": "#806EB7",
-              "Slab_Cache": "#E0752D",
-              "Swap": "#BF1B00",
-              "Swap_Cache": "#C15C17",
-              "Swap_Free": "#2F575E",
-              "Unused": "#EAB839"
-            },
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "decimals": 2,
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 12,
-              "y": 70
-            },
-            "hiddenSeries": false,
-            "id": 135,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sideWidth": 350,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 6,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [
-              {
-                "alias": "/.*Committed_AS - *./"
-              },
-              {
-                "alias": "/.*CommitLimit - *./",
-                "color": "#BF1B00",
-                "fill": 0
-              }
-            ],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "node_memory_Committed_AS_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "Committed_AS - Amount of memory presently allocated on the system",
-                "refId": "A",
-                "step": 4
-              },
-              {
-                "expr": "node_memory_CommitLimit_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "CommitLimit - Amount of  memory currently available to be allocated on the system",
-                "refId": "B",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Memory Commited",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "cumulative"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "bytes",
-                "label": "bytes",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {
-              "Apps": "#629E51",
-              "Buffers": "#614D93",
-              "Cache": "#6D1F62",
-              "Cached": "#511749",
-              "Committed": "#508642",
-              "Free": "#0A437C",
-              "Hardware Corrupted - Amount of RAM that the kernel identified as corrupted / not working": "#CFFAFF",
-              "Inactive": "#584477",
-              "PageTables": "#0A50A1",
-              "Page_Tables": "#0A50A1",
-              "RAM_Free": "#E0F9D7",
-              "Slab": "#806EB7",
-              "Slab_Cache": "#E0752D",
-              "Swap": "#BF1B00",
-              "Swap_Cache": "#C15C17",
-              "Swap_Free": "#2F575E",
-              "Unused": "#EAB839"
-            },
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "decimals": 2,
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 0,
-              "y": 80
-            },
-            "hiddenSeries": false,
-            "id": 191,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sideWidth": 350,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 6,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": true,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "node_memory_Inactive_file_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 2,
-                "legendFormat": "Inactive_file - File-backed memory on inactive LRU list",
-                "refId": "A",
-                "step": 4
-              },
-              {
-                "expr": "node_memory_Inactive_anon_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 2,
-                "legendFormat": "Inactive_anon - Anonymous and swap cache on inactive LRU list, including tmpfs (shmem)",
-                "refId": "B",
-                "step": 4
-              },
-              {
-                "expr": "node_memory_Active_file_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 2,
-                "legendFormat": "Active_file - File-backed memory on active LRU list",
-                "refId": "C",
-                "step": 4
-              },
-              {
-                "expr": "node_memory_Active_anon_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 2,
-                "legendFormat": "Active_anon - Anonymous and swap cache on active least-recently-used (LRU) list, including tmpfs",
-                "refId": "D",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Memory Active / Inactive Detail",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "cumulative"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "bytes",
-                "label": "bytes",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "bytes",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {
-              "Active": "#99440A",
-              "Buffers": "#58140C",
-              "Cache": "#6D1F62",
-              "Cached": "#511749",
-              "Committed": "#508642",
-              "Dirty": "#6ED0E0",
-              "Free": "#B7DBAB",
-              "Inactive": "#EA6460",
-              "Mapped": "#052B51",
-              "PageTables": "#0A50A1",
-              "Page_Tables": "#0A50A1",
-              "Slab_Cache": "#EAB839",
-              "Swap": "#BF1B00",
-              "Swap_Cache": "#C15C17",
-              "Total": "#511749",
-              "Total RAM": "#052B51",
-              "Total RAM + Swap": "#052B51",
-              "Total Swap": "#614D93",
-              "VmallocUsed": "#EA6460"
-            },
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "decimals": 2,
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 12,
-              "y": 80
-            },
-            "hiddenSeries": false,
-            "id": 130,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sideWidth": null,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 2,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "node_memory_Writeback_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "Writeback - Memory which is actively being written back to disk",
-                "refId": "A",
-                "step": 4
-              },
-              {
-                "expr": "node_memory_WritebackTmp_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "WritebackTmp - Memory used by FUSE for temporary writeback buffers",
-                "refId": "B",
-                "step": 4
-              },
-              {
-                "expr": "node_memory_Dirty_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "Dirty - Memory which is waiting to get written back to the disk",
-                "refId": "C",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Memory Writeback and Dirty",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "bytes",
-                "label": "bytes",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {
-              "Apps": "#629E51",
-              "Buffers": "#614D93",
-              "Cache": "#6D1F62",
-              "Cached": "#511749",
-              "Committed": "#508642",
-              "Free": "#0A437C",
-              "Hardware Corrupted - Amount of RAM that the kernel identified as corrupted / not working": "#CFFAFF",
-              "Inactive": "#584477",
-              "PageTables": "#0A50A1",
-              "Page_Tables": "#0A50A1",
-              "RAM_Free": "#E0F9D7",
-              "Slab": "#806EB7",
-              "Slab_Cache": "#E0752D",
-              "Swap": "#BF1B00",
-              "Swap_Cache": "#C15C17",
-              "Swap_Free": "#2F575E",
-              "Unused": "#EAB839"
-            },
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "decimals": 2,
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 0,
-              "y": 90
-            },
-            "hiddenSeries": false,
-            "id": 138,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sideWidth": 350,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 6,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [
-              {
-                "alias": "ShmemHugePages - Memory used by shared memory (shmem) and tmpfs allocated  with huge pages",
-                "fill": 0
-              },
-              {
-                "alias": "ShmemHugePages - Memory used by shared memory (shmem) and tmpfs allocated  with huge pages",
-                "fill": 0
-              }
-            ],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "node_memory_Mapped_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "Mapped - Used memory in mapped pages files which have been mmaped, such as libraries",
-                "refId": "A",
-                "step": 4
-              },
-              {
-                "expr": "node_memory_Shmem_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "Shmem - Used shared memory (shared between several processes, thus including RAM disks)",
-                "refId": "B",
-                "step": 4
-              },
-              {
-                "expr": "node_memory_ShmemHugePages_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "ShmemHugePages - Memory used by shared memory (shmem) and tmpfs allocated  with huge pages",
-                "refId": "C",
-                "step": 4
-              },
-              {
-                "expr": "node_memory_ShmemPmdMapped_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "ShmemPmdMapped - Ammount of shared (shmem/tmpfs) memory backed by huge pages",
-                "refId": "D",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Memory Shared and Mapped",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "cumulative"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "bytes",
-                "label": "bytes",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {
-              "Active": "#99440A",
-              "Buffers": "#58140C",
-              "Cache": "#6D1F62",
-              "Cached": "#511749",
-              "Committed": "#508642",
-              "Dirty": "#6ED0E0",
-              "Free": "#B7DBAB",
-              "Inactive": "#EA6460",
-              "Mapped": "#052B51",
-              "PageTables": "#0A50A1",
-              "Page_Tables": "#0A50A1",
-              "Slab_Cache": "#EAB839",
-              "Swap": "#BF1B00",
-              "Swap_Cache": "#C15C17",
-              "Total": "#511749",
-              "Total RAM": "#052B51",
-              "Total RAM + Swap": "#052B51",
-              "Total Swap": "#614D93",
-              "VmallocUsed": "#EA6460"
-            },
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "decimals": 2,
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 12,
-              "y": 90
-            },
-            "hiddenSeries": false,
-            "id": 131,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sideWidth": null,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 2,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": true,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "node_memory_SUnreclaim_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "SUnreclaim - Part of Slab, that cannot be reclaimed on memory pressure",
-                "refId": "A",
-                "step": 4
-              },
-              {
-                "expr": "node_memory_SReclaimable_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "SReclaimable - Part of Slab, that might be reclaimed, such as caches",
-                "refId": "B",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Memory Slab",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "bytes",
-                "label": "bytes",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {
-              "Active": "#99440A",
-              "Buffers": "#58140C",
-              "Cache": "#6D1F62",
-              "Cached": "#511749",
-              "Committed": "#508642",
-              "Dirty": "#6ED0E0",
-              "Free": "#B7DBAB",
-              "Inactive": "#EA6460",
-              "Mapped": "#052B51",
-              "PageTables": "#0A50A1",
-              "Page_Tables": "#0A50A1",
-              "Slab_Cache": "#EAB839",
-              "Swap": "#BF1B00",
-              "Swap_Cache": "#C15C17",
-              "Total": "#511749",
-              "Total RAM": "#052B51",
-              "Total RAM + Swap": "#052B51",
-              "VmallocUsed": "#EA6460"
-            },
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "decimals": 2,
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 0,
-              "y": 100
-            },
-            "hiddenSeries": false,
-            "id": 70,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sideWidth": null,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 6,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "node_memory_VmallocChunk_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 2,
-                "legendFormat": "VmallocChunk - Largest contigious block of vmalloc area which is free",
-                "refId": "A",
-                "step": 4
-              },
-              {
-                "expr": "node_memory_VmallocTotal_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 2,
-                "legendFormat": "VmallocTotal - Total size of vmalloc memory area",
-                "refId": "B",
-                "step": 4
-              },
-              {
-                "expr": "node_memory_VmallocUsed_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 2,
-                "legendFormat": "VmallocUsed - Amount of vmalloc area which is used",
-                "refId": "C",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Memory Vmalloc",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "bytes",
-                "label": "bytes",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {
-              "Apps": "#629E51",
-              "Buffers": "#614D93",
-              "Cache": "#6D1F62",
-              "Cached": "#511749",
-              "Committed": "#508642",
-              "Free": "#0A437C",
-              "Hardware Corrupted - Amount of RAM that the kernel identified as corrupted / not working": "#CFFAFF",
-              "Inactive": "#584477",
-              "PageTables": "#0A50A1",
-              "Page_Tables": "#0A50A1",
-              "RAM_Free": "#E0F9D7",
-              "Slab": "#806EB7",
-              "Slab_Cache": "#E0752D",
-              "Swap": "#BF1B00",
-              "Swap_Cache": "#C15C17",
-              "Swap_Free": "#2F575E",
-              "Unused": "#EAB839"
-            },
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "decimals": 2,
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 12,
-              "y": 100
-            },
-            "hiddenSeries": false,
-            "id": 159,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sideWidth": 350,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 6,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "node_memory_Bounce_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "Bounce - Memory used for block device bounce buffers",
-                "refId": "A",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Memory Bounce",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "cumulative"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "bytes",
-                "label": "bytes",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {
-              "Active": "#99440A",
-              "Buffers": "#58140C",
-              "Cache": "#6D1F62",
-              "Cached": "#511749",
-              "Committed": "#508642",
-              "Dirty": "#6ED0E0",
-              "Free": "#B7DBAB",
-              "Inactive": "#EA6460",
-              "Mapped": "#052B51",
-              "PageTables": "#0A50A1",
-              "Page_Tables": "#0A50A1",
-              "Slab_Cache": "#EAB839",
-              "Swap": "#BF1B00",
-              "Swap_Cache": "#C15C17",
-              "Total": "#511749",
-              "Total RAM": "#052B51",
-              "Total RAM + Swap": "#052B51",
-              "VmallocUsed": "#EA6460"
-            },
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "decimals": 2,
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 0,
-              "y": 110
-            },
-            "hiddenSeries": false,
-            "id": 129,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sideWidth": null,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 6,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [
-              {
-                "alias": "/.*Inactive *./",
-                "transform": "negative-Y"
-              }
-            ],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "node_memory_AnonHugePages_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "AnonHugePages - Memory in anonymous huge pages",
-                "refId": "A",
-                "step": 4
-              },
-              {
-                "expr": "node_memory_AnonPages_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "AnonPages - Memory in user pages not backed by files",
-                "refId": "B",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Memory Anonymous",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "bytes",
-                "label": "bytes",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {
-              "Apps": "#629E51",
-              "Buffers": "#614D93",
-              "Cache": "#6D1F62",
-              "Cached": "#511749",
-              "Committed": "#508642",
-              "Free": "#0A437C",
-              "Hardware Corrupted - Amount of RAM that the kernel identified as corrupted / not working": "#CFFAFF",
-              "Inactive": "#584477",
-              "PageTables": "#0A50A1",
-              "Page_Tables": "#0A50A1",
-              "RAM_Free": "#E0F9D7",
-              "Slab": "#806EB7",
-              "Slab_Cache": "#E0752D",
-              "Swap": "#BF1B00",
-              "Swap_Cache": "#C15C17",
-              "Swap_Free": "#2F575E",
-              "Unused": "#EAB839"
-            },
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "decimals": 2,
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 12,
-              "y": 110
-            },
-            "hiddenSeries": false,
-            "id": 160,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sideWidth": 350,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 2,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "node_memory_KernelStack_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "KernelStack - Kernel memory stack. This is not reclaimable",
-                "refId": "A",
-                "step": 4
-              },
-              {
-                "expr": "node_memory_Percpu_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "PerCPU - Per CPU memory allocated dynamically by loadable modules",
-                "refId": "B",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Memory Kernel / CPU",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "cumulative"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "bytes",
-                "label": "bytes",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {
-              "Active": "#99440A",
-              "Buffers": "#58140C",
-              "Cache": "#6D1F62",
-              "Cached": "#511749",
-              "Committed": "#508642",
-              "Dirty": "#6ED0E0",
-              "Free": "#B7DBAB",
-              "Inactive": "#EA6460",
-              "Mapped": "#052B51",
-              "PageTables": "#0A50A1",
-              "Page_Tables": "#0A50A1",
-              "Slab_Cache": "#EAB839",
-              "Swap": "#BF1B00",
-              "Swap_Cache": "#C15C17",
-              "Total": "#511749",
-              "Total RAM": "#806EB7",
-              "Total RAM + Swap": "#806EB7",
-              "VmallocUsed": "#EA6460"
-            },
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "decimals": 2,
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 0,
-              "y": 120
-            },
-            "hiddenSeries": false,
-            "id": 140,
-            "legend": {
-              "alignAsTable": true,
-              "avg": false,
-              "current": true,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sideWidth": null,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 6,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "node_memory_HugePages_Free{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "HugePages_Free - Huge pages in the pool that are not yet allocated",
-                "refId": "A",
-                "step": 4
-              },
-              {
-                "expr": "node_memory_HugePages_Rsvd{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "HugePages_Rsvd - Huge pages for which a commitment to allocate from the pool has been made, but no allocation has yet been made",
-                "refId": "B",
-                "step": 4
-              },
-              {
-                "expr": "node_memory_HugePages_Surp{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "HugePages_Surp - Huge pages in the pool above the value in /proc/sys/vm/nr_hugepages",
-                "refId": "C",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Memory HugePages Counter",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": "pages",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": "",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {
-              "Active": "#99440A",
-              "Buffers": "#58140C",
-              "Cache": "#6D1F62",
-              "Cached": "#511749",
-              "Committed": "#508642",
-              "Dirty": "#6ED0E0",
-              "Free": "#B7DBAB",
-              "Inactive": "#EA6460",
-              "Mapped": "#052B51",
-              "PageTables": "#0A50A1",
-              "Page_Tables": "#0A50A1",
-              "Slab_Cache": "#EAB839",
-              "Swap": "#BF1B00",
-              "Swap_Cache": "#C15C17",
-              "Total": "#511749",
-              "Total RAM": "#806EB7",
-              "Total RAM + Swap": "#806EB7",
-              "VmallocUsed": "#EA6460"
-            },
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "decimals": 2,
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 12,
-              "y": 120
-            },
-            "hiddenSeries": false,
-            "id": 71,
-            "legend": {
-              "alignAsTable": true,
-              "avg": false,
-              "current": true,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sideWidth": null,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 2,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "node_memory_HugePages_Total{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "HugePages - Total size of the pool of huge pages",
-                "refId": "A",
-                "step": 4
-              },
-              {
-                "expr": "node_memory_Hugepagesize_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "Hugepagesize - Huge Page size",
-                "refId": "B",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Memory HugePages Size",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "bytes",
-                "label": "bytes",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": "",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {
-              "Active": "#99440A",
-              "Buffers": "#58140C",
-              "Cache": "#6D1F62",
-              "Cached": "#511749",
-              "Committed": "#508642",
-              "Dirty": "#6ED0E0",
-              "Free": "#B7DBAB",
-              "Inactive": "#EA6460",
-              "Mapped": "#052B51",
-              "PageTables": "#0A50A1",
-              "Page_Tables": "#0A50A1",
-              "Slab_Cache": "#EAB839",
-              "Swap": "#BF1B00",
-              "Swap_Cache": "#C15C17",
-              "Total": "#511749",
-              "Total RAM": "#052B51",
-              "Total RAM + Swap": "#052B51",
-              "VmallocUsed": "#EA6460"
-            },
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "decimals": 2,
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 0,
-              "y": 130
-            },
-            "hiddenSeries": false,
-            "id": 128,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": false,
-              "hideEmpty": false,
-              "hideZero": false,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sideWidth": null,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 6,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "node_memory_DirectMap1G_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "DirectMap1G - Amount of pages mapped as this size",
-                "refId": "A",
-                "step": 4
-              },
-              {
-                "expr": "node_memory_DirectMap2M_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "DirectMap2M - Amount of pages mapped as this size",
-                "refId": "B",
-                "step": 4
-              },
-              {
-                "expr": "node_memory_DirectMap4k_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "DirectMap4K - Amount of pages mapped as this size",
-                "refId": "C",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Memory DirectMap",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "bytes",
-                "label": "bytes",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {
-              "Apps": "#629E51",
-              "Buffers": "#614D93",
-              "Cache": "#6D1F62",
-              "Cached": "#511749",
-              "Committed": "#508642",
-              "Free": "#0A437C",
-              "Hardware Corrupted - Amount of RAM that the kernel identified as corrupted / not working": "#CFFAFF",
-              "Inactive": "#584477",
-              "PageTables": "#0A50A1",
-              "Page_Tables": "#0A50A1",
-              "RAM_Free": "#E0F9D7",
-              "Slab": "#806EB7",
-              "Slab_Cache": "#E0752D",
-              "Swap": "#BF1B00",
-              "Swap_Cache": "#C15C17",
-              "Swap_Free": "#2F575E",
-              "Unused": "#EAB839"
-            },
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "decimals": 2,
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 12,
-              "y": 130
-            },
-            "hiddenSeries": false,
-            "id": 137,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sideWidth": 350,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 6,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "node_memory_Unevictable_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "Unevictable - Amount of unevictable memory that can't be swapped out for a variety of reasons",
-                "refId": "A",
-                "step": 4
-              },
-              {
-                "expr": "node_memory_Mlocked_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "MLocked - Size of pages locked to memory using the mlock() system call",
-                "refId": "B",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Memory Unevictable and MLocked",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "cumulative"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "bytes",
-                "label": "bytes",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {
-              "Active": "#99440A",
-              "Buffers": "#58140C",
-              "Cache": "#6D1F62",
-              "Cached": "#511749",
-              "Committed": "#508642",
-              "Dirty": "#6ED0E0",
-              "Free": "#B7DBAB",
-              "Inactive": "#EA6460",
-              "Mapped": "#052B51",
-              "PageTables": "#0A50A1",
-              "Page_Tables": "#0A50A1",
-              "Slab_Cache": "#EAB839",
-              "Swap": "#BF1B00",
-              "Swap_Cache": "#C15C17",
-              "Total": "#511749",
-              "Total RAM": "#052B51",
-              "Total RAM + Swap": "#052B51",
-              "Total Swap": "#614D93",
-              "VmallocUsed": "#EA6460"
-            },
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "decimals": 2,
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 0,
-              "y": 140
-            },
-            "hiddenSeries": false,
-            "id": 132,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sideWidth": null,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 6,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "node_memory_NFS_Unstable_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "NFS Unstable - Memory in NFS pages sent to the server, but not yet commited to the storage",
-                "refId": "A",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Memory NFS",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "bytes",
-                "label": "bytes",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          }
-        ],
-        "repeat": null,
-        "title": "Memory Meminfo",
-        "type": "row"
-      },
-      {
-        "collapsed": true,
-        "datasource": "Prometheus",
-        "gridPos": {
-          "h": 1,
-          "w": 24,
-          "x": 0,
-          "y": 22
-        },
-        "id": 267,
-        "panels": [
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 0,
-              "y": 23
-            },
-            "hiddenSeries": false,
-            "id": 176,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 6,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [
-              {
-                "alias": "/.*out/",
-                "transform": "negative-Y"
-              }
-            ],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "irate(node_vmstat_pgpgin{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "Pagesin - Page in operations",
-                "refId": "A",
-                "step": 4
-              },
-              {
-                "expr": "irate(node_vmstat_pgpgout{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "Pagesout - Page out operations",
-                "refId": "B",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Memory Pages In / Out",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": "pages out (-) / in (+)",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 12,
-              "y": 23
-            },
-            "hiddenSeries": false,
-            "id": 22,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 6,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [
-              {
-                "alias": "/.*out/",
-                "transform": "negative-Y"
-              }
-            ],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "irate(node_vmstat_pswpin{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "Pswpin - Pages swapped in",
-                "refId": "A",
-                "step": 4
-              },
-              {
-                "expr": "irate(node_vmstat_pswpout{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "Pswpout - Pages swapped out",
-                "refId": "B",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Memory Pages Swap In / Out",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": "pages out (-) / in (+)",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {
-              "Apps": "#629E51",
-              "Buffers": "#614D93",
-              "Cache": "#6D1F62",
-              "Cached": "#511749",
-              "Committed": "#508642",
-              "Free": "#0A437C",
-              "Hardware Corrupted - Amount of RAM that the kernel identified as corrupted / not working": "#CFFAFF",
-              "Inactive": "#584477",
-              "PageTables": "#0A50A1",
-              "Page_Tables": "#0A50A1",
-              "RAM_Free": "#E0F9D7",
-              "Slab": "#806EB7",
-              "Slab_Cache": "#E0752D",
-              "Swap": "#BF1B00",
-              "Swap_Cache": "#C15C17",
-              "Swap_Free": "#2F575E",
-              "Unused": "#EAB839"
-            },
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "decimals": 2,
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 0,
-              "y": 33
-            },
-            "hiddenSeries": false,
-            "id": 175,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sideWidth": 350,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 6,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [
-              {
-                "alias": "Pgfault - Page major and minor fault operations",
-                "fill": 0,
-                "stack": false
-              }
-            ],
-            "spaceLength": 10,
-            "stack": true,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "irate(node_vmstat_pgfault{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "Pgfault - Page major and minor fault operations",
-                "refId": "A",
-                "step": 4
-              },
-              {
-                "expr": "irate(node_vmstat_pgmajfault{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "Pgmajfault - Major page fault operations",
-                "refId": "B",
-                "step": 4
-              },
-              {
-                "expr": "irate(node_vmstat_pgfault{instance=~\"$node:$port\",job=~\"$job\"}[5m])  - irate(node_vmstat_pgmajfault{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "Pgminfault - Minor page fault operations",
-                "refId": "C",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Memory Page Faults",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "cumulative"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": "faults",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {
-              "Active": "#99440A",
-              "Buffers": "#58140C",
-              "Cache": "#6D1F62",
-              "Cached": "#511749",
-              "Committed": "#508642",
-              "Dirty": "#6ED0E0",
-              "Free": "#B7DBAB",
-              "Inactive": "#EA6460",
-              "Mapped": "#052B51",
-              "PageTables": "#0A50A1",
-              "Page_Tables": "#0A50A1",
-              "Slab_Cache": "#EAB839",
-              "Swap": "#BF1B00",
-              "Swap_Cache": "#C15C17",
-              "Total": "#511749",
-              "Total RAM": "#052B51",
-              "Total RAM + Swap": "#052B51",
-              "Total Swap": "#614D93",
-              "VmallocUsed": "#EA6460"
-            },
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "decimals": 2,
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 12,
-              "y": 33
-            },
-            "hiddenSeries": false,
-            "id": 307,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sideWidth": null,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 6,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "irate(node_vmstat_oom_kill{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "oom killer invocations ",
-                "refId": "A",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "OOM Killer",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": "counter",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          }
-        ],
-        "repeat": null,
-        "title": "Memory Vmstat",
-        "type": "row"
-      },
-      {
-        "collapsed": true,
-        "datasource": "Prometheus",
-        "gridPos": {
-          "h": 1,
-          "w": 24,
-          "x": 0,
-          "y": 23
-        },
-        "id": 293,
-        "panels": [
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "description": "",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 0,
-              "y": 24
-            },
-            "hiddenSeries": false,
-            "id": 260,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "show": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [
-              {
-                "alias": "/.*Variation*./",
-                "color": "#890F02"
-              }
-            ],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "node_timex_estimated_error_seconds{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "hide": false,
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "Estimated error in seconds",
-                "refId": "A",
-                "step": 240
-              },
-              {
-                "expr": "node_timex_offset_seconds{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "hide": false,
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "Time offset in between local system and reference clock",
-                "refId": "B",
-                "step": 240
-              },
-              {
-                "expr": "node_timex_maxerror_seconds{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "hide": false,
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "Maximum error in seconds",
-                "refId": "C",
-                "step": 240
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Time Syncronized Drift",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "s",
-                "label": "seconds",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": "counter",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "description": "",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 12,
-              "y": 24
-            },
-            "hiddenSeries": false,
-            "id": 291,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "show": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "node_timex_loop_time_constant{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "Phase-locked loop time adjust",
-                "refId": "A",
-                "step": 240
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Time PLL Adjust",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": "counter",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "description": "",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 0,
-              "y": 34
-            },
-            "hiddenSeries": false,
-            "id": 168,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "show": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [
-              {
-                "alias": "/.*Variation*./",
-                "color": "#890F02"
-              }
-            ],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "node_timex_sync_status{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "Is clock synchronized to a reliable server (1 = yes, 0 = no)",
-                "refId": "A",
-                "step": 240
-              },
-              {
-                "expr": "node_timex_frequency_adjustment_ratio{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "Local clock frequency adjustment",
-                "refId": "B",
-                "step": 240
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Time Syncronized Status",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": "counter",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "description": "",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 12,
-              "y": 34
-            },
-            "hiddenSeries": false,
-            "id": 294,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "show": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "node_timex_tick_seconds{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "Seconds between clock ticks",
-                "refId": "A",
-                "step": 240
-              },
-              {
-                "expr": "node_timex_tai_offset_seconds{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "International Atomic Time (TAI) offset",
-                "refId": "B",
-                "step": 240
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Time Misc",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "s",
-                "label": "seconds",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          }
-        ],
-        "title": "System Timesync",
-        "type": "row"
-      },
-      {
-        "collapsed": true,
-        "datasource": "Prometheus",
-        "gridPos": {
-          "h": 1,
-          "w": 24,
-          "x": 0,
-          "y": 24
-        },
-        "id": 312,
-        "panels": [
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 0,
-              "y": 7
-            },
-            "hiddenSeries": false,
-            "id": 62,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "show": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 6,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "node_procs_blocked{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "Processes blocked waiting for I/O to complete",
-                "refId": "A",
-                "step": 240
-              },
-              {
-                "expr": "node_procs_running{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "Processes in runnable state",
-                "refId": "B",
-                "step": 240
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Processes Status",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": "counter",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 12,
-              "y": 7
-            },
-            "hiddenSeries": false,
-            "id": 315,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "show": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 6,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": true,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "node_processes_state{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "{{ state }}",
-                "refId": "A",
-                "step": 240
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Processes State",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": "counter",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 0,
-              "y": 17
-            },
-            "hiddenSeries": false,
-            "id": 148,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "show": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 6,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "irate(node_forks_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 2,
-                "legendFormat": "Processes forks second",
-                "refId": "A",
-                "step": 240
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Processes  Forks",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": "forks / sec",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 12,
-              "y": 17
-            },
-            "hiddenSeries": false,
-            "id": 149,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "show": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [
-              {
-                "alias": "/.*Max.*/",
-                "fill": 0
-              }
-            ],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "irate(process_virtual_memory_bytes{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "hide": false,
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "Processes virtual memory size in bytes",
-                "refId": "A",
-                "step": 240
-              },
-              {
-                "expr": "process_resident_memory_max_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
-                "hide": false,
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "Maximum amount of virtual memory available in bytes",
-                "refId": "B",
-                "step": 240
-              },
-              {
-                "expr": "irate(process_virtual_memory_bytes{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "hide": false,
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "Processes virtual memory size in bytes",
-                "refId": "C",
-                "step": 240
-              },
-              {
-                "expr": "irate(process_virtual_memory_max_bytes{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "hide": false,
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "Maximum amount of virtual memory available in bytes",
-                "refId": "D",
-                "step": 240
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Processes Memory",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "decbytes",
-                "label": "bytes",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 0,
-              "y": 27
-            },
-            "hiddenSeries": false,
-            "id": 313,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "show": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 6,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [
-              {
-                "alias": "PIDs limit",
-                "color": "#F2495C",
-                "fill": 0
-              }
-            ],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "node_processes_pids{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "Number of PIDs",
-                "refId": "A",
-                "step": 240
-              },
-              {
-                "expr": "node_processes_max_processes{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "PIDs limit",
-                "refId": "B",
-                "step": 240
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "PIDs Number and Limit",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": "counter",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 12,
-              "y": 27
-            },
-            "hiddenSeries": false,
-            "id": 305,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "show": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 6,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [
-              {
-                "alias": "/.*waiting.*/",
-                "transform": "negative-Y"
-              }
-            ],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "irate(node_schedstat_running_seconds_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "CPU {{ cpu }} - seconds spent running a process",
-                "refId": "A",
-                "step": 240
-              },
-              {
-                "expr": "irate(node_schedstat_waiting_seconds_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "CPU {{ cpu }} - seconds spent by processing waiting for this CPU",
-                "refId": "B",
-                "step": 240
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Process schdeule stats Running / Waiting",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "s",
-                "label": "seconds",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 12,
-              "y": 37
-            },
-            "hiddenSeries": false,
-            "id": 314,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "show": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 6,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [
-              {
-                "alias": "Threads limit",
-                "color": "#F2495C",
-                "fill": 0
-              }
-            ],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "node_processes_threads{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "Allocated threads",
-                "refId": "A",
-                "step": 240
-              },
-              {
-                "expr": "node_processes_max_threads{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "Threads limit",
-                "refId": "B",
-                "step": 240
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Threads Number and Limit",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": "counter",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          }
-        ],
-        "title": "System Processes",
-        "type": "row"
-      },
-      {
-        "collapsed": true,
-        "datasource": "Prometheus",
-        "gridPos": {
-          "h": 1,
-          "w": 24,
-          "x": 0,
-          "y": 25
-        },
-        "id": 269,
-        "panels": [
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 0,
-              "y": 8
-            },
-            "hiddenSeries": false,
-            "id": 8,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "show": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 6,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "repeat": null,
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "irate(node_context_switches_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "Context switches",
-                "refId": "A",
-                "step": 240
-              },
-              {
-                "expr": "irate(node_intr_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 2,
-                "legendFormat": "Interrupts",
-                "refId": "B",
-                "step": 240
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Context Switches / Interrupts",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": "counter",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 12,
-              "y": 8
-            },
-            "hiddenSeries": false,
-            "id": 7,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "show": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 6,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "repeat": null,
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "node_load1{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "intervalFactor": 4,
-                "legendFormat": "Load 1m",
-                "refId": "A",
-                "step": 480
-              },
-              {
-                "expr": "node_load5{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "intervalFactor": 4,
-                "legendFormat": "Load 5m",
-                "refId": "B",
-                "step": 480
-              },
-              {
-                "expr": "node_load15{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "intervalFactor": 4,
-                "legendFormat": "Load 15m",
-                "refId": "C",
-                "step": 480
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "System Load",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": "counter",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 0,
-              "y": 18
-            },
-            "hiddenSeries": false,
-            "id": 259,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "show": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [
-              {
-                "alias": "/.*Critical*./",
-                "color": "#E24D42",
-                "fill": 0
-              },
-              {
-                "alias": "/.*Max*./",
-                "color": "#EF843C",
-                "fill": 0
-              }
-            ],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "irate(node_interrupts_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "{{ type }} - {{ info }}",
-                "refId": "A",
-                "step": 240
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Interrupts Detail",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": "counter",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 12,
-              "y": 18
-            },
-            "hiddenSeries": false,
-            "id": 306,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "show": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 6,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "irate(node_schedstat_timeslices_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "CPU {{ cpu }}",
-                "refId": "A",
-                "step": 240
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Schedule timeslices executed by each cpu",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": "counter",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 0,
-              "y": 28
-            },
-            "hiddenSeries": false,
-            "id": 151,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "show": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 6,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "node_entropy_available_bits{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "Entropy available to random number generators",
-                "refId": "A",
-                "step": 240
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Entropy",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": "counter",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 12,
-              "y": 28
-            },
-            "hiddenSeries": false,
-            "id": 308,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "show": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 6,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "irate(process_cpu_seconds_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "Time spent",
-                "refId": "A",
-                "step": 240
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "CPU time spent in user and system contexts",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "s",
-                "label": "seconds",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 0,
-              "y": 38
-            },
-            "hiddenSeries": false,
-            "id": 64,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "show": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [
-              {
-                "alias": "/.*Max*./",
-                "color": "#890F02",
-                "fill": 0
-              }
-            ],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "process_max_fds{instance=~\"$node:$port\",job=~\"$job\"}",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "Maximum open file descriptors",
-                "refId": "A",
-                "step": 240
-              },
-              {
-                "expr": "process_open_fds{instance=~\"$node:$port\",job=~\"$job\"}",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "Open file descriptors",
-                "refId": "B",
-                "step": 240
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "File Descriptors",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": "counter",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          }
-        ],
-        "repeat": null,
-        "title": "System Misc",
-        "type": "row"
-      },
-      {
-        "collapsed": true,
-        "datasource": "Prometheus",
-        "gridPos": {
-          "h": 1,
-          "w": 24,
-          "x": 0,
-          "y": 26
-        },
-        "id": 304,
-        "panels": [
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 0,
-              "y": 26
-            },
-            "hiddenSeries": false,
-            "id": 158,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "show": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [
-              {
-                "alias": "/.*Critical*./",
-                "color": "#E24D42",
-                "fill": 0
-              },
-              {
-                "alias": "/.*Max*./",
-                "color": "#EF843C",
-                "fill": 0
-              }
-            ],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "node_hwmon_temp_celsius{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "{{ chip }} {{ sensor }} temp",
-                "refId": "A",
-                "step": 240
-              },
-              {
-                "expr": "node_hwmon_temp_crit_alarm_celsius{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "hide": true,
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "{{ chip }} {{ sensor }} Critical Alarm",
-                "refId": "B",
-                "step": 240
-              },
-              {
-                "expr": "node_hwmon_temp_crit_celsius{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "{{ chip }} {{ sensor }} Critical",
-                "refId": "C",
-                "step": 240
-              },
-              {
-                "expr": "node_hwmon_temp_crit_hyst_celsius{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "hide": true,
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "{{ chip }} {{ sensor }} Critical Historical",
-                "refId": "D",
-                "step": 240
-              },
-              {
-                "expr": "node_hwmon_temp_max_celsius{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "hide": true,
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "{{ chip }} {{ sensor }} Max",
-                "refId": "E",
-                "step": 240
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Hardware temperature monitor",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "celsius",
-                "label": "temperature",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 12,
-              "y": 26
-            },
-            "hiddenSeries": false,
-            "id": 300,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "show": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [
-              {
-                "alias": "/.*Max*./",
-                "color": "#EF843C",
-                "fill": 0
-              }
-            ],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "node_cooling_device_cur_state{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "hide": false,
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "Current {{ name }} in {{ type }}",
-                "refId": "A",
-                "step": 240
-              },
-              {
-                "expr": "node_cooling_device_max_state{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "Max {{ name }} in {{ type }}",
-                "refId": "B",
-                "step": 240
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Throttle cooling device",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": "counter",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 0,
-              "y": 36
-            },
-            "hiddenSeries": false,
-            "id": 302,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "show": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "node_power_supply_online{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "hide": false,
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "{{ power_supply }} online",
-                "refId": "A",
-                "step": 240
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Power supply",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": "counter",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          }
-        ],
-        "title": "Hardware Misc",
-        "type": "row"
-      },
-      {
-        "collapsed": true,
-        "datasource": "Prometheus",
-        "gridPos": {
-          "h": 1,
-          "w": 24,
-          "x": 0,
-          "y": 27
-        },
-        "id": 296,
-        "panels": [
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 0,
-              "y": 10
-            },
-            "hiddenSeries": false,
-            "id": 297,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "show": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "irate(node_systemd_socket_accepted_connections_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "{{ name }} Connections",
-                "refId": "A",
-                "step": 240
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Systemd Sockets",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": "counter",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 12,
-              "y": 10
-            },
-            "hiddenSeries": false,
-            "id": 298,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "show": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [
-              {
-                "alias": "Failed",
-                "color": "#F2495C"
-              },
-              {
-                "alias": "Inactive",
-                "color": "#FF9830"
-              },
-              {
-                "alias": "Active",
-                "color": "#73BF69"
-              },
-              {
-                "alias": "Deactivating",
-                "color": "#FFCB7D"
-              },
-              {
-                "alias": "Activating",
-                "color": "#C8F2C2"
-              }
-            ],
-            "spaceLength": 10,
-            "stack": true,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "node_systemd_units{instance=~\"$node:$port\",job=~\"$job\",state=\"activating\"}",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "Activating",
-                "refId": "A",
-                "step": 240
-              },
-              {
-                "expr": "node_systemd_units{instance=~\"$node:$port\",job=~\"$job\",state=\"active\"}",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "Active",
-                "refId": "B",
-                "step": 240
-              },
-              {
-                "expr": "node_systemd_units{instance=~\"$node:$port\",job=~\"$job\",state=\"deactivating\"}",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "Deactivating",
-                "refId": "C",
-                "step": 240
-              },
-              {
-                "expr": "node_systemd_units{instance=~\"$node:$port\",job=~\"$job\",state=\"failed\"}",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "Failed",
-                "refId": "D",
-                "step": 240
-              },
-              {
-                "expr": "node_systemd_units{instance=~\"$node:$port\",job=~\"$job\",state=\"inactive\"}",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "Inactive",
-                "refId": "E",
-                "step": 240
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Systemd Units State",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": "counter",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          }
-        ],
-        "title": "Systemd",
-        "type": "row"
-      },
-      {
-        "collapsed": true,
-        "datasource": "Prometheus",
-        "gridPos": {
-          "h": 1,
-          "w": 24,
-          "x": 0,
-          "y": 28
-        },
-        "id": 270,
-        "panels": [
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "description": "",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 0,
-              "y": 28
-            },
-            "hiddenSeries": false,
-            "id": 9,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "hideZero": true,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 6,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "repeat": null,
-            "seriesOverrides": [
-              {
-                "alias": "/.*Read.*/",
-                "transform": "negative-Y"
-              },
-              {
-                "alias": "/.*sda_.*/",
-                "color": "#7EB26D"
-              },
-              {
-                "alias": "/.*sdb_.*/",
-                "color": "#EAB839"
-              },
-              {
-                "alias": "/.*sdc_.*/",
-                "color": "#6ED0E0"
-              },
-              {
-                "alias": "/.*sdd_.*/",
-                "color": "#EF843C"
-              },
-              {
-                "alias": "/.*sde_.*/",
-                "color": "#E24D42"
-              },
-              {
-                "alias": "/.*sda1.*/",
-                "color": "#584477"
-              },
-              {
-                "alias": "/.*sda2_.*/",
-                "color": "#BA43A9"
-              },
-              {
-                "alias": "/.*sda3_.*/",
-                "color": "#F4D598"
-              },
-              {
-                "alias": "/.*sdb1.*/",
-                "color": "#0A50A1"
-              },
-              {
-                "alias": "/.*sdb2.*/",
-                "color": "#BF1B00"
-              },
-              {
-                "alias": "/.*sdb3.*/",
-                "color": "#E0752D"
-              },
-              {
-                "alias": "/.*sdc1.*/",
-                "color": "#962D82"
-              },
-              {
-                "alias": "/.*sdc2.*/",
-                "color": "#614D93"
-              },
-              {
-                "alias": "/.*sdc3.*/",
-                "color": "#9AC48A"
-              },
-              {
-                "alias": "/.*sdd1.*/",
-                "color": "#65C5DB"
-              },
-              {
-                "alias": "/.*sdd2.*/",
-                "color": "#F9934E"
-              },
-              {
-                "alias": "/.*sdd3.*/",
-                "color": "#EA6460"
-              },
-              {
-                "alias": "/.*sde1.*/",
-                "color": "#E0F9D7"
-              },
-              {
-                "alias": "/.*sdd2.*/",
-                "color": "#FCEACA"
-              },
-              {
-                "alias": "/.*sde3.*/",
-                "color": "#F9E2D2"
-              }
-            ],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "irate(node_disk_reads_completed_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "intervalFactor": 4,
-                "legendFormat": "{{device}} - Reads completed",
-                "refId": "A",
-                "step": 8
-              },
-              {
-                "expr": "irate(node_disk_writes_completed_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "intervalFactor": 2,
-                "legendFormat": "{{device}} - Writes completed",
-                "refId": "B",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Disk IOps Completed",
-            "tooltip": {
-              "shared": false,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "iops",
-                "label": "IO read (-) / write (+)",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "description": "",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 12,
-              "y": 28
-            },
-            "hiddenSeries": false,
-            "id": 33,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "hideZero": true,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 6,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [
-              {
-                "alias": "/.*Read.*/",
-                "transform": "negative-Y"
-              },
-              {
-                "alias": "/.*sda_.*/",
-                "color": "#7EB26D"
-              },
-              {
-                "alias": "/.*sdb_.*/",
-                "color": "#EAB839"
-              },
-              {
-                "alias": "/.*sdc_.*/",
-                "color": "#6ED0E0"
-              },
-              {
-                "alias": "/.*sdd_.*/",
-                "color": "#EF843C"
-              },
-              {
-                "alias": "/.*sde_.*/",
-                "color": "#E24D42"
-              },
-              {
-                "alias": "/.*sda1.*/",
-                "color": "#584477"
-              },
-              {
-                "alias": "/.*sda2_.*/",
-                "color": "#BA43A9"
-              },
-              {
-                "alias": "/.*sda3_.*/",
-                "color": "#F4D598"
-              },
-              {
-                "alias": "/.*sdb1.*/",
-                "color": "#0A50A1"
-              },
-              {
-                "alias": "/.*sdb2.*/",
-                "color": "#BF1B00"
-              },
-              {
-                "alias": "/.*sdb3.*/",
-                "color": "#E0752D"
-              },
-              {
-                "alias": "/.*sdc1.*/",
-                "color": "#962D82"
-              },
-              {
-                "alias": "/.*sdc2.*/",
-                "color": "#614D93"
-              },
-              {
-                "alias": "/.*sdc3.*/",
-                "color": "#9AC48A"
-              },
-              {
-                "alias": "/.*sdd1.*/",
-                "color": "#65C5DB"
-              },
-              {
-                "alias": "/.*sdd2.*/",
-                "color": "#F9934E"
-              },
-              {
-                "alias": "/.*sdd3.*/",
-                "color": "#EA6460"
-              },
-              {
-                "alias": "/.*sde1.*/",
-                "color": "#E0F9D7"
-              },
-              {
-                "alias": "/.*sdd2.*/",
-                "color": "#FCEACA"
-              },
-              {
-                "alias": "/.*sde3.*/",
-                "color": "#F9E2D2"
-              }
-            ],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "irate(node_disk_read_bytes_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "intervalFactor": 4,
-                "legendFormat": "{{device}} - Read bytes",
-                "refId": "A",
-                "step": 8
-              },
-              {
-                "expr": "irate(node_disk_written_bytes_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "{{device}} - Written bytes",
-                "refId": "B",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Disk R/W Data",
-            "tooltip": {
-              "shared": false,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "Bps",
-                "label": "bytes read (-) / write (+)",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "description": "",
-            "fill": 3,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 0,
-              "y": 38
-            },
-            "hiddenSeries": false,
-            "id": 37,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "hideZero": true,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sort": "current",
-              "sortDesc": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 6,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [
-              {
-                "alias": "/.*Read.*/",
-                "transform": "negative-Y"
-              },
-              {
-                "alias": "/.*sda_.*/",
-                "color": "#7EB26D"
-              },
-              {
-                "alias": "/.*sdb_.*/",
-                "color": "#EAB839"
-              },
-              {
-                "alias": "/.*sdc_.*/",
-                "color": "#6ED0E0"
-              },
-              {
-                "alias": "/.*sdd_.*/",
-                "color": "#EF843C"
-              },
-              {
-                "alias": "/.*sde_.*/",
-                "color": "#E24D42"
-              },
-              {
-                "alias": "/.*sda1.*/",
-                "color": "#584477"
-              },
-              {
-                "alias": "/.*sda2_.*/",
-                "color": "#BA43A9"
-              },
-              {
-                "alias": "/.*sda3_.*/",
-                "color": "#F4D598"
-              },
-              {
-                "alias": "/.*sdb1.*/",
-                "color": "#0A50A1"
-              },
-              {
-                "alias": "/.*sdb2.*/",
-                "color": "#BF1B00"
-              },
-              {
-                "alias": "/.*sdb3.*/",
-                "color": "#E0752D"
-              },
-              {
-                "alias": "/.*sdc1.*/",
-                "color": "#962D82"
-              },
-              {
-                "alias": "/.*sdc2.*/",
-                "color": "#614D93"
-              },
-              {
-                "alias": "/.*sdc3.*/",
-                "color": "#9AC48A"
-              },
-              {
-                "alias": "/.*sdd1.*/",
-                "color": "#65C5DB"
-              },
-              {
-                "alias": "/.*sdd2.*/",
-                "color": "#F9934E"
-              },
-              {
-                "alias": "/.*sdd3.*/",
-                "color": "#EA6460"
-              },
-              {
-                "alias": "/.*sde1.*/",
-                "color": "#E0F9D7"
-              },
-              {
-                "alias": "/.*sdd2.*/",
-                "color": "#FCEACA"
-              },
-              {
-                "alias": "/.*sde3.*/",
-                "color": "#F9E2D2"
-              }
-            ],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "irate(node_disk_read_time_seconds_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "hide": false,
-                "intervalFactor": 4,
-                "legendFormat": "{{device}} - Read time",
-                "refId": "A",
-                "step": 8
-              },
-              {
-                "expr": "irate(node_disk_write_time_seconds_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "hide": false,
-                "intervalFactor": 2,
-                "legendFormat": "{{device}} - Write time",
-                "refId": "B",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Disk R/W Time",
-            "tooltip": {
-              "shared": false,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "s",
-                "label": "time. read (-) / write (+)",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "description": "",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 12,
-              "y": 38
-            },
-            "hiddenSeries": false,
-            "id": 35,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "hideZero": true,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sort": "current",
-              "sortDesc": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 6,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [
-              {
-                "alias": "/.*sda_.*/",
-                "color": "#7EB26D"
-              },
-              {
-                "alias": "/.*sdb_.*/",
-                "color": "#EAB839"
-              },
-              {
-                "alias": "/.*sdc_.*/",
-                "color": "#6ED0E0"
-              },
-              {
-                "alias": "/.*sdd_.*/",
-                "color": "#EF843C"
-              },
-              {
-                "alias": "/.*sde_.*/",
-                "color": "#E24D42"
-              },
-              {
-                "alias": "/.*sda1.*/",
-                "color": "#584477"
-              },
-              {
-                "alias": "/.*sda2_.*/",
-                "color": "#BA43A9"
-              },
-              {
-                "alias": "/.*sda3_.*/",
-                "color": "#F4D598"
-              },
-              {
-                "alias": "/.*sdb1.*/",
-                "color": "#0A50A1"
-              },
-              {
-                "alias": "/.*sdb2.*/",
-                "color": "#BF1B00"
-              },
-              {
-                "alias": "/.*sdb3.*/",
-                "color": "#E0752D"
-              },
-              {
-                "alias": "/.*sdc1.*/",
-                "color": "#962D82"
-              },
-              {
-                "alias": "/.*sdc2.*/",
-                "color": "#614D93"
-              },
-              {
-                "alias": "/.*sdc3.*/",
-                "color": "#9AC48A"
-              },
-              {
-                "alias": "/.*sdd1.*/",
-                "color": "#65C5DB"
-              },
-              {
-                "alias": "/.*sdd2.*/",
-                "color": "#F9934E"
-              },
-              {
-                "alias": "/.*sdd3.*/",
-                "color": "#EA6460"
-              },
-              {
-                "alias": "/.*sde1.*/",
-                "color": "#E0F9D7"
-              },
-              {
-                "alias": "/.*sdd2.*/",
-                "color": "#FCEACA"
-              },
-              {
-                "alias": "/.*sde3.*/",
-                "color": "#F9E2D2"
-              }
-            ],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "irate(node_disk_io_time_weighted_seconds_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "intervalFactor": 4,
-                "legendFormat": "{{device}} - IO time weighted",
-                "refId": "A",
-                "step": 8
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Disk IOs Weighted",
-            "tooltip": {
-              "shared": false,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "s",
-                "label": "time",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "description": "",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 0,
-              "y": 48
-            },
-            "hiddenSeries": false,
-            "id": 133,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "hideZero": true,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sort": "current",
-              "sortDesc": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 6,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [
-              {
-                "alias": "/.*Read.*/",
-                "transform": "negative-Y"
-              },
-              {
-                "alias": "/.*sda_.*/",
-                "color": "#7EB26D"
-              },
-              {
-                "alias": "/.*sdb_.*/",
-                "color": "#EAB839"
-              },
-              {
-                "alias": "/.*sdc_.*/",
-                "color": "#6ED0E0"
-              },
-              {
-                "alias": "/.*sdd_.*/",
-                "color": "#EF843C"
-              },
-              {
-                "alias": "/.*sde_.*/",
-                "color": "#E24D42"
-              },
-              {
-                "alias": "/.*sda1.*/",
-                "color": "#584477"
-              },
-              {
-                "alias": "/.*sda2_.*/",
-                "color": "#BA43A9"
-              },
-              {
-                "alias": "/.*sda3_.*/",
-                "color": "#F4D598"
-              },
-              {
-                "alias": "/.*sdb1.*/",
-                "color": "#0A50A1"
-              },
-              {
-                "alias": "/.*sdb2.*/",
-                "color": "#BF1B00"
-              },
-              {
-                "alias": "/.*sdb3.*/",
-                "color": "#E0752D"
-              },
-              {
-                "alias": "/.*sdc1.*/",
-                "color": "#962D82"
-              },
-              {
-                "alias": "/.*sdc2.*/",
-                "color": "#614D93"
-              },
-              {
-                "alias": "/.*sdc3.*/",
-                "color": "#9AC48A"
-              },
-              {
-                "alias": "/.*sdd1.*/",
-                "color": "#65C5DB"
-              },
-              {
-                "alias": "/.*sdd2.*/",
-                "color": "#F9934E"
-              },
-              {
-                "alias": "/.*sdd3.*/",
-                "color": "#EA6460"
-              },
-              {
-                "alias": "/.*sde1.*/",
-                "color": "#E0F9D7"
-              },
-              {
-                "alias": "/.*sdd2.*/",
-                "color": "#FCEACA"
-              },
-              {
-                "alias": "/.*sde3.*/",
-                "color": "#F9E2D2"
-              }
-            ],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "irate(node_disk_reads_merged_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "intervalFactor": 2,
-                "legendFormat": "{{device}} - Read merged",
-                "refId": "A",
-                "step": 4
-              },
-              {
-                "expr": "irate(node_disk_writes_merged_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "intervalFactor": 2,
-                "legendFormat": "{{device}} - Write merged",
-                "refId": "B",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Disk R/W Merged",
-            "tooltip": {
-              "shared": false,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "iops",
-                "label": "I/Os",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "description": "",
-            "fill": 3,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 12,
-              "y": 48
-            },
-            "hiddenSeries": false,
-            "id": 36,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "hideZero": true,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sort": "current",
-              "sortDesc": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 6,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [
-              {
-                "alias": "/.*sda_.*/",
-                "color": "#7EB26D"
-              },
-              {
-                "alias": "/.*sdb_.*/",
-                "color": "#EAB839"
-              },
-              {
-                "alias": "/.*sdc_.*/",
-                "color": "#6ED0E0"
-              },
-              {
-                "alias": "/.*sdd_.*/",
-                "color": "#EF843C"
-              },
-              {
-                "alias": "/.*sde_.*/",
-                "color": "#E24D42"
-              },
-              {
-                "alias": "/.*sda1.*/",
-                "color": "#584477"
-              },
-              {
-                "alias": "/.*sda2_.*/",
-                "color": "#BA43A9"
-              },
-              {
-                "alias": "/.*sda3_.*/",
-                "color": "#F4D598"
-              },
-              {
-                "alias": "/.*sdb1.*/",
-                "color": "#0A50A1"
-              },
-              {
-                "alias": "/.*sdb2.*/",
-                "color": "#BF1B00"
-              },
-              {
-                "alias": "/.*sdb3.*/",
-                "color": "#E0752D"
-              },
-              {
-                "alias": "/.*sdc1.*/",
-                "color": "#962D82"
-              },
-              {
-                "alias": "/.*sdc2.*/",
-                "color": "#614D93"
-              },
-              {
-                "alias": "/.*sdc3.*/",
-                "color": "#9AC48A"
-              },
-              {
-                "alias": "/.*sdd1.*/",
-                "color": "#65C5DB"
-              },
-              {
-                "alias": "/.*sdd2.*/",
-                "color": "#F9934E"
-              },
-              {
-                "alias": "/.*sdd3.*/",
-                "color": "#EA6460"
-              },
-              {
-                "alias": "/.*sde1.*/",
-                "color": "#E0F9D7"
-              },
-              {
-                "alias": "/.*sdd2.*/",
-                "color": "#FCEACA"
-              },
-              {
-                "alias": "/.*sde3.*/",
-                "color": "#F9E2D2"
-              }
-            ],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "irate(node_disk_io_time_seconds_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "intervalFactor": 4,
-                "legendFormat": "{{device}} - IO time",
-                "refId": "A",
-                "step": 8
-              },
-              {
-                "expr": "irate(node_disk_discard_time_seconds_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "interval": "",
-                "intervalFactor": 4,
-                "legendFormat": "{{device}} - discard time",
-                "refId": "B",
-                "step": 8
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Time Spent Doing I/Os",
-            "tooltip": {
-              "shared": false,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "s",
-                "label": "time",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "description": "",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 0,
-              "y": 58
-            },
-            "hiddenSeries": false,
-            "id": 34,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "hideZero": true,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sort": "current",
-              "sortDesc": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 6,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [
-              {
-                "alias": "/.*sda_.*/",
-                "color": "#7EB26D"
-              },
-              {
-                "alias": "/.*sdb_.*/",
-                "color": "#EAB839"
-              },
-              {
-                "alias": "/.*sdc_.*/",
-                "color": "#6ED0E0"
-              },
-              {
-                "alias": "/.*sdd_.*/",
-                "color": "#EF843C"
-              },
-              {
-                "alias": "/.*sde_.*/",
-                "color": "#E24D42"
-              },
-              {
-                "alias": "/.*sda1.*/",
-                "color": "#584477"
-              },
-              {
-                "alias": "/.*sda2_.*/",
-                "color": "#BA43A9"
-              },
-              {
-                "alias": "/.*sda3_.*/",
-                "color": "#F4D598"
-              },
-              {
-                "alias": "/.*sdb1.*/",
-                "color": "#0A50A1"
-              },
-              {
-                "alias": "/.*sdb2.*/",
-                "color": "#BF1B00"
-              },
-              {
-                "alias": "/.*sdb3.*/",
-                "color": "#E0752D"
-              },
-              {
-                "alias": "/.*sdc1.*/",
-                "color": "#962D82"
-              },
-              {
-                "alias": "/.*sdc2.*/",
-                "color": "#614D93"
-              },
-              {
-                "alias": "/.*sdc3.*/",
-                "color": "#9AC48A"
-              },
-              {
-                "alias": "/.*sdd1.*/",
-                "color": "#65C5DB"
-              },
-              {
-                "alias": "/.*sdd2.*/",
-                "color": "#F9934E"
-              },
-              {
-                "alias": "/.*sdd3.*/",
-                "color": "#EA6460"
-              },
-              {
-                "alias": "/.*sde1.*/",
-                "color": "#E0F9D7"
-              },
-              {
-                "alias": "/.*sdd2.*/",
-                "color": "#FCEACA"
-              },
-              {
-                "alias": "/.*sde3.*/",
-                "color": "#F9E2D2"
-              }
-            ],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "irate(node_disk_io_now{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "intervalFactor": 4,
-                "legendFormat": "{{device}} - IO now",
-                "refId": "A",
-                "step": 8
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Disk IOs Current in Progress",
-            "tooltip": {
-              "shared": false,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "iops",
-                "label": "I/Os",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "description": "",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 12,
-              "y": 58
-            },
-            "hiddenSeries": false,
-            "id": 301,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "hideZero": true,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 6,
-            "nullPointMode": "null as zero",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [
-              {
-                "alias": "/.*sda_.*/",
-                "color": "#7EB26D"
-              },
-              {
-                "alias": "/.*sdb_.*/",
-                "color": "#EAB839"
-              },
-              {
-                "alias": "/.*sdc_.*/",
-                "color": "#6ED0E0"
-              },
-              {
-                "alias": "/.*sdd_.*/",
-                "color": "#EF843C"
-              },
-              {
-                "alias": "/.*sde_.*/",
-                "color": "#E24D42"
-              },
-              {
-                "alias": "/.*sda1.*/",
-                "color": "#584477"
-              },
-              {
-                "alias": "/.*sda2_.*/",
-                "color": "#BA43A9"
-              },
-              {
-                "alias": "/.*sda3_.*/",
-                "color": "#F4D598"
-              },
-              {
-                "alias": "/.*sdb1.*/",
-                "color": "#0A50A1"
-              },
-              {
-                "alias": "/.*sdb2.*/",
-                "color": "#BF1B00"
-              },
-              {
-                "alias": "/.*sdb3.*/",
-                "color": "#E0752D"
-              },
-              {
-                "alias": "/.*sdc1.*/",
-                "color": "#962D82"
-              },
-              {
-                "alias": "/.*sdc2.*/",
-                "color": "#614D93"
-              },
-              {
-                "alias": "/.*sdc3.*/",
-                "color": "#9AC48A"
-              },
-              {
-                "alias": "/.*sdd1.*/",
-                "color": "#65C5DB"
-              },
-              {
-                "alias": "/.*sdd2.*/",
-                "color": "#F9934E"
-              },
-              {
-                "alias": "/.*sdd3.*/",
-                "color": "#EA6460"
-              },
-              {
-                "alias": "/.*sde1.*/",
-                "color": "#E0F9D7"
-              },
-              {
-                "alias": "/.*sdd2.*/",
-                "color": "#FCEACA"
-              },
-              {
-                "alias": "/.*sde3.*/",
-                "color": "#F9E2D2"
-              }
-            ],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "irate(node_disk_discards_completed_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "interval": "",
-                "intervalFactor": 4,
-                "legendFormat": "{{device}} - Discards completed",
-                "refId": "A",
-                "step": 8
-              },
-              {
-                "expr": "irate(node_disk_discards_merged_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "{{device}} - Discards merged",
-                "refId": "B",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Disk IOps Discards completed / merged",
-            "tooltip": {
-              "shared": false,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "iops",
-                "label": "IOs",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          }
-        ],
-        "repeat": null,
-        "title": "Storage Disk",
-        "type": "row"
-      },
-      {
-        "collapsed": true,
-        "datasource": "Prometheus",
-        "gridPos": {
-          "h": 1,
-          "w": 24,
-          "x": 0,
-          "y": 29
-        },
-        "id": 271,
-        "panels": [
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "decimals": 3,
-            "description": "",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 0,
-              "y": 29
-            },
-            "hiddenSeries": false,
-            "id": 43,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 6,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "node_filesystem_avail_bytes{instance=~\"$node:$port\",job=~\"$job\",device!~'rootfs'}",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 2,
-                "legendFormat": "{{mountpoint}} - Available",
-                "metric": "",
-                "refId": "A",
-                "step": 4
-              },
-              {
-                "expr": "node_filesystem_free_bytes{instance=~\"$node:$port\",job=~\"$job\",device!~'rootfs'}",
-                "format": "time_series",
-                "hide": true,
-                "intervalFactor": 2,
-                "legendFormat": "{{mountpoint}} - Free",
-                "refId": "B",
-                "step": 2
-              },
-              {
-                "expr": "node_filesystem_size_bytes{instance=~\"$node:$port\",job=~\"$job\",device!~'rootfs'}",
-                "format": "time_series",
-                "hide": true,
-                "intervalFactor": 2,
-                "legendFormat": "{{mountpoint}} - Size",
-                "refId": "C",
-                "step": 2
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Filesystem space available",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "bytes",
-                "label": "bytes",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "description": "",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 12,
-              "y": 29
-            },
-            "hiddenSeries": false,
-            "id": 41,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "hideZero": true,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "node_filesystem_files_free{instance=~\"$node:$port\",job=~\"$job\",device!~'rootfs'}",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 2,
-                "legendFormat": "{{mountpoint}} - Free file nodes",
-                "refId": "A",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "File Nodes Free",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": "file nodes",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "description": "",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 0,
-              "y": 39
-            },
-            "hiddenSeries": false,
-            "id": 28,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "show": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 6,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "node_filefd_maximum{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "intervalFactor": 4,
-                "legendFormat": "Max open files",
-                "refId": "A",
-                "step": 8
-              },
-              {
-                "expr": "node_filefd_allocated{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "Open files",
-                "refId": "B",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "File Descriptor",
-            "tooltip": {
-              "shared": false,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": "files",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "description": "",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 12,
-              "y": 39
-            },
-            "hiddenSeries": false,
-            "id": 219,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "hideZero": true,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "node_filesystem_files{instance=~\"$node:$port\",job=~\"$job\",device!~'rootfs'}",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 2,
-                "legendFormat": "{{mountpoint}} - File nodes total",
-                "refId": "A",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "File Nodes Size",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": "file Nodes",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {
-              "/ ReadOnly": "#890F02"
-            },
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "decimals": null,
-            "description": "",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 0,
-              "y": 49
-            },
-            "hiddenSeries": false,
-            "id": 44,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "hideEmpty": true,
-              "hideZero": true,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 6,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": true,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "node_filesystem_readonly{instance=~\"$node:$port\",job=~\"$job\",device!~'rootfs'}",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "{{mountpoint}} - ReadOnly",
-                "refId": "A",
-                "step": 4
-              },
-              {
-                "expr": "node_filesystem_device_error{instance=~\"$node:$port\",job=~\"$job\",device!~'rootfs'}",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "{{mountpoint}} - Device error",
-                "refId": "B",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Filesystem in ReadOnly / Error",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": "counter",
-                "logBase": 1,
-                "max": "1",
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          }
-        ],
-        "repeat": null,
-        "title": "Storage Filesystem",
-        "type": "row"
-      },
-      {
-        "collapsed": true,
-        "datasource": "Prometheus",
-        "gridPos": {
-          "h": 1,
-          "w": 24,
-          "x": 0,
-          "y": 30
-        },
-        "id": 272,
-        "panels": [
-          {
-            "aliasColors": {
-              "receive_packets_eth0": "#7EB26D",
-              "receive_packets_lo": "#E24D42",
-              "transmit_packets_eth0": "#7EB26D",
-              "transmit_packets_lo": "#E24D42"
-            },
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 0,
-              "y": 30
-            },
-            "hiddenSeries": false,
-            "id": 60,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sideWidth": 300,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [
-              {
-                "alias": "/.*Trans.*/",
-                "transform": "negative-Y"
-              }
-            ],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "irate(node_network_receive_packets_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "{{device}} - Receive",
-                "refId": "A",
-                "step": 4
-              },
-              {
-                "expr": "irate(node_network_transmit_packets_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "{{device}} - Transmit",
-                "refId": "B",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Network Traffic by Packets",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "pps",
-                "label": "packets out (-) / in (+)",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 12,
-              "y": 30
-            },
-            "hiddenSeries": false,
-            "id": 142,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "hideEmpty": false,
-              "hideZero": false,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sideWidth": 300,
-              "sort": "current",
-              "sortDesc": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [
-              {
-                "alias": "/.*Trans.*/",
-                "transform": "negative-Y"
-              }
-            ],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "irate(node_network_receive_errs_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "{{device}} - Receive errors",
-                "refId": "A",
-                "step": 4
-              },
-              {
-                "expr": "irate(node_network_transmit_errs_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "{{device}} - Rransmit errors",
-                "refId": "B",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Network Traffic Errors",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "pps",
-                "label": "packets out (-) / in (+)",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 0,
-              "y": 40
-            },
-            "hiddenSeries": false,
-            "id": 143,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "hideEmpty": false,
-              "hideZero": false,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sideWidth": 300,
-              "sort": "current",
-              "sortDesc": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [
-              {
-                "alias": "/.*Trans.*/",
-                "transform": "negative-Y"
-              }
-            ],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "irate(node_network_receive_drop_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "{{device}} - Receive drop",
-                "refId": "A",
-                "step": 4
-              },
-              {
-                "expr": "irate(node_network_transmit_drop_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "{{device}} - Transmit drop",
-                "refId": "B",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Network Traffic Drop",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "pps",
-                "label": "packets out (-) / in (+)",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 12,
-              "y": 40
-            },
-            "hiddenSeries": false,
-            "id": 141,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "hideEmpty": false,
-              "hideZero": false,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sideWidth": 300,
-              "sort": "current",
-              "sortDesc": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [
-              {
-                "alias": "/.*Trans.*/",
-                "transform": "negative-Y"
-              }
-            ],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "irate(node_network_receive_compressed_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "{{device}} - Receive compressed",
-                "refId": "A",
-                "step": 4
-              },
-              {
-                "expr": "irate(node_network_transmit_compressed_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "{{device}} - Transmit compressed",
-                "refId": "B",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Network Traffic Compressed",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "pps",
-                "label": "packets out (-) / in (+)",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 0,
-              "y": 50
-            },
-            "hiddenSeries": false,
-            "id": 146,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "hideEmpty": false,
-              "hideZero": false,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sideWidth": 300,
-              "sort": "current",
-              "sortDesc": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [
-              {
-                "alias": "/.*Trans.*/",
-                "transform": "negative-Y"
-              }
-            ],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "irate(node_network_receive_multicast_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "{{device}} - Receive multicast",
-                "refId": "A",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Network Traffic Multicast",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "pps",
-                "label": "packets out (-) / in (+)",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 12,
-              "y": 50
-            },
-            "hiddenSeries": false,
-            "id": 144,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "hideEmpty": false,
-              "hideZero": false,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sideWidth": 300,
-              "sort": "current",
-              "sortDesc": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [
-              {
-                "alias": "/.*Trans.*/",
-                "transform": "negative-Y"
-              }
-            ],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "irate(node_network_receive_fifo_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "{{device}} - Receive fifo",
-                "refId": "A",
-                "step": 4
-              },
-              {
-                "expr": "irate(node_network_transmit_fifo_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "{{device}} - Transmit fifo",
-                "refId": "B",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Network Traffic Fifo",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "pps",
-                "label": "packets out (-) / in (+)",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 0,
-              "y": 60
-            },
-            "hiddenSeries": false,
-            "id": 145,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "hideEmpty": false,
-              "hideZero": false,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sideWidth": 300,
-              "sort": "current",
-              "sortDesc": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [
-              {
-                "alias": "/.*Trans.*/",
-                "transform": "negative-Y"
-              }
-            ],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "irate(node_network_receive_frame_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "hide": false,
-                "intervalFactor": 2,
-                "legendFormat": "{{device}} - Receive frame",
-                "refId": "A",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Network Traffic Frame",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "pps",
-                "label": "packets out (-) / in (+)",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 12,
-              "y": 60
-            },
-            "hiddenSeries": false,
-            "id": 231,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "hideEmpty": false,
-              "hideZero": false,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sideWidth": 300,
-              "sort": "current",
-              "sortDesc": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "irate(node_network_transmit_carrier_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "{{device}} - Statistic transmit_carrier",
-                "refId": "A",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Network Traffic Carrier",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": "counter",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 0,
-              "y": 70
-            },
-            "hiddenSeries": false,
-            "id": 232,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "hideEmpty": false,
-              "hideZero": false,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sideWidth": 300,
-              "sort": "current",
-              "sortDesc": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [
-              {
-                "alias": "/.*Trans.*/",
-                "transform": "negative-Y"
-              }
-            ],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "irate(node_network_transmit_colls_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "{{device}} - Transmit colls",
-                "refId": "A",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Network Traffic Colls",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": "counter",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 12,
-              "y": 70
-            },
-            "hiddenSeries": false,
-            "id": 61,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [
-              {
-                "alias": "NF conntrack limit",
-                "color": "#890F02",
-                "fill": 0
-              }
-            ],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "node_nf_conntrack_entries{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "NF conntrack entries",
-                "refId": "A",
-                "step": 4
-              },
-              {
-                "expr": "node_nf_conntrack_entries_limit{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "NF conntrack limit",
-                "refId": "B",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "NF Contrack",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": "entries",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 0,
-              "y": 80
-            },
-            "hiddenSeries": false,
-            "id": 230,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "node_arp_entries{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "{{ device }} - ARP entries",
-                "refId": "A",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "ARP Entries",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": "Entries",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 12,
-              "y": 80
-            },
-            "hiddenSeries": false,
-            "id": 288,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 1,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "node_network_mtu_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "{{ device }} - Bytes",
-                "refId": "A",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "MTU",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "decimals": 0,
-                "format": "bytes",
-                "label": "bytes",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 0,
-              "y": 90
-            },
-            "hiddenSeries": false,
-            "id": 280,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 1,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "node_network_speed_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "{{ device }} - Speed",
-                "refId": "A",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Speed",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "decimals": 0,
-                "format": "bytes",
-                "label": "bytes",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 12,
-              "y": 90
-            },
-            "hiddenSeries": false,
-            "id": 289,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 1,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "node_network_transmit_queue_length{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "{{ device }} -   Interface transmit queue length",
-                "refId": "A",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Queue Length",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "decimals": 0,
-                "format": "none",
-                "label": "packets",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 0,
-              "y": 100
-            },
-            "hiddenSeries": false,
-            "id": 290,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "hideEmpty": false,
-              "hideZero": false,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sideWidth": 300,
-              "sort": "current",
-              "sortDesc": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [
-              {
-                "alias": "/.*Dropped.*/",
-                "transform": "negative-Y"
-              }
-            ],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "irate(node_softnet_processed_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "CPU {{cpu}} - Processed",
-                "refId": "A",
-                "step": 4
-              },
-              {
-                "expr": "irate(node_softnet_dropped_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "CPU {{cpu}} - Dropped",
-                "refId": "B",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Softnet Packets",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": "packetes drop (-) / process (+)",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 12,
-              "y": 100
-            },
-            "hiddenSeries": false,
-            "id": 310,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "hideEmpty": false,
-              "hideZero": false,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sideWidth": 300,
-              "sort": "current",
-              "sortDesc": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "irate(node_softnet_times_squeezed_total{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "CPU {{cpu}} - Squeezed",
-                "refId": "A",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Softnet Out of Quota",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": "counter",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 0,
-              "y": 110
-            },
-            "hiddenSeries": false,
-            "id": 309,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "hideEmpty": false,
-              "hideZero": false,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sideWidth": 300,
-              "sort": "current",
-              "sortDesc": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "node_network_up{operstate=\"up\",instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "{{interface}} - Operational state UP",
-                "refId": "A",
-                "step": 4
-              },
-              {
-                "expr": "node_network_carrier{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "instant": false,
-                "legendFormat": "{{device}} - Physical link state",
-                "refId": "B"
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Network Operational Status",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": "counter",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          }
-        ],
-        "repeat": null,
-        "title": "Network Traffic",
-        "type": "row"
-      },
-      {
-        "collapsed": true,
-        "datasource": "Prometheus",
-        "gridPos": {
-          "h": 1,
-          "w": 24,
-          "x": 0,
-          "y": 31
-        },
-        "id": 273,
-        "panels": [
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 0,
-              "y": 13
-            },
-            "hiddenSeries": false,
-            "id": 63,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "hideEmpty": false,
-              "hideZero": false,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sideWidth": 300,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "node_sockstat_TCP_alloc{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "TCP_alloc - Allocated sockets",
-                "refId": "A",
-                "step": 240
-              },
-              {
-                "expr": "node_sockstat_TCP_inuse{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "TCP_inuse - Tcp sockets currently in use",
-                "refId": "B",
-                "step": 240
-              },
-              {
-                "expr": "node_sockstat_TCP_mem{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "hide": true,
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "TCP_mem - Used memory for tcp",
-                "refId": "C",
-                "step": 240
-              },
-              {
-                "expr": "node_sockstat_TCP_orphan{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "TCP_orphan - Orphan sockets",
-                "refId": "D",
-                "step": 240
-              },
-              {
-                "expr": "node_sockstat_TCP_tw{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "TCP_tw - Sockets wating close",
-                "refId": "E",
-                "step": 240
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Sockstat TCP",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": "counter",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 12,
-              "y": 13
-            },
-            "hiddenSeries": false,
-            "id": 124,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "hideEmpty": false,
-              "hideZero": false,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sideWidth": 300,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "node_sockstat_UDPLITE_inuse{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "UDPLITE_inuse - Udplite sockets currently in use",
-                "refId": "A",
-                "step": 240
-              },
-              {
-                "expr": "node_sockstat_UDP_inuse{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "UDP_inuse - Udp sockets currently in use",
-                "refId": "B",
-                "step": 240
-              },
-              {
-                "expr": "node_sockstat_UDP_mem{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "UDP_mem - Used memory for udp",
-                "refId": "C",
-                "step": 240
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Sockstat UDP",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": "counter",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 0,
-              "y": 23
-            },
-            "hiddenSeries": false,
-            "id": 126,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "hideEmpty": false,
-              "hideZero": false,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sideWidth": 300,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "node_sockstat_sockets_used{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "Sockets_used - Sockets currently in use",
-                "refId": "A",
-                "step": 240
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Sockstat Used",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": "sockets",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 12,
-              "y": 23
-            },
-            "hiddenSeries": false,
-            "id": 220,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "hideEmpty": false,
-              "hideZero": false,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sideWidth": 300,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "node_sockstat_TCP_mem_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "mem_bytes - TCP sockets in that state",
-                "refId": "A",
-                "step": 240
-              },
-              {
-                "expr": "node_sockstat_UDP_mem_bytes{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "mem_bytes - UDP sockets in that state",
-                "refId": "B",
-                "step": 240
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Sockstat Memory Size",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "bytes",
-                "label": "bytes",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 0,
-              "y": 33
-            },
-            "hiddenSeries": false,
-            "id": 125,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "hideEmpty": false,
-              "hideZero": false,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sideWidth": 300,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "node_sockstat_FRAG_inuse{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "FRAG_inuse - Frag sockets currently in use",
-                "refId": "A",
-                "step": 240
-              },
-              {
-                "expr": "node_sockstat_FRAG_memory{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "FRAG_memory - Used memory for frag",
-                "refId": "B",
-                "step": 240
-              },
-              {
-                "expr": "node_sockstat_RAW_inuse{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "RAW_inuse - Raw sockets currently in use",
-                "refId": "C",
-                "step": 240
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Sockstat FRAG / RAW",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": "counter",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          }
-        ],
-        "repeat": null,
-        "title": "Network Sockstat",
-        "type": "row"
-      },
-      {
-        "collapsed": true,
-        "datasource": "Prometheus",
-        "gridPos": {
-          "h": 1,
-          "w": 24,
-          "x": 0,
-          "y": 32
-        },
-        "id": 274,
-        "panels": [
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 0,
-              "y": 32
-            },
-            "height": "",
-            "hiddenSeries": false,
-            "id": 221,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "hideEmpty": false,
-              "hideZero": false,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sideWidth": 300,
-              "sort": "current",
-              "sortDesc": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 12,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [
-              {
-                "alias": "/.*Out.*/",
-                "transform": "negative-Y"
-              }
-            ],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "irate(node_netstat_IpExt_InOctets{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "InOctets - Received octets",
-                "refId": "A",
-                "step": 4
-              },
-              {
-                "expr": "irate(node_netstat_IpExt_OutOctets{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "intervalFactor": 2,
-                "legendFormat": "OutOctets - Sent octets",
-                "refId": "B",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Netstat IP In / Out Octets",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": "octects out (-) / in (+)",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 12,
-              "y": 32
-            },
-            "height": "",
-            "hiddenSeries": false,
-            "id": 81,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "hideEmpty": false,
-              "hideZero": false,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sideWidth": 300,
-              "sort": "current",
-              "sortDesc": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "irate(node_netstat_Ip_Forwarding{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "Forwarding - IP forwarding",
-                "refId": "A",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Netstat IP Forwarding",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": "datagrams",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "decimals": null,
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 0,
-              "y": 42
-            },
-            "height": "",
-            "hiddenSeries": false,
-            "id": 115,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "hideZero": false,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sort": "current",
-              "sortDesc": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 12,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [
-              {
-                "alias": "/.*Out.*/",
-                "transform": "negative-Y"
-              }
-            ],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "irate(node_netstat_Icmp_InMsgs{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "InMsgs -  Messages which the entity received. Note that this counter includes all those counted by icmpInErrors",
-                "refId": "A",
-                "step": 4
-              },
-              {
-                "expr": "irate(node_netstat_Icmp_OutMsgs{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "OutMsgs - Messages which this entity attempted to send. Note that this counter includes all those counted by icmpOutErrors",
-                "refId": "B",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "ICMP In / Out",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": "messages out (-) / in (+)",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "decimals": null,
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 12,
-              "y": 42
-            },
-            "height": "",
-            "hiddenSeries": false,
-            "id": 50,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "hideZero": false,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sort": "current",
-              "sortDesc": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 12,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [
-              {
-                "alias": "/.*Out.*/",
-                "transform": "negative-Y"
-              }
-            ],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "irate(node_netstat_Icmp_InErrors{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "InErrors - Messages which the entity received but determined as having ICMP-specific errors (bad ICMP checksums, bad length, etc.)",
-                "refId": "A",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "ICMP Errors",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": "messages out (-) / in (+)",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "decimals": null,
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 0,
-              "y": 52
-            },
-            "height": "",
-            "hiddenSeries": false,
-            "id": 55,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "hideZero": false,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sort": "current",
-              "sortDesc": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 12,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [
-              {
-                "alias": "/.*Out.*/",
-                "transform": "negative-Y"
-              },
-              {
-                "alias": "/.*Snd.*/",
-                "transform": "negative-Y"
-              }
-            ],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "irate(node_netstat_Udp_InDatagrams{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "InDatagrams - Datagrams received",
-                "refId": "A",
-                "step": 4
-              },
-              {
-                "expr": "irate(node_netstat_Udp_OutDatagrams{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "OutDatagrams - Datagrams sent",
-                "refId": "B",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "UDP In / Out",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": "datagrams out (-) / in (+)",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 12,
-              "y": 52
-            },
-            "height": "",
-            "hiddenSeries": false,
-            "id": 109,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "hideZero": false,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sort": "current",
-              "sortDesc": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 12,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "irate(node_netstat_Udp_InErrors{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "InErrors - UDP Datagrams that could not be delivered to an application",
-                "refId": "A",
-                "step": 4
-              },
-              {
-                "expr": "irate(node_netstat_Udp_NoPorts{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "NoPorts - UDP Datagrams received on a port with no listener",
-                "refId": "B",
-                "step": 4
-              },
-              {
-                "expr": "irate(node_netstat_UdpLite_InErrors{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "interval": "",
-                "legendFormat": "InErrors Lite - UDPLite Datagrams that could not be delivered to an application",
-                "refId": "C"
-              },
-              {
-                "expr": "irate(node_netstat_Udp_RcvbufErrors{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "RcvbufErrors - UDP buffer errors received",
-                "refId": "D",
-                "step": 4
-              },
-              {
-                "expr": "irate(node_netstat_Udp_SndbufErrors{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "SndbufErrors - UDP buffer errors send",
-                "refId": "E",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "UDP Errors",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": "datagrams",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "decimals": null,
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 0,
-              "y": 62
-            },
-            "height": "",
-            "hiddenSeries": false,
-            "id": 299,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "hideZero": false,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sort": "current",
-              "sortDesc": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 12,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [
-              {
-                "alias": "/.*Out.*/",
-                "transform": "negative-Y"
-              },
-              {
-                "alias": "/.*Snd.*/",
-                "transform": "negative-Y"
-              }
-            ],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "irate(node_netstat_Tcp_InSegs{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "instant": false,
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "InSegs - Segments received, including those received in error. This count includes segments received on currently established connections",
-                "refId": "A",
-                "step": 4
-              },
-              {
-                "expr": "irate(node_netstat_Tcp_OutSegs{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "OutSegs - Segments sent, including those on current connections but excluding those containing only retransmitted octets",
-                "refId": "B",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "TCP In / Out",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": "datagrams out (-) / in (+)",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "description": "",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 12,
-              "y": 62
-            },
-            "height": "",
-            "hiddenSeries": false,
-            "id": 104,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "hideEmpty": false,
-              "hideZero": false,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sort": "current",
-              "sortDesc": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 12,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "irate(node_netstat_TcpExt_ListenOverflows{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "hide": false,
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "ListenOverflows - Times the listen queue of a socket overflowed",
-                "refId": "A",
-                "step": 4
-              },
-              {
-                "expr": "irate(node_netstat_TcpExt_ListenDrops{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "hide": false,
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "ListenDrops - SYNs to LISTEN sockets ignored",
-                "refId": "B",
-                "step": 4
-              },
-              {
-                "expr": "irate(node_netstat_TcpExt_TCPSynRetrans{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "TCPSynRetrans - SYN-SYN/ACK retransmits to break down retransmissions in SYN, fast/timeout retransmits",
-                "refId": "C",
-                "step": 4
-              },
-              {
-                "expr": "irate(node_netstat_Tcp_RetransSegs{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "interval": "",
-                "legendFormat": "RetransSegs - Segments retransmitted - that is, the number of TCP segments transmitted containing one or more previously transmitted octets",
-                "refId": "D"
-              },
-              {
-                "expr": "irate(node_netstat_Tcp_InErrs{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "interval": "",
-                "legendFormat": "InErrs - Segments received in error (e.g., bad TCP checksums)",
-                "refId": "E"
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "TCP Errors",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": "counter",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 0,
-              "y": 72
-            },
-            "height": "",
-            "hiddenSeries": false,
-            "id": 85,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "hideZero": false,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sortDesc": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 12,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [
-              {
-                "alias": "/.*MaxConn *./",
-                "color": "#890F02",
-                "fill": 0
-              }
-            ],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "node_netstat_Tcp_CurrEstab{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "hide": false,
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "CurrEstab - TCP connections for which the current state is either ESTABLISHED or CLOSE- WAIT",
-                "refId": "A",
-                "step": 4
-              },
-              {
-                "expr": "node_netstat_Tcp_MaxConn{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "hide": false,
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "MaxConn - Limit on the total number of TCP connections the entity can support (Dinamic is \"-1\")",
-                "refId": "B",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "TCP Connections",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": "connections",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "description": "",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 12,
-              "y": 72
-            },
-            "height": "",
-            "hiddenSeries": false,
-            "id": 91,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "hideEmpty": false,
-              "hideZero": false,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sort": "current",
-              "sortDesc": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 12,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [
-              {
-                "alias": "/.*Sent.*/",
-                "transform": "negative-Y"
-              }
-            ],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "irate(node_netstat_TcpExt_SyncookiesFailed{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "hide": false,
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "SyncookiesFailed - Invalid SYN cookies received",
-                "refId": "A",
-                "step": 4
-              },
-              {
-                "expr": "irate(node_netstat_TcpExt_SyncookiesRecv{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "hide": false,
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "SyncookiesRecv - SYN cookies received",
-                "refId": "B",
-                "step": 4
-              },
-              {
-                "expr": "irate(node_netstat_TcpExt_SyncookiesSent{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "hide": false,
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "SyncookiesSent - SYN cookies sent",
-                "refId": "C",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "TCP SynCookie",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": "counter out (-) / in (+)",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 0,
-              "y": 82
-            },
-            "height": "",
-            "hiddenSeries": false,
-            "id": 82,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "hideZero": false,
-              "max": true,
-              "min": true,
-              "rightSide": false,
-              "show": true,
-              "sortDesc": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "maxPerRow": 12,
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": false,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "irate(node_netstat_Tcp_ActiveOpens{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "ActiveOpens - TCP connections that have made a direct transition to the SYN-SENT state from the CLOSED state",
-                "refId": "A",
-                "step": 4
-              },
-              {
-                "expr": "irate(node_netstat_Tcp_PassiveOpens{instance=~\"$node:$port\",job=~\"$job\"}[5m])",
-                "format": "time_series",
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "PassiveOpens - TCP connections that have made a direct transition to the SYN-RCVD state from the LISTEN state",
-                "refId": "B",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "TCP Direct Transition",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": "connections",
-                "logBase": 1,
-                "max": null,
-                "min": "0",
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          }
-        ],
-        "repeat": null,
-        "title": "Network Netstat",
-        "type": "row"
-      },
-      {
-        "collapsed": true,
-        "datasource": "Prometheus",
-        "gridPos": {
-          "h": 1,
-          "w": 24,
-          "x": 0,
-          "y": 33
-        },
-        "id": 279,
-        "panels": [
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "description": "",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 0,
-              "y": 54
-            },
-            "hiddenSeries": false,
-            "id": 40,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "show": true,
-              "sort": "current",
-              "sortDesc": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [],
-            "spaceLength": 10,
-            "stack": true,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "node_scrape_collector_duration_seconds{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "hide": false,
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "{{collector}} - Scrape duration",
-                "refId": "A",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Node Exporter Scrape Time",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "s",
-                "label": "seconds",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          },
-          {
-            "aliasColors": {},
-            "bars": false,
-            "dashLength": 10,
-            "dashes": false,
-            "datasource": "Prometheus",
-            "description": "",
-            "fill": 2,
-            "fillGradient": 0,
-            "gridPos": {
-              "h": 10,
-              "w": 12,
-              "x": 12,
-              "y": 54
-            },
-            "hiddenSeries": false,
-            "id": 157,
-            "legend": {
-              "alignAsTable": true,
-              "avg": true,
-              "current": true,
-              "max": true,
-              "min": true,
-              "show": true,
-              "total": false,
-              "values": true
-            },
-            "lines": true,
-            "linewidth": 1,
-            "links": [],
-            "nullPointMode": "null",
-            "options": {
-              "dataLinks": []
-            },
-            "percentage": false,
-            "pointradius": 5,
-            "points": false,
-            "renderer": "flot",
-            "seriesOverrides": [
-              {
-                "alias": "/.*error.*/",
-                "color": "#F2495C",
-                "transform": "negative-Y"
-              }
-            ],
-            "spaceLength": 10,
-            "stack": true,
-            "steppedLine": false,
-            "targets": [
-              {
-                "expr": "node_scrape_collector_success{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "hide": false,
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "{{collector}} - Scrape success",
-                "refId": "A",
-                "step": 4
-              },
-              {
-                "expr": "node_textfile_scrape_error{instance=~\"$node:$port\",job=~\"$job\"}",
-                "format": "time_series",
-                "hide": false,
-                "interval": "",
-                "intervalFactor": 2,
-                "legendFormat": "{{collector}} - Scrape textfile error (1 = true)",
-                "refId": "B",
-                "step": 4
-              }
-            ],
-            "thresholds": [],
-            "timeFrom": null,
-            "timeRegions": [],
-            "timeShift": null,
-            "title": "Node Exporter Scrape",
-            "tooltip": {
-              "shared": true,
-              "sort": 0,
-              "value_type": "individual"
-            },
-            "type": "graph",
-            "xaxis": {
-              "buckets": null,
-              "mode": "time",
-              "name": null,
-              "show": true,
-              "values": []
-            },
-            "yaxes": [
-              {
-                "format": "short",
-                "label": "counter",
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": true
-              },
-              {
-                "format": "short",
-                "label": null,
-                "logBase": 1,
-                "max": null,
-                "min": null,
-                "show": false
-              }
-            ],
-            "yaxis": {
-              "align": false,
-              "alignLevel": null
-            }
-          }
-        ],
-        "repeat": null,
-        "title": "Node Exporter",
-        "type": "row"
-      }
-    ],
-    "refresh": "1m",
-    "schemaVersion": 25,
-    "style": "dark",
-    "tags": [
-      "linux"
-    ],
-    "templating": {
-      "list": [
-        {
-          "current": {
-            "selected": true,
-            "text": "Prometheus",
-            "value": "Prometheus"
-          },
-          "hide": 0,
-          "includeAll": false,
-          "label": "datasource",
-          "multi": false,
-          "name": "DS_PROMETHEUS",
-          "options": [],
-          "query": "prometheus",
-          "queryValue": "",
-          "refresh": 1,
-          "regex": "",
-          "skipUrlSync": false,
-          "type": "datasource"
-        },
-        {
-          "allValue": null,
-          "current": {
-            "selected": true,
-            "text": "nodeexporter",
-            "value": "nodeexporter"
-          },
-          "datasource": "Prometheus",
-          "definition": "",
-          "hide": 0,
-          "includeAll": false,
-          "label": "Job",
-          "multi": false,
-          "name": "job",
-          "options": [],
-          "query": "label_values(node_uname_info, job)",
-          "refresh": 1,
-          "regex": "",
-          "skipUrlSync": false,
-          "sort": 1,
-          "tagValuesQuery": "",
-          "tags": [],
-          "tagsQuery": "",
-          "type": "query",
-          "useTags": false
-        },
-        {
-          "allValue": null,
-          "current": {
-            "selected": true,
-            "text": "4d564edf4c3d",
-            "value": "4d564edf4c3d"
-          },
-          "datasource": "Prometheus",
-          "definition": "",
-          "hide": 0,
-          "includeAll": false,
-          "label": "Host:",
-          "multi": false,
-          "name": "name",
-          "options": [],
-          "query": "label_values(node_uname_info{job=~\"$job\"}, nodename)",
-          "refresh": 1,
-          "regex": "",
-          "skipUrlSync": false,
-          "sort": 1,
-          "tagValuesQuery": "",
-          "tags": [],
-          "tagsQuery": "",
-          "type": "query",
-          "useTags": false
-        },
-        {
-          "allValue": null,
-          "current": {
-            "selected": false,
-            "text": "nodeexporter",
-            "value": "nodeexporter"
-          },
-          "datasource": "Prometheus",
-          "definition": "",
-          "hide": 2,
-          "includeAll": false,
-          "label": "Host:",
-          "multi": false,
-          "name": "node",
-          "options": [],
-          "query": "label_values(node_uname_info{nodename=\"$name\"}, instance)",
-          "refresh": 1,
-          "regex": "/([^:]+):.*/",
-          "skipUrlSync": false,
-          "sort": 1,
-          "tagValuesQuery": "",
-          "tags": [],
-          "tagsQuery": "",
-          "type": "query",
-          "useTags": false
-        },
-        {
-          "allValue": null,
-          "current": {
-            "selected": false,
-            "text": "9100",
-            "value": "9100"
-          },
-          "datasource": "Prometheus",
-          "definition": "",
-          "hide": 0,
-          "includeAll": false,
-          "label": "Port",
-          "multi": false,
-          "name": "port",
-          "options": [],
-          "query": "label_values(node_uname_info{instance=~\"$node:(.*)\"}, instance)",
-          "refresh": 1,
-          "regex": "/[^:]+:(.*)/",
-          "skipUrlSync": false,
-          "sort": 3,
-          "tagValuesQuery": "",
-          "tags": [],
-          "tagsQuery": "",
-          "type": "query",
-          "useTags": false
-        }
-      ]
-    },
-    "time": {
-      "from": "now-24h",
-      "to": "now"
-    },
-    "timepicker": {
-      "refresh_intervals": [
-        "10s",
-        "30s",
-        "1m",
-        "5m",
-        "15m",
-        "30m",
-        "1h",
-        "2h",
-        "1d"
-      ],
-      "time_options": [
-        "5m",
-        "15m",
-        "1h",
-        "6h",
-        "12h",
-        "24h",
-        "2d",
-        "7d",
-        "30d"
-      ]
-    },
-    "timezone": "browser",
-    "title": "Node Exporter Full",
-    "uid": "rYdddlPWk",
-    "version": 1
-  }
\ No newline at end of file

From 1fa9123d40c266ee483a894e3cee3e17afbad0d9 Mon Sep 17 00:00:00 2001
From: adria0 <adria@codecontext.io>
Date: Wed, 1 Jul 2020 10:43:35 +0200
Subject: [PATCH 18/32] wip

---
 Cargo.lock                      | 501 ++++++++++++++++++++++++++------
 Cargo.toml                      |   5 +-
 ethcore/Cargo.toml              |   2 +-
 ethcore/sync/Cargo.toml         |   2 +-
 miner/Cargo.toml                |   2 +-
 miner/price-info/Cargo.toml     |   4 +-
 parity/account.rs               |   4 +-
 parity/account_utils.rs         |   9 +-
 parity/blockchain.rs            |  13 +-
 parity/configuration.rs         |  29 +-
 parity/db/rocksdb/mod.rs        |   4 +-
 parity/deprecated.rs            |   2 +-
 parity/export_hardcoded_sync.rs |  12 +-
 parity/helpers.rs               |   9 +-
 parity/metrics.rs               |  61 ++--
 parity/params.rs                |   3 +-
 parity/presale.rs               |   4 +-
 parity/rpc.rs                   |   7 +-
 parity/rpc_apis.rs              |   3 +-
 parity/run.rs                   |  43 +--
 parity/secretstore/server.rs    |   3 +-
 parity/signer.rs                |   5 +-
 parity/snapshot_cmd.rs          |  14 +-
 rpc/Cargo.toml                  |   2 +-
 updater/hash-fetch/Cargo.toml   |   2 +-
 25 files changed, 549 insertions(+), 196 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 19b44d6dda4..9e8707b7366 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -123,6 +123,12 @@ dependencies = [
  "xdg",
 ]
 
+[[package]]
+name = "arc-swap"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d25d88fd6b8041580a654f9d0c581a047baee2b3efee13275f2fc392fc75034"
+
 [[package]]
 name = "arrayref"
 version = "0.3.6"
@@ -147,7 +153,7 @@ version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd4da2f0d9a8eb4e0aabc162278968eaf753999aa4aed173b753f9fa8da4cb86"
 dependencies = [
- "http",
+ "http 0.1.21",
  "log",
  "url 1.7.2",
 ]
@@ -496,6 +502,15 @@ dependencies = [
  "iovec",
 ]
 
+[[package]]
+name = "bytes"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "118cf036fbb97d0816e3c34b2d7a1e8cfc60f68fcf63d550ddbe9bd5f59c213b"
+dependencies = [
+ "loom",
+]
+
 [[package]]
 name = "cast"
 version = "0.2.3"
@@ -579,7 +594,7 @@ name = "cli-signer"
 version = "1.4.0"
 dependencies = [
  "ethereum-types",
- "futures",
+ "futures 0.1.29",
  "parity-rpc",
  "parity-rpc-client",
  "rpassword",
@@ -1178,7 +1193,7 @@ dependencies = [
  "evm",
  "executive-state",
  "fetch",
- "futures",
+ "futures 0.1.29",
  "hash-db",
  "itertools",
  "journaldb",
@@ -1192,7 +1207,7 @@ dependencies = [
  "memory-cache",
  "parity-bytes",
  "parity-crypto",
- "parity-runtime",
+ "parity-runtime 0.1.1 (git+https://github.com/vorot93/parity-common?branch=tokio-compat)",
  "parking_lot 0.10.0",
  "patricia-trie-ethereum",
  "pod",
@@ -1316,7 +1331,7 @@ version = "1.12.0"
 dependencies = [
  "crossbeam-deque",
  "fnv",
- "futures",
+ "futures 0.1.29",
  "log",
  "mio",
  "num_cpus",
@@ -1324,7 +1339,7 @@ dependencies = [
  "slab",
  "time",
  "timer",
- "tokio",
+ "tokio 0.1.22",
 ]
 
 [[package]]
@@ -1346,7 +1361,7 @@ dependencies = [
  "executive-state",
  "failsafe",
  "fastmap",
- "futures",
+ "futures 0.1.29",
  "hash-db",
  "journaldb",
  "keccak-hash",
@@ -1405,13 +1420,13 @@ dependencies = [
  "ethcore-call-contract",
  "ethereum-types",
  "fetch",
- "futures",
- "hyper",
+ "futures 0.1.29",
+ "hyper 0.12.35",
  "keccak-hash",
  "linked-hash-map",
  "log",
  "parity-crypto",
- "parity-runtime",
+ "parity-runtime 0.1.1 (git+https://github.com/vorot93/parity-common?branch=tokio-compat)",
  "parity-util-mem",
  "parking_lot 0.10.0",
  "price-info",
@@ -1451,7 +1466,7 @@ version = "1.12.0"
 dependencies = [
  "ansi_term",
  "assert_matches",
- "bytes",
+ "bytes 0.4.12",
  "derive_more",
  "enr",
  "env_logger 0.5.13",
@@ -1502,7 +1517,7 @@ dependencies = [
  "ethereum-types",
  "ethjson",
  "fetch",
- "futures",
+ "futures 0.1.29",
  "hash-db",
  "journaldb",
  "keccak-hash",
@@ -1567,7 +1582,7 @@ dependencies = [
  "keccak-hash",
  "log",
  "parking_lot 0.10.0",
- "tokio",
+ "tokio 0.1.22",
  "tokio-io",
 ]
 
@@ -1589,7 +1604,7 @@ dependencies = [
  "ethereum-forkid",
  "ethereum-types",
  "fastmap",
- "futures",
+ "futures 0.1.29",
  "indexmap",
  "keccak-hash",
  "kvdb-memorydb",
@@ -1598,7 +1613,7 @@ dependencies = [
  "num-traits",
  "parity-bytes",
  "parity-crypto",
- "parity-runtime",
+ "parity-runtime 0.1.1 (git+https://github.com/vorot93/parity-common?branch=tokio-compat)",
  "parity-util-mem",
  "parking_lot 0.10.0",
  "rand 0.7.3",
@@ -1806,7 +1821,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf04c6ffd217a68c73fdf40eb3331c484fd7a9fa4fd1028fcf74456ef889ca12"
 dependencies = [
- "futures",
+ "futures 0.1.29",
  "parking_lot 0.6.4",
  "rand 0.5.6",
 ]
@@ -1838,8 +1853,8 @@ name = "fake-fetch"
 version = "0.0.1"
 dependencies = [
  "fetch",
- "futures",
- "hyper",
+ "futures 0.1.29",
+ "hyper 0.12.35",
 ]
 
 [[package]]
@@ -1869,13 +1884,13 @@ dependencies = [
 name = "fetch"
 version = "0.1.0"
 dependencies = [
- "bytes",
- "futures",
- "http",
- "hyper",
+ "bytes 0.4.12",
+ "futures 0.1.29",
+ "http 0.1.21",
+ "hyper 0.12.35",
  "hyper-rustls",
  "log",
- "tokio",
+ "tokio 0.1.22",
  "url 2.1.1",
 ]
 
@@ -1965,16 +1980,85 @@ version = "0.1.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b980f2816d6ee8673b6517b52cb0e808a180efc92e5c19d02cdda79066703ef"
 
+[[package]]
+name = "futures"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e05b85ec287aac0dc34db7d4a569323df697f9c55b99b15d6b4ef8cde49f613"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f366ad74c28cca6ba456d95e6422883cfb4b252a83bed929c83abfdbbf2967d5"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59f5fff90fd5d971f936ad674802482ba441b6f09ba5e15fd8b39145582ca399"
+
 [[package]]
 name = "futures-cpupool"
 version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4"
 dependencies = [
- "futures",
+ "futures 0.1.29",
  "num_cpus",
 ]
 
+[[package]]
+name = "futures-io"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de27142b013a8e869c14957e6d2edeef89e97c289e69d042ee3a49acd8b51789"
+
+[[package]]
+name = "futures-sink"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f2032893cb734c7a05d85ce0cc8b8c4075278e93b24b66f9de99d6eb0fa8acc"
+
+[[package]]
+name = "futures-task"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bdb66b5f09e22019b1ab0830f7785bcea8e7a42148683f99214f73f8ec21a626"
+dependencies = [
+ "once_cell",
+]
+
+[[package]]
+name = "futures-util"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8764574ff08b701a084482c3c7031349104b07ac897393010494beaa18ce32c6"
+dependencies = [
+ "futures 0.1.29",
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project",
+ "pin-utils",
+ "slab",
+]
+
 [[package]]
 name = "fxhash"
 version = "0.2.1"
@@ -1984,6 +2068,19 @@ dependencies = [
  "byteorder",
 ]
 
+[[package]]
+name = "generator"
+version = "0.6.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "add72f17bb81521258fcc8a7a3245b1e184e916bfbe34f0ea89558f440df5c68"
+dependencies = [
+ "cc",
+ "libc",
+ "log",
+ "rustc_version",
+ "winapi 0.3.8",
+]
+
 [[package]]
 name = "generic-array"
 version = "0.12.3"
@@ -2030,10 +2127,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a5b34c246847f938a410a03c5458c7fee2274436675e76d8b903c08efc29c462"
 dependencies = [
  "byteorder",
- "bytes",
+ "bytes 0.4.12",
  "fnv",
- "futures",
- "http",
+ "futures 0.1.29",
+ "http 0.1.21",
  "indexmap",
  "log",
  "slab",
@@ -2041,6 +2138,25 @@ dependencies = [
  "tokio-io",
 ]
 
+[[package]]
+name = "h2"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79b7246d7e4b979c03fa093da39cfb3617a96bbeee6310af63991668d7e843ff"
+dependencies = [
+ "bytes 0.5.5",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "http 0.2.1",
+ "indexmap",
+ "log",
+ "slab",
+ "tokio 0.2.21",
+ "tokio-util",
+]
+
 [[package]]
 name = "hamming"
 version = "0.1.3"
@@ -2149,7 +2265,18 @@ version = "0.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6ccf5ede3a895d8856620237b2f02972c1bbc78d2965ad7fe8838d4a0ed41f0"
 dependencies = [
- "bytes",
+ "bytes 0.4.12",
+ "fnv",
+ "itoa",
+]
+
+[[package]]
+name = "http"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9"
+dependencies = [
+ "bytes 0.5.5",
  "fnv",
  "itoa",
 ]
@@ -2160,12 +2287,22 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d"
 dependencies = [
- "bytes",
- "futures",
- "http",
+ "bytes 0.4.12",
+ "futures 0.1.29",
+ "http 0.1.21",
  "tokio-buf",
 ]
 
+[[package]]
+name = "http-body"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b"
+dependencies = [
+ "bytes 0.5.5",
+ "http 0.2.1",
+]
+
 [[package]]
 name = "httparse"
 version = "1.3.4"
@@ -2187,12 +2324,12 @@ version = "0.12.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9dbe6ed1438e1f8ad955a4701e9a944938e9519f6888d12d8558b645e247d5f6"
 dependencies = [
- "bytes",
- "futures",
+ "bytes 0.4.12",
+ "futures 0.1.29",
  "futures-cpupool",
- "h2",
- "http",
- "http-body",
+ "h2 0.1.26",
+ "http 0.1.21",
+ "http-body 0.1.0",
  "httparse",
  "iovec",
  "itoa",
@@ -2200,7 +2337,7 @@ dependencies = [
  "net2",
  "rustc_version",
  "time",
- "tokio",
+ "tokio 0.1.22",
  "tokio-buf",
  "tokio-executor",
  "tokio-io",
@@ -2208,7 +2345,31 @@ dependencies = [
  "tokio-tcp",
  "tokio-threadpool",
  "tokio-timer",
- "want",
+ "want 0.2.0",
+]
+
+[[package]]
+name = "hyper"
+version = "0.13.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6e7655b9594024ad0ee439f3b5a7299369dc2a3f459b47c696f9ff676f9aa1f"
+dependencies = [
+ "bytes 0.5.5",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "h2 0.2.5",
+ "http 0.2.1",
+ "http-body 0.3.1",
+ "httparse",
+ "itoa",
+ "log",
+ "pin-project",
+ "socket2",
+ "time",
+ "tokio 0.2.21",
+ "tower-service",
+ "want 0.3.0",
 ]
 
 [[package]]
@@ -2217,10 +2378,10 @@ version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b66a4973381d01141ed0a4f20070d47a232c764642dd6217d3d93f7a1f952ea5"
 dependencies = [
- "bytes",
+ "bytes 0.4.12",
  "ct-logs",
- "futures",
- "hyper",
+ "futures 0.1.29",
+ "hyper 0.12.35",
  "rustls",
  "rustls-native-certs",
  "tokio-io",
@@ -2424,7 +2585,7 @@ version = "14.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fe3b688648f1ef5d5072229e2d672ecb92cbff7d1c79bcf3fd5898f3f3df0970"
 dependencies = [
- "futures",
+ "futures 0.1.29",
  "log",
  "serde",
  "serde_derive",
@@ -2449,7 +2610,7 @@ version = "14.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "816d63997ea45d3634608edbef83ddb35e661f7c0b27b5b72f237e321f0e9807"
 dependencies = [
- "hyper",
+ "hyper 0.12.35",
  "jsonrpc-core",
  "jsonrpc-server-utils",
  "log",
@@ -2490,12 +2651,12 @@ version = "14.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95b7635e618a0edbbe0d2a2bbbc69874277c49383fcf6c3c0414491cfb517d22"
 dependencies = [
- "bytes",
+ "bytes 0.4.12",
  "globset",
  "jsonrpc-core",
  "lazy_static",
  "log",
- "tokio",
+ "tokio 0.1.22",
  "tokio-codec",
  "unicase",
 ]
@@ -2728,6 +2889,17 @@ dependencies = [
  "utf8-ranges",
 ]
 
+[[package]]
+name = "loom"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ecc775857611e1df29abba5c41355cdf540e7e9d4acfdf0f355eefee82330b7"
+dependencies = [
+ "cfg-if",
+ "generator",
+ "scoped-tls",
+]
+
 [[package]]
 name = "lru"
 version = "0.4.3"
@@ -3203,8 +3375,8 @@ dependencies = [
  "ethstore",
  "fake-fetch",
  "fdlimit",
- "futures",
- "hyper",
+ "futures 0.1.29",
+ "hyper 0.13.6",
  "ipnetwork",
  "journaldb",
  "jsonrpc-core",
@@ -3224,7 +3396,7 @@ dependencies = [
  "parity-local-store",
  "parity-path",
  "parity-rpc",
- "parity-runtime",
+ "parity-runtime 0.1.1 (git+https://github.com/vorot93/parity-common?branch=tokio-compat)",
  "parity-secretstore",
  "parity-updater",
  "parity-util-mem",
@@ -3343,13 +3515,13 @@ dependencies = [
  "ethereum-types",
  "fake-fetch",
  "fetch",
- "futures",
+ "futures 0.1.29",
  "keccak-hash",
  "log",
  "mime",
  "mime_guess",
  "parity-bytes",
- "parity-runtime",
+ "parity-runtime 0.1.1 (git+https://github.com/vorot93/parity-common?branch=tokio-compat)",
  "parking_lot 0.10.0",
  "rand 0.7.3",
  "registrar",
@@ -3409,7 +3581,7 @@ dependencies = [
  "fake-fetch",
  "fastmap",
  "fetch",
- "futures",
+ "futures 0.1.29",
  "itertools",
  "jsonrpc-core",
  "jsonrpc-derive",
@@ -3424,7 +3596,7 @@ dependencies = [
  "order-stat",
  "parity-bytes",
  "parity-crypto",
- "parity-runtime",
+ "parity-runtime 0.1.1 (git+https://github.com/vorot93/parity-common?branch=tokio-compat)",
  "parity-updater",
  "parity-version",
  "parking_lot 0.10.0",
@@ -3455,7 +3627,7 @@ name = "parity-rpc-client"
 version = "1.4.0"
 dependencies = [
  "ethereum-types",
- "futures",
+ "futures 0.1.29",
  "jsonrpc-core",
  "jsonrpc-ws-server",
  "keccak-hash",
@@ -3468,14 +3640,25 @@ dependencies = [
  "url 2.1.1",
 ]
 
+[[package]]
+name = "parity-runtime"
+version = "0.1.1"
+source = "git+https://github.com/vorot93/parity-common?branch=tokio-compat#0d2e58b3346c13770c6811522216badb952ba279"
+dependencies = [
+ "futures 0.1.29",
+ "futures 0.3.5",
+ "tokio 0.2.21",
+ "tokio-compat",
+]
+
 [[package]]
 name = "parity-runtime"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "710e8d8e9769827952aa83a44d33bc993658cccd97e15e3b5eb070d1a70d1a3a"
 dependencies = [
- "futures",
- "tokio",
+ "futures 0.1.29",
+ "tokio 0.1.22",
 ]
 
 [[package]]
@@ -3500,8 +3683,8 @@ dependencies = [
  "ethabi-contract",
  "ethabi-derive",
  "ethereum-types",
- "futures",
- "hyper",
+ "futures 0.1.29",
+ "hyper 0.12.35",
  "jsonrpc-server-utils",
  "keccak-hash",
  "kvdb",
@@ -3511,7 +3694,7 @@ dependencies = [
  "log",
  "parity-bytes",
  "parity-crypto",
- "parity-runtime",
+ "parity-runtime 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.10.0",
  "percent-encoding 2.1.0",
  "rustc-hex 1.0.0",
@@ -3519,7 +3702,7 @@ dependencies = [
  "serde_derive",
  "serde_json",
  "tiny-keccak 1.5.0",
- "tokio",
+ "tokio 0.1.22",
  "tokio-io",
  "tokio-service",
  "url 2.1.1",
@@ -3531,14 +3714,14 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e57fea504fea33f9fbb5f49f378359030e7e026a6ab849bb9e8f0787376f1bf"
 dependencies = [
- "bytes",
- "futures",
+ "bytes 0.4.12",
+ "futures 0.1.29",
  "libc",
  "log",
  "mio-named-pipes",
  "miow 0.3.3",
  "rand 0.7.3",
- "tokio",
+ "tokio 0.1.22",
  "tokio-named-pipes",
  "tokio-uds",
  "winapi 0.3.8",
@@ -3768,6 +3951,38 @@ dependencies = [
  "ordermap",
 ]
 
+[[package]]
+name = "pin-project"
+version = "0.4.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12e3a6cdbfe94a5e4572812a0201f8c0ed98c1c452c7b8563ce2276988ef9c17"
+dependencies = [
+ "pin-project-internal",
+]
+
+[[package]]
+name = "pin-project-internal"
+version = "0.4.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a0ffd45cf79d88737d7cc85bfd5d2894bee1139b356e616fe85dc389c61aaf7"
+dependencies = [
+ "proc-macro2 1.0.9",
+ "quote 1.0.3",
+ "syn 1.0.17",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282adbf10f2698a7a77f8e983a74b2d18176c19a7fd32a45446139ae7b02b715"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
 [[package]]
 name = "plain_hasher"
 version = "0.2.3"
@@ -3833,9 +4048,9 @@ version = "1.12.0"
 dependencies = [
  "fake-fetch",
  "fetch",
- "futures",
+ "futures 0.1.29",
  "log",
- "parity-runtime",
+ "parity-runtime 0.1.1 (git+https://github.com/vorot93/parity-common?branch=tokio-compat)",
  "serde_json",
 ]
 
@@ -4444,6 +4659,12 @@ dependencies = [
  "winapi 0.3.8",
 ]
 
+[[package]]
+name = "scoped-tls"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "332ffa32bf586782a3efaeb58f127980944bbc8c4d6913a86107ac2a5ab24b28"
+
 [[package]]
 name = "scopeguard"
 version = "0.3.3"
@@ -4606,6 +4827,16 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
 
+[[package]]
+name = "signal-hook-registry"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94f478ede9f64724c5d173d7bb56099ec3e2d9fc2774aac65d34b8b890405f41"
+dependencies = [
+ "arc-swap",
+ "libc",
+]
+
 [[package]]
 name = "simple_uint"
 version = "0.1.0"
@@ -4846,7 +5077,7 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d24114bfcceb867ca7f71a0d3fe45d45619ec47a6fbfa98cb14e14250bfa5d6d"
 dependencies = [
- "bytes",
+ "bytes 0.4.12",
 ]
 
 [[package]]
@@ -5063,8 +5294,8 @@ version = "0.1.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6"
 dependencies = [
- "bytes",
- "futures",
+ "bytes 0.4.12",
+ "futures 0.1.29",
  "mio",
  "num_cpus",
  "tokio-codec",
@@ -5081,15 +5312,39 @@ dependencies = [
  "tokio-uds",
 ]
 
+[[package]]
+name = "tokio"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d099fa27b9702bed751524694adbe393e18b36b204da91eb1cbbbbb4a5ee2d58"
+dependencies = [
+ "bytes 0.5.5",
+ "fnv",
+ "futures-core",
+ "iovec",
+ "lazy_static",
+ "libc",
+ "memchr",
+ "mio",
+ "mio-named-pipes",
+ "mio-uds",
+ "num_cpus",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "slab",
+ "tokio-macros",
+ "winapi 0.3.8",
+]
+
 [[package]]
 name = "tokio-buf"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8fb220f46c53859a4b7ec083e41dec9778ff0b1851c0942b211edb89e0ccdc46"
 dependencies = [
- "bytes",
+ "bytes 0.4.12",
  "either",
- "futures",
+ "futures 0.1.29",
 ]
 
 [[package]]
@@ -5098,18 +5353,35 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "25b2998660ba0e70d18684de5d06b70b70a3a747469af9dea7618cc59e75976b"
 dependencies = [
- "bytes",
- "futures",
+ "bytes 0.4.12",
+ "futures 0.1.29",
  "tokio-io",
 ]
 
+[[package]]
+name = "tokio-compat"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "107b625135aa7b9297dd2d99ccd6ca6ab124a5d1230778e159b9095adca4c722"
+dependencies = [
+ "futures 0.1.29",
+ "futures-core",
+ "futures-util",
+ "pin-project-lite",
+ "tokio 0.2.21",
+ "tokio-current-thread",
+ "tokio-executor",
+ "tokio-reactor",
+ "tokio-timer",
+]
+
 [[package]]
 name = "tokio-current-thread"
 version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b1de0e32a83f131e002238d7ccde18211c0a5397f60cbfffcb112868c2e0e20e"
 dependencies = [
- "futures",
+ "futures 0.1.29",
  "tokio-executor",
 ]
 
@@ -5120,7 +5392,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fb2d1b8f4548dbf5e1f7818512e9c406860678f29c300cdf0ebac72d1a3a1671"
 dependencies = [
  "crossbeam-utils",
- "futures",
+ "futures 0.1.29",
 ]
 
 [[package]]
@@ -5129,7 +5401,7 @@ version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "297a1206e0ca6302a0eed35b700d292b275256f596e2f3fea7729d5e629b6ff4"
 dependencies = [
- "futures",
+ "futures 0.1.29",
  "tokio-io",
  "tokio-threadpool",
 ]
@@ -5140,22 +5412,33 @@ version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674"
 dependencies = [
- "bytes",
- "futures",
+ "bytes 0.4.12",
+ "futures 0.1.29",
  "log",
 ]
 
+[[package]]
+name = "tokio-macros"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0c3acc6aa564495a0f2e1d59fab677cd7f81a19994cfc7f3ad0e64301560389"
+dependencies = [
+ "proc-macro2 1.0.9",
+ "quote 1.0.3",
+ "syn 1.0.17",
+]
+
 [[package]]
 name = "tokio-named-pipes"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d282d483052288b2308ba5ee795f5673b159c9bdf63c385a05609da782a5eae"
 dependencies = [
- "bytes",
- "futures",
+ "bytes 0.4.12",
+ "futures 0.1.29",
  "mio",
  "mio-named-pipes",
- "tokio",
+ "tokio 0.1.22",
 ]
 
 [[package]]
@@ -5165,7 +5448,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09bc590ec4ba8ba87652da2068d150dcada2cfa2e07faae270a5e0409aa51351"
 dependencies = [
  "crossbeam-utils",
- "futures",
+ "futures 0.1.29",
  "lazy_static",
  "log",
  "mio",
@@ -5183,8 +5466,8 @@ version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2d7cf08f990090abd6c6a73cab46fed62f85e8aef8b99e4b918a9f4a637f0676"
 dependencies = [
- "bytes",
- "futures",
+ "bytes 0.4.12",
+ "futures 0.1.29",
  "iovec",
  "rustls",
  "tokio-io",
@@ -5197,7 +5480,7 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24da22d077e0f15f55162bdbdc661228c1581892f52074fb242678d015b45162"
 dependencies = [
- "futures",
+ "futures 0.1.29",
 ]
 
 [[package]]
@@ -5207,7 +5490,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "edfe50152bc8164fcc456dab7891fa9bf8beaf01c5ee7e1dd43a397c3cf87dee"
 dependencies = [
  "fnv",
- "futures",
+ "futures 0.1.29",
 ]
 
 [[package]]
@@ -5216,8 +5499,8 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "98df18ed66e3b72e742f185882a9e201892407957e45fbff8da17ae7a7c51f72"
 dependencies = [
- "bytes",
- "futures",
+ "bytes 0.4.12",
+ "futures 0.1.29",
  "iovec",
  "mio",
  "tokio-io",
@@ -5233,7 +5516,7 @@ dependencies = [
  "crossbeam-deque",
  "crossbeam-queue",
  "crossbeam-utils",
- "futures",
+ "futures 0.1.29",
  "lazy_static",
  "log",
  "num_cpus",
@@ -5248,7 +5531,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296"
 dependencies = [
  "crossbeam-utils",
- "futures",
+ "futures 0.1.29",
  "slab",
  "tokio-executor",
 ]
@@ -5259,8 +5542,8 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2a0b10e610b39c38b031a2fcab08e4b82f16ece36504988dcbd81dbba650d82"
 dependencies = [
- "bytes",
- "futures",
+ "bytes 0.4.12",
+ "futures 0.1.29",
  "log",
  "mio",
  "tokio-codec",
@@ -5274,8 +5557,8 @@ version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5076db410d6fdc6523df7595447629099a1fdc47b3d9f896220780fa48faf798"
 dependencies = [
- "bytes",
- "futures",
+ "bytes 0.4.12",
+ "futures 0.1.29",
  "iovec",
  "libc",
  "log",
@@ -5286,6 +5569,20 @@ dependencies = [
  "tokio-reactor",
 ]
 
+[[package]]
+name = "tokio-util"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499"
+dependencies = [
+ "bytes 0.5.5",
+ "futures-core",
+ "futures-sink",
+ "log",
+ "pin-project-lite",
+ "tokio 0.2.21",
+]
+
 [[package]]
 name = "toml"
 version = "0.5.6"
@@ -5304,6 +5601,12 @@ dependencies = [
  "fxhash",
 ]
 
+[[package]]
+name = "tower-service"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860"
+
 [[package]]
 name = "trace"
 version = "0.1.0"
@@ -5675,7 +5978,17 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230"
 dependencies = [
- "futures",
+ "futures 0.1.29",
+ "log",
+ "try-lock",
+]
+
+[[package]]
+name = "want"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
+dependencies = [
  "log",
  "try-lock",
 ]
@@ -5846,7 +6159,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c51a2c47b5798ccc774ffb93ff536aec7c4275d722fd9c740c83cdd1af1f2d94"
 dependencies = [
  "byteorder",
- "bytes",
+ "bytes 0.4.12",
  "httparse",
  "log",
  "mio",
diff --git a/Cargo.toml b/Cargo.toml
index d06e0539851..28ab616bd4d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,6 +4,7 @@ name = "openethereum"
 # NOTE Make sure to update util/version/Cargo.toml as well
 version = "3.0.0"
 license = "GPL-3.0"
+edition = "2018"
 authors = [
 	"OpenEthereum developers",
 	"Parity Technologies <admin@parity.io>"
@@ -40,7 +41,7 @@ ethkey = { path = "accounts/ethkey" }
 ethstore = { path = "accounts/ethstore" }
 fdlimit = "0.1"
 futures = "0.1"
-hyper = { version = "0.12" }
+hyper = { version = "0.13" }
 journaldb = { path = "util/journaldb" }
 jsonrpc-core = "14.0.3"
 keccak-hash = "0.5.0"
@@ -59,7 +60,7 @@ parity-hash-fetch = { path = "updater/hash-fetch" }
 parity-local-store = { path = "miner/local-store" }
 parity-path = "0.1"
 parity-rpc = { path = "rpc" }
-parity-runtime = "0.1.1"
+parity-runtime = { git = "https://github.com/vorot93/parity-common", branch = "tokio-compat" }
 parity-secretstore = { git = "https://github.com/paritytech/secret-store", branch = "v1.x", optional = true }
 parity-updater = { path = "updater" }
 parity-util-mem = { version = "0.6.0", features = ["jemalloc-global"] }
diff --git a/ethcore/Cargo.toml b/ethcore/Cargo.toml
index 8e07b7fa59a..8709c331995 100644
--- a/ethcore/Cargo.toml
+++ b/ethcore/Cargo.toml
@@ -82,7 +82,7 @@ kvdb-memorydb = "0.5.0"
 kvdb-rocksdb = "0.7.0"
 lazy_static = "1.3"
 machine = { path = "./machine", features = ["test-helpers"] }
-parity-runtime = "0.1.1"
+parity-runtime = { git = "https://github.com/vorot93/parity-common", branch = "tokio-compat" }
 serde_json = "1.0"
 pod = { path = "pod" }
 tempfile = "3.1"
diff --git a/ethcore/sync/Cargo.toml b/ethcore/sync/Cargo.toml
index 030e9c0e9d8..27a53c37e5d 100644
--- a/ethcore/sync/Cargo.toml
+++ b/ethcore/sync/Cargo.toml
@@ -26,7 +26,7 @@ light = { package = "ethcore-light", path = "../light" }
 log = "0.4"
 network = { package = "ethcore-network", path = "../../util/network" }
 num-traits = "0.2"
-parity-runtime = "0.1.1"
+parity-runtime = { git = "https://github.com/vorot93/parity-common", branch = "tokio-compat" }
 parity-crypto = { version = "0.6.1", features = ["publickey"] }
 parity-util-mem = "0.6.0"
 rand = "0.7.3"
diff --git a/miner/Cargo.toml b/miner/Cargo.toml
index 8c1442ebe66..cefcede2a12 100644
--- a/miner/Cargo.toml
+++ b/miner/Cargo.toml
@@ -26,7 +26,7 @@ parity-util-mem = "0.6.0"
 keccak-hash = "0.5.0"
 linked-hash-map = "0.5"
 log = "0.4"
-parity-runtime = "0.1.1"
+parity-runtime = { git = "https://github.com/vorot93/parity-common", branch = "tokio-compat" }
 parking_lot = "0.10.0"
 price-info = { path = "./price-info", optional = true }
 registrar = { path = "../util/registrar" }
diff --git a/miner/price-info/Cargo.toml b/miner/price-info/Cargo.toml
index 984e2db570c..2e7b5973c42 100644
--- a/miner/price-info/Cargo.toml
+++ b/miner/price-info/Cargo.toml
@@ -11,9 +11,9 @@ edition = "2018"
 fetch = { path = "../../util/fetch" }
 futures = "0.1"
 log = "0.4"
-parity-runtime = "0.1.1"
+parity-runtime = { git = "https://github.com/vorot93/parity-common", branch = "tokio-compat" }
 serde_json = "1.0"
 
 [dev-dependencies]
 fake-fetch = { path = "../../util/fake-fetch" }
-parity-runtime = { version = "0.1.1", features = ["test-helpers"] }
+parity-runtime = { git = "https://github.com/vorot93/parity-common", branch = "tokio-compat", features = ["test-helpers"] }
diff --git a/parity/account.rs b/parity/account.rs
index 48a4d9616fe..b44e41c5878 100644
--- a/parity/account.rs
+++ b/parity/account.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
-use params::SpecType;
+use crate::params::SpecType;
 
 #[derive(Debug, PartialEq)]
 pub enum AccountCmd {
@@ -68,7 +68,7 @@ mod command {
 	use accounts::{AccountProvider, AccountProviderSettings};
 	use ethstore::{EthStore, SecretStore, SecretVaultRef, import_account, import_accounts, read_geth_accounts};
 	use ethstore::accounts_dir::RootDiskDirectory;
-	use helpers::{password_prompt, password_from_file};
+	use crate::helpers::{password_prompt, password_from_file};
 
 	pub fn execute(cmd: AccountCmd) -> Result<String, String> {
 		match cmd {
diff --git a/parity/account_utils.rs b/parity/account_utils.rs
index 4a2e3da0a3c..7697cf50b5b 100644
--- a/parity/account_utils.rs
+++ b/parity/account_utils.rs
@@ -16,11 +16,12 @@
 
 use std::sync::Arc;
 
+use crate::params::{SpecType, AccountsConfig};
+
 use dir::Directories;
 use ethereum_types::Address;
 use ethkey::Password;
 
-use params::{SpecType, AccountsConfig};
 
 #[cfg(not(feature = "accounts"))]
 mod accounts {
@@ -60,11 +61,11 @@ mod accounts {
 #[cfg(feature = "accounts")]
 mod accounts {
 	use super::*;
-	use upgrade::upgrade_key_location;
+	use crate::upgrade::upgrade_key_location;
 	use ethereum_types::{H160, H256};
 	use std::str::FromStr;
 
-	pub use accounts::AccountProvider;
+	pub use crate::accounts::AccountProvider;
 
 	/// Pops along with error messages when a password is missing or invalid.
 	const VERIFY_PASSWORD_HINT: &str = "Make sure valid password is present in files passed using `--password` or in the configuration file.";
@@ -73,7 +74,7 @@ mod accounts {
 	pub fn prepare_account_provider(spec: &SpecType, dirs: &Directories, data_dir: &str, cfg: AccountsConfig, passwords: &[Password]) -> Result<AccountProvider, String> {
 		use ethstore::EthStore;
 		use ethstore::accounts_dir::RootDiskDirectory;
-		use accounts::AccountProviderSettings;
+		use crate::accounts::AccountProviderSettings;
 
 		let path = dirs.keys_path(data_dir);
 		upgrade_key_location(&dirs.legacy_keys_path(cfg.testnet), &path);
diff --git a/parity/blockchain.rs b/parity/blockchain.rs
index b1087452ebb..da213dc3378 100644
--- a/parity/blockchain.rs
+++ b/parity/blockchain.rs
@@ -21,6 +21,13 @@ use std::time::{Instant, Duration};
 use std::thread::sleep;
 use std::sync::Arc;
 
+use crate::cache::CacheConfig;
+use crate::informant::{Informant, FullNodeInformantData};
+use crate::params::{SpecType, Pruning, Switch, tracing_switch_to_bool, fatdb_switch_to_bool};
+use crate::helpers::{to_client_config, execute_upgrades};
+use crate::user_defaults::UserDefaults;
+use crate::db;
+
 use rustc_hex::FromHex;
 use hash::{keccak, KECCAK_NULL_RLP};
 use ethereum_types::{U256, H256, Address};
@@ -32,14 +39,8 @@ use ethcore::{
 	miner::Miner,
 };
 use ethcore_service::ClientService;
-use cache::CacheConfig;
-use informant::{Informant, FullNodeInformantData};
-use params::{SpecType, Pruning, Switch, tracing_switch_to_bool, fatdb_switch_to_bool};
-use helpers::{to_client_config, execute_upgrades};
 use dir::Directories;
-use user_defaults::UserDefaults;
 use ethcore_private_tx;
-use db;
 use ansi_term::Colour;
 use types::{
 	ids::BlockId,
diff --git a/parity/configuration.rs b/parity/configuration.rs
index e7819c38fe2..2f9e4dbfbe1 100644
--- a/parity/configuration.rs
+++ b/parity/configuration.rs
@@ -21,7 +21,20 @@ use std::path::PathBuf;
 use std::collections::{HashSet, BTreeMap};
 use std::iter::FromIterator;
 use std::cmp;
-use cli::{Args, ArgsError};
+use crate::cli::{Args, ArgsError};
+use crate::rpc::{IpcConfiguration, HttpConfiguration, WsConfiguration};
+use crate::cache::CacheConfig;
+use crate::helpers::{to_duration, to_mode, to_block_id, to_u256, to_pending_set, to_price, geth_ipc_path, parity_ipc_path, to_bootnodes, to_addresses, to_address, to_queue_strategy, to_queue_penalization};
+use crate::params::{ResealPolicy, AccountsConfig, GasPricerConfig, MinerExtras, SpecType};
+use crate::metrics::MetricsConfiguration;
+use crate::secretstore::{NodeSecretKey, Configuration as SecretStoreConfiguration, ContractAddress as SecretStoreContractAddress};
+use crate::run::RunCmd;
+use crate::blockchain::{BlockchainCmd, ImportBlockchain, ExportBlockchain, KillBlockchain, ExportState, ResetBlockchain};
+use crate::export_hardcoded_sync::ExportHsyncCmd;
+use crate::presale::ImportWallet;
+use crate::account::{AccountCmd, NewAccount, ListAccounts, ImportAccounts, ImportFromGethAccounts};
+use crate::snapshot_cmd::{self, SnapshotCommand};
+
 use hash::keccak;
 use ethereum_types::{U256, H256, Address};
 use parity_version::{version_data, version};
@@ -34,26 +47,14 @@ use snapshot::SnapshotConfiguration;
 use miner::pool;
 use verification::queue::VerifierSettings;
 
-use rpc::{IpcConfiguration, HttpConfiguration, WsConfiguration};
 use parity_rpc::NetworkSettings;
-use cache::CacheConfig;
-use helpers::{to_duration, to_mode, to_block_id, to_u256, to_pending_set, to_price, geth_ipc_path, parity_ipc_path, to_bootnodes, to_addresses, to_address, to_queue_strategy, to_queue_penalization};
 use dir::helpers::{replace_home, replace_home_and_local};
-use params::{ResealPolicy, AccountsConfig, GasPricerConfig, MinerExtras, SpecType};
 use ethcore_logger::Config as LogConfig;
 use dir::{self, Directories, default_hypervisor_path, default_local_path, default_data_path};
 use ethcore_private_tx::{ProviderConfig, EncryptorConfig};
-use secretstore::{NodeSecretKey, Configuration as SecretStoreConfiguration, ContractAddress as SecretStoreContractAddress};
 use updater::{UpdatePolicy, UpdateFilter, ReleaseTrack};
-use run::RunCmd;
 use types::data_format::DataFormat;
-use blockchain::{BlockchainCmd, ImportBlockchain, ExportBlockchain, KillBlockchain, ExportState, ResetBlockchain};
-use export_hardcoded_sync::ExportHsyncCmd;
-use presale::ImportWallet;
-use account::{AccountCmd, NewAccount, ListAccounts, ImportAccounts, ImportFromGethAccounts};
-use snapshot_cmd::{self, SnapshotCommand};
 use network::{IpFilter, NatType};
-use metrics::MetricsConfiguration;
 
 const DEFAULT_MAX_PEERS: u16 = 50;
 const DEFAULT_MIN_PEERS: u16 = 25;
@@ -151,7 +152,7 @@ impl Configuration {
 		let cmd = if self.args.flag_version {
 			Cmd::Version
 		} else if self.args.cmd_signer {
-			let authfile = ::signer::codes_path(&ws_conf.signer_path);
+			let authfile = crate::signer::codes_path(&ws_conf.signer_path);
 
 			if self.args.cmd_signer_new_token {
 				Cmd::SignerToken(ws_conf, logger_config.clone())
diff --git a/parity/db/rocksdb/mod.rs b/parity/db/rocksdb/mod.rs
index 2e30a718405..cf8b856758f 100644
--- a/parity/db/rocksdb/mod.rs
+++ b/parity/db/rocksdb/mod.rs
@@ -24,6 +24,9 @@ extern crate tempfile;
 use std::{io, fs};
 use std::sync::Arc;
 use std::path::Path;
+
+use crate::cache::CacheConfig;
+
 use blooms_db;
 use ethcore_db::NUM_COLUMNS;
 use ethcore::client::{ClientConfig, DatabaseCompactionProfile};
@@ -31,7 +34,6 @@ use kvdb::KeyValueDB;
 use self::ethcore_blockchain::{BlockChainDBHandler, BlockChainDB};
 use self::kvdb_rocksdb::{Database, DatabaseConfig};
 
-use cache::CacheConfig;
 
 mod blooms;
 mod migration;
diff --git a/parity/deprecated.rs b/parity/deprecated.rs
index 5ca56d57adc..bf56487e7fa 100644
--- a/parity/deprecated.rs
+++ b/parity/deprecated.rs
@@ -15,7 +15,7 @@
 // along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::fmt;
-use cli::Args;
+use crate::cli::Args;
 
 #[derive(Debug, PartialEq)]
 pub enum Deprecated {
diff --git a/parity/export_hardcoded_sync.rs b/parity/export_hardcoded_sync.rs
index c404343d72e..d2b11924e97 100644
--- a/parity/export_hardcoded_sync.rs
+++ b/parity/export_hardcoded_sync.rs
@@ -17,17 +17,19 @@
 use std::sync::Arc;
 use std::time::Duration;
 
+use crate::params::{SpecType, Pruning};
+use crate::helpers::execute_upgrades;
+use crate::cache::CacheConfig;
+use crate::user_defaults::UserDefaults;
+use crate::db;
+
 use ethcore::client::DatabaseCompactionProfile;
 use spec::SpecParams;
 use light::client::fetch::Unavailable as UnavailableDataFetcher;
 use light::Cache as LightDataCache;
 use types::engines::OptimizeFor;
-use params::{SpecType, Pruning};
-use helpers::execute_upgrades;
 use dir::Directories;
-use cache::CacheConfig;
-use user_defaults::UserDefaults;
-use db;
+
 
 // Number of minutes before a given gas price corpus should expire.
 // Light client only.
diff --git a/parity/helpers.rs b/parity/helpers.rs
index 22deb00c99d..faad0665e3e 100644
--- a/parity/helpers.rs
+++ b/parity/helpers.rs
@@ -19,18 +19,21 @@ use std::io::{Write, BufReader, BufRead};
 use std::time::Duration;
 use std::fs::File;
 use std::collections::HashSet;
+
+use crate::cache::CacheConfig;
+use crate::upgrade::{upgrade, upgrade_data_paths};
+use crate::db::migrate;
+
 use ethereum_types::{U256, Address};
 use journaldb::Algorithm;
 use ethcore::client::{DatabaseCompactionProfile, ClientConfig};
 use ethcore::miner::{PendingSet, Penalization};
 use verification::VerifierType;
 use miner::pool::PrioritizationStrategy;
-use cache::CacheConfig;
+
 use dir::DatabaseDirectories;
 use dir::helpers::replace_home;
-use upgrade::{upgrade, upgrade_data_paths};
 use sync::{validate_node_url, self};
-use db::migrate;
 use path;
 use ethkey::Password;
 use types::{
diff --git a/parity/metrics.rs b/parity/metrics.rs
index 7856d993495..3e0f959385f 100644
--- a/parity/metrics.rs
+++ b/parity/metrics.rs
@@ -1,13 +1,15 @@
 use std::{
     time::Instant,
-    sync::{Mutex, Arc}
+    sync::{Mutex, Arc},
+    str::FromStr,
 };
+use std::convert::Infallible;
 
-use hyper::{Method, Body, Request, Response, service::service_fn_ok};
+use crate::rpc;
+use crate::rpc_apis;
 
-use rpc;
-use rpc_apis;
-use futures::*;
+use hyper::{Method, Body, Request, Response, Server, service::{make_service_fn, service_fn}};
+use futures::prelude::*;
 
 use stats::{
 	PrometheusMetrics,
@@ -39,7 +41,7 @@ struct State {
 	rpc_apis: Arc<rpc_apis::FullDependencies>,
 }
 
-fn handle_request(req: Request<Body>, state: &Arc<Mutex<State>>) -> Response<Body> {
+async fn handle_request(req: Request<Body>, state: &Arc<Mutex<State>>) -> Result<Response<Body>,hyper::Error> {
     let (parts, _body) = req.into_parts();
     match (parts.method, parts.uri.path()) {
         (Method::GET, "/metrics") => {
@@ -61,16 +63,39 @@ fn handle_request(req: Request<Body>, state: &Arc<Mutex<State>>) -> Response<Bod
             encoder.encode(&metric_families, &mut buffer).unwrap();
             let text = String::from_utf8(buffer).unwrap();
 
-            Response::new(hyper::Body::from(text))
+            Ok(Response::new(hyper::Body::from(text)))
         },
         (_, _) => {
             let mut res = hyper::Response::new(hyper::Body::from("not found"));
             *res.status_mut() = hyper::StatusCode::NOT_FOUND;
-            res
+            Ok(res)
         }
     }
 }
 
+/*
+    let state = State {
+        rpc_apis: deps.apis.clone(),
+    };
+    let state = Arc::new(Mutex::new(state));
+    let hyper = hyper::Server::bind(&addr)
+    .serve(move || {
+        let inner = Arc::clone(&state);
+        Ok::<_,hyper::Error>::service_fn(move |req| handle_request(req, &inner))
+    })
+    .map_err(|err| eprintln!("server error: {}", err));
+
+    deps.executor.spawn(hyper);
+    */
+
+
+
+
+async fn handle(_req: Request<Body>) -> Result<Response<Body>, Infallible> {
+    Ok(Response::new(Body::from("Hello World")))
+}
+
+
 /// Start the prometheus metrics server accessible via GET <host>:<port>/metrics
 pub fn start_prometheus_metrics(conf: &MetricsConfiguration, deps: &rpc::Dependencies<rpc_apis::FullDependencies>) -> Result<(), String> {
 
@@ -79,23 +104,19 @@ pub fn start_prometheus_metrics(conf: &MetricsConfiguration, deps: &rpc::Depende
     }
 
     let addr = format!("{}:{}", conf.interface, conf.port);
-    let addr = addr 
+    let addr = addr
         .parse()
         .map_err(|err| format!("Failed to parse address '{}': {}", addr,err))?;
 
-    let state = State {
-        rpc_apis: deps.apis.clone(),
-    };
-    let state = Arc::new(Mutex::new(state));
+    // And a MakeService to handle each connection...
+    let make_service = make_service_fn(|_conn| async {
+        Ok::<_, Infallible>(service_fn(handle))
+    });
 
-    let hyper = hyper::Server::bind(&addr)
-    .serve(move || {
-        let inner = Arc::clone(&state);
-        service_fn_ok(move |req| handle_request(req, &inner))
-    })
-    .map_err(|err| eprintln!("server error: {}", err));
+    // Then bind and serve...
+    let server = Server::bind(&addr).serve(make_service);
 
-    deps.executor.spawn(hyper);
+    deps.executor.spawn_std( async { let _ =server.await; } );
 
     Ok(())
 }
diff --git a/parity/params.rs b/parity/params.rs
index d7b0c83fe94..49667347f39 100644
--- a/parity/params.rs
+++ b/parity/params.rs
@@ -18,6 +18,8 @@ use std::collections::HashSet;
 use std::time::Duration;
 use std::{str, fs, fmt};
 
+use crate::user_defaults::UserDefaults;
+
 use spec::{Spec, SpecParams, self};
 use ethereum_types::{U256, Address};
 use parity_runtime::Executor;
@@ -26,7 +28,6 @@ use journaldb::Algorithm;
 use miner::gas_pricer::GasPricer;
 use miner::gas_price_calibrator::{GasPriceCalibratorOptions, GasPriceCalibrator};
 use parity_version::version_data;
-use user_defaults::UserDefaults;
 use types::client_types::Mode;
 
 use crate::configuration;
diff --git a/parity/presale.rs b/parity/presale.rs
index 21543e6da81..f7a125905f6 100644
--- a/parity/presale.rs
+++ b/parity/presale.rs
@@ -14,11 +14,11 @@
 // You should have received a copy of the GNU General Public License
 // along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
+use crate::helpers::{password_prompt, password_from_file};
+use crate::params::SpecType;
 
 use ethkey::Password;
 use ethstore::PresaleWallet;
-use helpers::{password_prompt, password_from_file};
-use params::SpecType;
 
 #[derive(Debug, PartialEq)]
 pub struct ImportWallet {
diff --git a/parity/rpc.rs b/parity/rpc.rs
index d089b70cd4e..994957a4fe9 100644
--- a/parity/rpc.rs
+++ b/parity/rpc.rs
@@ -19,14 +19,15 @@ use std::sync::Arc;
 use std::path::PathBuf;
 use std::collections::HashSet;
 
+use crate::rpc_apis::{self, ApiSet};
+use crate::helpers::parity_ipc_path;
+
 use dir::default_data_path;
 use dir::helpers::replace_home;
-use helpers::parity_ipc_path;
 use jsonrpc_core::MetaIoHandler;
 use parity_runtime::Executor;
 use parity_rpc::informant::{RpcStats, Middleware};
 use parity_rpc::{self as rpc, Metadata, DomainsValidation};
-use rpc_apis::{self, ApiSet};
 
 pub use parity_rpc::{IpcServer, HttpServer, RequestMiddleware};
 pub use parity_rpc::ws::{Server as WsServer, ws};
@@ -179,7 +180,7 @@ pub fn new_ws<D: rpc_apis::Dependencies>(
 	let signer_path;
 	let path = match conf.support_token_api {
 		true => {
-			signer_path = ::signer::codes_path(&conf.signer_path);
+			signer_path = crate::signer::codes_path(&conf.signer_path);
 			Some(signer_path.as_path())
 		},
 		false => None
diff --git a/parity/rpc_apis.rs b/parity/rpc_apis.rs
index 5cbd1c7594b..53589af5118 100644
--- a/parity/rpc_apis.rs
+++ b/parity/rpc_apis.rs
@@ -19,9 +19,10 @@ use std::collections::{BTreeMap, HashSet};
 use std::str::FromStr;
 use std::sync::{Arc, Weak};
 
+use crate::account_utils::{self, AccountProvider};
+
 pub use parity_rpc::signer::SignerService;
 
-use account_utils::{self, AccountProvider};
 use ethcore::client::Client;
 use ethcore::miner::Miner;
 use snapshot::SnapshotService;
diff --git a/parity/run.rs b/parity/run.rs
index ea395148861..ca5f20db8e5 100644
--- a/parity/run.rs
+++ b/parity/run.rs
@@ -19,6 +19,26 @@ use std::sync::{Arc, Weak, atomic};
 use std::time::{Duration, Instant};
 use std::thread;
 
+use crate::informant::{Informant, LightNodeInformantData, FullNodeInformantData};
+use crate::metrics::{MetricsConfiguration, start_prometheus_metrics};
+use crate::miner::external::ExternalMiner;
+use crate::miner::work_notify::WorkPoster;
+use crate::params::{
+	SpecType, Pruning, AccountsConfig, GasPricerConfig, MinerExtras, Switch,
+	tracing_switch_to_bool, fatdb_switch_to_bool, mode_switch_to_bool
+};
+use crate::account_utils;
+use crate::helpers::{to_client_config, execute_upgrades, passwords_from_files};
+use crate::cache::CacheConfig;
+use crate::user_defaults::UserDefaults;
+use crate::jsonrpc_core;
+use crate::modules;
+use crate::rpc;
+use crate::rpc_apis;
+use crate::secretstore;
+use crate::signer;
+use crate::db;
+
 use ansi_term::Colour;
 use client_traits::{BlockInfo, BlockChainClient};
 use ethcore::client::{Client, DatabaseCompactionProfile};
@@ -30,12 +50,8 @@ use ethcore_logger::{Config as LogConfig, RotatingLogger};
 use ethcore_service::ClientService;
 use futures::Stream;
 use hash_fetch::{self, fetch};
-use informant::{Informant, LightNodeInformantData, FullNodeInformantData};
 use journaldb::Algorithm;
 use light::Cache as LightDataCache;
-use metrics::{MetricsConfiguration, start_prometheus_metrics};
-use miner::external::ExternalMiner;
-use miner::work_notify::WorkPoster;
 use node_filter::NodeFilter;
 use parity_runtime::Runtime;
 use sync::{self, SyncConfig, PrivateTxHandler};
@@ -50,22 +66,7 @@ use parity_rpc::{
 use updater::{UpdateFilter, UpdatePolicy, Updater};
 use parity_version::version;
 use ethcore_private_tx::{ProviderConfig, EncryptorConfig, SecretStoreEncryptor};
-use params::{
-	SpecType, Pruning, AccountsConfig, GasPricerConfig, MinerExtras, Switch,
-	tracing_switch_to_bool, fatdb_switch_to_bool, mode_switch_to_bool
-};
-use account_utils;
-use helpers::{to_client_config, execute_upgrades, passwords_from_files};
 use dir::{Directories, DatabaseDirectories};
-use cache::CacheConfig;
-use user_defaults::UserDefaults;
-use jsonrpc_core;
-use modules;
-use rpc;
-use rpc_apis;
-use secretstore;
-use signer;
-use db;
 use registrar::RegistrarClient;
 
 // How often we attempt to take a snapshot: only snapshot on blocknumbers that are multiples of this.
@@ -164,7 +165,7 @@ impl ::local_store::NodeInfo for FullNodeInfo {
 	}
 }
 
-type LightClient = ::light::client::Client<::light_helpers::EpochFetch>;
+type LightClient = crate::light::client::Client<crate::light_helpers::EpochFetch>;
 
 // helper for light execution.
 fn execute_light_impl<Cr>(cmd: RunCmd, logger: Arc<RotatingLogger>, on_client_rq: Cr) -> Result<RunningClient, String>
@@ -248,7 +249,7 @@ fn execute_light_impl<Cr>(cmd: RunCmd, logger: Arc<RotatingLogger>, on_client_rq
 	});
 
 	let sync_handle = Arc::new(RwLock::new(Weak::new()));
-	let fetch = ::light_helpers::EpochFetch {
+	let fetch = crate::light_helpers::EpochFetch {
 		on_demand: on_demand.clone(),
 		sync: sync_handle.clone(),
 	};
diff --git a/parity/secretstore/server.rs b/parity/secretstore/server.rs
index 4c556adbc92..c7de3d1f6f1 100644
--- a/parity/secretstore/server.rs
+++ b/parity/secretstore/server.rs
@@ -19,7 +19,8 @@
 use std::collections::BTreeMap;
 use std::sync::Arc;
 
-use account_utils::AccountProvider;
+use crate::account_utils::AccountProvider;
+
 use dir::default_data_path;
 use dir::helpers::replace_home;
 use ethcore::client::Client;
diff --git a/parity/signer.rs b/parity/signer.rs
index ad834294aba..d1681a71571 100644
--- a/parity/signer.rs
+++ b/parity/signer.rs
@@ -17,10 +17,11 @@
 use std::io;
 use std::path::{Path, PathBuf};
 
+use crate::rpc;
+use crate::rpc_apis;
+
 use ansi_term::Colour::White;
 use ethcore_logger::Config as LogConfig;
-use rpc;
-use rpc_apis;
 use parity_rpc;
 use path::restrict_permissions_owner;
 
diff --git a/parity/snapshot_cmd.rs b/parity/snapshot_cmd.rs
index f4095a37482..76c46394af9 100644
--- a/parity/snapshot_cmd.rs
+++ b/parity/snapshot_cmd.rs
@@ -20,6 +20,12 @@ use std::time::Duration;
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
 
+use crate::cache::CacheConfig;
+use crate::params::{SpecType, Pruning, Switch, tracing_switch_to_bool, fatdb_switch_to_bool};
+use crate::helpers::{to_client_config, execute_upgrades};
+use crate::user_defaults::UserDefaults;
+use crate::db;
+
 use hash::keccak;
 use snapshot::{SnapshotConfiguration, SnapshotService as SS, SnapshotClient};
 use snapshot::io::{SnapshotReader, PackedReader, PackedWriter};
@@ -35,13 +41,9 @@ use types::{
 	snapshot::RestorationStatus,
 };
 
-use cache::CacheConfig;
-use params::{SpecType, Pruning, Switch, tracing_switch_to_bool, fatdb_switch_to_bool};
-use helpers::{to_client_config, execute_upgrades};
+
 use dir::Directories;
-use user_defaults::UserDefaults;
 use ethcore_private_tx;
-use db;
 
 /// Kinds of snapshot commands.
 #[derive(Debug, PartialEq, Clone, Copy)]
@@ -270,7 +272,7 @@ impl SnapshotCommand {
 						let cur_size = progress.bytes();
 						if cur_size != last_size {
 							last_size = cur_size;
-							let bytes = ::informant::format_bytes(cur_size);
+							let bytes = crate::informant::format_bytes(cur_size);
 							info!("Snapshot: {} accounts (state), {} blocks, {} bytes", progress.accounts(), progress.blocks(), bytes);
 						}
 					} else {
diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
index 19208fa8328..806a648e5fa 100644
--- a/rpc/Cargo.toml
+++ b/rpc/Cargo.toml
@@ -57,7 +57,7 @@ ethkey = { path = "../accounts/ethkey" }
 ethstore = { path = "../accounts/ethstore" }
 fetch = { path = "../util/fetch" }
 keccak-hash = "0.5.0"
-parity-runtime = { version = "0.1.1", features = ["test-helpers"] }
+parity-runtime = { git = "https://github.com/vorot93/parity-common", branch = "tokio-compat", features = ["test-helpers"] }
 parity-updater = { path = "../updater" }
 parity-version = { path = "../util/version" }
 rlp = "0.4.5"
diff --git a/updater/hash-fetch/Cargo.toml b/updater/hash-fetch/Cargo.toml
index 945fb18c3f0..9117bb63d67 100644
--- a/updater/hash-fetch/Cargo.toml
+++ b/updater/hash-fetch/Cargo.toml
@@ -17,7 +17,7 @@ rustc-hex = "2.1.0"
 fetch = { path = "../../util/fetch" }
 parity-bytes = "0.1"
 ethereum-types = "0.9.0"
-parity-runtime = "0.1.1"
+parity-runtime = { git = "https://github.com/vorot93/parity-common", branch = "tokio-compat" }
 keccak-hash = "0.5.0"
 registrar = { path = "../../util/registrar" }
 types = { path = "../../ethcore/types", package = "common-types" }

From 61792144e22d194e398b77c673bb4ae0b79abeb8 Mon Sep 17 00:00:00 2001
From: adria0 <adria@codecontext.io>
Date: Wed, 1 Jul 2020 12:45:47 +0200
Subject: [PATCH 19/32] Serve prometheus in tokio compat

---
 parity/metrics.rs | 74 ++++++++++++++++++++---------------------------
 1 file changed, 31 insertions(+), 43 deletions(-)

diff --git a/parity/metrics.rs b/parity/metrics.rs
index 3e0f959385f..362288b8c6c 100644
--- a/parity/metrics.rs
+++ b/parity/metrics.rs
@@ -1,15 +1,17 @@
 use std::{
     time::Instant,
-    sync::{Mutex, Arc},
-    str::FromStr,
+    sync::{Mutex, Arc}
 };
-use std::convert::Infallible;
 
-use crate::rpc;
-use crate::rpc_apis;
+use crate::{
+    rpc,
+    rpc_apis
+};
 
-use hyper::{Method, Body, Request, Response, Server, service::{make_service_fn, service_fn}};
-use futures::prelude::*;
+use hyper::{
+    Method, Body, Request, Response, Server, StatusCode,
+    service::{make_service_fn, service_fn}
+};
 
 use stats::{
 	PrometheusMetrics,
@@ -41,7 +43,7 @@ struct State {
 	rpc_apis: Arc<rpc_apis::FullDependencies>,
 }
 
-async fn handle_request(req: Request<Body>, state: &Arc<Mutex<State>>) -> Result<Response<Body>,hyper::Error> {
+fn handle_request(req: Request<Body>, state: &Arc<Mutex<State>>) -> Response<Body> {
     let (parts, _body) = req.into_parts();
     match (parts.method, parts.uri.path()) {
         (Method::GET, "/metrics") => {
@@ -63,39 +65,16 @@ async fn handle_request(req: Request<Body>, state: &Arc<Mutex<State>>) -> Result
             encoder.encode(&metric_families, &mut buffer).unwrap();
             let text = String::from_utf8(buffer).unwrap();
 
-            Ok(Response::new(hyper::Body::from(text)))
+            Response::new(Body::from(text))
         },
         (_, _) => {
-            let mut res = hyper::Response::new(hyper::Body::from("not found"));
-            *res.status_mut() = hyper::StatusCode::NOT_FOUND;
-            Ok(res)
+            let mut res = Response::new(Body::from("not found"));
+            *res.status_mut() = StatusCode::NOT_FOUND;
+            res
         }
     }
 }
 
-/*
-    let state = State {
-        rpc_apis: deps.apis.clone(),
-    };
-    let state = Arc::new(Mutex::new(state));
-    let hyper = hyper::Server::bind(&addr)
-    .serve(move || {
-        let inner = Arc::clone(&state);
-        Ok::<_,hyper::Error>::service_fn(move |req| handle_request(req, &inner))
-    })
-    .map_err(|err| eprintln!("server error: {}", err));
-
-    deps.executor.spawn(hyper);
-    */
-
-
-
-
-async fn handle(_req: Request<Body>) -> Result<Response<Body>, Infallible> {
-    Ok(Response::new(Body::from("Hello World")))
-}
-
-
 /// Start the prometheus metrics server accessible via GET <host>:<port>/metrics
 pub fn start_prometheus_metrics(conf: &MetricsConfiguration, deps: &rpc::Dependencies<rpc_apis::FullDependencies>) -> Result<(), String> {
 
@@ -108,15 +87,24 @@ pub fn start_prometheus_metrics(conf: &MetricsConfiguration, deps: &rpc::Depende
         .parse()
         .map_err(|err| format!("Failed to parse address '{}': {}", addr,err))?;
 
-    // And a MakeService to handle each connection...
-    let make_service = make_service_fn(|_conn| async {
-        Ok::<_, Infallible>(service_fn(handle))
-    });
-
-    // Then bind and serve...
-    let server = Server::bind(&addr).serve(make_service);
+    let state = State {
+        rpc_apis: deps.apis.clone(),
+    };
+    let state = Arc::new(Mutex::new(state));
 
-    deps.executor.spawn_std( async { let _ =server.await; } );
+    deps.executor.spawn_std( async move {
+        let make_service = make_service_fn(move |_| {
+            let state = state.clone();
+            async move {
+                Ok::<_, hyper::Error>(service_fn(move |req| {
+                    let response = handle_request(req,&state);
+                    async move { Ok::<_, hyper::Error>(response) }
+                }))
+            }
+        });
+        let server = Server::bind(&addr).serve(make_service);
+        let _ =server.await;
+    });
 
     Ok(())
 }

From 137c86d827587f8ee55efba667d3af8f52559e14 Mon Sep 17 00:00:00 2001
From: adria0 <adria@codecontext.io>
Date: Fri, 17 Jul 2020 20:04:21 +0200
Subject: [PATCH 20/32] update to runtime 0.1.2

---
 Cargo.lock                    | 31 +++++++++++--------------------
 Cargo.toml                    |  2 +-
 ethcore/Cargo.toml            |  2 +-
 ethcore/sync/Cargo.toml       |  2 +-
 miner/Cargo.toml              |  2 +-
 miner/price-info/Cargo.toml   |  4 ++--
 rpc/Cargo.toml                |  2 +-
 updater/hash-fetch/Cargo.toml |  2 +-
 8 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9e8707b7366..efb4ec6cd5e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1207,7 +1207,7 @@ dependencies = [
  "memory-cache",
  "parity-bytes",
  "parity-crypto",
- "parity-runtime 0.1.1 (git+https://github.com/vorot93/parity-common?branch=tokio-compat)",
+ "parity-runtime",
  "parking_lot 0.10.0",
  "patricia-trie-ethereum",
  "pod",
@@ -1426,7 +1426,7 @@ dependencies = [
  "linked-hash-map",
  "log",
  "parity-crypto",
- "parity-runtime 0.1.1 (git+https://github.com/vorot93/parity-common?branch=tokio-compat)",
+ "parity-runtime",
  "parity-util-mem",
  "parking_lot 0.10.0",
  "price-info",
@@ -1613,7 +1613,7 @@ dependencies = [
  "num-traits",
  "parity-bytes",
  "parity-crypto",
- "parity-runtime 0.1.1 (git+https://github.com/vorot93/parity-common?branch=tokio-compat)",
+ "parity-runtime",
  "parity-util-mem",
  "parking_lot 0.10.0",
  "rand 0.7.3",
@@ -3396,7 +3396,7 @@ dependencies = [
  "parity-local-store",
  "parity-path",
  "parity-rpc",
- "parity-runtime 0.1.1 (git+https://github.com/vorot93/parity-common?branch=tokio-compat)",
+ "parity-runtime",
  "parity-secretstore",
  "parity-updater",
  "parity-util-mem",
@@ -3521,7 +3521,7 @@ dependencies = [
  "mime",
  "mime_guess",
  "parity-bytes",
- "parity-runtime 0.1.1 (git+https://github.com/vorot93/parity-common?branch=tokio-compat)",
+ "parity-runtime",
  "parking_lot 0.10.0",
  "rand 0.7.3",
  "registrar",
@@ -3596,7 +3596,7 @@ dependencies = [
  "order-stat",
  "parity-bytes",
  "parity-crypto",
- "parity-runtime 0.1.1 (git+https://github.com/vorot93/parity-common?branch=tokio-compat)",
+ "parity-runtime",
  "parity-updater",
  "parity-version",
  "parking_lot 0.10.0",
@@ -3642,8 +3642,9 @@ dependencies = [
 
 [[package]]
 name = "parity-runtime"
-version = "0.1.1"
-source = "git+https://github.com/vorot93/parity-common?branch=tokio-compat#0d2e58b3346c13770c6811522216badb952ba279"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "486214cb6d1fc274248f735a3edfd7eea94fd928db1e0c4118b7c9ecde06fd4b"
 dependencies = [
  "futures 0.1.29",
  "futures 0.3.5",
@@ -3651,16 +3652,6 @@ dependencies = [
  "tokio-compat",
 ]
 
-[[package]]
-name = "parity-runtime"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "710e8d8e9769827952aa83a44d33bc993658cccd97e15e3b5eb070d1a70d1a3a"
-dependencies = [
- "futures 0.1.29",
- "tokio 0.1.22",
-]
-
 [[package]]
 name = "parity-scale-codec"
 version = "1.2.0"
@@ -3694,7 +3685,7 @@ dependencies = [
  "log",
  "parity-bytes",
  "parity-crypto",
- "parity-runtime 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parity-runtime",
  "parking_lot 0.10.0",
  "percent-encoding 2.1.0",
  "rustc-hex 1.0.0",
@@ -4050,7 +4041,7 @@ dependencies = [
  "fetch",
  "futures 0.1.29",
  "log",
- "parity-runtime 0.1.1 (git+https://github.com/vorot93/parity-common?branch=tokio-compat)",
+ "parity-runtime",
  "serde_json",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index 28ab616bd4d..a1ba3a1340b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -60,7 +60,7 @@ parity-hash-fetch = { path = "updater/hash-fetch" }
 parity-local-store = { path = "miner/local-store" }
 parity-path = "0.1"
 parity-rpc = { path = "rpc" }
-parity-runtime = { git = "https://github.com/vorot93/parity-common", branch = "tokio-compat" }
+parity-runtime = "0.1.2"
 parity-secretstore = { git = "https://github.com/paritytech/secret-store", branch = "v1.x", optional = true }
 parity-updater = { path = "updater" }
 parity-util-mem = { version = "0.6.0", features = ["jemalloc-global"] }
diff --git a/ethcore/Cargo.toml b/ethcore/Cargo.toml
index 8709c331995..3f7097114b2 100644
--- a/ethcore/Cargo.toml
+++ b/ethcore/Cargo.toml
@@ -82,7 +82,7 @@ kvdb-memorydb = "0.5.0"
 kvdb-rocksdb = "0.7.0"
 lazy_static = "1.3"
 machine = { path = "./machine", features = ["test-helpers"] }
-parity-runtime = { git = "https://github.com/vorot93/parity-common", branch = "tokio-compat" }
+parity-runtime = "0.1.2"
 serde_json = "1.0"
 pod = { path = "pod" }
 tempfile = "3.1"
diff --git a/ethcore/sync/Cargo.toml b/ethcore/sync/Cargo.toml
index 27a53c37e5d..1f30b77e3db 100644
--- a/ethcore/sync/Cargo.toml
+++ b/ethcore/sync/Cargo.toml
@@ -26,7 +26,7 @@ light = { package = "ethcore-light", path = "../light" }
 log = "0.4"
 network = { package = "ethcore-network", path = "../../util/network" }
 num-traits = "0.2"
-parity-runtime = { git = "https://github.com/vorot93/parity-common", branch = "tokio-compat" }
+parity-runtime = "0.1.2"
 parity-crypto = { version = "0.6.1", features = ["publickey"] }
 parity-util-mem = "0.6.0"
 rand = "0.7.3"
diff --git a/miner/Cargo.toml b/miner/Cargo.toml
index cefcede2a12..b76441fa084 100644
--- a/miner/Cargo.toml
+++ b/miner/Cargo.toml
@@ -26,7 +26,7 @@ parity-util-mem = "0.6.0"
 keccak-hash = "0.5.0"
 linked-hash-map = "0.5"
 log = "0.4"
-parity-runtime = { git = "https://github.com/vorot93/parity-common", branch = "tokio-compat" }
+parity-runtime = "0.1.2"
 parking_lot = "0.10.0"
 price-info = { path = "./price-info", optional = true }
 registrar = { path = "../util/registrar" }
diff --git a/miner/price-info/Cargo.toml b/miner/price-info/Cargo.toml
index 2e7b5973c42..a0391186337 100644
--- a/miner/price-info/Cargo.toml
+++ b/miner/price-info/Cargo.toml
@@ -11,9 +11,9 @@ edition = "2018"
 fetch = { path = "../../util/fetch" }
 futures = "0.1"
 log = "0.4"
-parity-runtime = { git = "https://github.com/vorot93/parity-common", branch = "tokio-compat" }
+parity-runtime = "0.1.2"
 serde_json = "1.0"
 
 [dev-dependencies]
 fake-fetch = { path = "../../util/fake-fetch" }
-parity-runtime = { git = "https://github.com/vorot93/parity-common", branch = "tokio-compat", features = ["test-helpers"] }
+parity-runtime = "0.1.2"
diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
index 806a648e5fa..6e6589e28ff 100644
--- a/rpc/Cargo.toml
+++ b/rpc/Cargo.toml
@@ -57,7 +57,7 @@ ethkey = { path = "../accounts/ethkey" }
 ethstore = { path = "../accounts/ethstore" }
 fetch = { path = "../util/fetch" }
 keccak-hash = "0.5.0"
-parity-runtime = { git = "https://github.com/vorot93/parity-common", branch = "tokio-compat", features = ["test-helpers"] }
+parity-runtime = { version = "0.1.2", features = ["test-helpers"] }
 parity-updater = { path = "../updater" }
 parity-version = { path = "../util/version" }
 rlp = "0.4.5"
diff --git a/updater/hash-fetch/Cargo.toml b/updater/hash-fetch/Cargo.toml
index 9117bb63d67..1e85e9a39de 100644
--- a/updater/hash-fetch/Cargo.toml
+++ b/updater/hash-fetch/Cargo.toml
@@ -17,7 +17,7 @@ rustc-hex = "2.1.0"
 fetch = { path = "../../util/fetch" }
 parity-bytes = "0.1"
 ethereum-types = "0.9.0"
-parity-runtime = { git = "https://github.com/vorot93/parity-common", branch = "tokio-compat" }
+parity-runtime = "0.1.2"
 keccak-hash = "0.5.0"
 registrar = { path = "../../util/registrar" }
 types = { path = "../../ethcore/types", package = "common-types" }

From b523e3913826bb85aab40b622e016f21f19801e8 Mon Sep 17 00:00:00 2001
From: "adria0.eth" <5526331+adria0@users.noreply.github.com>
Date: Fri, 17 Jul 2020 20:47:36 +0200
Subject: [PATCH 21/32] Update ethcore/snapshot/src/service.rs

Co-authored-by: Artem Vorotnikov <artem@vorotnikov.me>
---
 ethcore/snapshot/src/service.rs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ethcore/snapshot/src/service.rs b/ethcore/snapshot/src/service.rs
index 84e4d20eb9f..0d498b847fd 100644
--- a/ethcore/snapshot/src/service.rs
+++ b/ethcore/snapshot/src/service.rs
@@ -858,11 +858,12 @@ impl<C: Send + Sync> SnapshotService for Service<C> {
 	}
 
 	fn creation_status(&self) -> CreationStatus {
-		match self.taking_snapshot.load(Ordering::SeqCst) {
-			false => CreationStatus::Inactive,
-			true => CreationStatus::Ongoing {
+		if self.taking_snapshot.load(Ordering::SeqCst) {
+			CreationStatus::Ongoing {
 				block_number: self.taking_snapshot_num.load(Ordering::SeqCst) as u32
-			},
+			}
+		} else {
+			CreationStatus::Inactive
 		}
 	}
 

From e69504ec91a067a3eadb7743896e78bbffb5f846 Mon Sep 17 00:00:00 2001
From: "adria0.eth" <5526331+adria0@users.noreply.github.com>
Date: Fri, 17 Jul 2020 20:48:36 +0200
Subject: [PATCH 22/32] Update ethcore/src/client/client.rs

Co-authored-by: Artem Vorotnikov <artem@vorotnikov.me>
---
 ethcore/src/client/client.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ethcore/src/client/client.rs b/ethcore/src/client/client.rs
index c3a6f27147a..140347d7cdb 100644
--- a/ethcore/src/client/client.rs
+++ b/ethcore/src/client/client.rs
@@ -2872,7 +2872,7 @@ impl PrometheusMetrics for Client {
 		prometheus_gauge(r, "statedb_mem_used", "State DB memory used", state_db.mem_used() as i64);
 		prometheus_gauge(r, "statedb_cache_size", "State DB cache size", state_db.cache_size() as i64);
 
-		// blockchain caché
+		// blockchain cache
 		let blockchain_cache_info = self.blockchain_cache_info();
 		prometheus_gauge(r, "blockchaincache_block_details", "BlockDetails cache size", blockchain_cache_info.block_details as i64);
 		prometheus_gauge(r, "blockchaincache_block_recipts", "Block receipts size", blockchain_cache_info.block_receipts as i64);

From 631a1e9d98d21ba289d6d8b6bf51a2af1f584844 Mon Sep 17 00:00:00 2001
From: "adria0.eth" <5526331+adria0@users.noreply.github.com>
Date: Fri, 17 Jul 2020 20:51:08 +0200
Subject: [PATCH 23/32] Update ethcore/sync/src/api.rs

Co-authored-by: Artem Vorotnikov <artem@vorotnikov.me>
---
 ethcore/sync/src/api.rs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ethcore/sync/src/api.rs b/ethcore/sync/src/api.rs
index ae6ad32b1e3..aa8b12915e6 100644
--- a/ethcore/sync/src/api.rs
+++ b/ethcore/sync/src/api.rs
@@ -446,9 +446,10 @@ impl PrometheusMetrics for EthSync {
 		let restoration = self.eth_handler.snapshot_service.restoration_status();
 		let creation = self.eth_handler.snapshot_service.creation_status();
 
-		prometheus_gauge(r, "snapshot_create_block", "First block of the current snapshot creation",  match creation {
-			CreationStatus::Ongoing{block_number} => block_number as i64,
-			_ => 0,
+		prometheus_gauge(r, "snapshot_create_block", "First block of the current snapshot creation",  if let CreationStatus::Ongoing { block_number } = creation {
+			block_number as i64
+		} else {
+			0
 		});
 		prometheus_gauge(r, "snapshot_restore_block", "First block of the current snapshot restoration",  match restoration {
 			RestorationStatus::Ongoing{block_number, ..} => block_number as i64,

From 76bdfe304b65a7aa5145c8475b33ca283f649a29 Mon Sep 17 00:00:00 2001
From: "adria0.eth" <5526331+adria0@users.noreply.github.com>
Date: Fri, 17 Jul 2020 20:51:42 +0200
Subject: [PATCH 24/32] Update ethcore/sync/src/api.rs

Co-authored-by: Artem Vorotnikov <artem@vorotnikov.me>
---
 ethcore/sync/src/api.rs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ethcore/sync/src/api.rs b/ethcore/sync/src/api.rs
index aa8b12915e6..bd8fe1e5903 100644
--- a/ethcore/sync/src/api.rs
+++ b/ethcore/sync/src/api.rs
@@ -451,9 +451,10 @@ impl PrometheusMetrics for EthSync {
 		} else {
 			0
 		});
-		prometheus_gauge(r, "snapshot_restore_block", "First block of the current snapshot restoration",  match restoration {
-			RestorationStatus::Ongoing{block_number, ..} => block_number as i64,
-			_ => 0,
+		prometheus_gauge(r, "snapshot_restore_block", "First block of the current snapshot restoration",  if let RestorationStatus::Ongoing { block_number, ..} = restoration {
+			block_number as i64
+		} else {
+			0
 		});
 	}
 }

From 02595b0003ce68d245751d50af74084e62917791 Mon Sep 17 00:00:00 2001
From: "adria0.eth" <5526331+adria0@users.noreply.github.com>
Date: Fri, 17 Jul 2020 20:52:23 +0200
Subject: [PATCH 25/32] Update util/stats/src/lib.rs

Co-authored-by: Artem Vorotnikov <artem@vorotnikov.me>
---
 util/stats/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/stats/src/lib.rs b/util/stats/src/lib.rs
index 292a4b46dc6..0ca45425af0 100644
--- a/util/stats/src/lib.rs
+++ b/util/stats/src/lib.rs
@@ -44,7 +44,7 @@ pub fn prometheus_gauge(reg: &mut prometheus::Registry, name: &str, help: &str,
 }
 
 /// Adds a new prometheus counter with the time spent in running the specified function
-pub fn prometheus_optime<T>(r: &mut prometheus::Registry, name: &str, f: &dyn Fn()->T ) -> T {
+pub fn prometheus_optime<F: Fn() -> T, T>(r: &mut prometheus::Registry, name: &str, f: &F ) -> T {
 	let start = Instant::now();
 	let t = f();
 	let elapsed = start.elapsed();

From 4014fe13e05b6062ed8f507e2a0096c8f45ef4da Mon Sep 17 00:00:00 2001
From: adria0 <adria@codecontext.io>
Date: Sat, 18 Jul 2020 08:08:27 +0200
Subject: [PATCH 26/32] Rename to taking_snapshot_at

---
 ethcore/snapshot/src/service.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ethcore/snapshot/src/service.rs b/ethcore/snapshot/src/service.rs
index 99b3bcd448a..dd759886c42 100644
--- a/ethcore/snapshot/src/service.rs
+++ b/ethcore/snapshot/src/service.rs
@@ -265,7 +265,7 @@ pub struct Service<C: Send + Sync + 'static> {
 	client: Arc<C>,
 	progress: RwLock<Progress>,
 	taking_snapshot: AtomicBool,
-	taking_snapshot_num: AtomicUsize,
+	taking_snapshot_at: AtomicUsize,
 	restoring_snapshot: AtomicBool,
 }
 
@@ -287,7 +287,7 @@ impl<C> Service<C> where C: SnapshotClient + ChainInfo {
 			client: params.client,
 			progress: RwLock::new(Progress::new()),
 			taking_snapshot: AtomicBool::new(false),
-			taking_snapshot_num: AtomicUsize::new(0),
+			taking_snapshot_at: AtomicUsize::new(0),
 			restoring_snapshot: AtomicBool::new(false),
 		};
 
@@ -507,7 +507,7 @@ impl<C> Service<C> where C: SnapshotClient + ChainInfo {
 
 		info!("Taking snapshot at #{}", num);
 		{
-			self.taking_snapshot_num.store(num as usize, Ordering::SeqCst);
+			self.taking_snapshot_at.store(num as usize, Ordering::SeqCst);
 			scopeguard::defer! {{
 				self.taking_snapshot.store(false, Ordering::SeqCst);
 			}}
@@ -840,7 +840,7 @@ impl<C: Send + Sync> SnapshotService for Service<C> {
 	fn creation_status(&self) -> CreationStatus {
 		if self.taking_snapshot.load(Ordering::SeqCst) {
 			CreationStatus::Ongoing {
-				block_number: self.taking_snapshot_num.load(Ordering::SeqCst) as u32
+				block_number: self.taking_snapshot_at.load(Ordering::SeqCst) as u32
 			}
 		} else {
 			CreationStatus::Inactive

From 19b72794412980629a112bfc982ccabc5378f5be Mon Sep 17 00:00:00 2001
From: adria0 <adria@codecontext.io>
Date: Sat, 18 Jul 2020 08:19:57 +0200
Subject: [PATCH 27/32] Fix metrics Results handling

---
 parity/metrics.rs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/parity/metrics.rs b/parity/metrics.rs
index 362288b8c6c..93752e51a07 100644
--- a/parity/metrics.rs
+++ b/parity/metrics.rs
@@ -62,8 +62,9 @@ fn handle_request(req: Request<Body>, state: &Arc<Mutex<State>>) -> Response<Bod
             let mut buffer = vec![];
             let encoder = prometheus::TextEncoder::new();
             let metric_families = reg.gather();
-            encoder.encode(&metric_families, &mut buffer).unwrap();
-            let text = String::from_utf8(buffer).unwrap();
+
+            encoder.encode(&metric_families, &mut buffer).expect("all source of metrics are static; qed");
+            let text = String::from_utf8(buffer).expect("metrics encoding is ASCII; qed");
 
             Response::new(Body::from(text))
         },
@@ -102,8 +103,8 @@ pub fn start_prometheus_metrics(conf: &MetricsConfiguration, deps: &rpc::Depende
                 }))
             }
         });
-        let server = Server::bind(&addr).serve(make_service);
-        let _ =server.await;
+        Server::bind(&addr).serve(make_service).await
+            .expect("unable to create prometheus service.");
     });
 
     Ok(())

From 14598b3fb23835a1365b4e7644f6252e7acbe5eb Mon Sep 17 00:00:00 2001
From: adria0 <adria@codecontext.io>
Date: Sat, 18 Jul 2020 10:55:53 +0200
Subject: [PATCH 28/32] use parking_lot::Mutex

---
 parity/metrics.rs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/parity/metrics.rs b/parity/metrics.rs
index 93752e51a07..de0474fa12d 100644
--- a/parity/metrics.rs
+++ b/parity/metrics.rs
@@ -1,6 +1,6 @@
 use std::{
     time::Instant,
-    sync::{Mutex, Arc}
+    sync::Arc
 };
 
 use crate::{
@@ -8,6 +8,8 @@ use crate::{
     rpc_apis
 };
 
+use parking_lot::Mutex;
+
 use hyper::{
     Method, Body, Request, Response, Server, StatusCode,
     service::{make_service_fn, service_fn}
@@ -50,11 +52,13 @@ fn handle_request(req: Request<Body>, state: &Arc<Mutex<State>>) -> Response<Bod
             let start = Instant::now();
             let mut reg = prometheus::Registry::new();
 
-            let state = state.lock().unwrap();
+            let state = state.lock();
 
             state.rpc_apis.client.prometheus_metrics(&mut reg);
             state.rpc_apis.sync.prometheus_metrics(&mut reg);
 
+            drop(state);
+
             let elapsed = start.elapsed();
             let ms = (elapsed.as_secs() as i64)*1000 + (elapsed.subsec_millis() as i64);
             prometheus_gauge(&mut reg, "metrics_time", "Time to perform rpc metrics", ms);

From b9b675834fc9fb2fef9f0cfb86240adeadaa1d96 Mon Sep 17 00:00:00 2001
From: adria0 <adria@codecontext.io>
Date: Sat, 18 Jul 2020 14:08:05 +0200
Subject: [PATCH 29/32] spawn_blocking metrics collection

---
 Cargo.lock        |  1 +
 Cargo.toml        |  1 +
 parity/main.rs    |  1 +
 parity/metrics.rs | 55 ++++++++++++++++++++++++-----------------------
 4 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f14c0935fe9..93d054508d7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3430,6 +3430,7 @@ dependencies = [
  "tempfile",
  "term_size",
  "textwrap",
+ "tokio 0.2.21",
  "toml",
  "verification",
  "winapi 0.3.8",
diff --git a/Cargo.toml b/Cargo.toml
index e79f211df2e..74bf91b4d5d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -81,6 +81,7 @@ stats = { path = "util/stats" }
 term_size = "0.3"
 textwrap = "0.11.0"
 toml = "0.5.6"
+tokio = { version = "0.2", features = ["blocking"] }
 verification = { path = "ethcore/verification" }
 prometheus = "0.9.0"
 
diff --git a/parity/main.rs b/parity/main.rs
index 0c2b98d02ef..d4f9c411ca0 100644
--- a/parity/main.rs
+++ b/parity/main.rs
@@ -28,6 +28,7 @@ extern crate openethereum;
 extern crate parking_lot;
 extern crate parity_daemonize;
 extern crate ansi_term;
+extern crate tokio;
 
 #[cfg(windows)] extern crate winapi;
 extern crate ethcore_logger;
diff --git a/parity/metrics.rs b/parity/metrics.rs
index de0474fa12d..6baf22795f6 100644
--- a/parity/metrics.rs
+++ b/parity/metrics.rs
@@ -45,32 +45,33 @@ struct State {
 	rpc_apis: Arc<rpc_apis::FullDependencies>,
 }
 
-fn handle_request(req: Request<Body>, state: &Arc<Mutex<State>>) -> Response<Body> {
+async fn handle_request(req: Request<Body>, state: Arc<Mutex<State>>) -> Response<Body> {
     let (parts, _body) = req.into_parts();
     match (parts.method, parts.uri.path()) {
         (Method::GET, "/metrics") => {
-            let start = Instant::now();
-            let mut reg = prometheus::Registry::new();
 
-            let state = state.lock();
+            tokio::task::spawn_blocking(move || {
+                let start = Instant::now();
+
+                let mut reg = prometheus::Registry::new();
+                let state = state.lock();
+                state.rpc_apis.client.prometheus_metrics(&mut reg);
+                state.rpc_apis.sync.prometheus_metrics(&mut reg);
+                let elapsed = start.elapsed();
+                let ms = (elapsed.as_secs() as i64)*1000 + (elapsed.subsec_millis() as i64);
+                prometheus_gauge(&mut reg, "metrics_time", "Time to perform rpc metrics", ms);
+    
+                let mut buffer = vec![];
+                let encoder = prometheus::TextEncoder::new();
+                let metric_families = reg.gather();
+    
+                encoder.encode(&metric_families, &mut buffer).expect("all source of metrics are static; qed");
+                let text = String::from_utf8(buffer).expect("metrics encoding is ASCII; qed");
+    
+                Response::new(Body::from(text))
+    
+            }).await.expect("The prometheus collection has panicked")
 
-            state.rpc_apis.client.prometheus_metrics(&mut reg);
-            state.rpc_apis.sync.prometheus_metrics(&mut reg);
-
-            drop(state);
-
-            let elapsed = start.elapsed();
-            let ms = (elapsed.as_secs() as i64)*1000 + (elapsed.subsec_millis() as i64);
-            prometheus_gauge(&mut reg, "metrics_time", "Time to perform rpc metrics", ms);
-
-            let mut buffer = vec![];
-            let encoder = prometheus::TextEncoder::new();
-            let metric_families = reg.gather();
-
-            encoder.encode(&metric_families, &mut buffer).expect("all source of metrics are static; qed");
-            let text = String::from_utf8(buffer).expect("metrics encoding is ASCII; qed");
-
-            Response::new(Body::from(text))
         },
         (_, _) => {
             let mut res = Response::new(Body::from("not found"));
@@ -98,12 +99,12 @@ pub fn start_prometheus_metrics(conf: &MetricsConfiguration, deps: &rpc::Depende
     let state = Arc::new(Mutex::new(state));
 
     deps.executor.spawn_std( async move {
-        let make_service = make_service_fn(move |_| {
-            let state = state.clone();
-            async move {
-                Ok::<_, hyper::Error>(service_fn(move |req| {
-                    let response = handle_request(req,&state);
-                    async move { Ok::<_, hyper::Error>(response) }
+            let make_service = make_service_fn(move |_| {
+                let state = state.clone();
+                async move {
+                    Ok::<_, hyper::Error>(service_fn(move |req| {
+                    let response = handle_request(req, state.clone());
+                    async move { Ok::<_, hyper::Error>(response.await) }
                 }))
             }
         });

From 6f8b668d35a64b543a5b5ef02e086d595615cef1 Mon Sep 17 00:00:00 2001
From: "adria0.eth" <5526331+adria0@users.noreply.github.com>
Date: Sat, 18 Jul 2020 17:11:30 +0200
Subject: [PATCH 30/32] Update util/stats/src/lib.rs

Co-authored-by: Andronik Ordian <write@reusable.software>
---
 util/stats/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/stats/src/lib.rs b/util/stats/src/lib.rs
index 0ca45425af0..2523f160de0 100644
--- a/util/stats/src/lib.rs
+++ b/util/stats/src/lib.rs
@@ -53,7 +53,7 @@ pub fn prometheus_optime<F: Fn() -> T, T>(r: &mut prometheus::Registry, name: &s
 	t
 }
 
-/// Sorted corpus of data.1
+/// Sorted corpus of data.
 #[derive(Debug, Clone, PartialEq)]
 pub struct Corpus<T>(Vec<T>);
 

From 0a4bd5cd733a4386609f4165d8afabae4a9fcb55 Mon Sep 17 00:00:00 2001
From: adria0 <adria@codecontext.io>
Date: Sat, 18 Jul 2020 18:08:49 +0200
Subject: [PATCH 31/32] fix rust2018 use

---
 parity/configuration.rs | 18 +++++++++---------
 parity/deprecated.rs    |  2 +-
 parity/params.rs        |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/parity/configuration.rs b/parity/configuration.rs
index 0f367d81985..8f023e57771 100644
--- a/parity/configuration.rs
+++ b/parity/configuration.rs
@@ -1200,16 +1200,16 @@ mod tests {
 	use updater::{UpdatePolicy, UpdateFilter, ReleaseTrack};
 	use types::ids::BlockId;
 	use types::data_format::DataFormat;
-	use account::{AccountCmd, NewAccount, ImportAccounts, ListAccounts};
-	use blockchain::{BlockchainCmd, ImportBlockchain, ExportBlockchain, ExportState};
-	use cli::Args;
+	use crate::account::{AccountCmd, NewAccount, ImportAccounts, ListAccounts};
+	use crate::blockchain::{BlockchainCmd, ImportBlockchain, ExportBlockchain, ExportState};
+	use crate::cli::Args;
 	use dir::{Directories, default_hypervisor_path};
-	use helpers::{default_network_config};
-	use params::SpecType;
-	use presale::ImportWallet;
-	use rpc::WsConfiguration;
-	use rpc_apis::ApiSet;
-	use run::RunCmd;
+	use crate::helpers::{default_network_config};
+	use crate::params::SpecType;
+	use crate::presale::ImportWallet;
+	use crate::rpc::WsConfiguration;
+	use crate::rpc_apis::ApiSet;
+	use crate::run::RunCmd;
 
 	use network::{AllowIP, IpFilter};
 
diff --git a/parity/deprecated.rs b/parity/deprecated.rs
index bf56487e7fa..960d678c180 100644
--- a/parity/deprecated.rs
+++ b/parity/deprecated.rs
@@ -248,7 +248,7 @@ pub fn find_deprecated(args: &Args) -> Vec<Deprecated> {
 
 #[cfg(test)]
 mod tests {
-	use cli::Args;
+	use crate::cli::Args;
 	use super::{Deprecated, find_deprecated};
 
 	#[test]
diff --git a/parity/params.rs b/parity/params.rs
index 0b2b0645fad..c0746b011dc 100644
--- a/parity/params.rs
+++ b/parity/params.rs
@@ -368,7 +368,7 @@ pub fn mode_switch_to_bool(switch: Option<Mode>, user_defaults: &UserDefaults) -
 #[cfg(test)]
 mod tests {
 	use journaldb::Algorithm;
-	use user_defaults::UserDefaults;
+	use crate::user_defaults::UserDefaults;
 	use super::{SpecType, Pruning, ResealPolicy, Switch, tracing_switch_to_bool};
 
 	#[test]

From 16d89fc943ffcd1ddb9bb6798de2f3c94374b6e1 Mon Sep 17 00:00:00 2001
From: adria0 <adria@codecontext.io>
Date: Sat, 18 Jul 2020 18:12:56 +0200
Subject: [PATCH 32/32] Use Duration::as_millis()

---
 parity/metrics.rs     | 3 +--
 util/stats/src/lib.rs | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/parity/metrics.rs b/parity/metrics.rs
index 6baf22795f6..90b2da96138 100644
--- a/parity/metrics.rs
+++ b/parity/metrics.rs
@@ -58,8 +58,7 @@ async fn handle_request(req: Request<Body>, state: Arc<Mutex<State>>) -> Respons
                 state.rpc_apis.client.prometheus_metrics(&mut reg);
                 state.rpc_apis.sync.prometheus_metrics(&mut reg);
                 let elapsed = start.elapsed();
-                let ms = (elapsed.as_secs() as i64)*1000 + (elapsed.subsec_millis() as i64);
-                prometheus_gauge(&mut reg, "metrics_time", "Time to perform rpc metrics", ms);
+                prometheus_gauge(&mut reg, "metrics_time", "Time to perform rpc metrics", elapsed.as_millis()  as i64);
     
                 let mut buffer = vec![];
                 let encoder = prometheus::TextEncoder::new();
diff --git a/util/stats/src/lib.rs b/util/stats/src/lib.rs
index 2523f160de0..b8cca58d483 100644
--- a/util/stats/src/lib.rs
+++ b/util/stats/src/lib.rs
@@ -48,8 +48,7 @@ pub fn prometheus_optime<F: Fn() -> T, T>(r: &mut prometheus::Registry, name: &s
 	let start = Instant::now();
 	let t = f();
 	let elapsed = start.elapsed();
-	let ms = (elapsed.as_secs() as i64)*1000 + (elapsed.subsec_millis() as i64);
-	prometheus_gauge(r, &format!("optime_{}",name), &format!("Time to perform {}",name), ms);
+	prometheus_gauge(r, &format!("optime_{}",name), &format!("Time to perform {}",name), elapsed.as_millis() as i64);
 	t
 }