From 2522bca8f2000166316852a4bbb76796d1fcd783 Mon Sep 17 00:00:00 2001 From: Marcin Tojek Date: Wed, 26 Feb 2020 14:07:06 +0100 Subject: [PATCH 1/2] Revert "[metricbeat]Docker: add size flag to docker.container (#15224)" This reverts commit f40055e27f6754ca81d643978e735a7e5fe83bae. --- metricbeat/module/docker/container/_meta/data.json | 4 ++-- metricbeat/module/docker/container/container.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/metricbeat/module/docker/container/_meta/data.json b/metricbeat/module/docker/container/_meta/data.json index dd9f588a1b5..88123286939 100644 --- a/metricbeat/module/docker/container/_meta/data.json +++ b/metricbeat/module/docker/container/_meta/data.json @@ -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)" } diff --git a/metricbeat/module/docker/container/container.go b/metricbeat/module/docker/container/container.go index 543e46947da..b3523464db3 100644 --- a/metricbeat/module/docker/container/container.go +++ b/metricbeat/module/docker/container/container.go @@ -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") } From 8d15826ef02772c0211f2c59fb6ae52f1360faf1 Mon Sep 17 00:00:00 2001 From: Marcin Tojek Date: Wed, 26 Feb 2020 14:16:18 +0100 Subject: [PATCH 2/2] Update CHANGELOG --- CHANGELOG.next.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index cca20e44773..cea38cb6824 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -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*