From 9708b02387d1be44c52ffa825d7921c646365277 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Sat, 8 Aug 2020 18:32:36 -0400 Subject: [PATCH] update pipeline --- pillar/logstash/manager.sls | 7 ++----- pillar/logstash/search.sls | 4 ---- setup/so-functions | 2 +- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/pillar/logstash/manager.sls b/pillar/logstash/manager.sls index dcf222ae4..6f3ba495b 100644 --- a/pillar/logstash/manager.sls +++ b/pillar/logstash/manager.sls @@ -1,12 +1,9 @@ -{%- set PIPELINE = salt['pillar.get']('global:pipeline', 'minio') %} +{%- set PIPELINE = salt['pillar.get']('global:pipeline', 'redis') %} logstash: pipelines: manager: config: - so/0009_input_beats.conf - so/0010_input_hhbeats.conf - {%- if PIPELINE == "minio"%} - - so/9998_output_minio.conf.jinja - {%- else %} - so/9999_output_redis.conf.jinja - {%- endif %} \ No newline at end of file + \ No newline at end of file diff --git a/pillar/logstash/search.sls b/pillar/logstash/search.sls index 22f73c5d4..7a5aeec39 100644 --- a/pillar/logstash/search.sls +++ b/pillar/logstash/search.sls @@ -3,11 +3,7 @@ logstash: pipelines: search: config: - {%- if PIPELINE == "minio"%} - - so/0899_input_minio.conf.jinja - {%- else %} - so/0900_input_redis.conf.jinja - {%- endif %} - so/9000_output_zeek.conf.jinja - so/9002_output_import.conf.jinja - so/9034_output_syslog.conf.jinja diff --git a/setup/so-functions b/setup/so-functions index 7253856ba..00d9b7e1e 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1049,7 +1049,7 @@ manager_global() { " wazuh: $WAZUH"\ " managerupdate: $MANAGERUPDATES"\ " imagerepo: $IMAGEREPO"\ - " pipeline: minio"\ + " pipeline: redis"\ "pcap:"\ " sensor_checkin_interval_ms: $SENSOR_CHECKIN_INTERVAL_MS"\ "strelka:"\