Merge pull request #235 from vmarmol/rm

Remove remaining parts of samples and percentiles.

api/handler.go

@@ -170,7 +170,6 @@ func getContainerInfoRequest(body io.ReadCloser) (*info.ContainerInfoRequest, er
 
 	// Default stats and samples is 64.
 	query.NumStats = 64
-	query.NumSamples = 64
 
 	decoder := json.NewDecoder(body)
 	err := decoder.Decode(&query)

client/client_test.go

@@ -93,10 +93,7 @@ func TestGetMachineinfo(t *testing.T) {
 
 func TestGetContainerInfo(t *testing.T) {
 	query := &info.ContainerInfoRequest{
-		NumStats:               3,
-		NumSamples:             2,
-		CpuUsagePercentiles:    []int{10, 50, 90},
-		MemoryUsagePercentiles: []int{10, 80, 90},
+		NumStats: 3,
 	}
 	containerName := "/some/container"
 	cinfo := itest.GenerateRandomContainerInfo(containerName, 4, query, 1*time.Second)

info/container.go

@@ -57,13 +57,6 @@ type ContainerReference struct {
 type ContainerInfoRequest struct {
 	// Max number of stats to return.
 	NumStats int `json:"num_stats,omitempty"`
-	// Max number of samples to return.
-	NumSamples int `json:"num_samples,omitempty"`
-
-	// Different percentiles of CPU usage within a period. The values must be within [0, 100]
-	CpuUsagePercentiles []int `json:"cpu_usage_percentiles,omitempty"`
-	// Different percentiles of memory usage within a period. The values must be within [0, 100]
-	MemoryUsagePercentiles []int `json:"memory_usage_percentiles,omitempty"`
 }
 
 type ContainerInfo struct {

manager/manager_test.go

@@ -121,8 +121,7 @@ func TestGetContainerInfo(t *testing.T) {
 	}
 
 	query := &info.ContainerInfoRequest{
-		NumStats:   256,
-		NumSamples: 128,
+		NumStats: 256,
 	}
 
 	m, infosMap, handlerMap := expectManagerWithContainers(containers, query, t)
@@ -155,8 +154,7 @@ func TestSubcontainersInfo(t *testing.T) {
 	}
 
 	query := &info.ContainerInfoRequest{
-		NumStats:   64,
-		NumSamples: 64,
+		NumStats: 64,
 	}
 
 	m, _, _ := expectManagerWithContainers(containers, query, t)

pages/containers.go

@@ -260,8 +260,7 @@ func ServerContainersPage(m manager.Manager, w http.ResponseWriter, u *url.URL)
 
 	// Get the container.
 	reqParams := info.ContainerInfoRequest{
-		NumStats:   60,
-		NumSamples: 60,
+		NumStats: 60,
 	}
 	cont, err := m.GetContainerInfo(containerName, &reqParams)
 	if err != nil {