From 13af4971e748cc0afe690aebb879f4e5a67e3d3e Mon Sep 17 00:00:00 2001
From: Joe Meissler <joe.meissler@gmail.com>
Date: Wed, 5 Jul 2017 18:00:53 -0700
Subject: [PATCH 1/2] correct format for memory module in dockerbeat

---
 metricbeat/module/docker/memory/_meta/fields.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/metricbeat/module/docker/memory/_meta/fields.yml b/metricbeat/module/docker/memory/_meta/fields.yml
index be8b2a8c6d4..59c12c9b7d5 100644
--- a/metricbeat/module/docker/memory/_meta/fields.yml
+++ b/metricbeat/module/docker/memory/_meta/fields.yml
@@ -25,6 +25,7 @@
             Total memory resident set size.
         - name: pct
           type: scaled_float
+          format: percentage
           description: >
             Memory resident set size percentage.
     - name: usage
@@ -39,6 +40,7 @@
             Max memory usage.
         - name: pct
           type: scaled_float
+          format: percentage
           description: >
             Memory usage percentage.
         - name: total

From 35ea91ec338bdc229d86576b03fd3fa949f1c858 Mon Sep 17 00:00:00 2001
From: Joe Meissler <joe.meissler@gmail.com>
Date: Thu, 6 Jul 2017 08:31:56 -0700
Subject: [PATCH 2/2] update fields doc and changelog

---
 CHANGELOG.asciidoc              | 1 +
 metricbeat/docs/fields.asciidoc | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 9da40299594..be3b0359b2c 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -143,6 +143,7 @@ https://github.com/elastic/beats/compare/v6.0.0-alpha1...v6.0.0-alpha2[View comm
 
 *Metricbeat*
 
+- Set correct format for percent fields in memory module. {pull}4619[4619]
 - Fix a debug statement that said a module wrapper had stopped when it hadn't. {pull}4264[4264]
 - Use MemAvailable value from /proc/meminfo on Linux 3.14. {pull}4316[4316]
 - Fix panic when events were dropped by filters. {issue}4327[4327]
diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
index 2903d149931..3951ea8cc32 100644
--- a/metricbeat/docs/fields.asciidoc
+++ b/metricbeat/docs/fields.asciidoc
@@ -2063,6 +2063,8 @@ Total memory resident set size.
 
 type: scaled_float
 
+format: percentage
+
 Memory resident set size percentage.
 
 
@@ -2088,6 +2090,8 @@ Max memory usage.
 
 type: scaled_float
 
+format: percentage
+
 Memory usage percentage.