From 3f2b0973af3aeb86d8adae58ea2a49d013b0e71d Mon Sep 17 00:00:00 2001 From: reyesj2 <94730068+reyesj2@users.noreply.github.com> Date: Mon, 24 Feb 2025 08:59:59 -0600 Subject: [PATCH 1/2] manually create unused logs-soc@package for successful elasticsearch templates load --- .../component/elastic-agent/logs-soc@package.json | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 salt/elasticsearch/templates/component/elastic-agent/logs-soc@package.json diff --git a/salt/elasticsearch/templates/component/elastic-agent/logs-soc@package.json b/salt/elasticsearch/templates/component/elastic-agent/logs-soc@package.json new file mode 100644 index 000000000..bf3c4f649 --- /dev/null +++ b/salt/elasticsearch/templates/component/elastic-agent/logs-soc@package.json @@ -0,0 +1,7 @@ +{ + "package": { + "name": "log" + }, + "managed_by": "fleet", + "managed": true +} \ No newline at end of file From d7c06e5ff4622b5c370baacd4f20b3baf06d6d0b Mon Sep 17 00:00:00 2001 From: reyesj2 <94730068+reyesj2@users.noreply.github.com> Date: Mon, 24 Feb 2025 09:02:56 -0600 Subject: [PATCH 2/2] run elasticsearch state, right before completing soup to ensure templates for optional integrations are loaded --- salt/manager/tools/sbin/soup | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup index 27123c660..a6c9b7693 100755 --- a/salt/manager/tools/sbin/soup +++ b/salt/manager/tools/sbin/soup @@ -537,6 +537,10 @@ post_to_2.4.120() { } post_to_2.4.130() { + # Optional integrations are loaded AFTER initial successful load of core ES templates (/opt/so/state/estemplates.txt) + # Dynamic templates are created in elasticsearch.enabled for every optional integration based on output of so-elastic-fleet-optional-integrations-load script + echo "Ensuring Elasticsearch templates are up to date after updating package registry" + salt-call state.apply elasticsearch queue=True # Update kibana default space salt-call state.apply kibana.config queue=True