Use data container for the output-file format

Signed-off-by: Richard Wall <[email protected]>

Author: wallrj

pkg/agent/run.go

@@ -225,7 +225,6 @@ func Run(cmd *cobra.Command, args []string) (returnErr error) {
 	}
 
 	dataGatherers := map[string]datagatherer.DataGatherer{}
-
 	// load datagatherer config and boot each one
 	for _, dgConfig := range config.DataGatherers {
 		kind := dgConfig.Kind
@@ -379,7 +378,17 @@ func gatherAndOutputData(ctx context.Context, eventf Eventf, config CombinedConf
 	}
 
 	if config.OutputPath != "" {
-		data, err := json.MarshalIndent(readings, "", "  ")
+		clusterID := clusteruid.ClusterUIDFromContext(ctx)
+		payload := api.DataReadingsPost{
+			AgentMetadata: &api.AgentMetadata{
+				Version: version.PreflightVersion,
+				ClusterID: clusterID,
+			},
+			DataGatherTime: time.Now(),
+			DataReadings: readings,
+		}
+
+		data, err := json.MarshalIndent(payload, "", "  ")
 		if err != nil {
 			return fmt.Errorf("failed to marshal JSON: %s", err)
 		}