From c711ffe6c5cba43ca64b782575dc09e27bb14e91 Mon Sep 17 00:00:00 2001 From: reyesj2 <94730068+reyesj2@users.noreply.github.com> Date: Thu, 13 Feb 2025 08:44:56 -0600 Subject: [PATCH 1/2] keep pipeline "managed" metadata --- salt/elasticsearch/files/ingest/logs-pfsense.log-1.20.2 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/salt/elasticsearch/files/ingest/logs-pfsense.log-1.20.2 b/salt/elasticsearch/files/ingest/logs-pfsense.log-1.20.2 index d4861a35b..78a65b444 100644 --- a/salt/elasticsearch/files/ingest/logs-pfsense.log-1.20.2 +++ b/salt/elasticsearch/files/ingest/logs-pfsense.log-1.20.2 @@ -1,5 +1,12 @@ { "description": "Pipeline for PFsense", + "_meta": { + "package": { + "name": "pfsense" + }, + "managed_by": "fleet", + "managed": true + }, "processors": [ { "set": { @@ -153,7 +160,7 @@ } }, { - "pipeline": { + "pipeline": { "name": "logs-pfsense.log-1.20.2-suricata", "if": "ctx.event.provider == 'suricata'" } From 03b76cbcf5ede6b1f590227ee414469edd4d1aec Mon Sep 17 00:00:00 2001 From: reyesj2 <94730068+reyesj2@users.noreply.github.com> Date: Thu, 13 Feb 2025 08:51:50 -0600 Subject: [PATCH 2/2] remove state files --- salt/manager/tools/sbin/soup | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup index 89255f839..85da8bbd9 100755 --- a/salt/manager/tools/sbin/soup +++ b/salt/manager/tools/sbin/soup @@ -538,8 +538,8 @@ post_to_2.4.120() { } post_to_2.4.130() { - # Integrations policies need to be updated - rm -f /opt/so/state/eaintegrations.txt + # Integrations policies need to be updated, along with ingest pipelines & index templates. + rm -f /opt/so/state/eaintegrations.txt /opt/so/state/espipelines.txt /opt/so/state/estemplates.txt # Sync the newly generated index templates for elasticfleet integrations salt-call state.apply elasticsearch queue=True