Merge pull request #220 from vvanholl/es730

Upgrade to ES 7.3.0 and Release version 7.3.0.0

Author: vvanholl

.gitlab-ci.yml

@@ -13,6 +13,8 @@ stages:
 
 build:
   stage: "build"
+  tags:
+    - "gradle"
   script: "su gradle -c 'gradle --build-cache assemble'"
   cache:
     key: "$CI_COMMIT_REF_NAME"
@@ -23,6 +25,8 @@ build:
 
 test:
   stage: "test"
+  tags:
+    - "gradle"
   script: "su gradle -c 'gradle check'"
   artifacts:
     reports:
@@ -40,6 +44,8 @@ release:
     - "6.x"
     - "master"
   stage: "release"
+  tags:
+    - "gradle"
   script: "su gradle -c 'gradle release'"
   cache:
     key: "$CI_COMMIT_REF_NAME"

README.md

@@ -27,6 +27,7 @@ It collects all relevant metrics and makes them available to Prometheus via the
 
 | Elasticsearch  | Plugin         | Release date |
 | -------------- | -------------- | ------------ |
+| 7.3.0          | 7.3.0.0        | Sep 17, 2019 |
 | 7.2.1          | 7.2.1.0        | Jul 31, 2019 |
 | 7.2.0          | 7.2.0.0        | Jul 12, 2019 |
 | 7.1.1          | 7.1.1.0        | May 31, 2019 |
@@ -133,7 +134,7 @@ It collects all relevant metrics and makes them available to Prometheus via the
 ## Install
 
 - Since Elasticsearch 7.0.0 :
-    `./bin/elasticsearch-plugin install -b https://github.com/vvanholl/elasticsearch-prometheus-exporter/releases/download/7.2.1.0/prometheus-exporter-7.2.1.0.zip`
+    `./bin/elasticsearch-plugin install -b https://github.com/vvanholl/elasticsearch-prometheus-exporter/releases/download/7.3.0.0/prometheus-exporter-7.3.0.0.zip`
 
 - Since Elasticsearch 6.0.0 :
     `./bin/elasticsearch-plugin install -b https://github.com/vvanholl/elasticsearch-prometheus-exporter/releases/download/6.8.0.0/prometheus-exporter-6.8.0.0.zip`

build.gradle

@@ -154,3 +154,11 @@ task release() {
         dependsOn(["githubRelease"])
     }
 }
+
+// Fix for https://github.com/elastic/elasticsearch/issues/45073
+// TODO(lukas-vlcek): Should be removed for ES v7.3.1 and later.
+configurations.all {
+  resolutionStrategy.dependencySubstitution {
+    substitute project(':rest-api-spec') with module ("org.elasticsearch:rest-api-spec:${versions.elasticsearch}")
+  }
+}

gradle.properties

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

settings.gradle

@@ -1 +1,5 @@
 rootProject.name = "prometheus-exporter"
+
+// Fix for https://github.com/elastic/elasticsearch/issues/45073
+// TODO(lukas-vlcek): Should be removed for ES v7.3.1 and later.
+include ':rest-api-spec'

src/main/java/org/compuscene/metrics/prometheus/PrometheusMetricsCollector.java

@@ -24,7 +24,7 @@
 import org.elasticsearch.action.admin.indices.stats.IndexStats;
 import org.elasticsearch.action.admin.indices.stats.IndicesStatsResponse;
 import org.elasticsearch.cluster.health.ClusterIndexHealth;
-import org.elasticsearch.cluster.node.DiscoveryNode.Role;
+import org.elasticsearch.cluster.node.DiscoveryNodeRole;
 import org.elasticsearch.http.HttpStats;
 import org.elasticsearch.indices.NodeIndicesStats;
 import org.elasticsearch.indices.breaker.AllCircuitBreakerStats;
@@ -129,14 +129,17 @@ private void registerNodeMetrics() {
 
     private void updateNodeMetrics(NodeStats ns) {
         if (ns != null) {
+
+            // Plugins can introduce custom node roles from 7.3.0: https://github.com/elastic/elasticsearch/pull/43175
+            // TODO(lukas-vlcek): List of node roles can not be static but needs to be created dynamically.
             Map<String, Integer> roles = new HashMap<>();
 
             roles.put("master", 0);
             roles.put("data", 0);
             roles.put("ingest", 0);
 
-            for (Role r : ns.getNode().getRoles()) {
-                roles.put(r.getRoleName(), 1);
+            for (DiscoveryNodeRole r : ns.getNode().getRoles()) {
+                roles.put(r.roleName(), 1);
             }
 
             for (String k : roles.keySet()) {

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

@@ -21,18 +21,16 @@
 /**
  * Action class for Prometheus Exporter plugin.
  */
-public class NodePrometheusMetricsAction extends Action<NodePrometheusMetricsResponse> {
+public class NodePrometheusMetricsAction extends ActionType<NodePrometheusMetricsResponse> {
+    // TODO(lukas-vlcek): There are ongoing changes for ActionType class. This code needs additional review.
+    // - https://github.com/elastic/elasticsearch/pull/43778
+    // - https://github.com/elastic/elasticsearch/commit/b33ffc1ae06035e934277f17c4b5d9851f607056#diff-80df90ca727aadbbe854902f81bda313
+    // - https://github.com/elastic/elasticsearch/commit/5a9f81791a1be7fe6dd97728384ebafb189ab211#diff-80df90ca727aadbbe854902f81bda313
     public static final NodePrometheusMetricsAction INSTANCE = new NodePrometheusMetricsAction();
     public static final String NAME = "cluster:monitor/prometheus/metrics";
 
     private NodePrometheusMetricsAction() {
-        super(NAME);
-    }
-
-    @Override
-    @SuppressWarnings("deprecation")
-    public NodePrometheusMetricsResponse newResponse() {
-        throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable");
+        super(NAME, null);
     }
 
     @Override