Merge pull request #261 from lukas-vlcek/release_7.6.1

Release 7.6.1

Author: vvanholl

.gitlab-ci.yml

@@ -1,4 +1,5 @@
-image: "gradle:6.1.1-jdk13"
+image: "gradle:6.2.1-jdk13"
+# Please sync gradle version with README.md
 
 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 |
 | -------------- | -------------- | ------------ |
+| 7.6.1          | 7.6.1.0        | Mar 30, 2020 |
 | 7.6.0          | 7.6.0.0        | Feb 12, 2020 |
 | 7.5.2          | 7.5.2.0        | Jan 25, 2020 |
 | 7.5.1          | 7.5.1.0        | Jan 21, 2020 |
@@ -146,7 +147,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.6.0.0/prometheus-exporter-7.6.0.0.zip`
+    `./bin/elasticsearch-plugin install -b https://github.com/vvanholl/elasticsearch-prometheus-exporter/releases/download/7.6.1.0/prometheus-exporter-7.6.1.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`
@@ -254,6 +255,13 @@ Project contains [integration tests](src/test/resources/rest-api-spec) implement
 [rest layer](https://github.com/elastic/elasticsearch/blob/master/TESTING.asciidoc#testing-the-rest-layer)
 framework.
 
+To run everything similar to the gitlab pipeline you can do:
+```
+docker run -v $(pwd):/home/gradle gradle:6.2.1-jdk13 su gradle -c 'gradle check'
+```
+NOTE: Please keep version in sync with .gitlab-ci.yml
+
+
 Complete test suite is run using:
 ```
 gradle clean check

build.gradle

@@ -105,8 +105,17 @@ esplugin {
     classname pluginClassname
 }
 
+// Remove in 7.6.2
+// https://github.com/spinscale/elasticsearch-ingest-langdetect/blob/c619173300113f26411a0bc42da8e41c8d4d72a5/build.gradle#L26
+restResources {
+    restApi {
+        includeCore '*'
+    }
+}
+
 testClusters.integTest {
     numberOfNodes = 2
+
 // There does not seem to be any easy way how to setup custom cluster name.
 
 //    This worked in ES 7.4.x, but now results in:

gradle.properties

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