Merge pull request #1596 from gravitl/feature_v0.16.1_ee_check

ee check

ee/initialize.go

@@ -9,6 +9,7 @@ import (
 	"github.com/gravitl/netmaker/logger"
 	"github.com/gravitl/netmaker/logic"
 	"github.com/gravitl/netmaker/models"
+	"github.com/gravitl/netmaker/servercfg"
 )
 
 // InitEE - Initialize EE Logic
@@ -34,7 +35,7 @@ func setControllerLimits() {
 	logic.Users_Limit = Limits.Users
 	logic.Clients_Limit = Limits.Clients
 	logic.Free_Tier = Limits.FreeTier
-	logic.Is_EE = true
+	servercfg.Is_EE = true
 }
 
 func retrieveEELogo() string {

logic/serverconf.go

@@ -17,8 +17,6 @@ var (
 	Clients_Limit = 1000000000
 	// Free_Tier - specifies if free tier
 	Free_Tier = false
-	// Is_EE - specifies if enterprise
-	Is_EE = false
 )
 
 // constant for database key for storing server ids

models/structs.go

@@ -218,6 +218,7 @@ type ServerConfig struct {
 	Version     string `yaml:"version"`
 	MQPort      string `yaml:"mqport"`
 	Server      string `yaml:"server"`
+	Is_EE       bool   `yaml:"isee"`
 }
 
 // User.NameInCharset - returns if name is in charset below or not

netclient/functions/mqpublish.go

@@ -116,7 +116,7 @@ func checkin(currentRun int) {
 		}
 		Hello(&nodeCfg)
 		checkCertExpiry(&nodeCfg)
-		if currentRun >= 5 {
+		if currentRun >= 5 && nodeCfg.Server.Is_EE {
 			logger.Log(0, "collecting metrics for node", nodeCfg.Node.Name)
 			publishMetrics(&nodeCfg)
 		}

servercfg/serverconf.go

@@ -15,6 +15,7 @@ import (
 
 var (
 	Version = "dev"
+	Is_EE   = false
 )
 
 // SetHost - sets the host ip
@@ -84,6 +85,10 @@ func GetServerConfig() config.ServerConfig {
 	cfg.PortForwardServices = services
 	cfg.Server = GetServer()
 	cfg.Verbosity = GetVerbosity()
+	cfg.IsEE = "no"
+	if Is_EE {
+		cfg.IsEE = "yes"
+	}
 
 	return cfg
 }
@@ -101,6 +106,7 @@ func GetServerInfo() models.ServerConfig {
 	}
 	cfg.Version = GetVersion()
 	cfg.Server = GetServer()
+	cfg.Is_EE = GetServerConfig().IsEE == "yes"
 
 	return cfg
 }