Skip to content

Commit 632bdee

Browse files
committed
Applies Elasticsearch GeopIp interface changes.
1 parent c7d376e commit 632bdee

File tree

2 files changed

+21
-3
lines changed

2 files changed

+21
-3
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
LOGSTASH_PATH=../../ls
2-
ELASTICSEARCH_TREEISH=8.13
2+
ELASTICSEARCH_TREEISH=8.14

src/main/java/co/elastic/logstash/filters/elasticintegration/geoip/GeoIpDatabaseAdapter.java

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,11 @@
1414
import org.elasticsearch.ingest.geoip.shaded.com.maxmind.geoip2.model.AnonymousIpResponse;
1515
import org.elasticsearch.ingest.geoip.shaded.com.maxmind.geoip2.model.AsnResponse;
1616
import org.elasticsearch.ingest.geoip.shaded.com.maxmind.geoip2.model.CityResponse;
17+
import org.elasticsearch.ingest.geoip.shaded.com.maxmind.geoip2.model.ConnectionTypeResponse;
1718
import org.elasticsearch.ingest.geoip.shaded.com.maxmind.geoip2.model.CountryResponse;
19+
import org.elasticsearch.ingest.geoip.shaded.com.maxmind.geoip2.model.DomainResponse;
1820
import org.elasticsearch.ingest.geoip.shaded.com.maxmind.geoip2.model.EnterpriseResponse;
21+
import org.elasticsearch.ingest.geoip.shaded.com.maxmind.geoip2.model.IspResponse;
1922

2023
import java.io.Closeable;
2124
import java.io.File;
@@ -54,16 +57,31 @@ public AsnResponse getAsn(InetAddress inetAddress) {
5457
return getResponse(inetAddress, this.databaseReader::tryAsn);
5558
}
5659

57-
/* @Override // neither available nor reachable until Elasticsearch 8.14 */
60+
@Override
5861
public AnonymousIpResponse getAnonymousIp(InetAddress ipAddress) {
5962
return getResponse(ipAddress, this.databaseReader::tryAnonymousIp);
6063
}
6164

62-
/* @Override // neither available nor reachable until Elasticsearch 8.14 */
65+
@Override
6366
public EnterpriseResponse getEnterprise(InetAddress ipAddress) {
6467
return getResponse(ipAddress, this.databaseReader::tryEnterprise);
6568
}
6669

70+
/* @Override // neither available nor reachable until Elasticsearch 8.15 */
71+
public ConnectionTypeResponse getConnectionType(InetAddress inetAddress) {
72+
return getResponse(inetAddress, this.databaseReader::tryConnectionType);
73+
}
74+
75+
/* @Override // neither available nor reachable until Elasticsearch 8.15 */
76+
public DomainResponse getDomain(InetAddress ipAddress) {
77+
return getResponse(ipAddress, this.databaseReader::tryDomain);
78+
}
79+
80+
/* @Override // neither available nor reachable until Elasticsearch 8.15 */
81+
public IspResponse getIsp(InetAddress ipAddress) {
82+
return getResponse(ipAddress, this.databaseReader::tryIsp);
83+
}
84+
6785
private <T extends AbstractResponse> T getResponse(final InetAddress inetAddress, MaxmindTryLookup<T> resolver) {
6886
try {
6987
return resolver.lookup(inetAddress).orElse(null);

0 commit comments

Comments
 (0)