Merge "Add support for gathering Slab memory usage"

openstack · Jan 13, 2020 · 8af0526 · 8af0526
2 parents 3406f82 + 0a4abd5
commit 8af0526
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/docs/Plugins.md b/docs/Plugins.md
@@ -462,6 +462,7 @@ instances:
 | mem.used_cached |  | Mbytes of memory used for the page cache
 | mem.used_shared  |  | Mbytes of memory shared between separate processes and typically used for inter-process communication
 | mem.used_real_mb |  | Mbytes of memory currently in use less mem.used_buffers and mem.used_cached
+| mem.used_slab_mb  |  | Mbytes of memory currently allocated to slab. Requires psutil >=5.4.4.
 
 ### Disk
 | Metric Name | Dimensions | Semantics |

diff --git a/monasca_agent/collector/checks_d/memory.py b/monasca_agent/collector/checks_d/memory.py
@@ -97,4 +97,11 @@ def check(self, instance):
                        dimensions=dimensions)
             count += 1
 
+        # The slab metric was added in psutil 5.4.4
+        if hasattr(mem_info, 'slab') and mem_info.slab:
+            self.gauge('mem.used_slab_mb',
+                       int(mem_info.slab / 1048576),
+                       dimensions=dimensions)
+            count += 1
+
         log.debug('Collected {0} memory metrics'.format(count))
diff --git a/releasenotes/notes/add-slab-usage-metric-e7504c57e4b3ba16.yaml b/releasenotes/notes/add-slab-usage-metric-e7504c57e4b3ba16.yaml
@@ -0,0 +1,3 @@
+---
+features:
+  - Adds support for monitoring slab memory usage.