From 38b84df302dfd04be6a2131e77d3de138471f901 Mon Sep 17 00:00:00 2001 From: beats-jenkins Date: Mon, 28 Jan 2019 12:39:50 +0100 Subject: [PATCH 1/3] [Metricbeat] Change type of field docker.container.ip_addresses to `ip` instead of `keyword This will make more queries possible then just with keyword. --- CHANGELOG.next.asciidoc | 3 +++ metricbeat/docs/fields.asciidoc | 2 +- metricbeat/module/docker/container/_meta/fields.yml | 2 +- metricbeat/module/docker/fields.go | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index b8243fe525db..8d1d5c38bb43 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -75,6 +75,9 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Refactor Prometheus metric mappings {pull}9948[9948] - Removed Prometheus stats metricset in favor of just using Prometheus collector {pull}9948[9948] - Adjust Redis.info metricset fields to ECS. {pull}10319[10319] +- Refactor Prometheus metric mappings. {pull}9948[9948] +- Removed Prometheus stats metricset in favor of just using Prometheus collector. {pull}9948[9948] +- Change type of field docker.container.ip_addresses to `ip` instead of `keyword. {pull}[] *Packetbeat* diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index 5c651924e165..4498d173aa6f 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -3009,7 +3009,7 @@ Container status. *`docker.container.ip_addresses`*:: + -- -type: keyword +type: ip Container IP addresses. diff --git a/metricbeat/module/docker/container/_meta/fields.yml b/metricbeat/module/docker/container/_meta/fields.yml index 2792a328aba2..a3f6f8fe8169 100644 --- a/metricbeat/module/docker/container/_meta/fields.yml +++ b/metricbeat/module/docker/container/_meta/fields.yml @@ -17,7 +17,7 @@ description: > Container status. - name: ip_addresses - type: keyword + type: ip description: > Container IP addresses. - name: size diff --git a/metricbeat/module/docker/fields.go b/metricbeat/module/docker/fields.go index afe2321b4dee..f2e8dfeab15b 100644 --- a/metricbeat/module/docker/fields.go +++ b/metricbeat/module/docker/fields.go @@ -32,5 +32,5 @@ func init() { // AssetDocker returns asset data. // This is the base64 encoded gzipped contents of ../metricbeat/module/docker. func AssetDocker() string { - return "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" + return "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" } From 6faa9a0d33ad27e36d052a0fabe9b52f39f79440 Mon Sep 17 00:00:00 2001 From: beats-jenkins Date: Mon, 28 Jan 2019 12:40:38 +0100 Subject: [PATCH 2/3] commit id --- CHANGELOG.next.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 8d1d5c38bb43..ba4a8feb187b 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -77,7 +77,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Adjust Redis.info metricset fields to ECS. {pull}10319[10319] - Refactor Prometheus metric mappings. {pull}9948[9948] - Removed Prometheus stats metricset in favor of just using Prometheus collector. {pull}9948[9948] -- Change type of field docker.container.ip_addresses to `ip` instead of `keyword. {pull}[] +- Change type of field docker.container.ip_addresses to `ip` instead of `keyword. {pull}10364[10364] *Packetbeat* From 68f30bb23d39d85db7e89d4dd69ea304bc2211ce Mon Sep 17 00:00:00 2001 From: beats-jenkins Date: Mon, 28 Jan 2019 16:06:36 +0100 Subject: [PATCH 3/3] fix changelog --- CHANGELOG.next.asciidoc | 2 -- 1 file changed, 2 deletions(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index ba4a8feb187b..84b0f26dce90 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -75,8 +75,6 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Refactor Prometheus metric mappings {pull}9948[9948] - Removed Prometheus stats metricset in favor of just using Prometheus collector {pull}9948[9948] - Adjust Redis.info metricset fields to ECS. {pull}10319[10319] -- Refactor Prometheus metric mappings. {pull}9948[9948] -- Removed Prometheus stats metricset in favor of just using Prometheus collector. {pull}9948[9948] - Change type of field docker.container.ip_addresses to `ip` instead of `keyword. {pull}10364[10364] *Packetbeat*