Fix Conflicts

2025-12-29 04:13:13 +01:00 · 2020-06-11 13:14:11 -04:00
parent 9bed02934b 1c86ae4e14
commit 032c8ca4e9
32 changed files with 356 additions and 1589 deletions
--- a/pillar/logstash/master.sls
+++ b/pillar/logstash/master.sls
@@ -2,5 +2,6 @@ logstash:
  pipelines:
    master:
      config:
+        - so/0009_input_beats.conf      
        - so/0010_input_hhbeats.conf
        - so/9999_output_redis.conf.jinja
--- a/pillar/logstash/search.sls
+++ b/pillar/logstash/search.sls
@@ -12,6 +12,5 @@ logstash:
        - so/9600_output_ossec.conf.jinja
        - so/9700_output_strelka.conf.jinja
  templates:
-    - so/so-beats-template.json
    - so/so-common-template.json
    - so/so-zeek-template.json