Redis: remove deprecated fields (elastic#28246)

* Redis: remove deprecated fields
Icedroid · Nov 1, 2021 · 0138139 · 0138139
1 parent 09f1403
commit 0138139
Show file tree

Hide file tree

Showing 10 changed files with 50 additions and 129 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -117,6 +117,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Remove deprecated fields in Docker module. {issue}11835[11835] {pull}27933[27933]
 - Remove deprecated fields in Kafka module. {pull}27938[27938]
 - Remove deprecated config option default_region from aws module. {pull}28120[28120]
+- Remove deprecated fields in Redis module. {issue}11835[11835] {pull}28246[28246]
 
 *Packetbeat*
 

diff --git a/libbeat/kibana/testdata/extensive/fields.yml b/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:

diff --git a/libbeat/kibana/testdata/extensive/metricbeat-6.ndjson b/libbeat/kibana/testdata/extensive/metricbeat-6.ndjson
diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
@@ -54215,19 +54215,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
 
 --
@@ -54238,19 +54225,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
 
 --
@@ -54385,7 +54359,7 @@ format: bytes
 *`redis.info.memory.used.lua`*::
 +
 --
-Used memory by the Lua engine.        
+Used memory by the Lua engine.
 
 
 type: long
@@ -54397,7 +54371,7 @@ format: bytes
 *`redis.info.memory.used.dataset`*::
 +
 --
-The size in bytes of the dataset 
+The size in bytes of the dataset
 
 
 type: long
@@ -54642,7 +54616,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
@@ -54771,7 +54745,7 @@ format: bytes
 *`redis.info.persistence.aof.size.current`*::
 +
 --
-AOF current file size             
+AOF current file size
 
 
 type: long
@@ -54835,19 +54809,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
 
 --
@@ -54877,7 +54838,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

diff --git a/metricbeat/module/redis/fields.go b/metricbeat/module/redis/fields.go
diff --git a/metricbeat/module/redis/info/_meta/data.json b/metricbeat/module/redis/info/_meta/data.json
@@ -1,30 +1,25 @@
 {
     "@timestamp": "2017-10-12T08:05:34.853Z",
-    "agent": {
-        "hostname": "host.example.com",
-        "name": "host.example.com"
-    },
     "event": {
         "dataset": "redis.info",
         "duration": 115000,
         "module": "redis"
     },
     "metricset": {
-        "name": "info"
+        "name": "info",
+        "period": 10000
     },
     "os": {
-        "full": "Linux 4.9.125-linuxkit x86_64"
+        "full": "Linux 5.10.47-linuxkit x86_64"
     },
     "process": {
         "pid": 1
     },
     "redis": {
         "info": {
             "clients": {
-                "biggest_input_buf": 0,
                 "blocked": 0,
-                "connected": 5,
-                "longest_output_list": 0,
+                "connected": 1,
                 "max_input_buffer": 0,
                 "max_output_buffer": 0
             },
@@ -33,10 +28,10 @@
             },
             "cpu": {
                 "used": {
-                    "sys": 1.66,
+                    "sys": 0.23,
                     "sys_children": 0,
-                    "user": 0.39,
-                    "user_children": 0.01
+                    "user": 0.05,
+                    "user_children": 0
                 }
             },
             "memory": {
@@ -47,17 +42,17 @@
                     "rss": {}
                 },
                 "fragmentation": {
-                    "ratio": 2.71
+                    "ratio": 2.85
                 },
                 "max": {
                     "policy": "noeviction",
                     "value": 0
                 },
                 "used": {
                     "lua": 37888,
-                    "peak": 945016,
-                    "rss": 2453504,
-                    "value": 904992
+                    "peak": 822456,
+                    "rss": 2347008,
+                    "value": 822456
                 }
             },
             "persistence": {
@@ -99,8 +94,8 @@
                     },
                     "copy_on_write": {},
                     "last_save": {
-                        "changes_since": 35,
-                        "time": 1548663522
+                        "changes_since": 0,
+                        "time": 1633422962
                     }
                 }
             },
@@ -116,7 +111,6 @@
                     "offset": 0,
                     "sync": {}
                 },
-                "master_offset": 0,
                 "role": "master",
                 "slave": {}
             },
@@ -128,44 +122,44 @@
                 "git_dirty": "0",
                 "git_sha1": "00000000",
                 "hz": 10,
-                "lru_clock": 5159690,
+                "lru_clock": 6033096,
                 "mode": "standalone",
                 "multiplexing_api": "epoll",
-                "run_id": "0f681cb959aa47413ec40ff383715c923f9cbefd",
+                "run_id": "ddfd6edda7dcd357ac9f24ebfb0ef8b3ee771f8d",
                 "tcp_port": 6379,
-                "uptime": 707
+                "uptime": 86
             },
             "slowlog": {
                 "count": 0
             },
             "stats": {
                 "active_defrag": {},
-                "commands_processed": 265,
+                "commands_processed": 2,
                 "connections": {
-                    "received": 848,
+                    "received": 82,
                     "rejected": 0
                 },
                 "instantaneous": {
-                    "input_kbps": 0.18,
-                    "ops_per_sec": 6,
-                    "output_kbps": 1.39
+                    "input_kbps": 0,
+                    "ops_per_sec": 0,
+                    "output_kbps": 0
                 },
                 "keys": {
                     "evicted": 0,
                     "expired": 0
                 },
                 "keyspace": {
-                    "hits": 15,
+                    "hits": 0,
                     "misses": 0
                 },
                 "latest_fork_usec": 0,
                 "migrate_cached_sockets": 0,
                 "net": {
                     "input": {
-                        "bytes": 7300
+                        "bytes": 80
                     },
                     "output": {
-                        "bytes": 219632
+                        "bytes": 2111
                     }
                 },
                 "pubsub": {
@@ -183,7 +177,7 @@
         }
     },
     "service": {
-        "address": "127.0.0.1:6379",
+        "address": "localhost:53854",
         "type": "redis",
         "version": "3.2.12"
     }