Ottomata has submitted this change and it was merged.
Change subject: Update Elasticsearch monitoring for 0.90.10
......................................................................
Update Elasticsearch monitoring for 0.90.10
When we updated Elasticsearch to 0.90.10 we lost some gc metrics and didn't
notice it until now. This fixes them and adds some memory pool metrics.
Change-Id: I2e6908b616f7222fb3677c7df138de6b86fc2ac3
---
M modules/elasticsearch/files/ganglia/elasticsearch_monitoring.py
1 file changed, 15 insertions(+), 6 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
diff --git a/modules/elasticsearch/files/ganglia/elasticsearch_monitoring.py
b/modules/elasticsearch/files/ganglia/elasticsearch_monitoring.py
index 6670a68..2b8690b 100644
--- a/modules/elasticsearch/files/ganglia/elasticsearch_monitoring.py
+++ b/modules/elasticsearch/files/ganglia/elasticsearch_monitoring.py
@@ -225,6 +225,17 @@
'description': 'Java Non Heap Used (Bytes)',
})
+## MEMORY POOLS
+for name in ['young', 'survivor', 'old']:
+ main_stats['es_' + name + '_heap_used'] = merge(BYTES_GAUGE, {
+ 'path': 'jvm.mem.pools.' + name + '.used_in_bytes',
+ 'description': name.capitalize() + ' Generation Used (Bytes)',
+ })
+ main_stats['es_' + name + '_heap_max'] = merge(BYTES_GAUGE, {
+ 'path': 'jvm.mem.pools.' + name + '.max_in_bytes',
+ 'description': name.capitalize() + ' Generation Max (Bytes)',
+ })
+
## THREADS
main_stats['es_jvm_threads'] = merge(GAUGE, {
'path': 'jvm.threads.count',
@@ -233,20 +244,18 @@
})
## GC
-for name, path in [('par_new', 'ParNew'),
- ('concurrent_mark_sweep', 'ConcurrentMarkSweep')]:
+for name in ['young', 'old']:
main_stats['es_' + name + '_gcs'] = merge(COUNTER, {
- 'path': 'jvm.gc.collectors.' + path + '.collection_count',
+ 'path': 'jvm.gc.collectors.' + name + '.collection_count',
'units': 'collections/sec',
'description': 'Collections/sec',
})
main_stats['es_' + name + '_gc_time'] = merge(TIME, {
- 'path': 'jvm.gc.collectors.' + path + '.collection_time_in_millis',
+ 'path': 'jvm.gc.collectors.' + name + '.collection_time_in_millis',
'description': 'Collection Time/sec'
})
-
-## Buffer Pools
+## BUFFER POOLS
for name in ['direct', 'mapped']:
main_stats['es_jvm_' + name + '_buffer_pools'] = merge(GAUGE, {
'path': 'jvm.buffer_pools.' + name + '.count',
--
To view, visit https://gerrit.wikimedia.org/r/110389
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2e6908b616f7222fb3677c7df138de6b86fc2ac3
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Manybubbles <never...@wikimedia.org>
Gerrit-Reviewer: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: Ottomata <o...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
