Redis: remove deprecated fields

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 Redis module. {issue}11835[11835] {pull}27948[27948]
 
 *Packetbeat*
 

libbeat/kibana/testdata/extensive/fields.yml

@@ -4943,16 +4943,6 @@
                   description: >
                     Number of client connections (excluding connections from slaves).
 
-                - name: longest_output_list
-                  type: long
-                  description: >
-                    Longest output list among current client connections.
-
-                - name: biggest_input_buf
-                  type: long
-                  description: >
-                    Biggest input buffer among current client connections.
-
                 - name: blocked
                   type: long
                   description: >
@@ -5109,10 +5099,6 @@
                   type: long
                   description:
 
-                - name: master_offset
-                  type: long
-                  description:
-
                 - name: backlog.active
                   type: long
                   description:

metricbeat/docs/fields.asciidoc

@@ -53407,19 +53407,6 @@ Redis client stats.
 Number of client connections (excluding connections from slaves).
 
 
-type: long
-
---
-
-*`redis.info.clients.longest_output_list`*::
-+
---
-
-deprecated:[6.5.0]
-
-Longest output list among current client connections (replaced by max_output_buffer).
-
-
 type: long
 
 --
@@ -53430,19 +53417,6 @@ type: long
 Longest output list among current client connections.
 
 
-type: long
-
---
-
-*`redis.info.clients.biggest_input_buf`*::
-+
---
-
-deprecated:[6.5.0]
-
-Biggest input buffer among current client connections (replaced by max_input_buffer).
-
-
 type: long
 
 --
@@ -53577,7 +53551,7 @@ format: bytes
 *`redis.info.memory.used.lua`*::
 +
 --
-Used memory by the Lua engine.        
+Used memory by the Lua engine.
 
 
 type: long
@@ -53589,7 +53563,7 @@ format: bytes
 *`redis.info.memory.used.dataset`*::
 +
 --
-The size in bytes of the dataset 
+The size in bytes of the dataset
 
 
 type: long
@@ -53834,7 +53808,7 @@ format: duration
 *`redis.info.persistence.rdb.copy_on_write.last_size`*::
 +
 --
-The size in bytes of copy-on-write allocations during the last RBD save operation                
+The size in bytes of copy-on-write allocations during the last RBD save operation
 
 
 type: long
@@ -53963,7 +53937,7 @@ format: bytes
 *`redis.info.persistence.aof.size.current`*::
 +
 --
-AOF current file size             
+AOF current file size
 
 
 type: long
@@ -54027,19 +54001,6 @@ type: keyword
 Number of connected slaves
 
 
-type: long
-
---
-
-*`redis.info.replication.master_offset`*::
-+
---
-
-deprecated:[6.5]
-
-The server's current replication offset
-
-
 type: long
 
 --
@@ -54069,7 +54030,7 @@ format: bytes
 *`redis.info.replication.backlog.first_byte_offset`*::
 +
 --
-The master offset of the replication backlog buffer          
+The master offset of the replication backlog buffer
 
 
 type: long

metricbeat/module/redis/docker-compose.yml

@@ -2,11 +2,11 @@ version: '2.3'
 
 services:
   redis:
-    image: docker.elastic.co/integrations-ci/beats-redis:${REDIS_VERSION:-3.2.12}-1
+    image: docker.elastic.co/integrations-ci/beats-redis:${REDIS_VERSION:-5.0.5}-1
     build:
       context: ./_meta
       args:
-        REDIS_VERSION: ${REDIS_VERSION:-3.2.12}
+        REDIS_VERSION: ${REDIS_VERSION:-5.0.5}
     privileged: true
     ports:
       - 6379

metricbeat/module/redis/info/_meta/data.json

@@ -21,10 +21,8 @@
     "redis": {
         "info": {
             "clients": {
-                "biggest_input_buf": 0,
                 "blocked": 0,
                 "connected": 5,
-                "longest_output_list": 0,
                 "max_input_buffer": 0,
                 "max_output_buffer": 0
             },
@@ -116,7 +114,6 @@
                     "offset": 0,
                     "sync": {}
                 },
-                "master_offset": 0,
                 "role": "master",
                 "slave": {}
             },
@@ -187,4 +184,4 @@
         "type": "redis",
         "version": "3.2.12"
     }
-}
+}

metricbeat/module/redis/info/_meta/fields.yml

@@ -13,20 +13,10 @@
           type: long
           description: >
             Number of client connections (excluding connections from slaves).
-        - name: longest_output_list
-          type: long
-          deprecated: "6.5.0"
-          description: >
-            Longest output list among current client connections (replaced by max_output_buffer).
         - name: max_output_buffer
           type: long
           description: >
             Longest output list among current client connections.
