Merge pull request #12164 from Security-Onion-Solutions/fix/optional_…

…integration_pillar_merge

Make sure optional integration pillar values are merged with defaults

salt/elasticfleet/config.sls

@@ -6,6 +6,7 @@
 {% from 'allowed_states.map.jinja' import allowed_states %}
 {% from 'vars/globals.map.jinja' import GLOBALS %}
 {% if sls.split('.')[0] in allowed_states %}
+{% from 'elasticfleet/map.jinja' import ELASTICFLEETMERGED %}
 {% set node_data = salt['pillar.get']('node_data') %}
 
 # Add EA Group
@@ -104,8 +105,8 @@ eaoptionalintegrationsdir:
 {% for minion in node_data %}
 {% set role = node_data[minion]["role"] %}
 {% if role in [ "eval","fleet","heavynode","import","manager","managersearch","standalone" ] %}
-{% set optional_integrations = salt['pillar.get']('elasticfleet:optional_integrations', {}) %}
-{% set integration_keys = salt['pillar.get']('elasticfleet:optional_integrations', {}).keys() %}
+{% set optional_integrations = ELASTICFLEETMERGED.optional_integrations %}
+{% set integration_keys = optional_integrations.keys() %}
 fleet_server_integrations_{{ minion }}:
   file.directory:
     - name: /opt/so/conf/elastic-fleet/integrations-optional/FleetServer_{{ minion }}