diff --git a/api/handler.go b/api/handler.go index d3c571c4..56ab8a7d 100644 --- a/api/handler.go +++ b/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) diff --git a/client/client_test.go b/client/client_test.go index 450cb153..eb6b7a45 100644 --- a/client/client_test.go +++ b/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) diff --git a/info/container.go b/info/container.go index 9d375f4b..7858fa53 100644 --- a/info/container.go +++ b/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 { diff --git a/manager/manager_test.go b/manager/manager_test.go index cd104e5a..033f4045 100644 --- a/manager/manager_test.go +++ b/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) diff --git a/pages/containers.go b/pages/containers.go index e77aa4c2..e8f98068 100644 --- a/pages/containers.go +++ b/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 {