Merge pull request #79 from dvjyothsna/od-1.3

Update Performance Analyzer to support ElasticSearch version 7.3.2

Author: ktkrg

build.gradle

@@ -16,7 +16,7 @@
 buildscript {
 
     ext {
-        es_version = System.getProperty("es.version", "7.2.1")
+        es_version = System.getProperty("es.version", "7.3.2")
     }
     // This isn't applying from repositories.gradle so repeating it here
     repositories {
@@ -34,7 +34,7 @@ plugins {
 }
 
 ext {
-    opendistroVersion = '1.2.1'
+    opendistroVersion = '1.3.0'
     isSnapshot = "true" == System.getProperty("build.snapshot", "true")
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/http_action/whoami/WhoAmIAction.java

@@ -15,19 +15,22 @@
 
 package com.amazon.opendistro.elasticsearch.performanceanalyzer.http_action.whoami;
 
-import org.elasticsearch.action.Action;
+import org.elasticsearch.action.ActionType;
+import org.elasticsearch.common.io.stream.Writeable;
 
-public class WhoAmIAction extends Action<WhoAmIResponse> {
+public class WhoAmIAction extends ActionType<WhoAmIResponse> {
 
     public static final WhoAmIAction INSTANCE = new WhoAmIAction();
     public static final String NAME = "cluster:admin/performanceanalyzer/whoami";
+    public static final Writeable.Reader<WhoAmIResponse> responseReader = null;
 
-    protected WhoAmIAction() {
-        super(NAME);
+    private WhoAmIAction() {
+        super(NAME, responseReader);
     }
 
     @Override
-    public WhoAmIResponse newResponse() {
-        return new WhoAmIResponse();
+    public Writeable.Reader<WhoAmIResponse> getResponseReader() {
+        return responseReader;
     }
 }
+

src/test/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/hwnet/CollectMetricsTests.java

@@ -38,7 +38,7 @@
 import org.elasticsearch.Version;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.node.DiscoveryNode;
-import org.elasticsearch.cluster.node.DiscoveryNode.Role;
+import org.elasticsearch.cluster.node.DiscoveryNodeRole;
 import org.elasticsearch.cluster.node.DiscoveryNodes;
 import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.transport.TransportAddress;
@@ -466,12 +466,12 @@ private static List<DiscoveryNode> buildNumNodes(String nodeId1, String nodeId2,
 
         final DiscoveryNode node1 = new DiscoveryNode("s7gDCVn", nodeId1,
                 new TransportAddress(address1, 9200), emptyMap(),
-                singleton(Role.MASTER), Version.CURRENT);
+                singleton(DiscoveryNodeRole.MASTER_ROLE), Version.CURRENT);
         nodesList.add(node1);
 
         final DiscoveryNode node2 = new DiscoveryNode("Zn1QcSU", nodeId2,
                 new TransportAddress(address2, 9200), emptyMap(),
-                singleton(Role.DATA), Version.CURRENT);
+                singleton(DiscoveryNodeRole.DATA_ROLE), Version.CURRENT);
         nodesList.add(node2);
 
         return nodesList;