Passing the base platform name to the nodemanager #3612
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lancewf
commented
May 6, 2020
| @@ -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(), | |||
There was a problem hiding this comment.
This is cleaning up the way we grab the platform.
lancewf
commented
May 6, 2020
| @@ -30,6 +30,7 @@ type ChefRun struct { | |||
| NodeRun backend.Run | |||
| NodeAttribute backend.NodeAttribute | |||
| BulkableRequests []elastic.BulkableRequest | |||
| Platform string | |||
There was a problem hiding this comment.
Added the raw platform to the message that is passed along in the pipeline.
lancewf
commented
May 6, 2020
| @@ -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() | |||
There was a problem hiding this comment.
This is the only place we have access to the raw platform. So, we set the pipeline msg platform here.
lancewf
commented
May 6, 2020
| @@ -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, | |||
There was a problem hiding this comment.
Then at this point, we can set the platform from the pipeline message.
Signed-off-by: Lance Finfrock <[email protected]>
lancewf
force-pushed
the
base_platform_name
branch
from
dc916e8 to
c170e34
Compare
3 tasks
vjeffrey
pushed a commit
that referenced
this pull request
May 6, 2020
Signed-off-by: Lance Finfrock <[email protected]>
vjeffrey
pushed a commit
that referenced
this pull request
May 7, 2020
…sort options (#3596) * send platform family and version from ingest -> nodemanager Signed-off-by: Victoria Jeffrey <[email protected]> * send all report tags (including env) to nodemanager Signed-off-by: Victoria Jeffrey <[email protected]> * allow sorting by state for nodes Signed-off-by: Victoria Jeffrey <[email protected]> * test updates Signed-off-by: Victoria Jeffrey <[email protected]> * test for sorting nodes Signed-off-by: Victoria Jeffrey <[email protected]> * fix unit test Signed-off-by: Victoria Jeffrey <[email protected]> * use lowercase environment Signed-off-by: Victoria Jeffrey <[email protected]> * argh one more test fix Signed-off-by: Victoria Jeffrey <[email protected]> * Passing the base platform name to the nodemanager (#3612) Signed-off-by: Lance Finfrock <[email protected]> * unit test fix Signed-off-by: Victoria Jeffrey <[email protected]> Co-authored-by: Lance Finfrock <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Before:
After:
