zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-29 03:12:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

remove IsServer field from metric model

Browse Source
This commit is contained in:
Abhishek Kondur
2023-01-12 14:49:10 +05:30
parent 2cebece6b7
commit bf9a93c41b
3 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
logic/metrics/metrics.go
View File

@@ -40,7 +40,6 @@ func Collect(iface, server, network string, peerMap models.PeerMap) (*models.Met
proxyMetrics := proxy_metrics.GetMetric(server, currPeer.PublicKey.String()) proxyMetrics := proxy_metrics.GetMetric(server, currPeer.PublicKey.String())
var newMetric = models.Metric{ var newMetric = models.Metric{
NodeName: peerMap[currPeer.PublicKey.String()].Name, NodeName: peerMap[currPeer.PublicKey.String()].Name,
IsServer: peerMap[currPeer.PublicKey.String()].IsServer,
} }
logger.Log(2, "collecting metrics for peer", address) logger.Log(2, "collecting metrics for peer", address)
newMetric.TotalReceived = int64(proxyMetrics.TrafficRecieved) newMetric.TotalReceived = int64(proxyMetrics.TrafficRecieved)
@@ -116,7 +115,6 @@ func fillUnconnectedData(metrics *models.Metrics, peerMap models.PeerMap) {
if !metrics.Connectivity[id].Connected { if !metrics.Connectivity[id].Connected {
newMetric := models.Metric{ newMetric := models.Metric{
NodeName: peerMap[r].Name, NodeName: peerMap[r].Name,
IsServer: peerMap[r].IsServer,
Uptime: 0, Uptime: 0,
TotalTime: 1, TotalTime: 1,
Connected: false, Connected: false,

2
models/metrics.go
View File

@@ -9,7 +9,6 @@ type Metrics struct {
Network string `json:"network" bson:"network" yaml:"network"` Network string `json:"network" bson:"network" yaml:"network"`
NodeID string `json:"node_id" bson:"node_id" yaml:"node_id"` NodeID string `json:"node_id" bson:"node_id" yaml:"node_id"`
NodeName string `json:"node_name" bson:"node_name" yaml:"node_name"` NodeName string `json:"node_name" bson:"node_name" yaml:"node_name"`
IsServer string `json:"isserver" bson:"isserver" yaml:"isserver" validate:"checkyesorno"`
Connectivity map[string]Metric `json:"connectivity" bson:"connectivity" yaml:"connectivity"` Connectivity map[string]Metric `json:"connectivity" bson:"connectivity" yaml:"connectivity"`
FailoverPeers map[string]string `json:"needsfailover" bson:"needsfailover" yaml:"needsfailover"` FailoverPeers map[string]string `json:"needsfailover" bson:"needsfailover" yaml:"needsfailover"`
} }
@@ -17,7 +16,6 @@ type Metrics struct {
// Metric - holds a metric for data between nodes // Metric - holds a metric for data between nodes
type Metric struct { type Metric struct {
NodeName string `json:"node_name" bson:"node_name" yaml:"node_name"` NodeName string `json:"node_name" bson:"node_name" yaml:"node_name"`
IsServer string `json:"isserver" bson:"isserver" yaml:"isserver" validate:"checkyesorno"`
Uptime int64 `json:"uptime" bson:"uptime" yaml:"uptime"` Uptime int64 `json:"uptime" bson:"uptime" yaml:"uptime"`
TotalTime int64 `json:"totaltime" bson:"totaltime" yaml:"totaltime"` TotalTime int64 `json:"totaltime" bson:"totaltime" yaml:"totaltime"`
Latency int64 `json:"latency" bson:"latency" yaml:"latency"` Latency int64 `json:"latency" bson:"latency" yaml:"latency"`

1
mq/handlers.go
View File

@@ -248,7 +248,6 @@ func updateNodeMetrics(currentNode *models.Node, newMetrics *models.Metrics) boo
} }
} }
extMetric.NodeName = attachedClients[i].ClientID extMetric.NodeName = attachedClients[i].ClientID
extMetric.IsServer = "no"
delete(newMetrics.Connectivity, attachedClients[i].PublicKey) delete(newMetrics.Connectivity, attachedClients[i].PublicKey)
newMetrics.Connectivity[attachedClients[i].ClientID] = extMetric newMetrics.Connectivity[attachedClients[i].ClientID] = extMetric
} }