diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
index 59b931e768a4..c783b097245a 100644
--- a/metricbeat/docs/fields.asciidoc
+++ b/metricbeat/docs/fields.asciidoc
@@ -8714,6 +8714,8 @@ The number of failed and successful Raft RPC requests.
 --
 type: integer
 
+successful Raft RPC requests
+
 --
 
 *`etcd.leader.followers.counts.followers.counts.fail`*::
@@ -8721,6 +8723,8 @@ type: integer
 --
 type: integer
 
+failed Raft RPC requests
+
 --
 
 [float]
@@ -8770,6 +8774,8 @@ type: scaled_float
 --
 type: keyword
 
+ID of actual leader
+
 --
 
 [float]
@@ -8804,6 +8810,9 @@ id of the current leader member
 --
 type: keyword
 
+the time when this node was started
+
+
 --
 
 *`etcd.self.leaderinfo.uptime`*::
@@ -8811,7 +8820,7 @@ type: keyword
 --
 type: keyword
 
-id of the current leader member
+amount of time the leader has been leader
 
 
 --
diff --git a/metricbeat/module/etcd/fields.go b/metricbeat/module/etcd/fields.go
index 07b37802ac56..38e667616d8d 100644
--- a/metricbeat/module/etcd/fields.go
+++ b/metricbeat/module/etcd/fields.go
@@ -32,5 +32,5 @@ func init() {
 // AssetEtcd returns asset data.
 // This is the base64 encoded gzipped contents of ../metricbeat/module/etcd.
 func AssetEtcd() string {
-	return "eJzMl8+O2zYQxu9+ioEvbYHGD+BDL2mOBYogt6JoZslPFrEUqZBDO377grLktWzKf1YOWh4WC5nzzW+G5HD4gV6xXxNE6QWRGLFY0/KTKL1cEGlEFUwrxrs1/bYgom4m/eF1slgQBVhwxJo2vCCKEDFuE9f01zJGu/yVlrVIu/x7QVQZWB3XncYHctzg6DUP2bdZJfjU9l8KvvP4mo2+kvJO2LhIUVhMFKMiSc1COwRQAGuqgm/o05uLU4JTCgvWCMfPJZYrPHl8HGC65Bz0TsBWJ5PHCRvGOdopXuWt9TuEuFI+OYmjSVOwN4Dz+FKDXGpeEMhXVLGx0MROU0xKIcYqWfrMldDnPz9SwLeEKKNQpsCvwa968QuDIRDjBJvRatwQzOB3q13+U9a2LHBq/6xUU69H4gmsamqBQMaR1CBlU5SLiO9PbK+94i0CbzCZi6jYQv9TWc/ygKxKIcBdWsyUbfi7aVLzdFnjrsreu72OglHYaQ76d2wN5/V9nHiyzrzZvmK/80Ffbs/BNsJWz6tQWe1p9cnou0K6iZgta1By5lsCGQ0npjIIVPnQ/dIgF6vrR/iQY+Mqv3og3fewkdG5TnYn9nAkhkJ/xjWBE4WDiGnOD+g0UUEktQ8pPC2mIlf++zwUqU3s3f4Ux9pF7wFqu+K2hdP95XS4EYpE5WN/g+jtcjy4OV6CB1bnNajmSG3w+UpDefU6zhd2eme01IGlnLMr9e5uzJe9IFKbew8o7/QJp4kZBGZr3IZ+HqoceWf3v0xjt6+bHwp8TOj7mYvwEU7/2L1RCqJrP8dbI57fnCPC/8OuyCBdfvuD32V3RV/ynC3b1E1KTqMyDpq8o2jcxg7VeOhezhrDUZj/+S56fozlYB+u8HcURVBWpF0NdxLUjuPBHQo9wxnTRObfxQMjNcJwSfhw7JcuGxbxAXM6lvw86UROX3jGKZvyorrKh6brx4hffJIuU75F6L4Vz2LNTlvoec3OBpNvmOlqMjIuvFduvFVGaZ3jP873r2EheDdBbz6PIbWaZzD05vMYVMAcht58JoNvWg5gp+OO2/ezjGWexTRzp1wIPc5V1MX31gQ80A4UVXYsqka4Hta/AQAA//9pXiwr"
+	return "eJzMl8+O2zYQxu9+ioEvbYHGD+BDL0kOPRQogtyKohmTnyxiKVIhh3b89gVl2StZknfXUpDosFjI5MffzHD+6B094bQliNIrIjFisaX1R1F6vSLSiCqYWox3W/pjRUTNSvrL62SxIgqw4Igt7XlFFCFi3D5u6Z91jHb9O61LkXr974qoMLA6bhuNd+S4wvXU/MipzirBp7p9M3J2fr7kTV9IeSdsXKQoLCaKUZGkZKEjAiiANRXBV/Tx+YguQZfCgjXC9fUYyx2e/Ly/wDTOOet1wDadxX2HXZ5btC5e4a31R4S4UT45ib1FU7AvAOfncwlyqdohkC+oYGOhiZ2mmJRCjEWy9IkLoU9/v6eArwlReqZMgd+D37Tigw0XQ4wT7HvRGDXnHuPrYbLRc0lax01TDP8ZZ7IscOq0VHip1SPxBFYl1UAg40hKkLIpysC21wez1d7wAYH3mPRhVGyh/yusZ3mDrEohwA13zJSt+JupUrW4rHF3Zacu0q3iVTAKO81Bf8DBcI7v24kna9vz3iecjj7oe7fqzw+5NLCSxPZWalBGI2yxXBHNaouVUHNr5as9MMirnD3Jma8JZDScmMIgUOFD80uFXE/vZ/zZj8YVfjMvOsOcNzrHq0nwcwZdetEN1wROFA4iprrN5xlEmSUr0rFELj0mkvMadOSmcweBfokq1csicZWLf+OoDJYJWy+VHGkHuMmr3iXMf5f0k4ltlH6Jfe3R0wPUYcN1DafbhnPuaaNE4wXoBaLn0eB8zLWxdaKYHVYHnzvxRBwbzh07fTRaysAy7rM7lffVmLuTIFKdJy8o73SH08QMAnMwbk+/XuoteWdPv01j10/77wp8dejjzKPwEU5/37sxZkQzfPevRrzt4T3Cn+FWZJDGv20FaLy7oc95zYFtahYlp1EYB03eUTRuby+F/jJH3YzFPTN/+C1a3sZxY39s85himvD8QzwwUiJcuoUP18ltOAuJD5gzDOWPs0ak+31rnLIpB9UVPlTNZEi880kaT/kaoXk3moslO22h581Re0x+wU1Xk97mkS+u8Z0TCTXj/Dj/fA0LwcME7fZ5DKnWPIOh3T6PQQXMYWi3z2TwVc0B7HQ8cv04S19mKaaZN2Ug9HauUV18q03AG8aBUZUjiyoR7pv1fwAAAP//Jlp0/Q=="
 }
diff --git a/metricbeat/module/etcd/leader/_meta/fields.yml b/metricbeat/module/etcd/leader/_meta/fields.yml
index aa2b398877d7..2c14ac79dacf 100644
--- a/metricbeat/module/etcd/leader/_meta/fields.yml
+++ b/metricbeat/module/etcd/leader/_meta/fields.yml
@@ -11,8 +11,10 @@
       fields:
         - name: followers.counts.success
           type: integer
+          description: successful Raft RPC requests
         - name: followers.counts.fail
           type: integer
+          description: failed Raft RPC requests
 
 
     - name: followers.latency
@@ -32,4 +34,5 @@
           type: scaled_float
     - name: leader
       type: keyword
+      description: ID of actual leader
 
diff --git a/metricbeat/module/etcd/self/_meta/fields.yml b/metricbeat/module/etcd/self/_meta/fields.yml
index cdb2536e71dc..e20157adda60 100644
--- a/metricbeat/module/etcd/self/_meta/fields.yml
+++ b/metricbeat/module/etcd/self/_meta/fields.yml
@@ -15,10 +15,12 @@
         id of the current leader member
     - name: leaderinfo.starttime
       type: keyword
+      description: >
+        the time when this node was started
     - name: leaderinfo.uptime
       type: keyword
       description: >
-        id of the current leader member
+        amount of time the leader has been leader
 
     - name: name
       type: keyword