pezkuwichain/pezkuwi-telemetry
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-telemetry.git synced 2026-05-08 05:17:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dp-add-changelog

Browse Source
This commit is contained in:
David Palm
2021-03-26 07:45:33 +01:00
parent 9403d31cbe 53ec4ba07d
commit 927c365993
8 changed files with 461 additions and 1330 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/Cargo.lock
Generated
+404 -1287
View File
File diff suppressed because it is too large Load Diff
backend/Cargo.toml
+7 -10
View File
@@ -6,21 +6,21 @@ edition = "2018"
license = "GPL-3.0"
[dependencies]
actix = "0.10.0"
actix-web = "3.1.0"
actix-web-actors = "3.0.0"
actix-http = "2.0.0"
bytes = "0.5.6"
actix = "0.11.1"
actix-web = "4.0.0-beta.4"
actix-web-actors = "4.0.0-beta.3"
actix-http = "3.0.0-beta.4"
bytes = "1.0.1"
chrono = { version = "0.4", features = ["serde"] }
fnv = "1.0.7"
serde = { version = "1.0", features = ["derive"] }
serde_json = { version = "1.0", features = ["raw_value"] }
primitive-types = { version = "0.7.2", features = ["serde"] }
primitive-types = { version = "0.9.0", features = ["serde"] }
log = "0.4"
simple_logger = "1.11.0"
num-traits = "0.2"
parking_lot = "0.11"
reqwest = "0.9.18"
reqwest = { version = "0.11.1", features = ["blocking", "json"] }
rustc-hash = "1.1.0"
clap = "3.0.0-beta.2"
lazy_static = "1"
@@ -28,6 +28,3 @@ lazy_static = "1"
[profile.release]
lto = true
panic = "abort"
[patch.crates-io]
actix-web = { git = "https://github.com/maciejhirsz/actix-web", branch = "no-panic-normalize" }
backend/src/aggregator.rs
+8 -1
View File
@@ -15,6 +15,8 @@ pub struct Aggregator {
chains: DenseMap<ChainEntry>,
feeds: DenseMap<Addr<FeedConnector>>,
serializer: FeedMessageSerializer,
/// Denylist for networks we do not want to allow connecting.
denylist: HashSet<String>
}
pub struct ChainEntry {
@@ -43,13 +45,14 @@ lazy_static! {
const THIRD_PARTY_NETWORKS_MAX_NODES: usize = 500;
impl Aggregator {
pub fn new() -> Self {
pub fn new(denylist: HashSet<String>) -> Self {
Aggregator {
labels: HashMap::new(),
networks: HashMap::new(),
chains: DenseMap::new(),
feeds: DenseMap::new(),
serializer: FeedMessageSerializer::new(),
denylist,
}
}
@@ -192,6 +195,10 @@ impl Handler<AddNode> for Aggregator {
type Result = ();
fn handle(&mut self, msg: AddNode, ctx: &mut Self::Context) {
if self.denylist.contains(&*msg.node.chain) {
log::debug!(target: "Aggregator::AddNode", "'{}' is on the denylist.", msg.node.chain);
return;
}
let AddNode { node, conn_id, rec } = msg;
log::trace!(target: "Aggregator::AddNode", "New node connected. Chain '{}'", node.chain);
backend/src/chain.rs
+1 -1
View File
@@ -18,7 +18,7 @@ pub type Label = Arc<str>;
pub struct Chain {
cid: ChainId,
/// Who to inform if we Chain drops itself
/// Who to inform if the Chain drops itself
aggregator: Addr<Aggregator>,
/// Label of this chain, along with count of nodes that use this label
label: (Label, usize),
backend/src/main.rs
+18 -8
View File
@@ -1,4 +1,6 @@
use std::net::Ipv4Addr;
use std::collections::HashSet;
use std::iter::FromIterator;
use actix::prelude::*;
use actix_http::ws::Codec;
@@ -25,16 +27,23 @@ const AUTHORS: &str = env!("CARGO_PKG_AUTHORS");
const NAME: &str = "Substrate Telemetry Backend";
const ABOUT: &str = "This is the Telemetry Backend that injects and provide the data sent by Substrate/Polkadot nodes";
#[derive(Clap)]
#[derive(Clap, Debug)]
#[clap(name = NAME, version = VERSION, author = AUTHORS, about = ABOUT)]
struct Opts {
#[clap(
short = 'l',
long = "listen",
default_value = "127.0.0.1:8000",
about = "This is the socket address Telemetry is listening to. This is restricted localhost (127.0.0.1) by default and should be fine for most use cases. If you are using Telemetry in a container, you likely want to set this to '0.0.0.0:8000'"
about = "This is the socket address Telemetry is listening to. This is restricted to localhost (127.0.0.1) by default and should be fine for most use cases. If you are using Telemetry in a container, you likely want to set this to '0.0.0.0:8000'"
)]
socket: std::net::SocketAddr,
#[clap(
required = false,
long = "denylist",
default_value = "Earth",
about = "Space delimited list of chains that are not allowed to connect to telemetry. Case sensitive."
)]
denylist: Vec<String>,
#[clap(
arg_enum,
required = false,
@@ -67,7 +76,7 @@ impl From<&LogLevel> for log::LevelFilter {
}
/// Entry point for connecting nodes
#[get("/submit/")]
#[get("/submit")]
async fn node_route(
req: HttpRequest,
stream: web::Payload,
@@ -93,7 +102,7 @@ async fn node_route(
}
/// Entry point for connecting feeds
#[get("/feed/")]
#[get("/feed")]
async fn feed_route(
req: HttpRequest,
stream: web::Payload,
@@ -107,7 +116,7 @@ async fn feed_route(
}
/// Entry point for network state dump
#[get("/network_state/{chain}/{nid}/")]
#[get("/network_state/{chain}/{nid}")]
async fn state_route(
path: web::Path<(Box<str>, NodeId)>,
aggregator: web::Data<Addr<Aggregator>>,
@@ -136,7 +145,7 @@ async fn state_route(
}
/// Entry point for health check monitoring bots
#[get("/health/")]
#[get("/health")]
async fn health(aggregator: web::Data<Addr<Aggregator>>) -> Result<HttpResponse, Error> {
match aggregator.send(GetHealth).await {
Ok(count) => {
@@ -160,7 +169,8 @@ async fn main() -> std::io::Result<()> {
let log_level = &opts.log_level;
SimpleLogger::new().with_level(log_level.into()).init().expect("Must be able to start a logger");
let aggregator = Aggregator::new().start();
let denylist = HashSet::from_iter(opts.denylist);
let aggregator = Aggregator::new(denylist).start();
let factory = LocatorFactory::new();
let locator = SyncArbiter::start(4, move || factory.create());
@@ -174,7 +184,7 @@ async fn main() -> std::io::Result<()> {
.service(state_route)
.service(health)
})
.bind(format!("{}", opts.socket))?
.bind(opts.socket)?
.run()
.await
}
backend/src/node/connector.rs
+1 -1
View File
@@ -196,7 +196,7 @@ impl StreamHandler<Result<ws::Message, ws::ProtocolError>> for NodeConnector {
return;
}
Ok(ws::Message::Pong(_)) => return,
Ok(ws::Message::Text(text)) => text.into(),
Ok(ws::Message::Text(text)) => text.into_bytes(),
Ok(ws::Message::Binary(data)) => data,
Ok(ws::Message::Close(_)) => {
ctx.stop();
backend/src/util/location.rs
+2 -2
View File
@@ -11,7 +11,7 @@ use crate::types::{NodeId, NodeLocation};
#[derive(Clone)]
pub struct Locator {
client: reqwest::Client,
client: reqwest::blocking::Client,
cache: Arc<RwLock<FxHashMap<Ipv4Addr, Option<Arc<NodeLocation>>>>>,
}
@@ -36,7 +36,7 @@ impl LocatorFactory {
pub fn create(&self) -> Locator {
Locator {
client: reqwest::Client::new(),
client: reqwest::blocking::Client::new(),
cache: self.cache.clone(),
}
}
frontend/yarn.lock
+20 -20
View File
@@ -1594,10 +1594,10 @@ bluebird@^3.4.7, bluebird@^3.5.1:
resolved "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
version "4.11.9"
resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz#26d556829458f9d1e81fc48952493d0ba3507828"
integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==
bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.11.9:
version "4.12.0"
resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88"
integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==
bn.js@^5.1.1:
version "5.1.1"
@@ -1690,7 +1690,7 @@ braces@^3.0.1:
dependencies:
fill-range "^7.0.1"
brorand@^1.0.1:
brorand@^1.0.1, brorand@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
@@ -3046,17 +3046,17 @@ elegant-spinner@^1.0.1:
integrity sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=
elliptic@^6.0.0, elliptic@^6.5.2:
version "6.5.3"
resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz#cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6"
integrity sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==
version "6.5.4"
resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb"
integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==
dependencies:
bn.js "^4.4.0"
brorand "^1.0.1"
bn.js "^4.11.9"
brorand "^1.1.0"
hash.js "^1.0.0"
hmac-drbg "^1.0.0"
inherits "^2.0.1"
minimalistic-assert "^1.0.0"
minimalistic-crypto-utils "^1.0.0"
hmac-drbg "^1.0.1"
inherits "^2.0.4"
minimalistic-assert "^1.0.1"
minimalistic-crypto-utils "^1.0.1"
emoji-regex@^8.0.0:
version "8.0.0"
@@ -4224,7 +4224,7 @@ he@1.2.x:
resolved "https://registry.npmjs.org/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
hmac-drbg@^1.0.0:
hmac-drbg@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
@@ -4510,7 +4510,7 @@ inflight@^1.0.4:
once "^1.3.0"
wrappy "1"
inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3, inherits@~2.0.4:
inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3, inherits@~2.0.4:
version "2.0.4"
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -6278,7 +6278,7 @@ minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
minimalistic-crypto-utils@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
@@ -9654,9 +9654,9 @@ uri-js@^4.2.2:
punycode "^2.1.0"
urijs@^1.16.1:
version "1.19.5"
resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.5.tgz#119683ab4b2fb0bd637e5ea6dd9117bcac68d3e4"
integrity sha512-48z9VGWwdCV5KfizHsE05DWS5fhK6gFlx5MjO7xu0Krc5FGPWzjlXEVV0nPMrdVuP7xmMHiPZ2HoYZwKOFTZOg==
version "1.19.6"
resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.6.tgz#51f8cb17ca16faefb20b9a31ac60f84aa2b7c870"
integrity sha512-eSXsXZ2jLvGWeLYlQA3Gh36BcjF+0amo92+wHPyN1mdR8Nxf75fuEuYTd9c0a+m/vhCjRK0ESlE9YNLW+E1VEw==
urix@^0.1.0:
version "0.1.0"