Skip to content

Commit

Permalink
fixes merging local pillar /global overrides for generated index temp…
Browse files Browse the repository at this point in the history
…lates
  • Loading branch information
reyesj2 committed Jan 22, 2025
1 parent d779f7a commit 81ac1eb
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion salt/elasticfleet/integration-defaults.map.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,10 @@
{% if component_name in WEIRD_INTEGRATIONS %}
{% set component_name = WEIRD_INTEGRATIONS[component_name] %}
{% endif %}
{% set integration_key = "so-" ~ integration_type ~ component_name %}
{# component_name_x maintains the functionality of merging local pillar changes with generated 'defaults' via SOC UI #}
{% set component_name_x = component_name.replace(".","_x_") %}
{# pillar overrides/merge expects the key names to follow the naming in elasticsearch/defaults.yaml eg. so-logs-1password_x_item_usages . The _x_ is replaced later on in elasticsearch/template.map.jinja #}
{% set integration_key = "so-" ~ integration_type ~ component_name_x %}

{# Default integration settings #}
{% set integration_defaults = {
Expand Down

0 comments on commit 81ac1eb

Please sign in to comment.