Check CPU metric - Fix memory metric to include text+data+stack

idemia · Apr 12, 2020 · 3bc4336 · 3bc4336
1 parent 4fa80f9
commit 3bc4336
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/livemetrics/__init__.py b/livemetrics/__init__.py
@@ -172,9 +172,11 @@
 if os.name=='posix':
  def get_memory():
  # Retrieve memory usage from /proc/self/statm
+ # text + data (data+stack)
  try:
  with open('/proc/self/statm','r') as f:
- return int(f.read().split(' ')[0]) * os.sysconf('SC_PAGE_SIZE')
+ parts = f.read().split(' ')
+ return (int(parts[3])+int(parts[5])) * os.sysconf('SC_PAGE_SIZE')
  except:
  return 0
 

diff --git a/tests/dashboard/sample.yaml b/tests/dashboard/sample.yaml
@@ -11,10 +11,11 @@ rows:
  type: status
  - label: CPU
  server: "{{server}}/metrics/gauges/cpu/count"
- type: value
- unit: "%o"
- factor: "*1000"
- color: green
+ type: gauge
+ unit: "%"
+ max: 100
+ gauge_color: green
+ color: "#C0F0C0"
  - label: Memory
  server: "{{server}}/metrics/gauges/memory/count"
  type: gauge
@@ -62,7 +63,7 @@ rows:
  type: value
  unit: "/h"
  factor: "*3600"
- color: "#C0F0C0"
+ color: green
  max: 25000
  operator: min
  precision: 1
@@ -71,7 +72,7 @@ rows:
  type: value
  unit: "/h"
  factor: "*3600"
- color: "#C0F0C0"
+ color: green
  max: 25000
  operator: max
  precision: 2