Update version and documentation

objectrocket · Dec 14, 2015 · 82e7ec8 · 82e7ec8
1 parent 389b79c
commit 82e7ec8
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -82,7 +82,7 @@ optional arguments:
     - RTR: a client node, node.master = false, node.data = false
     - UNK: node with an unkown or undetermined role
 - os
-  - load: the 1 minute / 5 minute / 15 minute [load average](http://blog.scoutapp.com/articles/2009/07/31/understanding-load-averages) of the node
+  - load: the 1 minute / 5 minute / 15 minute [load average](http://blog.scoutapp.com/articles/2009/07/31/understanding-load-averages) of the node (only 1 minute load average for Elasticsearch 2.x+)
   - mem: percentage of total memory used on the node (including memory used by the kernel and other processes besides Elasticsearch)
 - [jvm](https://www.elastic.co/guide/en/elasticsearch/guide/current/_monitoring_individual_nodes.html#_jvm_section)
   - heap: percentage of Java heap memory in use.  Java garbage collections occur when this reaches or exceeds 75%.
@@ -94,7 +94,6 @@ optional arguments:
   - search: all search and query requests
   - bulk: bulk requests
   - get: all get-by-ID operations
-  - merge: threadpool for managing Lucene merges
 - [fielddata](https://www.elastic.co/guide/en/elasticsearch/guide/current/_limiting_memory_usage.html#fielddata-size)
   - fde: count of field data evictions that have occurred since last update
   - fdt: number of times the field data circuit breaker has tripped since the last update
@@ -104,6 +103,7 @@ optional arguments:
 - data_nodes: metrics useful only for data-bearing nodes
   - merges: total time spent in Lucene segment merges since the last time the node was restarted
   - idx st: [index store throttle](https://www.elastic.co/guide/en/elasticsearch/reference/current/index-modules-store.html#store-throttling), the total time indexing has been throttled to a single thread since the last time the node was restarted (see [Segments and Merging](https://www.elastic.co/guide/en/elasticsearch/guide/current/indexing-performance.html#segments-and-merging))
+  - disk usage: the total space used and percentage of space used for storing Elasticsearch data files
   - docs: the total number of documents in all index shards allocated to this node.  If there is a second number, this is the total number of deleted documents not yet merged
 
 ## License

diff --git a/elasticstat/__init__.py b/elasticstat/__init__.py
@@ -1,2 +1,2 @@
 __author__ = 'Jeff Tharp'
-__version__ = '1.0.0'
+__version__ = '1.1.0'
diff --git a/extra/man/elasticstat.1 b/extra/man/elasticstat.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "ELASTICSTAT" "1" "September 2015" "" ""
+.TH "ELASTICSTAT" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBelasticstat\fR \- Real\-time performance monitoring of an Elasticsearch cluster
@@ -121,7 +121,7 @@ The role this node serves in the cluster\.
 .
 .TP
 load
-The 1min/5min/15min load average of the node\.
+The 1min/5min/15min load average of the node\. (Only 1 minute load average for Elasticsearch 2\.x+)
 .
 .TP
 mem
@@ -167,10 +167,6 @@ Bulk requests\.
 get
 All get\-by\-ID operations\.
 .
-.TP
-merge
-Threadpool for managing Lucene merges\.
-.
 .SS "FIELD DATA"
 .
 .TP
@@ -202,6 +198,10 @@ idx st
 This is the "index store throttle": the total time indexing has been throttled to a single thread since the last time the node was restarted\.
 .
 .TP
+disk usage
+The total space used and percentage of space used for storing Elasticsearch data files\.
+.
+.TP
 docs
 The total number of documents in all index shards allocated to this node\. If there is a second number, this is the total number of deleted documents not yet merged\.
 .

diff --git a/extra/man/elasticstat.ronn b/extra/man/elasticstat.ronn
@@ -100,7 +100,7 @@ These metrics are displayed for each node in the cluster.
 ### OS METRICS
 
   * load:
-    The 1min/5min/15min load average of the node.
+    The 1min/5min/15min load average of the node.  (Only 1 minute load average for Elasticsearch 2.x+)
 
   * mem:
     Percentage of total memory used on the node, including memory used by the kernel and other processes besides Elasticsearch.
@@ -130,8 +130,6 @@ Default threadpools listed are as follows:
     Bulk requests.
   * get:
     All get-by-ID operations.
-  * merge:
-    Threadpool for managing Lucene merges.
 
 ### FIELD DATA
 
@@ -153,6 +151,8 @@ Default threadpools listed are as follows:
     Total time spent in Lucene segment merges since the last time the node was restarted.
   * idx st:
     This is the "index store throttle": the total time indexing has been throttled to a single thread since the last time the node was restarted.
+  * disk usage:
+    The total space used and percentage of space used for storing Elasticsearch data files.
   * docs:
     The total number of documents in all index shards allocated to this node.  If there is a second number, this is the total number of deleted documents not yet merged.