blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix num nodes metrics (#7068) 

* Fix num nodes metric

* Fix node count metrics
This commit is contained in:
Sagar Dhawan 2019-11-20 17:00:31 -08:00 committed by GitHub
parent 3415db9739
commit 100b9dd12a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 58 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/src/cluster_info.rs
View File

@ -745,7 +745,11 @@ impl ClusterInfo {
let (peers, peers_and_stakes) = self.sorted_tvu_peers_and_stakes(stakes); let (peers, peers_and_stakes) = self.sorted_tvu_peers_and_stakes(stakes);
let broadcast_len = peers_and_stakes.len(); let broadcast_len = peers_and_stakes.len();
if broadcast_len == 0 { if broadcast_len == 0 {
datapoint_debug!("cluster_info-num_nodes", ("count", 1, i64)); datapoint_debug!(
"cluster_info-num_nodes",
("live_count", 1, i64),
("broadcast_count", 1, i64)
);
return Ok(()); return Ok(());
} }
let mut packets: Vec<_> = shreds let mut packets: Vec<_> = shreds
@ -768,7 +772,18 @@ impl ClusterInfo {
} }
} }
datapoint_debug!("cluster_info-num_nodes", ("count", broadcast_len + 1, i64)); let mut num_live_peers = 1i64;
peers.iter().for_each(|p| {
// A peer is considered live if they generated their contact info recently
if timestamp() - p.wallclock <= CRDS_GOSSIP_PULL_CRDS_TIMEOUT_MS {
num_live_peers += 1;
}
});
datapoint_debug!(
"cluster_info-num_nodes",
("live_count", num_live_peers, i64),
("broadcast_count", broadcast_len + 1, i64)
);
Ok(()) Ok(())
} }

44
metrics/scripts/grafana-provisioning/dashboards/testnet-monitor.json
View File

@ -236,7 +236,7 @@
"hide": false, "hide": false,
"orderByTime": "ASC", "orderByTime": "ASC",
"policy": "default", "policy": "default",
"query": "SELECT LAST(median) FROM ( SELECT median(count) FROM \"$testnet\".\"autogen\".\"cluster_info-num_nodes\" WHERE $timeFilter AND count > 0 GROUP BY time(5s) )\n", "query": "SELECT LAST(median) FROM ( SELECT median(live_count) FROM \"$testnet\".\"autogen\".\"cluster_info-num_nodes\" WHERE $timeFilter AND live_count > 0 GROUP BY time(5s) )\n",
"rawQuery": true, "rawQuery": true,
"refId": "A", "refId": "A",
"resultFormat": "time_series", "resultFormat": "time_series",
@ -1713,9 +1713,47 @@
"hide": false, "hide": false,
"orderByTime": "ASC", "orderByTime": "ASC",
"policy": "default", "policy": "default",
"query": "SELECT median(\"count\") AS \"total\" FROM \"$testnet\".\"autogen\".\"cluster_info-num_nodes\" WHERE $timeFilter AND count > 0 GROUP BY time(5s)", "query": "SELECT median(\"broadcast_count\") AS \"broadcast_total\" FROM \"$testnet\".\"autogen\".\"cluster_info-num_nodes\" WHERE $timeFilter AND broadcast_count > 0 GROUP BY time(5s)",
"rawQuery": true, "rawQuery": true,
"refId": "C", "refId": "A",
"resultFormat": "time_series",
"select": [
[
{
"params": [
"value"
],
"type": "field"
},
{
"params": [],
"type": "mean"
}
]
],
"tags": []
},
{
"groupBy": [
{
"params": [
"$__interval"
],
"type": "time"
},
{
"params": [
"null"
],
"type": "fill"
}
],
"hide": false,
"orderByTime": "ASC",
"policy": "default",
"query": "SELECT median(\"live_count\") AS \"live_total\" FROM \"$testnet\".\"autogen\".\"cluster_info-num_nodes\" WHERE $timeFilter AND live_count > 0 GROUP BY time(5s)",
"rawQuery": true,
"refId": "B",
"resultFormat": "time_series", "resultFormat": "time_series",
"select": [ "select": [
[ [