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

Remove leading is_ prefix from Enterprise geoip docs #108518

Merged
merged 4 commits into from
May 13, 2024
Merged

Remove leading is_ prefix from Enterprise geoip docs #108518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d321c3d
Remove leading is_ prefix
joegallo May 10, 2024
75e44ee
Update docs/changelog/108518.yaml
joegallo May 10, 2024
f0defd9
Merge branch 'main' into ingest-processor-remove-leading-is-underscore
joegallo May 10, 2024
a5f9c5a
Merge branch 'main' into ingest-processor-remove-leading-is-underscore
joegallo May 13, 2024
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
5 changes: 5 additions & 0 deletions docs/changelog/108518.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 108518
summary: Remove leading is_ prefix from Enterprise geoip docs
area: Ingest Node
type: bug
issues: []
12 changes: 6 additions & 6 deletions modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/GeoIpProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,22 +483,22 @@ private Map<String, Object> retrieveEnterpriseGeoData(GeoIpDatabase geoIpDatabas
}
}
case HOSTING_PROVIDER -> {
geoData.put("is_hosting_provider", isHostingProvider);
geoData.put("hosting_provider", isHostingProvider);
}
case TOR_EXIT_NODE -> {
geoData.put("is_tor_exit_node", isTorExitNode);
geoData.put("tor_exit_node", isTorExitNode);
}
case ANONYMOUS_VPN -> {
geoData.put("is_anonymous_vpn", isAnonymousVpn);
geoData.put("anonymous_vpn", isAnonymousVpn);
}
case ANONYMOUS -> {
geoData.put("is_anonymous", isAnonymous);
geoData.put("anonymous", isAnonymous);
}
case PUBLIC_PROXY -> {
geoData.put("is_public_proxy", isPublicProxy);
geoData.put("public_proxy", isPublicProxy);
}
case RESIDENTIAL_PROXY -> {
geoData.put("is_residential_proxy", isResidentialProxy);
geoData.put("residential_proxy", isResidentialProxy);
}
}
}
Expand Down
12 changes: 6 additions & 6 deletions modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,12 +373,12 @@ public void testEnterprise() throws Exception {
location.put("lon", -1.25);
assertThat(geoData.get("location"), equalTo(location));
assertThat(geoData.get("network"), equalTo("2.125.160.216/29"));
assertThat(geoData.get("is_hosting_provider"), equalTo(false));
assertThat(geoData.get("is_tor_exit_node"), equalTo(false));
assertThat(geoData.get("is_anonymous_vpn"), equalTo(false));
assertThat(geoData.get("is_anonymous"), equalTo(false));
assertThat(geoData.get("is_public_proxy"), equalTo(false));
assertThat(geoData.get("is_residential_proxy"), equalTo(false));
assertThat(geoData.get("hosting_provider"), equalTo(false));
assertThat(geoData.get("tor_exit_node"), equalTo(false));
assertThat(geoData.get("anonymous_vpn"), equalTo(false));
assertThat(geoData.get("anonymous"), equalTo(false));
assertThat(geoData.get("public_proxy"), equalTo(false));
assertThat(geoData.get("residential_proxy"), equalTo(false));
}

public void testAddressIsNotInTheDatabase() throws Exception {
Expand Down