Merge pull request #261 from jetstack/update-datareadings-endpoint

These changes will update the agent's datareadings endpoint. The new saas endpoint comes with better memory usage and fewer limitations compared to the old one. The old `api/v1/org/<orgID>/datareadings` endpoint will become deprecated.

Author: Oluwole Fadeyi

pkg/agent/run.go

@@ -329,7 +329,6 @@ func gatherData(ctx context.Context, config Config, dataGatherers map[string]dat
 
 func postData(config Config, preflightClient *client.PreflightClient, readings []*api.DataReading) error {
 	baseURL := config.Server
-	var err error
 
 	log.Println("Running Agent...")
 	log.Println("Posting data to:", baseURL)
@@ -358,12 +357,18 @@ func postData(config Config, preflightClient *client.PreflightClient, readings [
 			return fmt.Errorf("Received response with status code %d. Body: %s", code, errorContent)
 		}
 		log.Println("Data sent successfully.")
-	} else {
-		err := preflightClient.PostDataReadings(config.OrganizationID, readings)
-		if err != nil {
-			return fmt.Errorf("Post to server failed: %+v", err)
-		}
-		log.Println("Data sent successfully.")
+		return err
 	}
-	return err
+
+	if config.ClusterID == "" {
+		return fmt.Errorf("Post to server failed: missing clusterID from agent configuration")
+	}
+
+	err := preflightClient.PostDataReadings(config.OrganizationID, config.ClusterID, readings)
+	if err != nil {
+		return fmt.Errorf("Post to server failed: %+v", err)
+	}
+	log.Println("Data sent successfully.")
+
+	return nil
 }

pkg/client/client.go

@@ -76,7 +76,7 @@ func (c *PreflightClient) usingOAuth2() bool {
 }
 
 // PostDataReadings sends a slice of readings to Preflight.
-func (c *PreflightClient) PostDataReadings(orgID string, readings []*api.DataReading) error {
+func (c *PreflightClient) PostDataReadings(orgID, clusterID string, readings []*api.DataReading) error {
 	payload := api.DataReadingsPost{
 		AgentMetadata:  c.agentMetadata,
 		DataGatherTime: time.Now().UTC(),
@@ -87,7 +87,7 @@ func (c *PreflightClient) PostDataReadings(orgID string, readings []*api.DataRea
 		return err
 	}
 
-	res, err := c.Post(filepath.Join("/api/v1/org", orgID, "datareadings"), bytes.NewBuffer(data))
+	res, err := c.Post(filepath.Join("/api/v1/org", orgID, "datareadings", clusterID), bytes.NewBuffer(data))
 	if err != nil {
 		return err
 	}