From 5ed3dbff39da067376789fa2b84652394efe2ab3 Mon Sep 17 00:00:00 2001 From: Wes Lambert Date: Tue, 17 Mar 2020 15:15:01 +0000 Subject: [PATCH] Fix template name --- salt/logstash/pipelines/config/so/9001_output_switch.conf.jinja | 2 +- salt/logstash/pipelines/config/so/9002_output_import.conf.jinja | 2 +- salt/logstash/pipelines/config/so/9004_output_flow.conf.jinja | 2 +- salt/logstash/pipelines/config/so/9026_output_dhcp.conf.jinja | 2 +- salt/logstash/pipelines/config/so/9029_output_esxi.conf.jinja | 2 +- .../pipelines/config/so/9030_output_greensql.conf.jinja | 2 +- salt/logstash/pipelines/config/so/9031_output_iis.conf.jinja | 2 +- salt/logstash/pipelines/config/so/9032_output_mcafee.conf.jinja | 2 +- salt/logstash/pipelines/config/so/9033_output_snort.conf.jinja | 2 +- salt/logstash/pipelines/config/so/9034_output_syslog.conf.jinja | 2 +- .../logstash/pipelines/config/so/9100_output_osquery.conf.jinja | 2 +- .../pipelines/config/so/9200_output_firewall.conf.jinja | 2 +- .../logstash/pipelines/config/so/9300_output_windows.conf.jinja | 2 +- .../pipelines/config/so/9301_output_dns_windows.conf.jinja | 2 +- .../pipelines/config/so/9400_output_suricata.conf.jinja | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/salt/logstash/pipelines/config/so/9001_output_switch.conf.jinja b/salt/logstash/pipelines/config/so/9001_output_switch.conf.jinja index 0fc30c4b0..824f29e34 100644 --- a/salt/logstash/pipelines/config/so/9001_output_switch.conf.jinja +++ b/salt/logstash/pipelines/config/so/9001_output_switch.conf.jinja @@ -21,7 +21,7 @@ output { elasticsearch { hosts => "{{ ES }}" index => "so-switch-%{+YYYY.MM.dd}" - template => "/so-template.json" + template => "/so-common-template.json" } } } diff --git a/salt/logstash/pipelines/config/so/9002_output_import.conf.jinja b/salt/logstash/pipelines/config/so/9002_output_import.conf.jinja index 2b7db9370..b32794f5b 100644 --- a/salt/logstash/pipelines/config/so/9002_output_import.conf.jinja +++ b/salt/logstash/pipelines/config/so/9002_output_import.conf.jinja @@ -20,7 +20,7 @@ output { hosts => "{{ ES }}" index => "so-import-%{+YYYY.MM.dd}" template_name => "logstash" - template => "/so-template.json" + template => "/so-common-template.json" template_overwrite => true } } diff --git a/salt/logstash/pipelines/config/so/9004_output_flow.conf.jinja b/salt/logstash/pipelines/config/so/9004_output_flow.conf.jinja index 2fd427129..f830ffeb3 100644 --- a/salt/logstash/pipelines/config/so/9004_output_flow.conf.jinja +++ b/salt/logstash/pipelines/config/so/9004_output_flow.conf.jinja @@ -21,7 +21,7 @@ output { elasticsearch { hosts => "{{ ES }}" index => "so-flow-%{+YYYY.MM.dd}" - template => "/so-template.json" + template => "/so-common-template.json" } } } diff --git a/salt/logstash/pipelines/config/so/9026_output_dhcp.conf.jinja b/salt/logstash/pipelines/config/so/9026_output_dhcp.conf.jinja index f7f3d8060..0772841a8 100644 --- a/salt/logstash/pipelines/config/so/9026_output_dhcp.conf.jinja +++ b/salt/logstash/pipelines/config/so/9026_output_dhcp.conf.jinja @@ -20,7 +20,7 @@ output { #stdout { codec => rubydebug } elasticsearch { hosts => "{{ ES }}" - template => "/so-template.json" + template => "/so-common-template.json" } } } diff --git a/salt/logstash/pipelines/config/so/9029_output_esxi.conf.jinja b/salt/logstash/pipelines/config/so/9029_output_esxi.conf.jinja index 7de501bf8..fc664564c 100644 --- a/salt/logstash/pipelines/config/so/9029_output_esxi.conf.jinja +++ b/salt/logstash/pipelines/config/so/9029_output_esxi.conf.jinja @@ -19,7 +19,7 @@ output { if [event_type] == "esxi" and "test_data" not in [tags] { elasticsearch { hosts => "{{ ES }}" - template => "/so-template.json" + template => "/so-common-template.json" } } } diff --git a/salt/logstash/pipelines/config/so/9030_output_greensql.conf.jinja b/salt/logstash/pipelines/config/so/9030_output_greensql.conf.jinja index 544e62856..1007d5f58 100644 --- a/salt/logstash/pipelines/config/so/9030_output_greensql.conf.jinja +++ b/salt/logstash/pipelines/config/so/9030_output_greensql.conf.jinja @@ -19,7 +19,7 @@ output { if [event_type] == "greensql" and "test_data" not in [tags] { elasticsearch { hosts => "{{ ES }}" - template => "/so-template.json" + template => "/so-common-template.json" } } } diff --git a/salt/logstash/pipelines/config/so/9031_output_iis.conf.jinja b/salt/logstash/pipelines/config/so/9031_output_iis.conf.jinja index 7de10b974..f17616060 100644 --- a/salt/logstash/pipelines/config/so/9031_output_iis.conf.jinja +++ b/salt/logstash/pipelines/config/so/9031_output_iis.conf.jinja @@ -20,7 +20,7 @@ output { #stdout { codec => rubydebug } elasticsearch { hosts => "{{ ES }}" - template => "/so-template.json" + template => "/so-common-template.json" } } } diff --git a/salt/logstash/pipelines/config/so/9032_output_mcafee.conf.jinja b/salt/logstash/pipelines/config/so/9032_output_mcafee.conf.jinja index bb3ec0714..9a6668619 100644 --- a/salt/logstash/pipelines/config/so/9032_output_mcafee.conf.jinja +++ b/salt/logstash/pipelines/config/so/9032_output_mcafee.conf.jinja @@ -20,7 +20,7 @@ output { #stdout { codec => rubydebug } elasticsearch { hosts => "{{ ES }}" - template => "/so-template.json" + template => "/so-common-template.json" } } } diff --git a/salt/logstash/pipelines/config/so/9033_output_snort.conf.jinja b/salt/logstash/pipelines/config/so/9033_output_snort.conf.jinja index dc9c5f7e1..4ea9cfe12 100644 --- a/salt/logstash/pipelines/config/so/9033_output_snort.conf.jinja +++ b/salt/logstash/pipelines/config/so/9033_output_snort.conf.jinja @@ -22,7 +22,7 @@ output { hosts => "{{ ES }}" index => "so-ids-%{+YYYY.MM.dd}" template_name => "logstash" - template => "/so-template.json" + template => "/so-common-template.json" template_overwrite => true } } diff --git a/salt/logstash/pipelines/config/so/9034_output_syslog.conf.jinja b/salt/logstash/pipelines/config/so/9034_output_syslog.conf.jinja index 33b841c08..35d3cf7dc 100644 --- a/salt/logstash/pipelines/config/so/9034_output_syslog.conf.jinja +++ b/salt/logstash/pipelines/config/so/9034_output_syslog.conf.jinja @@ -21,7 +21,7 @@ output { hosts => "{{ ES }}" index => "so-syslog-%{+YYYY.MM.dd}" template_name => "logstash" - template => "/so-template.json" + template => "/so-common-template.json" template_overwrite => true } } diff --git a/salt/logstash/pipelines/config/so/9100_output_osquery.conf.jinja b/salt/logstash/pipelines/config/so/9100_output_osquery.conf.jinja index 63fd3c25b..ca9c90215 100644 --- a/salt/logstash/pipelines/config/so/9100_output_osquery.conf.jinja +++ b/salt/logstash/pipelines/config/so/9100_output_osquery.conf.jinja @@ -13,7 +13,7 @@ output { elasticsearch { hosts => "{{ ES }}" index => "so-osquery-%{+YYYY.MM.dd}" - template => "/so-template.json" + template => "/so-common-template.json" } } } \ No newline at end of file diff --git a/salt/logstash/pipelines/config/so/9200_output_firewall.conf.jinja b/salt/logstash/pipelines/config/so/9200_output_firewall.conf.jinja index 17e774976..2c9796b5f 100644 --- a/salt/logstash/pipelines/config/so/9200_output_firewall.conf.jinja +++ b/salt/logstash/pipelines/config/so/9200_output_firewall.conf.jinja @@ -22,7 +22,7 @@ output { hosts => "{{ ES }}" index => "so-firewall-%{+YYYY.MM.dd}" template_name => "logstash" - template => "/so-template.json" + template => "/so-common-template.json" template_overwrite => true } } diff --git a/salt/logstash/pipelines/config/so/9300_output_windows.conf.jinja b/salt/logstash/pipelines/config/so/9300_output_windows.conf.jinja index 9779d01a5..8b8a9299f 100644 --- a/salt/logstash/pipelines/config/so/9300_output_windows.conf.jinja +++ b/salt/logstash/pipelines/config/so/9300_output_windows.conf.jinja @@ -21,7 +21,7 @@ output { elasticsearch { hosts => "{{ ES }}" index => "so-windows-%{+YYYY.MM.dd}" - template => "/so-template.json" + template => "/so-common-template.json" } } } diff --git a/salt/logstash/pipelines/config/so/9301_output_dns_windows.conf.jinja b/salt/logstash/pipelines/config/so/9301_output_dns_windows.conf.jinja index dc6bbbda4..fec703b1c 100644 --- a/salt/logstash/pipelines/config/so/9301_output_dns_windows.conf.jinja +++ b/salt/logstash/pipelines/config/so/9301_output_dns_windows.conf.jinja @@ -21,7 +21,7 @@ output { elasticsearch { hosts => "{{ ES }}" index => "so-%{+YYYY.MM.dd}" - template => "/so-template.json" + template => "/so-common-template.json" } } } diff --git a/salt/logstash/pipelines/config/so/9400_output_suricata.conf.jinja b/salt/logstash/pipelines/config/so/9400_output_suricata.conf.jinja index a85fba758..7b587242a 100644 --- a/salt/logstash/pipelines/config/so/9400_output_suricata.conf.jinja +++ b/salt/logstash/pipelines/config/so/9400_output_suricata.conf.jinja @@ -21,7 +21,7 @@ output { elasticsearch { hosts => "{{ ES }}" index => "so-ids-%{+YYYY.MM.dd}" - template => "/so-template.json" + template => "/so-common-template.json" } } }