Skip to content

Commit

Permalink
Revert "[metricbeat]Docker: add size flag to docker.container (elasti…
Browse files Browse the repository at this point in the history
…c#15224)" (elastic#16600)

* Revert "[metricbeat]Docker: add size flag to docker.container (elastic#15224)"

This reverts commit f40055e.
  • Loading branch information
mtojek authored Feb 26, 2020
1 parent ed693e9 commit e3a9d83
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Fix skipping protocol scheme by light modules. {pull}16205[pull]
- Made `logstash-xpack` module once again have parity with internally-collected Logstash monitoring data. {pull}16198[16198]
- Change sqs metricset to use average as statistic method. {pull}16438[16438]
- Revert changes in `docker` module: add size flag to docker.container. {pull}16600[16600]

*Packetbeat*

Expand Down
4 changes: 2 additions & 2 deletions metricbeat/module/docker/container/_meta/data.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
"org_label-schema_version": "6.5.1"
},
"size": {
"rw": 193031181,
"root_fs": 1290400448
"root_fs": 0,
"rw": 0
},
"status": "Up 7 minutes (healthy)"
}
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/docker/container/container.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
// This is based on https://docs.docker.com/engine/reference/api/docker_remote_api_v1.24/#/list-containers.
func (m *MetricSet) Fetch(ctx context.Context, r mb.ReporterV2) error {
// Fetch a list of all containers.
containers, err := m.dockerClient.ContainerList(ctx, types.ContainerListOptions{Size: true})
containers, err := m.dockerClient.ContainerList(ctx, types.ContainerListOptions{})
if err != nil {
return errors.Wrap(err, "failed to get docker containers list")
}
Expand Down

0 comments on commit e3a9d83

Please sign in to comment.