Docker: remove deprecated fields (#27933)

* Docker: remove deprecated fields * Update docs/fields.asciidoc * Update CHANGELOG * Fix * Fix
elastic · Sep 15, 2021 · 2c47ac8 · 2c47ac8
1 parent ba9eebf
commit 2c47ac8
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 219 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -112,6 +112,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Add support for kube-state-metrics v2.0.0 {pull}27552[27552]
 - Add User-Agent header to HTTP requests. {issue}18160[18160] {pull}27509[27509]
 - Errors should be thrown as errors. Metricsets inside Metricbeat will now throw errors as the `error` log level. {pull}27804[27804]
+- Remove deprecated fields in Docker module. {issue}11835[11835] {pull}27933[27933]
 
 *Packetbeat*
 

diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
@@ -12029,19 +12029,6 @@ type: long
 
 --
 
-*`docker.diskio.reads`*::
-+
---
-
-deprecated:[6.4]
-
-Number of current reads per second
-
-
-type: scaled_float
-
---
-
 [float]
 === write
 
@@ -12111,19 +12098,6 @@ type: long
 
 --
 
-*`docker.diskio.writes`*::
-+
---
-
-deprecated:[6.4]
-
-Number of current writes per second
-
-
-type: scaled_float
-
---
-
 [float]
 === summary
 
@@ -12193,19 +12167,6 @@ type: long
 
 --
 
-*`docker.diskio.total`*::
-+
---
-
-deprecated:[6.4]
-
-Number of reads and writes per second
-
-
-type: scaled_float
-
---
-
 [float]
 === event
 
@@ -12703,104 +12664,6 @@ type: keyword
 
 --
 
-[float]
-=== in
-
-Incoming network stats per second.
-
-
-
-*`docker.network.in.bytes`*::
-+
---
-Total number of incoming bytes.
-
-
-type: long
-
-format: bytes
-
---
-
-*`docker.network.in.dropped`*::
-+
---
-Total number of dropped incoming packets.
-
-
-type: scaled_float
-
---
-
-*`docker.network.in.errors`*::
-+
---
-Total errors on incoming packets.
-
-
-type: long
-
---
-
-*`docker.network.in.packets`*::
-+
---
-Total number of incoming packets.
-
-
-type: long
-
---
-
-[float]
-=== out
-
-Outgoing network stats per second.
-
-
-
-*`docker.network.out.bytes`*::
-+
---
-Total number of outgoing bytes.
-
-
-type: long
-
-format: bytes
-
---
-
-*`docker.network.out.dropped`*::
-+
---
-Total number of dropped outgoing packets.
-
-
-type: scaled_float
-
---
-
-*`docker.network.out.errors`*::
-+
---
-Total errors on outgoing packets.
-
-
-type: long
-
---
-
-*`docker.network.out.packets`*::
-+
---
-Total number of outgoing packets.
-
-
-type: long
-
---
-
 [float]
 === inbound
 

diff --git a/metricbeat/module/docker/diskio/_meta/fields.yml b/metricbeat/module/docker/diskio/_meta/fields.yml
@@ -28,17 +28,12 @@
             Total time to service IO requests, in nanoseconds
         - name: wait_time
           type: long
-          description: > 
+          description: >
             Total time requests spent waiting in queues for service, in nanoseconds
         - name: queued
           type: long
           description: >
             Total number of queued requests
-    - name: reads
-      type: scaled_float
-      deprecated: 6.4
-      description: >
-        Number of current reads per second
     - name: write
       type: group
       description: >
@@ -63,17 +58,12 @@
             Total time to service IO requests, in nanoseconds
         - name: wait_time
           type: long
-          description: > 
+          description: >
             Total time requests spent waiting in queues for service, in nanoseconds
         - name: queued
           type: long
           description: >
             Total number of queued requests
-    - name: writes
-      type: scaled_float
-      deprecated: 6.4
-      description: >
-        Number of current writes per second
     - name: summary
       type: group
       description: >
@@ -98,14 +88,9 @@
             Total time to service IO requests, in nanoseconds
         - name: wait_time
           type: long
-          description: > 
+          description: >
             Total time requests spent waiting in queues for service, in nanoseconds
         - name: queued
           type: long
           description: >
             Total number of queued requests
-    - name: total
-      type: scaled_float
-      deprecated: 6.4
-      description: >
-        Number of reads and writes per second
diff --git a/metricbeat/module/docker/diskio/data.go b/metricbeat/module/docker/diskio/data.go
@@ -30,9 +30,6 @@ func eventsMapping(r mb.ReporterV2, blkioStatsList []BlkioStats) {
 
 func eventMapping(r mb.ReporterV2, stats *BlkioStats) {
 	fields := common.MapStr{
-		"reads":  stats.reads,
-		"writes": stats.writes,
-		"total":  stats.totals,
 		"read": common.MapStr{
 			"ops":          stats.serviced.reads,
 			"bytes":        stats.servicedBytes.reads,

diff --git a/metricbeat/module/docker/fields.go b/metricbeat/module/docker/fields.go
diff --git a/metricbeat/module/docker/network/_meta/fields.yml b/metricbeat/module/docker/network/_meta/fields.yml
@@ -9,52 +9,6 @@
       type: keyword
       description: >
         Network interface name.
-    - name: in
-      type: group
-      deprecated: 6.4
-      description: >
-        Incoming network stats per second.
-      fields:
-        - name: bytes
-          type: long
-          format: bytes
-          description: >
-            Total number of incoming bytes.
-        - name: dropped
-          type: scaled_float
-          description: >
-            Total number of dropped incoming packets.
-        - name: errors
-          type: long
-          description: >
-            Total errors on incoming packets.
-        - name: packets
-          type: long
-          description: >
-            Total number of incoming packets.
-    - name: out
-      type: group
-      deprecated: 6.4
-      description: >
-        Outgoing network stats per second.
-      fields:
-        - name: bytes
-          type: long
-          format: bytes
-          description: >
-            Total number of outgoing bytes.
-        - name: dropped
-          type: scaled_float
-          description: >
-            Total number of dropped outgoing packets.
-        - name: errors
-          type: long
-          description: >
-            Total errors on outgoing packets.
-        - name: packets
-          type: long
-          description: >
-            Total number of outgoing packets.
     - name: inbound
       type: group
       description: >

diff --git a/metricbeat/module/docker/network/data.go b/metricbeat/module/docker/network/data.go
@@ -33,20 +33,6 @@ func eventMapping(r mb.ReporterV2, stats *NetStats) {
 		RootFields: stats.Container.ToMapStr(),
 		MetricSetFields: common.MapStr{
 			"interface": stats.NameInterface,
-			// Deprecated
-			"in": common.MapStr{
-				"bytes":   stats.RxBytes,
-				"dropped": stats.RxDropped,
-				"errors":  stats.RxErrors,
-				"packets": stats.RxPackets,
-			},
-			// Deprecated
-			"out": common.MapStr{
-				"bytes":   stats.TxBytes,
-				"dropped": stats.TxDropped,
-				"errors":  stats.TxErrors,
-				"packets": stats.TxPackets,
-			},
 			"inbound": common.MapStr{
 				"bytes":   stats.Total.RxBytes,
 				"dropped": stats.Total.RxDropped,