From 839cfcaefa3e93ae0d20fb8aad7fca70813fcab2 Mon Sep 17 00:00:00 2001
From: Wes Lambert <wlambertts@gmail.com>
Date: Tue, 2 Aug 2022 14:32:17 +0000
Subject: [PATCH] Update Elasticsearch defaults file and config.map.jinja to
 allow for local GeoIP database use when airgap is enabled

---
 salt/elasticsearch/config.map.jinja | 5 +++++
 salt/elasticsearch/defaults.yaml    | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/salt/elasticsearch/config.map.jinja b/salt/elasticsearch/config.map.jinja
index 9a80ce30f..71ff5b912 100644
--- a/salt/elasticsearch/config.map.jinja
+++ b/salt/elasticsearch/config.map.jinja
@@ -1,5 +1,6 @@
 {% import_yaml 'elasticsearch/defaults.yaml' as ESCONFIG with context %}
 {% set HIGHLANDER = salt['pillar.get']('global:highlander', False) %}
+{% set ISAIRGAP = salt['pillar.get']('global:airgap', False) %}
 
 {% if not salt['pillar.get']('elasticsearch:auth:enabled', False) %}
   {% do ESCONFIG.elasticsearch.config.xpack.security.authc.anonymous.update({'username': 'anonymous_user', 'roles': 'superuser', 'authz_exception': 'true'}) %}
@@ -33,6 +34,10 @@
     {% endif %}
 {% endif %}
 
+{% if ISAIRGAP %}
+  {% do ESCONFIG.elasticsearch.config.ingest.geoip.downloader.update({'enabled': false}) %}
+{% endif %}
+
 {# merge with the elasticsearch pillar #}
 {% set ESCONFIG = salt['pillar.get']('elasticsearch:config', default=ESCONFIG.elasticsearch.config, merge=True) %}
 
diff --git a/salt/elasticsearch/defaults.yaml b/salt/elasticsearch/defaults.yaml
index 830d1372c..782f2ad93 100644
--- a/salt/elasticsearch/defaults.yaml
+++ b/salt/elasticsearch/defaults.yaml
@@ -55,6 +55,10 @@ elasticsearch:
     indices:
       id_field_data:
         enabled: false
+    ingest:
+      geoip:
+        downloader:
+          enabled: true
     logger:
       org:
         elasticsearch: