From 457494c9eebdfa816d14f0774984d1a3be7509ea Mon Sep 17 00:00:00 2001 From: Marcin Tojek Date: Wed, 26 Feb 2020 20:10:04 +0100 Subject: [PATCH] Cherry-pick #16600 to 7.6: Revert "[metricbeat]Docker: add size flag to docker.container (#15224)" (#16619) * Revert "[metricbeat]Docker: add size flag to docker.container (#15224)" --- CHANGELOG.next.asciidoc | 4 ++++ metricbeat/module/docker/container/_meta/data.json | 4 ++-- metricbeat/module/docker/container/container.go | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index ab211ed5ca2..76315e14537 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -60,8 +60,12 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d *Metricbeat* +- Add dedot for tags in ec2 metricset and cloudwatch metricset. {issue}15843[15843] {pull}15844[15844] +- Use RFC3339 format for timestamps collected using the SQL module. {pull}15847[15847] +- Add dedot for cloudwatch metric name. {issue}15916[15916] {pull}15917[15917] - Avoid parsing errors returned from prometheus endpoints. {pull}15712[15712] - 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* 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") }