Skip to content

Commit 4b63654

Browse files
committed
Release version 6.7.0.0
Upgrade to Elasticsearch 6.7.0
1 parent 0d69d67 commit 4b63654

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ It collects all relevant metrics and makes them available to Prometheus via the
2727

2828
| Elasticsearch | Plugin | Release date |
2929
| -------------- | -------------- | ------------ |
30+
| 6.7.0 | 6.7.0.0 | Apr 02, 2019 |
3031
| 6.6.2 | 6.6.2.0 | Mar 14, 2019 |
3132
| 6.6.1 | 6.6.1.0 | Feb 21, 2019 |
3233
| 6.6.0 | 6.6.0.0 | Feb 11, 2019 |
@@ -113,7 +114,7 @@ It collects all relevant metrics and makes them available to Prometheus via the
113114
## Install
114115

115116
- Since Elasticsearch 6.0.0 :
116-
`./bin/elasticsearch-plugin install -b https://distfiles.compuscene.net/elasticsearch/elasticsearch-prometheus-exporter-6.6.2.0.zip`
117+
`./bin/elasticsearch-plugin install -b https://distfiles.compuscene.net/elasticsearch/elasticsearch-prometheus-exporter-6.7.0.0.zip`
117118

118119
- On Elasticsearch 5.x.x :
119120
`./bin/elasticsearch-plugin install -b https://distfiles.compuscene.net/elasticsearch/elasticsearch-prometheus-exporter-5.6.14.0.zip`

build.gradle

+4-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ buildscript {
88
}
99

1010
dependencies {
11-
classpath "org.elasticsearch.gradle:build-tools:6.6.2" // How can we use ${versions.elasticsearch} here ???
11+
classpath "org.elasticsearch.gradle:build-tools:6.7.0" // How can we use ${versions.elasticsearch} here ???
1212
classpath group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.0'
1313
classpath group: 'com.sun.xml.bind', name: 'jaxb-core', version: '2.3.0'
1414
classpath group: 'com.sun.xml.bind', name: 'jaxb-impl', version: '2.3.0'
@@ -47,9 +47,11 @@ thirdPartyAudit.enabled = false
4747
// license header checks can be disabled
4848
licenseHeaders.enabled = true
4949

50+
// No unit tests in this plugin
51+
unitTest.enabled = false
52+
5053
// There are only integration tests
5154
integTestRunner.enabled = true
52-
test.enabled = false
5355

5456
println "Host: " + java.net.InetAddress.getLocalHost()
5557
println "Gradle: " + gradle.gradleVersion + " JVM: " + org.gradle.internal.jvm.Jvm.current() + " Groovy: " + GroovySystem.getVersion()

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
group = org.elasticsearch.plugin.prometheus
22

3-
version = 6.6.2.1-SNAPSHOT
3+
version = 6.7.0.0
44

55
pluginName = prometheus-exporter
66
pluginClassname = org.elasticsearch.plugin.prometheus.PrometheusExporterPlugin

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.elasticsearch.common.settings.ClusterSettings;
2828
import org.elasticsearch.common.settings.Settings;
2929
import org.elasticsearch.common.settings.SettingsException;
30+
import org.elasticsearch.common.unit.RatioValue;
3031

3132
import java.io.IOException;
3233

@@ -109,7 +110,7 @@ private void parseValue(Settings s, String key, Long[] bytesPointer, Double[] pc
109110
String value = s.get(key);
110111
if (value != null && pctPointer[0] == null) {
111112
try {
112-
pctPointer[0] = s.getAsRatio(key, null).getAsPercent();
113+
pctPointer[0] = RatioValue.parseRatioValue(s.get(key, null)).getAsPercent();
113114
} catch (SettingsException | ElasticsearchParseException | NullPointerException e1) {
114115
if (bytesPointer[0] == null) {
115116
try {

0 commit comments

Comments
 (0)