Passing the base platform name to the nodemanager (#3612)

Signed-off-by: Lance Finfrock <[email protected]>
chef · May 6, 2020 · 154753b · 154753b
1 parent 0318ae6
commit 154753b
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/components/ingest-service/backend/chef_client_run.go b/components/ingest-service/backend/chef_client_run.go
@@ -250,7 +250,7 @@ func (ccr *ChefClientRun) initializeNodeInfo() (sharedNodeInfo NodeInfo, err err
 		UptimeSeconds:    int64(uptimeSeconds),
 		OrganizationName: ccr.OrganizationName,
 		Environment:      ccr.NodePayload.ChefEnvironment,
-		Platform:         getPlatformWithVersion(ccr.NodePayload),
+		Platform:         ccr.PlatformWithVersion(),
 		PlatformFamily:   EmptyStringIfNil(ccr.NodePayload.Automatic["platform_family"]),
 		PlatformVersion:  EmptyStringIfNil(ccr.NodePayload.Automatic["platform_version"]),
 		// Tags                 ccr. TODO: Is this compliance tags?
@@ -286,6 +286,10 @@ func (ccr *ChefClientRun) initializeNodeInfo() (sharedNodeInfo NodeInfo, err err
 	return // nolint: nakedret
 }
 
+func (ccr *ChefClientRun) Platform() string {
+	return EmptyStringIfNil(ccr.NodePayload.Automatic["platform"])
+}
+
 // ChefVersion Returns a chef version string retrieved from automatic attributes or an empty string if it is not present
 func (ccr *ChefClientRun) ChefVersion() string {
 	chefPackages := extractMapOrEmpty(ccr.NodePayload.Automatic, "chef_packages")
@@ -492,9 +496,9 @@ func countNumberOfValueObject(object interface{}) int {
 	return count
 }
 
-func getPlatformWithVersion(nodePayload NodePayload) string {
-	platform := EmptyStringIfNil(nodePayload.Automatic["platform"])
-	platformVersion := EmptyStringIfNil(nodePayload.Automatic["platform_version"])
+func (ccr *ChefClientRun) PlatformWithVersion() string {
+	platform := ccr.Platform()
+	platformVersion := EmptyStringIfNil(ccr.NodePayload.Automatic["platform_version"])
 
 	platformAndVersion := ""
 

diff --git a/components/ingest-service/pipeline/message/chef_run.go b/components/ingest-service/pipeline/message/chef_run.go
@@ -30,6 +30,7 @@ type ChefRun struct {
 	NodeRun          backend.Run
 	NodeAttribute    backend.NodeAttribute
 	BulkableRequests []elastic.BulkableRequest
+	Platform         string
 	Ctx              context.Context
 	errc             chan<- error
 }
@@ -43,6 +44,7 @@ func NewChefRun(ctx context.Context, run *chef.Run, err chan<- error) ChefRun {
 		backend.Run{},
 		backend.NodeAttribute{},
 		[]elastic.BulkableRequest{},
+		"",
 		ctx,
 		err,
 	}

diff --git a/components/ingest-service/pipeline/processor/transmogrify_run.go b/components/ingest-service/pipeline/processor/transmogrify_run.go
@@ -80,6 +80,9 @@ func ChefRunTransmogrify(in <-chan message.ChefRun, out chan<- message.ChefRun,
 				continue
 			}
 
+			// Needed for the nodemanager because the platform field is combined with the version.
+			msg.Platform = ccr.Platform()
+
 			message.PropagateChefRun(out, &msg)
 		}
 		close(out)

diff --git a/components/ingest-service/pipeline/publisher/node_manager_publisher.go b/components/ingest-service/pipeline/publisher/node_manager_publisher.go
@@ -32,7 +32,7 @@ func nodeManagerPublisher(in <-chan message.ChefRun, nodeManagerClient manager.N
 				continue
 			}
 
-			nodeMetadata, err := gatherInfoForNode(msg.Node)
+			nodeMetadata, err := gatherInfoForNode(msg)
 			if err != nil {
 				log.Errorf("unable parse node data to be send to manager. aborting attempt to send info to mgr for node %s -- %v", msg.Node.NodeName, err)
 				out <- msg
@@ -51,7 +51,9 @@ func nodeManagerPublisher(in <-chan message.ChefRun, nodeManagerClient manager.N
 	return out
 }
 
-func gatherInfoForNode(node backend.Node) (*manager.NodeMetadata, error) {
+func gatherInfoForNode(msg message.ChefRun) (*manager.NodeMetadata, error) {
+	node := msg.Node
+
 	// convert node check in time to proto timestamp
 	timestamp, err := ptypes.TimestampProto(node.Checkin)
 	if err != nil {
@@ -82,7 +84,7 @@ func gatherInfoForNode(node backend.Node) (*manager.NodeMetadata, error) {
 	return &manager.NodeMetadata{
 		Uuid:            node.EntityUuid,
 		Name:            node.NodeName,
-		PlatformName:    node.PlatformFamily,
+		PlatformName:    msg.Platform,
 		PlatformRelease: node.PlatformVersion,
 		LastContact:     timestamp,
 		SourceId:        node.CloudID,