void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-06 12:33:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adding peer metrics

Browse source 
still need to be wired up for use
This commit is contained in:
Grant Limberg 2023-05-03 14:04:01 -07:00
parent 925599cab0
commit 289f231677
No known key found for this signature in database
GPG key ID: 8F2F97D3BE8D7735
4 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
node/Metrics.cpp
View file

@ -176,6 +176,12 @@ namespace ZeroTier {
prometheus::simpleapi::counter_family_t network_outgoing_packets prometheus::simpleapi::counter_family_t network_outgoing_packets
{ "zt_network_outgoing_packets", "number of outgoing packets per network" }; { "zt_network_outgoing_packets", "number of outgoing packets per network" };
// PeerMetrics
prometheus::CustomFamily<prometheus::Histogram<uint64_t>> peer_latency
{ "zt_peer_latency", "peer latency (ms)", {{}}};
prometheus::simpleapi::gauge_family_t peer_path_count
{ "zt_peer_path_count", "number of paths to peer" };
// General Controller Metrics // General Controller Metrics
prometheus::simpleapi::gauge_metric_t network_count prometheus::simpleapi::gauge_metric_t network_count
{"controller_network_count", "number of networks the controller is serving"}; {"controller_network_count", "number of networks the controller is serving"};

4
node/Metrics.hpp
View file

@ -107,6 +107,10 @@ namespace ZeroTier {
extern prometheus::simpleapi::counter_family_t network_incoming_packets; extern prometheus::simpleapi::counter_family_t network_incoming_packets;
extern prometheus::simpleapi::counter_family_t network_outgoing_packets; extern prometheus::simpleapi::counter_family_t network_outgoing_packets;
// Peer Metrics
extern prometheus::CustomFamily<prometheus::Histogram<uint64_t>> peer_latency;
extern prometheus::simpleapi::gauge_family_t peer_path_count;
// General Controller Metrics // General Controller Metrics
extern prometheus::simpleapi::gauge_metric_t network_count; extern prometheus::simpleapi::gauge_metric_t network_count;
extern prometheus::simpleapi::gauge_metric_t member_count; extern prometheus::simpleapi::gauge_metric_t member_count;

9
node/Peer.cpp
View file

@ -28,11 +28,6 @@ namespace ZeroTier {
static unsigned char s_freeRandomByteCounter = 0; static unsigned char s_freeRandomByteCounter = 0;
char * peerIDString(const Identity &id) {
char out[16];
return id.address().toString(out);
}
Peer::Peer(const RuntimeEnvironment *renv,const Identity &myIdentity,const Identity &peerIdentity) : Peer::Peer(const RuntimeEnvironment *renv,const Identity &myIdentity,const Identity &peerIdentity) :
RR(renv), RR(renv),
_lastReceive(0), _lastReceive(0),
@ -55,7 +50,9 @@ Peer::Peer(const RuntimeEnvironment *renv,const Identity &myIdentity,const Ident
_directPathPushCutoffCount(0), _directPathPushCutoffCount(0),
_echoRequestCutoffCount(0), _echoRequestCutoffCount(0),
_localMultipathSupported(false), _localMultipathSupported(false),
_lastComputedAggregateMeanLatency(0) _lastComputedAggregateMeanLatency(0),
_peer_latency{Metrics::peer_latency.Add({{"node_id", OSUtils::nodeIDStr(peerIdentity.address().toInt())}}, std::vector<uint64_t>{1,3,6,10,30,60,100,300,600,1000})},
_path_count{Metrics::peer_path_count.Add({{"node_id", OSUtils::nodeIDStr(peerIdentity.address().toInt())}})}
{ {
if (!myIdentity.agree(peerIdentity,_key)) { if (!myIdentity.agree(peerIdentity,_key)) {
throw ZT_EXCEPTION_INVALID_ARGUMENT; throw ZT_EXCEPTION_INVALID_ARGUMENT;

3
node/Peer.hpp
View file

@ -598,6 +598,9 @@ private:
int32_t _lastComputedAggregateMeanLatency; int32_t _lastComputedAggregateMeanLatency;
SharedPtr<Bond> _bond; SharedPtr<Bond> _bond;
prometheus::Histogram<uint64_t> _peer_latency;
prometheus::simpleapi::gauge_metric_t _path_count;
}; };
} // namespace ZeroTier } // namespace ZeroTier