Split the JVM heap chart into two so that different units are not mixed together.
NeonSludge committed
Mar 13, 2018 at 12:26 UTC
4cd27a53d90987a3c09d817ad43d21e6a596858b
1 file changed
+11
-4
python.d/elasticsearch.chart.py
+11
-4
@@ -54,6 +54,7 @@ NODE_STATS = [
54
'jvm.gc.collectors.young.collection_time_in_millis',
55
'jvm.gc.collectors.old.collection_time_in_millis',
56
'jvm.mem.heap_used_percent',
57
+ 'jvm.mem.heap_used_in_bytes',
58
'jvm.mem.heap_committed_in_bytes',
59
'jvm.buffer_pools.direct.count',
60
'jvm.buffer_pools.direct.used_in_bytes',
@@ -125,7 +126,7 @@ LATENCY = {
126
ORDER = ['search_performance_total', 'search_performance_current', 'search_performance_time',
127
'search_latency', 'index_performance_total', 'index_performance_current', 'index_performance_time',
128
'index_latency', 'index_translog_operations', 'index_translog_size', 'index_segments_count', 'index_segments_memory', 'jvm_mem_heap',
128
- 'jvm_buffer_pool_count', 'jvm_direct_buffers_memory', 'jvm_mapped_buffers_memory',
129
+ 'jvm_mem_heap_bytes', 'jvm_buffer_pool_count', 'jvm_direct_buffers_memory', 'jvm_mapped_buffers_memory',
130
'jvm_gc_count', 'jvm_gc_time', 'host_metrics_file_descriptors',
131
'host_metrics_http', 'host_metrics_transport', 'thread_pool_queued', 'thread_pool_rejected',
132
'fielddata_cache', 'fielddata_evictions_tripped', 'cluster_health_status', 'cluster_health_nodes',
@@ -225,11 +226,17 @@ CHARTS = {
226
['indices_segments_fixed_bit_set_memory_in_bytes', 'fixed bit set', 'absolute', 1, 1048567]
227
]},
228
'jvm_mem_heap': {
228
- 'options': [None, 'JVM Heap Currently in Use/Committed', 'percent/MB', 'memory usage and gc',
229
+ 'options': [None, 'JVM Heap Percentage Currently in Use', 'percent', 'memory usage and gc',
230
'elastic.jvm_heap', 'area'],
231
'lines': [
231
- ['jvm_mem_heap_used_percent', 'inuse', 'absolute'],
232
- ['jvm_mem_heap_committed_in_bytes', 'commit', 'absolute', -1, 1048576]
232
+ ['jvm_mem_heap_used_percent', 'inuse', 'absolute']
233
+ ]},
234
+ 'jvm_mem_heap_bytes': {
235
+ 'options': [None, 'JVM Heap Commit And Usage', 'MB', 'memory usage and gc',
236
+ 'elastic.jvm_heap_bytes', 'area'],
237
+ 'lines': [
238
+ ['jvm_mem_heap_committed_in_bytes', 'commited', 'absolute', 1, 1048576],
239
+ ['jvm_mem_heap_used_in_bytes', 'used', 'absolute', 1, 1048576]
240
]},
241
'jvm_buffer_pool_count': {
242
'options': [None, 'JVM Buffers', 'count', 'memory usage and gc',