R4R: prometheus exporter in substrate

Cargo.toml

@@ -53,9 +53,8 @@ members = [
 	"client/telemetry",
 	"client/transaction-pool",
 	"client/transaction-pool/graph",
+	"utils/prometheus",
 	"utils/wasm-builder-runner",
-	"utils/grafana-data-source",
-	"utils/grafana-data-source/test",
 	"frame/assets",
 	"frame/aura",
 	"frame/authority-discovery",

client/cli/Cargo.toml

@@ -31,6 +31,7 @@ sp-core = { version = "2.0.0", path = "../../primitives/core" }
 sc-service = { version = "0.8", default-features = false, path = "../service" }
 sp-state-machine = { version = "0.8", path = "../../primitives/state-machine" }
 sc-telemetry = { version = "2.0.0", path = "../telemetry" }
+prometheus-exporter = { path = "../../utils/prometheus" }
 sp-keyring = { version = "2.0.0", path = "../../primitives/keyring" }
 names = "0.11.0"
 structopt = "0.3.8"

client/cli/src/lib.rs

@@ -623,13 +623,6 @@ where
 		config.rpc_ws = Some(parse_address(&format!("{}:{}", ws_interface, 9944), cli.ws_port)?);
 	}
 
-	if config.grafana_port.is_none() || cli.grafana_port.is_some() {
-		let grafana_interface: &str = if cli.grafana_external { "0.0.0.0" } else { "127.0.0.1" };
-		config.grafana_port = Some(
-			parse_address(&format!("{}:{}", grafana_interface, 9955), cli.grafana_port)?
-		);
-	}
-
 	config.rpc_ws_max_connections = cli.ws_max_connections;
 	config.rpc_cors = cli.rpc_cors.unwrap_or_else(|| if is_dev {
 		log::warn!("Running in --dev mode, RPC CORS has been disabled.");
@@ -651,6 +644,14 @@ where
 	} else if !cli.telemetry_endpoints.is_empty() {
 		config.telemetry_endpoints = Some(TelemetryEndpoints::new(cli.telemetry_endpoints));
 	}
+	// Override prometheus
+	if cli.no_prometheus {
+		config.prometheus_port = None;
+	} else {
+		let prometheus_interface: &str = if cli.prometheus_external { "0.0.0.0" } else { "127.0.0.1" };
+		config.prometheus_port = Some(
+		parse_address(&format!("{}:{}", prometheus_interface, 9615), cli.prometheus_port)?);
+	}
 
 	config.tracing_targets = cli.import_params.tracing_targets.into();
 	config.tracing_receiver = cli.import_params.tracing_receiver.into();
@@ -877,4 +878,4 @@ mod tests {
 		assert!(config.network.config_path.is_some());
 		assert!(!config.network.listen_addresses.is_empty());
 	}
-}
+}