-        - name: biggest_input_buf
-          type: long
-          deprecated: "6.5.0"
-          description: >
-            Biggest input buffer among current client connections (replaced by max_input_buffer).
         - name: max_input_buffer
           type: long
           description: >
@@ -92,12 +82,12 @@
           type: long
           format: bytes
           description: >
-            Used memory by the Lua engine.        
+            Used memory by the Lua engine.
         - name: used.dataset
           type: long
           format: bytes
           description: >
-            The size in bytes of the dataset 
+            The size in bytes of the dataset
 
         - name: max.value
           type: long
@@ -209,12 +199,12 @@
               format: duration
               description: >
                 Duration of the on-going RDB save operation if any
-            
+
             - name: copy_on_write.last_size
               type: long
               format: bytes
               description: >
-                The size in bytes of copy-on-write allocations during the last RBD save operation                
+                The size in bytes of copy-on-write allocations during the last RBD save operation
 
         - name: aof
           type: group
@@ -271,12 +261,12 @@
               format: bytes
               description: >
                 Size of the AOF buffer
-            
+
             - name: size.current
               type: long
               format: bytes
               description: >
-                AOF current file size             
+                AOF current file size
             - name: size.base
               type: long
               format: bytes
@@ -307,12 +297,6 @@
           description: >
             Number of connected slaves
 
-        - name: master_offset
-          type: long
-          deprecated: 6.5
-          description: >
-            The server's current replication offset
-
         - name: backlog.active
           type: long
           description: >
@@ -325,7 +309,7 @@
         - name: backlog.first_byte_offset
           type: long
           description: >
-            The master offset of the replication backlog buffer          
+            The master offset of the replication backlog buffer
         - name: backlog.histlen
           type: long
           description: >
@@ -362,7 +346,7 @@
           format: duration
           description: >
             Number of seconds since last transfer I/O during a SYNC operation
-        
+
         - name: slave.offset
           type: long
           description: >
@@ -513,7 +497,7 @@
           type: long
           description: >
             Number of evicted keys due to maxmemory limit
-        
+
         - name: keyspace.hits
           type: long
           description: >

metricbeat/module/redis/info/data.go

@@ -27,12 +27,10 @@ import (
 var (
 	schema = s.Schema{
 		"clients": s.Object{
-			"connected":           c.Int("connected_clients"),
-			"longest_output_list": c.Int("client_longest_output_list"),
-			"biggest_input_buf":   c.Int("client_biggest_input_buf"),
-			"max_output_buffer":   c.Int("client_recent_max_output_buffer"),
-			"max_input_buffer":    c.Int("client_recent_max_input_buffer"),
-			"blocked":             c.Int("blocked_clients"),
+			"connected":         c.Int("connected_clients"),
+			"max_output_buffer": c.Int("client_recent_max_output_buffer"),
+			"max_input_buffer":  c.Int("client_recent_max_input_buffer"),
+			"blocked":           c.Int("blocked_clients"),
 		},
 		"cluster": s.Object{
 			"enabled": c.Bool("cluster_enabled"),
@@ -140,7 +138,6 @@ var (
 		"replication": s.Object{
 			"role":             c.Str("role"),
 			"connected_slaves": c.Int("connected_slaves"),
-			"master_offset":    c.Int("master_repl_offset"), // ToDo Should be deprectad as master.offset introduced
 			"backlog": s.Object{
 				"active":            c.Int("repl_backlog_active"),
 				"size":              c.Int("repl_backlog_size"),

metricbeat/module/redis/info/info.go

@@ -65,21 +65,6 @@ func (m *MetricSet) Fetch(r mb.ReporterV2) error {
 		return errors.Wrap(err, "failed to fetch redis info")
 	}
 
-	// In 5.0 some fields are renamed, maintain both names, old ones will be deprecated
-	renamings := []struct {
-		old, new string
-	}{
-		{"client_longest_output_list", "client_recent_max_output_buffer"},
-		{"client_biggest_input_buf", "client_recent_max_input_buffer"},
-	}
-	for _, r := range renamings {
-		if v, ok := info[r.new]; ok {
-			info[r.old] = v
-		} else {
-			info[r.new] = info[r.old]
-		}
-	}
-
 	slowLogLength, err := redis.FetchSlowLogLength(conn)
 	if err != nil {
 		return errors.Wrap(err, "failed to fetch slow log length")

metricbeat/module/redis/test_redis.py

@@ -16,9 +16,8 @@
 CPU_FIELDS = ["used.sys", "used.sys_children", "used.user",
               "used.user_children"]
 
-CLIENTS_FIELDS = ["blocked", "biggest_input_buf",
-                  "longest_output_list", "connected",
-                  "max_input_buffer", "max_output_buffer"]
+CLIENTS_FIELDS = ["blocked", "connected", "max_input_buffer",
+                  "max_output_buffer"]
 
 
 @metricbeat.parameterized_with_supported_versions