Skip to content

Commit 4995435

Browse files
authored
Merge pull request #248 from vvanholl/release_7.5.1
Upgrade to ES 7.5.1 and release 7.5.1.0
2 parents c8dcd1e + f2cdcc2 commit 4995435

File tree

3 files changed

+5
-14
lines changed

3 files changed

+5
-14
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+
| 7.5.1 | 7.5.1.0 | Jan 21, 2020 |
3031
| 7.5.0 | 7.5.0.0 | Jan 16, 2020 |
3132
| 7.4.2 | 7.4.2.0 | Jan 13, 2020 |
3233
| 7.4.1 | 7.4.1.0 | Jan 13, 2020 |
@@ -143,7 +144,7 @@ It collects all relevant metrics and makes them available to Prometheus via the
143144
## Install
144145

145146
- Since Elasticsearch 7.0.0 :
146-
`./bin/elasticsearch-plugin install -b https://github.com/vvanholl/elasticsearch-prometheus-exporter/releases/download/7.5.0.0/prometheus-exporter-7.5.0.0.zip`
147+
`./bin/elasticsearch-plugin install -b https://github.com/vvanholl/elasticsearch-prometheus-exporter/releases/download/7.5.1.0/prometheus-exporter-7.5.1.0.zip`
147148

148149
- Since Elasticsearch 6.0.0 :
149150
`./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

+2-12
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,8 @@ apply plugin: 'java'
3636
apply plugin: 'idea'
3737
apply plugin: 'elasticsearch.esplugin'
3838

39-
// ------ TODO(lukas-vlcek): Hack needed for ES 7.5.0 release ------
40-
// Remove this before release 7.5.1
41-
// See https://github.com/elastic/elasticsearch/issues/49787#issuecomment-562704640
42-
configurations.whenObjectAdded { c ->
43-
if (c.name == 'elasticsearch_7.5.0_integ_test_zip_null') {
44-
project.dependencies.add('elasticsearch_7.5.0_integ_test_zip_null', 'org.elasticsearch.distribution.integ-test-zip:elasticsearch:7.5.0@zip')
45-
}
46-
}
47-
// ------
48-
4939
// Uncomment if you want to use: System.out.println("Emergency!");
50-
// Logs are found in build/cluster/integTestCluster*/cwd/run.log
40+
// Logs are found in build/testcluster/integTest-*/logs/ folder.
5141
//forbiddenApis {
5242
// ignoreFailures = true
5343
//}
@@ -85,7 +75,7 @@ repositories {
8575
ext {
8676
versions = [
8777
"elasticsearch": es_version,
88-
"prometheus" : "0.6.0",
78+
"prometheus" : "0.8.0",
8979
"log4j" : "2.11.1",
9080
"junit" : "4.12"
9181
]

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 = 7.5.0.1-SNAPSHOT
3+
version = 7.5.1.0
44

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

0 commit comments

Comments
 (0)