diff --git a/dockerplugin.db b/dockerplugin.db index 977ac18..b5e6287 100644 --- a/dockerplugin.db +++ b/dockerplugin.db @@ -5,7 +5,7 @@ cpu.usage total:COUNTER:0:U, kernelmode:COUNTER:0:U, usermode:COUN cpu.percent value:GAUGE:0:150 cpu.throttling_data periods:COUNTER:0:U, throttled_periods:COUNTER:0:U, throttled_time:COUNTER:0:U network.usage rx_bytes:COUNTER:0:U, rx_dropped:COUNTER:0:U, rx_errors:COUNTER:0:U, rx_packets:COUNTER:0:U, tx_bytes:COUNTER:0:U, tx_dropped:COUNTER:0:U, tx_errors:COUNTER:0:U, tx_packets:COUNTER:0:U -memory.usage limit:GAUGE:0:U, max:GAUGE:0:U, total:GAUGE:0:U +memory.usage limit:GAUGE:0:U, max:GAUGE:0:U, total:GAUGE:0:U, rss:GAUGE:0:U memory.stats value:GAUGE:0:U memory.percent value:GAUGE:0:150 cpu.quota value:GAUGE:0:U diff --git a/dockerplugin.py b/dockerplugin.py index 968a304..f72330a 100755 --- a/dockerplugin.py +++ b/dockerplugin.py @@ -233,7 +233,7 @@ def read_memory_stats(container, dimensions, stats, t): mem_stats = stats['memory_stats'] log.info('Reading memory stats: {0}'.format(mem_stats)) - values = [mem_stats['limit'], mem_stats['max_usage'], mem_stats['usage']] + values = [mem_stats['limit'], mem_stats['max_usage'], mem_stats['usage'], mem_stats['stats']['rss']] emit(container, dimensions, 'memory.usage', values, t=t) detailed = mem_stats.get('stats')