Port to es 2.3

README.md

@@ -41,6 +41,117 @@ Check your elasticsearch log file for a line like this after adding the configur
 * Not extensively tested
 * In case of a master node failover, counts are starting from 0 again (in case you are wondering about spikes)
 
+## Changes (ES 2.3):
+
+```text
+node.process
+	cpu
+		- sysSeconds
+		- userSeconds
+	mem
+		- resident
+		- share
+
+node.os
+	cpu
+		+ percent
+		+ average
+		- sys
+		- idle
+		- user
+	mem
+		- actualFreeBytes
+		- actualUsedBytes
+
+- node.network.tcp
+	- activeOpens
+	- passiveOpens
+	- attemptFails
+	- estabResets
+	- currEstab
+	- inSegs
+	- outSegs
+	- retransSegs
+	- inErrs
+	- outRsts
+
+node.jvm
+	- gc.%name%.lastGc
+		- startTime
+		- endTime
+		- max
+		- beforeUsed
+		- afterUsed
+		- durationSeconds
+	+ buffer.pool.%name%
+		+ totalCapacity
+		+ used
+		+ count
+
+node.fs%i%
+	- diskReads
+	- diskReadsInBytes
+	- diskWrites
+	- diskWritesInBytes
+	- diskQueue
+	- distService
+
+indexes.%name%.id.%id%
+	+ completion
+		+ sizeInBytes
+	+ suggest
+		+ count
+		+ current
+		+ timeInMillis
+	+ segments
+		+ count
+		+ memoryInBytes
+		+ bitsetMemoryInBytes
+		+ docValuesMemoryInBytes
+		+ indexWriterMaxMemoryInBytes
+		+ indexWriterMemoryInBytes
+		+ normsMemoryInBytes
+		+ storedFieldsMemoryInBytes
+		+ termVectorsMemoryInBytes
+		+ termsMemoryInBytes
+		+ versionMapMemoryInBytes
+	+ recovery
+		+ currentAsSource
+		+ currentAsTarget
+	+ querycache
+		+ evictions
+		+ hitCount
+		+ missCount
+		+ memorySizeInBytes
+		+ cacheCount
+		+ cacheSize
+		+ totalCount
+	+ translog
+		+ estimatedNumberOfOperations
+		+ sizeInBytes
+
+node
+	+ merge [see higher]
+	+ store [see higher]
+	+ completion [see higher]
+	+ suggest [see higher]
+	+ segments [see higher]
+	+ recovery [see higher]
+	+ querycache [see higher]
+	+ requestcache
+		+ evictions
+		+ hitCount
+		+ missCount
+		+ memorySizeInBytes
+	+ percolate
+		+ count
+		+ current
+		+ memorySizeInBytes
+		+ numQueries
+		+ timeInMillis
+	- filtercache
+	- idcache
+```
 
 ## Credits
 

pom.xml

@@ -11,7 +11,7 @@
     <url>https://github.com/spinscale/elasticsearch-graphite-plugin/</url>
 
     <properties>
-        <elasticsearch.version>1.7.3</elasticsearch.version>
+        <elasticsearch.version>2.3.1</elasticsearch.version>
         <hamcrest.version>1.3</hamcrest.version>
     </properties>
 

src/main/assemblies/plugin.xml

@@ -5,6 +5,13 @@
         <format>zip</format>
     </formats>
     <includeBaseDirectory>false</includeBaseDirectory>
+    <files>
+        <file>
+            <source>src/main/resources/elasticsearch-graphite-plugin/plugin-descriptor.properties</source>
+            <outputDirectory></outputDirectory>
+            <filtered>true</filtered>
+        </file>
+    </files>
     <dependencySets>
         <dependencySet>
             <outputDirectory>/</outputDirectory>

src/main/java/org/elasticsearch/plugin/graphite/GraphitePlugin.java

@@ -1,13 +1,13 @@
 package org.elasticsearch.plugin.graphite;
 
-import org.elasticsearch.common.collect.Lists;
+import com.google.common.collect.Lists;
 import org.elasticsearch.common.component.LifecycleComponent;
-import org.elasticsearch.plugins.AbstractPlugin;
+import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.service.graphite.GraphiteService;
 
 import java.util.Collection;
 
-public class GraphitePlugin extends AbstractPlugin {
+public class GraphitePlugin extends Plugin {
 
     public String name() {
         return "graphite";
@@ -17,8 +17,8 @@ public String description() {
         return "Graphite Monitoring Plugin";
     }
 
-    @SuppressWarnings("rawtypes")
-    @Override public Collection<Class<? extends LifecycleComponent>> services() {
+    @Override
+    public Collection<Class<? extends LifecycleComponent>> nodeServices() {
         Collection<Class<? extends LifecycleComponent>> services = Lists.newArrayList();
         services.add(GraphiteService.class);
         return services;