R4R: prometheus exporter in substrate

Cargo.toml

@@ -48,9 +48,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

@@ -29,6 +29,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.7"

client/cli/src/lib.rs

@@ -1065,13 +1065,9 @@ where
 
 	let rpc_interface: &str = interface_str(cli.rpc_external, cli.unsafe_rpc_external, cli.validator)?;
 	let ws_interface: &str = interface_str(cli.ws_external, cli.unsafe_ws_external, cli.validator)?;
-	let grafana_interface: &str = if cli.grafana_external { "0.0.0.0" } else { "127.0.0.1" };
 
 	config.rpc_http = Some(parse_address(&format!("{}:{}", rpc_interface, 9933), cli.rpc_port)?);
 	config.rpc_ws = Some(parse_address(&format!("{}:{}", ws_interface, 9944), cli.ws_port)?);
-	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 {
@@ -1094,7 +1090,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.tracing_targets.into();
 	config.tracing_receiver = cli.tracing_receiver.into();
 

client/cli/src/params.rs

@@ -299,7 +299,7 @@ arg_enum! {
 	pub enum TracingReceiver {
 		Log,
 		Telemetry,
-		Grafana,
+		Prometheus,
 	}
 }
 
@@ -308,7 +308,7 @@ impl Into<sc_tracing::TracingReceiver> for TracingReceiver {
 		match self {
 			TracingReceiver::Log => sc_tracing::TracingReceiver::Log,
 			TracingReceiver::Telemetry => sc_tracing::TracingReceiver::Telemetry,
-			TracingReceiver::Grafana => sc_tracing::TracingReceiver::Grafana,
+			TracingReceiver::Prometheus => sc_tracing::TracingReceiver::Prometheus,
 		}
 	}
 }
@@ -448,11 +448,11 @@ pub struct RunCmd {
 	#[structopt(long = "unsafe-ws-external")]
 	pub unsafe_ws_external: bool,
 
-	/// Listen to all Grafana data source interfaces.
+	/// Listen to all Prometheus endpoint interfaces.
 	///
 	/// Default is local.
-	#[structopt(long = "grafana-external")]
-	pub grafana_external: bool,
+	#[structopt(long = "prometheus-external")]
+	pub prometheus_external: bool,
 
 	/// Specify HTTP RPC server TCP port.
 	#[structopt(long = "rpc-port", value_name = "PORT")]
@@ -476,9 +476,15 @@ pub struct RunCmd {
 	#[structopt(long = "rpc-cors", value_name = "ORIGINS", parse(try_from_str = parse_cors))]
 	pub rpc_cors: Option<Cors>,
 
-	/// Specify Grafana data source server TCP Port.
-	#[structopt(long = "grafana-port", value_name = "PORT")]
-	pub grafana_port: Option<u16>,
+	/// Specify Prometheus endpoint TCP Port.
+	#[structopt(long = "prometheus-port", value_name = "PORT")]
+	pub prometheus_port: Option<u16>,
+
+	/// Disable connecting to the Substrate prometheus.
+	///
+	/// prometheus is on by default on global chains.
+	#[structopt(long = "no-prometheus")]
+	pub no_prometheus: bool,
 
 	/// The human-readable name for this node.
 	///

client/service/Cargo.toml

@@ -51,7 +51,7 @@ sc-rpc = { version = "2.0.0", path = "../rpc" }
 sc-telemetry = { version = "2.0.0", path = "../telemetry" }
 sc-offchain = { version = "2.0.0", path = "../offchain" }
 parity-multiaddr = { package = "parity-multiaddr", version = "0.5.0" }
-grafana-data-source = { version = "0.8", path = "../../utils/grafana-data-source" }
+prometheus-exporter = { path = "../../utils/prometheus" }
 sc-tracing = { version = "2.0.0", path = "../tracing" }
 tracing = "0.1.10"