Skip to content
This repository was archived by the owner on Oct 23, 2024. It is now read-only.

Commit 1070197

Browse files
authored
Merge pull request #7 from mesosphere/elastic-6.6
* Updated for ES 6.6.1
2 parents a21ca8c + c9baf4d commit 1070197

File tree

4 files changed

+13
-8
lines changed

4 files changed

+13
-8
lines changed

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ The data sent to the StatsD server tries to be roughly equivalent to the [Indice
1010

1111
| Elasticsearch | Plugin | Release date |
1212
| -------------- | -------------- | ------------ |
13+
| 6.6.1 | 6.6.1.0 | Mar 11, 2019 |
1314
| 6.5.0 | 6.5.0.0 | Jan 2, 2019 |
1415
| 6.4.3 | 6.4.3.0 | Jan 1, 2019 |
1516
| 6.4.2 | 6.4.2.0 | Oct 10, 2018 |
@@ -84,12 +85,12 @@ The plugin artifacts are published to Maven Central and Github. To install a pre
8485
From Github:
8586

8687
```
87-
./bin/elasticsearch-plugin install https://github.com/Automattic/elasticsearch-statsd-plugin/releases/download/6.5.0.0/elasticsearch-statsd-6.5.0.0.zip
88+
./bin/elasticsearch-plugin install https://github.com/Automattic/elasticsearch-statsd-plugin/releases/download/6.6.1.0/elasticsearch-statsd-6.6.1.0.zip
8889
```
8990

9091
From Maven Central:
9192
```
92-
./bin/elasticsearch-plugin install http://repo1.maven.org/maven2/com/automattic/elasticsearch-statsd/6.5.0.0/elasticsearch-statsd-6.5.0.0.zip
93+
./bin/elasticsearch-plugin install http://repo1.maven.org/maven2/com/automattic/elasticsearch-statsd/6.6.1.0/elasticsearch-statsd-6.6.1.0.zip
9394
```
9495

9596
Change the version to match your ES version. For ES `x.y.z` the version is `x.y.z.0`
@@ -105,7 +106,7 @@ mvn clean package -Djava.security.policy=src/test/resources/plugin-security-test
105106
Once we have the artifact, install it with the following command:
106107

107108
```
108-
bin/elasticsearch-plugin install file:///absolute/path/to/current/dir/target/releases/elasticsearch-statsd-6.5.0.0.zip
109+
bin/elasticsearch-plugin install file:///absolute/path/to/current/dir/target/releases/elasticsearch-statsd-6.6.1.0.zip
109110
```
110111

111112
## Installation Elasticsearch 5.x

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>com.automattic</groupId>
77
<artifactId>elasticsearch-statsd</artifactId>
8-
<version>6.5.0.0</version>
8+
<version>6.6.1.0</version>
99
<packaging>jar</packaging>
1010

1111
<name>elasticsearch-statsd</name>
@@ -46,7 +46,7 @@
4646
</developers>
4747

4848
<properties>
49-
<elasticsearch.version>6.5.0</elasticsearch.version>
49+
<elasticsearch.version>6.6.1</elasticsearch.version>
5050
<junit.version>4.12</junit.version>
5151
<maven.compiler.target>1.8</maven.compiler.target>
5252
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

src/main/java/com/automattic/elasticsearch/statsd/StatsdService.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.automattic.elasticsearch.statsd;
22

3+
import org.apache.logging.log4j.LogManager;
4+
import org.apache.logging.log4j.Logger;
35
import com.automattic.elasticsearch.plugin.StatsdPlugin;
46
import com.timgroup.statsd.NonBlockingStatsDClient;
57
import com.timgroup.statsd.StatsDClient;
@@ -46,6 +48,8 @@ public class StatsdService extends AbstractLifecycleComponent {
4648
private final Thread statsdReporterThread;
4749
private final AtomicBoolean closed = new AtomicBoolean(false);
4850

51+
protected static final Logger logger = LogManager.getLogger(StatsdService.class);
52+
4953
@Inject
5054
public StatsdService(Settings settings, Client client, ClusterService clusterService, IndicesService indicesService, NodeService nodeService) {
5155
super(settings);
@@ -75,7 +79,7 @@ public StatsdService(Settings settings, Client client, ClusterService clusterSer
7579
StatsdService.this.statsdPort));
7680

7781
this.statsdReporterThread = EsExecutors
78-
.daemonThreadFactory(this.settings, "statsd_reporter")
82+
.daemonThreadFactory(settings, "statsd_reporter")
7983
.newThread(new StatsdReporterThread());
8084
}
8185

src/test/java/com/automattic/elasticsearch/statsd/test/StatsdMockServer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.automattic.elasticsearch.statsd.test;
22

3+
import org.apache.logging.log4j.LogManager;
34
import org.apache.logging.log4j.Logger;
4-
import org.elasticsearch.common.logging.Loggers;
55

66
import java.io.BufferedReader;
77
import java.io.ByteArrayInputStream;
@@ -18,7 +18,7 @@ public class StatsdMockServer extends Thread {
1818
public Collection<String> content = new ArrayList<>();
1919
private DatagramSocket socket;
2020
private boolean isClosed = false;
21-
private final Logger logger = Loggers.getLogger(getClass());
21+
protected static final Logger logger = LogManager.getLogger(StatsdMockServer.class);
2222

2323
public StatsdMockServer(int port) {
2424
this.port = port;

0 commit comments

Comments
 (0)