Read cluster_id from env variable and add it to summary data (#596)

src/config/configManager.go

@@ -2,6 +2,7 @@ package config
 
 import (
 	"os"
+	"strconv"
 
 	types "github.com/accuknox/auto-policy-discovery/src/types"
 	"github.com/spf13/viper"
@@ -120,8 +121,12 @@ func LoadConfigFromFile() {
 	CurrentCfg.Status = 1 // 1: active 0: inactive
 
 	// Load cluster related config
+	workspaceId, _ := strconv.ParseInt(os.Getenv("workspace_id"), 0, 32)
+	clusterId, _ := strconv.ParseInt(os.Getenv("cluster_id"), 0, 32)
+
 	CurrentCfg.ClusterName = os.Getenv("cluster_name")
-	CurrentCfg.WorkspaceID = os.Getenv("workspace_id")
+	CurrentCfg.WorkspaceID = int32(workspaceId)
+	CurrentCfg.ClusterID = int32(clusterId)
 
 	// load network policy discovery
 	CurrentCfg.ConfigNetPolicy = types.ConfigNetworkPolicy{
@@ -233,10 +238,14 @@ func GetCfgClusterName() string {
 	return CurrentCfg.ClusterName
 }
 
-func GetCfgWorkspaceId() string {
+func GetCfgWorkspaceId() int32 {
 	return CurrentCfg.WorkspaceID
 }
 
+func GetCfgClusterId() int32 {
+	return CurrentCfg.ClusterID
+}
+
 // ============================= //
 // == Get Network Config Info == //
 // ============================= //

src/libs/dbHandler.go

@@ -521,7 +521,7 @@ func getSysSummarySQL(db *sql.DB, dbName string, filterOptions types.SystemSumma
 		concatWhereClause(&whereClause, "cluster_name")
 		args = append(args, filterOptions.ClusterName)
 	}
-	if filterOptions.ClusterId != "" {
+	if filterOptions.ClusterId != 0 {
 		concatWhereClause(&whereClause, "cluster_id")
 		args = append(args, filterOptions.ClusterId)
 	}

src/observability/consumer.go

@@ -1,7 +1,6 @@
 package observability
 
 import (
-	"strconv"
 	"sync"
 
 	ppb "github.com/accuknox/auto-policy-discovery/src/protobuf/v1/publisher"
@@ -109,10 +108,9 @@ func validateSummaryRequest(consumer *SummaryConsumer, summary types.SystemSumma
 
 func convertSystemSummaryToGrpcResponse(summary *types.SystemSummary) *ppb.SummaryResponse {
 
-	clusterId, _ := strconv.ParseInt(summary.ClusterId, 0, 32)
 	return &ppb.SummaryResponse{
 		ClusterName:    summary.ClusterName,
-		ClusterId:      int32(clusterId),
+		ClusterId:      summary.ClusterId,
 		NamespaceName:  summary.NamespaceName,
 		NamespaceId:    summary.NamespaceId,
 		ContainerName:  summary.ContainerName,

src/observability/summarizer.go

@@ -91,9 +91,8 @@ func convertSysLogToSysSummaryMap(syslogs []*pb.Log) {
 			sysSummary.ClusterName = config.GetCfgClusterName()
 		}
 
-		workspaceId, _ := strconv.ParseInt(config.GetCfgWorkspaceId(), 0, 32)
-
-		sysSummary.WorkspaceId = int32(workspaceId)
+		sysSummary.WorkspaceId = config.GetCfgWorkspaceId()
+		sysSummary.ClusterId = config.GetCfgClusterId()
 		sysSummary.NamespaceName = syslog.NamespaceName
 		sysSummary.ContainerName = syslog.ContainerName
 		sysSummary.ContainerImage = syslog.ContainerImage

src/types/configData.go

@@ -115,7 +115,8 @@ type Configuration struct {
 	Status     int    `json:"status,omitempty" bson:"status,omitempty"`
 
 	ClusterName string `json:"cluster_name,omitempty" bson:"cluster_name,omitempty"`
-	WorkspaceID string `json:"workspace_id,omitempty" bson:"workspace_id,omitempty"`
+	WorkspaceID int32  `json:"workspace_id,omitempty" bson:"workspace_id,omitempty"`
+	ClusterID   int32  `json:"cluster_id,omitempty" bson:"cluster_id,omitempty"`
 
 	ConfigDB             ConfigDB             `json:"config_db,omitempty" bson:"config_db,omitempty"`
 	ConfigCiliumHubble   ConfigCiliumHubble   `json:"config_cilium_hubble,omitempty" bson:"config_cilium_hubble,omitempty"`

src/types/observability.go

@@ -97,7 +97,7 @@ type NetworkSummary struct {
 
 type SystemSummary struct {
 	ClusterName    string `json:"ClusterName,omitempty"`
-	ClusterId      string `json:"ClusterId,omitempty"`
+	ClusterId      int32  `json:"ClusterId,omitempty"`
 	WorkspaceId    int32  `json:"WorkspaceId,omitempty"`
 	NamespaceName  string `json:"Namespace,omitempty"`
 	NamespaceId    int32  `json:"NamespaceId,omitempty"`