Compare commits

..
Author SHA1 Message Date
reyesj2 180a4814f9 Fix global_overrides dropped by in-place pillar pop in template.map.jinja 2026-11-18 10:47:54 -06:00
Mike Reeves 4dbea0e28d Merge pull request #16403 from Security-Onion-Solutions/TOoSmOotH/568
INTERNAL: Trim Telegraf collection for Postgres
2026-11-17 16:58:20 -05:00
+2 -1
View File
@@ -11,7 +11,8 @@
{% set DATA_RETENTION_METHOD = ELASTICSEARCHMERGED.data_retention_method %}
{% set PILLAR_GLOBAL_OVERRIDES = {} %}
{% set ES_INDEX_PILLAR = salt['pillar.get']('elasticsearch:index_settings', {}) %}
{# merge into a copy: pillar.get returns a live reference and this map pops/updates ES_INDEX_PILLAR #}
{% set ES_INDEX_PILLAR = salt['defaults.merge'](salt['pillar.get']('elasticsearch:index_settings', {}), {}, in_place=False) %}
{% if ES_INDEX_PILLAR.global_overrides is defined %}
{% set PILLAR_GLOBAL_OVERRIDES = ES_INDEX_PILLAR.pop('global_overrides') %}
{% endif %}