Merge pull request #275 from vvanholl/es780

Upgrade to ES 7.8.0 and release version 7.8.0.0

Author: vvanholl

README.md

@@ -27,6 +27,7 @@ It collects all relevant metrics and makes them available to Prometheus via the
 
 | Elasticsearch  | Plugin         | Release date |
 | -------------- | -------------- | ------------ |
+| 7.8.0          | 7.8.0.0        | Jun 22, 2020 |
 | 7.7.1          | 7.7.1.0        | Jun 04, 2020 |
 | 7.7.0          | 7.7.0.0        | May 14, 2020 |
 | 7.6.2          | 7.6.2.0        | Apr  6, 2020 |
@@ -50,7 +51,7 @@ It collects all relevant metrics and makes them available to Prometheus via the
 
 ## Install
 
-`./bin/elasticsearch-plugin install -b https://github.com/vvanholl/elasticsearch-prometheus-exporter/releases/download/7.7.1.0/prometheus-exporter-7.7.1.0.zip`
+`./bin/elasticsearch-plugin install -b https://github.com/vvanholl/elasticsearch-prometheus-exporter/releases/download/7.8.0.0/prometheus-exporter-7.8.0.0.zip`
 
 **Do not forget to restart the node after the installation!**
 

build.gradle

@@ -130,6 +130,11 @@ testClusters.integTest {
 //    setting 'cluster.name', 'PrometheusExporterITCluster'
 }
 
+licenseHeaders {
+  additionalLicense 'APAC2', 'Apache 2.0 License', 'Licensed under the Apache License, Version 2.0'
+  approvedLicenses = ['Apache 2.0 License']
+}
+
 checkstyle {
     configFile = new File(rootDir, "checkstyle.xml")
     toolVersion = "8.2"

gradle.properties

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

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

@@ -20,7 +20,7 @@
 
 import org.elasticsearch.ElasticsearchParseException;
 import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse;
-import org.elasticsearch.cluster.metadata.MetaData;
+import org.elasticsearch.cluster.metadata.Metadata;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -82,7 +82,7 @@ public ClusterStatsData(StreamInput in) throws IOException {
     @SuppressWarnings({"checkstyle:LineLength"})
     ClusterStatsData(ClusterStateResponse clusterStateResponse, Settings settings, ClusterSettings clusterSettings) {
 
-        MetaData m = clusterStateResponse.getState().getMetaData();
+        Metadata m = clusterStateResponse.getState().getMetadata();
         // There are several layers of cluster settings in Elasticsearch each having different priority.
         // We need to traverse them from the top priority down to find relevant value of each setting.
         // See https://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-update-settings.html#_order_of_precedence

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

@@ -120,7 +120,7 @@ private AsyncAction(ActionListener<NodePrometheusMetricsResponse> listener) {
             // Cluster settings are get via ClusterStateRequest (see elasticsearch RestClusterGetSettingsAction for details)
             // We prefer to send it to master node (hence local=false; it should be set by default but we want to be sure).
             this.clusterStateRequest = isPrometheusClusterSettings ? Requests.clusterStateRequest()
-                    .clear().metaData(true).local(false) : null;
+                    .clear().metadata(true).local(false) : null;
         }
 
         private void gatherRequests() {