Skip to content

[ETCM-715] Add new network metric (tried.peers) #959

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 8, 2021
Merged

[ETCM-715] Add new network metric (tried.peers) #959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c63a1f2
[ETCM-715] Improve log in PeerManagerActor
jb-lunatech Apr 7, 2021
525b9ab
[ETCM-715] Add network metric (tried.peers)
jb-lunatech Apr 7, 2021
b476d49
[ETCM-715] Add Grafana panel: tried/discovered
jb-lunatech Apr 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
138 changes: 138 additions & 0 deletions docker/mantis/grafana/provisioning/dashboards/mantis-dashboard.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3017,6 +3017,144 @@
"alignLevel": null
}
},
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "Prometheus",
"fieldConfig": {
"defaults": {
"custom": {},
"links": []
},
"overrides": []
},
"fill": 0,
"fillGradient": 0,
"gridPos": {
"h": 8,
"w": 24,
"x": 0,
"y": 8
},
"hiddenSeries": false,
"id": 84,
"legend": {
"avg": false,
"current": false,
"hideEmpty": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 1,
"nullPointMode": "connected",
"options": {
"alertThreshold": true
},
"percentage": true,
"pluginVersion": "7.3.6",
"pointradius": 0.5,
"points": false,
"renderer": "flot",
"seriesOverrides": [
{
"alias": "nb_tried_peers",
"hiddenSeries": true,
"hideTooltip": true,
"legend": false
},
{
"alias": "nb_discovered_peers",
"hiddenSeries": true,
"hideTooltip": true,
"legend": false
}
],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"expr": "app_network_tried_peers_gauge",
"interval": "",
"legendFormat": "nb_tried_peers",
"refId": "Number of tried peers"
},
{
"expr": "app_network_discovery_foundPeers_gauge",
"interval": "",
"legendFormat": "nb_discovered_peers",
"refId": "Number discovered peers"
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Ratio of tried / discovered peers",
"tooltip": {
"shared": true,
"sort": 0,
"value_type": "individual"
},
"transformations": [
{
"id": "calculateField",
"options": {
"alias": "Ratio",
"binary": {
"left": "nb_tried_peers",
"operator": "/",
"reducer": "sum",
"right": "nb_discovered_peers"
},
"mode": "binary",
"reduce": {
"include": [
"{{instance}}"
],
"reducer": "sum"
}
}
}
],
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"decimals": null,
"format": "percentunit",
"label": "%",
"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
}
},
{
"aliasColors": {},
"bars": false,
Expand Down
6 changes: 5 additions & 1 deletion src/main/scala/io/iohk/ethereum/network/NetworkMetrics.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package io.iohk.ethereum.network

import io.iohk.ethereum.metrics.MetricsContainer
import java.util.concurrent.atomic.AtomicLong

import io.iohk.ethereum.metrics.MetricsContainer

case object NetworkMetrics extends MetricsContainer {

private final val HandshakedIncomingPeersGauge =
Expand All @@ -20,6 +21,9 @@ case object NetworkMetrics extends MetricsContainer {

final val PendingPeersSize = metrics.registry.gauge("network.peers.pending.gauge", new AtomicLong(0))

final val TriedPeersSize =
metrics.registry.gauge("network.tried.peers.gauge", new AtomicLong(0L))

def registerAddHandshakedPeer(peer: Peer): Unit = {
if (peer.incomingConnection) {
HandshakedIncomingPeersGauge.incrementAndGet()
Expand Down
7 changes: 4 additions & 3 deletions src/main/scala/io/iohk/ethereum/network/PeerManagerActor.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,11 +154,12 @@ class PeerManagerActor(
NetworkMetrics.DiscoveredPeersSize.set(nodes.size)
NetworkMetrics.BlacklistedPeersSize.set(blacklistedPeers.size)
NetworkMetrics.PendingPeersSize.set(connectedPeers.pendingPeersCount)
NetworkMetrics.TriedPeersSize.set(triedNodes.size)

log.info(
s"Discovered ${nodes.size} nodes, " +
s"Blacklisted ${blacklistedPeers.size} nodes, " +
s"handshaked to ${connectedPeers.handshakedPeersCount}/${peerConfiguration.maxOutgoingPeers + peerConfiguration.maxIncomingPeers}, " +
s"Total number of discovered nodes ${nodes.size}. " +
s"Total number of connection attempts ${triedNodes.size}, blacklisted ${blacklistedPeers.size} nodes. " +
s"Handshaked ${connectedPeers.handshakedPeersCount}/${peerConfiguration.maxOutgoingPeers + peerConfiguration.maxIncomingPeers}, " +
s"pending connection attempts ${connectedPeers.pendingPeersCount}. " +
s"Trying to connect to ${nodesToConnect.size} more nodes."
)
Expand Down