Skip to content

Ignore stack profile for geoip db #622

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

Merged
merged 1 commit into from
Dec 14, 2021
Merged

Ignore stack profile for geoip db #622

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
12 changes: 5 additions & 7 deletions internal/install/install.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,26 +165,24 @@ func writeStackResources(elasticPackagePath *locations.LocationManager) error {

// Install GeoIP database
ingestGeoIPDir := filepath.Join(elasticPackagePath.StackDir(), "ingest-geoip")

ingestGeoIPDefaultDir := filepath.Join(ingestGeoIPDir, "default")
err = os.MkdirAll(ingestGeoIPDefaultDir, 0755)
err = os.MkdirAll(ingestGeoIPDir, 0755)
if err != nil {
return errors.Wrapf(err, "creating directory failed (path: %s)", ingestGeoIPDefaultDir)
return errors.Wrapf(err, "creating directory failed (path: %s)", ingestGeoIPDir)
}

geoIpAsnMmdbPath := filepath.Join(ingestGeoIPDefaultDir, "GeoLite2-ASN.mmdb")
geoIpAsnMmdbPath := filepath.Join(ingestGeoIPDir, "GeoLite2-ASN.mmdb")
err = writeStaticResource(err, geoIpAsnMmdbPath, geoIpAsnMmdb)
if err != nil {
return errors.Wrapf(err, "copying GeoIP ASN database failed (%s)", geoIpAsnMmdbPath)
}

geoIpCityMmdbPath := filepath.Join(ingestGeoIPDefaultDir, "GeoLite2-City.mmdb")
geoIpCityMmdbPath := filepath.Join(ingestGeoIPDir, "GeoLite2-City.mmdb")
err = writeStaticResource(err, geoIpCityMmdbPath, geoIpCityMmdb)
if err != nil {
return errors.Wrapf(err, "copying GeoIP city database failed (%s)", geoIpCityMmdbPath)
}

geoIpCountryMmdbPath := filepath.Join(ingestGeoIPDefaultDir, "GeoLite2-Country.mmdb")
geoIpCountryMmdbPath := filepath.Join(ingestGeoIPDir, "GeoLite2-Country.mmdb")
err = writeStaticResource(err, geoIpCountryMmdbPath, geoIpCountryMmdb)
if err != nil {
return errors.Wrapf(err, "copying GeoIP country database failed (%s)", geoIpCountryMmdbPath)
Expand Down
2 changes: 1 addition & 1 deletion internal/profile/_static/docker-compose-stack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ services:
- "ELASTIC_PASSWORD=changeme"
volumes:
- "./elasticsearch.config.${STACK_VERSION_VARIANT}.yml:/usr/share/elasticsearch/config/elasticsearch.yml"
- "../../../stack/ingest-geoip/${STACK_VERSION_VARIANT}/:/usr/share/elasticsearch/config/ingest-geoip"
- "../../../stack/ingest-geoip:/usr/share/elasticsearch/config/ingest-geoip"
ports:
- "127.0.0.1:9200:9200"

Expand Down