Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Applies Elasticsearch GeoIP interface changes. #147

Merged
merged 1 commit into from
Jun 17, 2024
Merged

Applies Elasticsearch GeoIP interface changes. #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
LOGSTASH_PATH=../../ls
ELASTICSEARCH_TREEISH=8.13
ELASTICSEARCH_TREEISH=8.14
22 changes: 20 additions & 2 deletions src/main/java/co/elastic/logstash/filters/elasticintegration/geoip/GeoIpDatabaseAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,11 @@
import org.elasticsearch.ingest.geoip.shaded.com.maxmind.geoip2.model.AnonymousIpResponse;
import org.elasticsearch.ingest.geoip.shaded.com.maxmind.geoip2.model.AsnResponse;
import org.elasticsearch.ingest.geoip.shaded.com.maxmind.geoip2.model.CityResponse;
import org.elasticsearch.ingest.geoip.shaded.com.maxmind.geoip2.model.ConnectionTypeResponse;
import org.elasticsearch.ingest.geoip.shaded.com.maxmind.geoip2.model.CountryResponse;
import org.elasticsearch.ingest.geoip.shaded.com.maxmind.geoip2.model.DomainResponse;
import org.elasticsearch.ingest.geoip.shaded.com.maxmind.geoip2.model.EnterpriseResponse;
import org.elasticsearch.ingest.geoip.shaded.com.maxmind.geoip2.model.IspResponse;

import java.io.Closeable;
import java.io.File;
Expand Down Expand Up @@ -54,16 +57,31 @@ public AsnResponse getAsn(InetAddress inetAddress) {
return getResponse(inetAddress, this.databaseReader::tryAsn);
}

/* @Override // neither available nor reachable until Elasticsearch 8.14 */
@Override
public AnonymousIpResponse getAnonymousIp(InetAddress ipAddress) {
return getResponse(ipAddress, this.databaseReader::tryAnonymousIp);
}

/* @Override // neither available nor reachable until Elasticsearch 8.14 */
@Override
public EnterpriseResponse getEnterprise(InetAddress ipAddress) {
return getResponse(ipAddress, this.databaseReader::tryEnterprise);
}

/* @Override // neither available nor reachable until Elasticsearch 8.15 */
public ConnectionTypeResponse getConnectionType(InetAddress inetAddress) {
return getResponse(inetAddress, this.databaseReader::tryConnectionType);
}

/* @Override // neither available nor reachable until Elasticsearch 8.15 */
public DomainResponse getDomain(InetAddress ipAddress) {
return getResponse(ipAddress, this.databaseReader::tryDomain);
}

/* @Override // neither available nor reachable until Elasticsearch 8.15 */
public IspResponse getIsp(InetAddress ipAddress) {
return getResponse(ipAddress, this.databaseReader::tryIsp);
}

private <T extends AbstractResponse> T getResponse(final InetAddress inetAddress, MaxmindTryLookup<T> resolver) {
try {
return resolver.lookup(inetAddress).orElse(null);
Expand Down