Metricbeat: Add maxmemory to redis info metricset (elastic#7127)

stevea78 · May 20, 2018 · 2d32667 · 2d32667
1 parent 02e7b89
commit 2d32667
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 2 deletions.
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
@@ -241,6 +241,7 @@ https://github.com/elastic/beats/compare/v6.2.3...master[Check the HEAD diff]
 - Add config option `management_path_prefix` for RabbitMQ module to configure management plugin path prefix {issue}6875[6875] {pull}7074[7074]
 - Add shard metricset to Elasticsearch module. {pull}7006[7006]
 - Add apiserver metricset to Kubernetes module. {pull}7059[7059]
+- Add maxmemory to redis info metricset. {pull}7127[7127]
 
 *Packetbeat*
 

diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
@@ -12076,6 +12076,27 @@ format: bytes
 Used memory lua.
 
 
+--
+
+*`redis.info.memory.max.value`*::
++
+--
+type: long
+
+format: bytes
+
+Memory limit.
+
+
+--
+
+*`redis.info.memory.max.policy`*::
++
+--
+type: keyword
+
+Eviction policy to use when memory limit is reached.
+
 --
 
 *`redis.info.memory.allocator`*::

diff --git a/metricbeat/include/fields.go b/metricbeat/include/fields.go
diff --git a/metricbeat/module/redis/info/_meta/data.json b/metricbeat/module/redis/info/_meta/data.json
@@ -31,6 +31,10 @@
             },
             "memory": {
                 "allocator": "jemalloc-4.0.3",
+                "max": {
+                    "policy": "noeviction",
+                    "value": 0
+                },
                 "used": {
                     "lua": 37888,
                     "peak": 822240,
@@ -148,4 +152,4 @@
             }
         }
     }
-}
+}
diff --git a/metricbeat/module/redis/info/_meta/fields.yml b/metricbeat/module/redis/info/_meta/fields.yml
@@ -93,6 +93,17 @@
           description: >
             Used memory lua.
 
+        - name: max.value
+          type: long
+          format: bytes
+          description: >
+            Memory limit.
+
+        - name: max.policy
+          type: keyword
+          description:
+            Eviction policy to use when memory limit is reached.
+
         - name: allocator
           type: keyword
           description: >

diff --git a/metricbeat/module/redis/info/data.go b/metricbeat/module/redis/info/data.go
@@ -32,6 +32,10 @@ var (
 				"peak":  c.Int("used_memory_peak"),
 				"lua":   c.Int("used_memory_lua"),
 			},
+			"max": s.Object{
+				"value":  c.Int("maxmemory"),
+				"policy": c.Str("maxmemory_policy"),
+			},
 			"allocator": c.Str("mem_allocator"), // Could be moved to server as it rarely changes
 		},
 		"persistence": s.Object{