Merge pull request #161 from vvanholl/es660

Upgrade to Elasticsearch 6.6.0.0

Author: vvanholl

.gitlab-ci.yml

@@ -1,4 +1,4 @@
-image: gradle:4.10.2-jdk11
+image: gradle:5.2.1-jdk11
 
 variables:
   GRADLE_OPTS: "-Dorg.gradle.daemon=false"

README.md

@@ -27,6 +27,7 @@ It collects all relevant metrics and makes them available to Prometheus via the
 
 | Elasticsearch  | Plugin         | Release date |
 | -------------- | -------------- | ------------ |
+| 6.6.0          | 6.6.0.0        | Feb 11, 2019 |
 | 6.5.4          | 6.5.4.0        | Jan 01, 2019 |
 | 6.5.3          | 6.5.3.0        | Dec 13, 2018 |
 | 6.5.2          | 6.5.2.0        | Dec 05, 2018 |
@@ -110,7 +111,7 @@ It collects all relevant metrics and makes them available to Prometheus via the
 ## Install
 
 - Since Elasticsearch 6.0.0 :
-    `./bin/elasticsearch-plugin install -b https://distfiles.compuscene.net/elasticsearch/elasticsearch-prometheus-exporter-6.5.4.0.zip`
+    `./bin/elasticsearch-plugin install -b https://distfiles.compuscene.net/elasticsearch/elasticsearch-prometheus-exporter-6.6.0.0.zip`
 
 - On Elasticsearch 5.x.x :
     `./bin/elasticsearch-plugin install -b https://distfiles.compuscene.net/elasticsearch/elasticsearch-prometheus-exporter-5.6.14.0.zip`

build.gradle

@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "org.elasticsearch.gradle:build-tools:6.5.4" // How can we use ${versions.elasticsearch} here ???
+        classpath "org.elasticsearch.gradle:build-tools:6.6.0" // How can we use ${versions.elasticsearch} here ???
         classpath group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.0'
         classpath group: 'com.sun.xml.bind', name: 'jaxb-core', version: '2.3.0'
         classpath group: 'com.sun.xml.bind', name: 'jaxb-impl', version: '2.3.0'

gradle.properties

@@ -1,6 +1,6 @@
 group = org.elasticsearch.plugin.prometheus
 
-version = 6.5.4.1-SNAPSHOT
+version = 6.6.0.0-SNAPSHOT
 
 pluginName = prometheus-exporter
 pluginClassname = org.elasticsearch.plugin.prometheus.PrometheusExporterPlugin

src/main/java/org/elasticsearch/action/NodePrometheusMetricsAction.java

@@ -17,6 +17,7 @@
 package org.elasticsearch.action;
 
 import org.elasticsearch.client.ElasticsearchClient;
+import org.elasticsearch.common.io.stream.Writeable;
 
 /**
  * Action class for Prometheus Exporter plugin.
@@ -31,12 +32,18 @@ private NodePrometheusMetricsAction() {
     }
 
     @Override
+    @SuppressWarnings("deprecation")
     public NodePrometheusMetricsResponse newResponse() {
-        return new NodePrometheusMetricsResponse();
+        throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable");
     }
 
     @Override
     public NodePrometheusRequestBuilder newRequestBuilder(ElasticsearchClient client) {
         return new NodePrometheusRequestBuilder(client, this);
     }
+
+    @Override
+    public Writeable.Reader<NodePrometheusMetricsResponse> getResponseReader() {
+        return NodePrometheusMetricsResponse::new;
+    }
 }

src/main/java/org/elasticsearch/action/NodePrometheusMetricsResponse.java

@@ -42,7 +42,18 @@ public class NodePrometheusMetricsResponse extends ActionResponse {
     @Nullable private IndicesStatsResponse indicesStats;
     private ClusterStatsData clusterStatsData = null;
 
-    public NodePrometheusMetricsResponse() {
+    public NodePrometheusMetricsResponse(StreamInput in) throws IOException {
+        super.readFrom(in);
+        clusterHealth = ClusterHealthResponse.readResponseFrom(in);
+        nodeStats = NodeStats.readNodeStats(in);
+        BroadcastResponse br = new BroadcastResponse();
+        br.readFrom(in);
+        ShardStats[] ss = in.readArray(ShardStats::readShardStats, (size) -> new ShardStats[size]);
+        indicesStats = PackageAccessHelper.createIndicesStatsResponse(
+                ss, br.getTotalShards(), br.getSuccessfulShards(), br.getFailedShards(),
+                Arrays.asList(br.getShardFailures())
+        );
+        clusterStatsData.readFrom(in);
     }
 
     public NodePrometheusMetricsResponse(ClusterHealthResponse clusterHealth, NodeStats nodesStats,
@@ -76,21 +87,6 @@ public ClusterStatsData getClusterStatsData() {
         return this.clusterStatsData;
     }
 
-    @Override
-    public void readFrom(StreamInput in) throws IOException {
-        super.readFrom(in);
-        clusterHealth = ClusterHealthResponse.readResponseFrom(in);
-        nodeStats = NodeStats.readNodeStats(in);
-        BroadcastResponse br = new BroadcastResponse();
-        br.readFrom(in);
-        ShardStats[] ss = in.readArray(ShardStats::readShardStats, (size) -> new ShardStats[size]);
-        indicesStats = PackageAccessHelper.createIndicesStatsResponse(
-                ss, br.getTotalShards(), br.getSuccessfulShards(), br.getFailedShards(),
-                Arrays.asList(br.getShardFailures())
-        );
-        clusterStatsData.readFrom(in);
-    }
-
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);

src/main/java/org/elasticsearch/rest/prometheus/RestPrometheusMetricsAction.java

@@ -36,10 +36,12 @@
  * REST action class for Prometheus Exporter plugin.
  */
 public class RestPrometheusMetricsAction extends BaseRestHandler {
+    private final Settings settings;
 
     @Inject
     public RestPrometheusMetricsAction(Settings settings, RestController controller) {
         super(settings);
+        this.settings = settings;
         controller.registerHandler(GET, "/_prometheus/metrics", this);
     }