summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCosta Tsaousis <costa@tsaousis.gr>2018-06-26 14:51:28 +0300
committerGitHub <noreply@github.com>2018-06-26 14:51:28 +0300
commit436d4c59dbc4f914c51feb1cad90a25b2caf1686 (patch)
tree9daa8381c84b76da562c952a869d584ab65e93ba
parent5ca64c15f9a49639a6762deef3cb5b6a5bed1c40 (diff)
parent8d80e82d58edb511250f223bb085c6d8912d5a51 (diff)
Merge branch 'master' into master
-rw-r--r--CONTRIBUTORS.md2
-rw-r--r--python.d/elasticsearch.chart.py4
2 files changed, 6 insertions, 0 deletions
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 3f9f1ce75b..af503aa2a8 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -80,4 +80,6 @@ username|name|email (optional)
@facetoe|Facetoe|
@ntlug|Christopher Cox|ccox@endlessnow.com
@alonbl|Alon Bar-Lev|alon.barlev@gmail.com
+@Wing924|Wei He|weihe924stephen@gmail.com
+@NeonSludge|Kirill Buev|kirill.buev@gmx.com
@kmlucy|Kyle Lucy|kmlucy@gmail.com
diff --git a/python.d/elasticsearch.chart.py b/python.d/elasticsearch.chart.py
index 7421e1b94d..63dac99ffe 100644
--- a/python.d/elasticsearch.chart.py
+++ b/python.d/elasticsearch.chart.py
@@ -64,6 +64,8 @@ NODE_STATS = [
'jvm.buffer_pools.mapped.total_capacity_in_bytes',
'thread_pool.bulk.queue',
'thread_pool.bulk.rejected',
+ 'thread_pool.write.queue',
+ 'thread_pool.write.rejected',
'thread_pool.index.queue',
'thread_pool.index.rejected',
'thread_pool.search.queue',
@@ -281,6 +283,7 @@ CHARTS = {
'elastic.thread_pool_queued', 'stacked'],
'lines': [
['thread_pool_bulk_queue', 'bulk', 'absolute'],
+ ['thread_pool_write_queue', 'write', 'absolute'],
['thread_pool_index_queue', 'index', 'absolute'],
['thread_pool_search_queue', 'search', 'absolute'],
['thread_pool_merge_queue', 'merge', 'absolute']
@@ -290,6 +293,7 @@ CHARTS = {
'elastic.thread_pool_rejected', 'stacked'],
'lines': [
['thread_pool_bulk_rejected', 'bulk', 'absolute'],
+ ['thread_pool_write_rejected', 'write', 'absolute'],
['thread_pool_index_rejected', 'index', 'absolute'],
['thread_pool_search_rejected', 'search', 'absolute'],
['thread_pool_merge_rejected', 'merge', 'absolute']