Upgrade to ElasticSearch 5.3.0

Author: vvanholl

README.md

@@ -21,6 +21,7 @@ Current available metrics are :
 
 | Elasticsearch  | Plugin         | Release date | Prod ready ? |
 | -------------- | -------------- | ------------ | ------------ |
+| 5.3.0          | 5.3.0.0        | Mar 29, 2017 | NO           |
 | 5.2.2          | 5.2.2.0        | Mar 03, 2017 | NO           |
 | 5.2.1          | 5.2.1.0        | Feb 17, 2017 | NO           |
 | 5.2.0          | 5.2.0.0        | Feb 03, 2017 | NO           |
@@ -43,7 +44,7 @@ Current available metrics are :
 ## Install
 
 - Since ElasticSearch 5.0.0 :
-    ./bin/elasticsearch-plugin install -b https://github.com/vvanholl/elasticsearch-prometheus-exporter/releases/download/5.2.2.0/elasticsearch-prometheus-exporter-5.2.2.0.zip
+    ./bin/elasticsearch-plugin install -b https://github.com/vvanholl/elasticsearch-prometheus-exporter/releases/download/5.3.0.0/elasticsearch-prometheus-exporter-5.3.0.0.zip
 
 - On old 2.x.x versions :
     ./bin/plugin install https://github.com/vvanholl/elasticsearch-prometheus-exporter/releases/download/2.4.1.0/elasticsearch-prometheus-exporter-2.4.1.0.zip

plugin-descriptor.properties

@@ -34,7 +34,7 @@
 description=Prometheus Exporter
 #
 # 'version': plugin's version
-version=5.2.2.0
+version=5.3.0.0
 #
 # 'name': the plugin name
 name=prometheus-exporter
@@ -68,5 +68,5 @@ java.version=1.8
 # elasticsearch release. This version is checked when the plugin
 # is loaded so Elasticsearch will refuse to start in the presence of
 # plugins with the incorrect elasticsearch.version.
-elasticsearch.version=5.2.2
+elasticsearch.version=5.3.0
 #

pom.xml

@@ -27,7 +27,7 @@
     </scm>
 
     <properties>
-        <elasticsearch.version>5.2.2</elasticsearch.version>
+        <elasticsearch.version>5.3.0</elasticsearch.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 

src/main/java/org/elasticsearch/plugin/prometheus/PrometheusExporterPlugin.java

@@ -1,18 +1,24 @@
 package org.elasticsearch.plugin.prometheus;
 
 import org.apache.logging.log4j.Logger;
+import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
+import org.elasticsearch.cluster.node.DiscoveryNodes;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.logging.Loggers;
+import org.elasticsearch.common.settings.ClusterSettings;
+import org.elasticsearch.common.settings.IndexScopedSettings;
 import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.common.settings.SettingsFilter;
 import org.elasticsearch.index.IndexModule;
 import org.elasticsearch.plugins.ActionPlugin;
 import org.elasticsearch.plugins.Plugin;
+import org.elasticsearch.rest.RestController;
 import org.elasticsearch.rest.RestHandler;
 import org.elasticsearch.rest.prometheus.RestPrometheusMetricsAction;
 
+import java.util.Arrays;
 import java.util.List;
-
-import static java.util.Collections.singletonList;
+import java.util.function.Supplier;
 
 public class PrometheusExporterPlugin extends Plugin implements ActionPlugin {
 
@@ -29,8 +35,10 @@ public void onIndexModule(IndexModule indexModule) {
     }
 
     @Override
-    public List<Class<? extends RestHandler>> getRestHandlers() {
-        return singletonList(RestPrometheusMetricsAction.class);
+    public List<RestHandler> getRestHandlers(Settings settings, RestController restController, ClusterSettings clusterSettings, IndexScopedSettings indexScopedSettings, SettingsFilter settingsFilter, IndexNameExpressionResolver indexNameExpressionResolver, Supplier<DiscoveryNodes> nodesInCluster) {
+        return Arrays.asList(
+                new RestPrometheusMetricsAction(settings, restController)
+        );
     }
 
 }