handle static node status

gravitl · Nov 21, 2024 · 079b2ae · 079b2ae
1 parent 87f35f1
commit 079b2ae
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 2 deletions.
diff --git a/logic/status.go b/logic/status.go
@@ -6,8 +6,18 @@ import (
 	"github.com/gravitl/netmaker/models"
 )
 
-func GetNodeStatus(node *models.Node) {
+var GetNodeStatus = getNodeStatus
+
+func getNodeStatus(node *models.Node) {
 	// On CE check only last check-in time
+	if node.IsStatic {
+		if !node.StaticNode.Enabled {
+			node.Status = models.OfflineSt
+			return
+		}
+		node.Status = models.OnlineSt
+		return
+	}
 	if time.Since(node.LastCheckIn) > time.Minute*10 {
 		node.Status = models.OfflineSt
 		return

diff --git a/models/api_node.go b/models/api_node.go
@@ -52,6 +52,7 @@ type ApiNode struct {
 	IsStatic          bool                `json:"is_static"`
 	IsUserNode        bool                `json:"is_user_node"`
 	StaticNode        ExtClient           `json:"static_node"`
+	Status            NodeStatus          `json:"status"`
 }
 
 // ApiNode.ConvertToServerNode - converts an api node to a server node
@@ -192,6 +193,7 @@ func (nm *Node) ConvertToAPINode() *ApiNode {
 	apiNode.IsStatic = nm.IsStatic
 	apiNode.IsUserNode = nm.IsUserNode
 	apiNode.StaticNode = nm.StaticNode
+	apiNode.Status = nm.Status
 	return &apiNode
 }
 

diff --git a/models/node.go b/models/node.go
@@ -18,6 +18,7 @@ const (
 	OfflineSt NodeStatus = "offline"
 	WarningSt NodeStatus = "warning"
 	ErrorSt   NodeStatus = "error"
+	UnKnown   NodeStatus = "unknown"
 )
 
 // LastCheckInThreshold - if node's checkin more than this threshold,then node is declared as offline

diff --git a/pro/initialize.go b/pro/initialize.go
@@ -140,6 +140,7 @@ func InitPro() {
 	logic.IntialiseGroups = proLogic.UserGroupsInit
 	logic.AddGlobalNetRolesToAdmins = proLogic.AddGlobalNetRolesToAdmins
 	logic.GetUserGroupsInNetwork = proLogic.GetUserGroupsInNetwork
+	logic.GetNodeStatus = proLogic.GetNodeStatus
 }
 
 func retrieveProLogo() string {

diff --git a/pro/logic/status.go b/pro/logic/status.go
@@ -8,15 +8,43 @@ import (
 )
 
 func GetNodeStatus(node *models.Node) {
-	// On CE check only last check-in time
 	if time.Since(node.LastCheckIn) > models.LastCheckInThreshold {
 		node.Status = models.OfflineSt
 		return
 	}
+	if node.IsStatic {
+		if !node.StaticNode.Enabled {
+			node.Status = models.OfflineSt
+			return
+		}
+		// check extclient connection from metrics
+		ingressMetrics, err := GetMetrics(node.StaticNode.IngressGatewayID)
+		if err != nil || ingressMetrics == nil || ingressMetrics.Connectivity == nil {
+			node.Status = models.UnKnown
+			return
+		}
+		if metric, ok := ingressMetrics.Connectivity[node.StaticNode.ClientID]; ok {
+			if metric.Connected {
+				node.Status = models.OnlineSt
+				return
+			} else {
+				node.Status = models.OfflineSt
+				return
+			}
+		}
+		node.Status = models.UnKnown
+		return
+	}
 	metrics, err := logic.GetMetrics(node.ID.String())
 	if err != nil {
 		return
 	}
+	if metrics == nil || metrics.Connectivity == nil {
+		if time.Since(node.LastCheckIn) < models.LastCheckInThreshold {
+			node.Status = models.OnlineSt
+			return
+		}
+	}
 	peerNotConnectedCnt := 0
 	for peerID, metric := range metrics.Connectivity {
 		peer, err := logic.GetNodeByID(peerID)