From c43e5b842044d5171f115b67c000886f4a0bf637 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 19 Sep 2018 13:55:28 -0400 Subject: [PATCH] Logstash Module - Fix jinja syntax --- salt/logstash/files/dynamic/9000_output_bro.conf | 2 +- salt/logstash/files/dynamic/9001_output_switch.conf | 2 +- salt/logstash/files/dynamic/9002_output_import.conf | 2 +- salt/logstash/files/dynamic/9004_output_flow.conf | 2 +- salt/logstash/files/dynamic/9026_output_dhcp.conf | 2 +- salt/logstash/files/dynamic/9029_output_esxi.conf | 2 +- salt/logstash/files/dynamic/9030_output_greensql.conf | 2 +- salt/logstash/files/dynamic/9031_output_iis.conf | 2 +- salt/logstash/files/dynamic/9032_output_mcafee.conf | 2 +- salt/logstash/files/dynamic/9033_output_snort.conf | 2 +- salt/logstash/files/dynamic/9034_output_syslog.conf | 2 +- salt/logstash/files/dynamic/9200_output_firewall.conf | 2 +- salt/logstash/files/dynamic/9300_output_windows.conf | 2 +- salt/logstash/files/dynamic/9301_output_dns_windows.conf | 2 +- salt/logstash/files/dynamic/9400_output_suricata.conf | 2 +- salt/logstash/files/dynamic/9500_output_beats.conf | 2 +- salt/logstash/files/dynamic/9998_output_test_data.conf | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/salt/logstash/files/dynamic/9000_output_bro.conf b/salt/logstash/files/dynamic/9000_output_bro.conf index d076cca79..4ed124993 100644 --- a/salt/logstash/files/dynamic/9000_output_bro.conf +++ b/salt/logstash/files/dynamic/9000_output_bro.conf @@ -1,5 +1,5 @@ {%- if grains['role'] != 'so-master' %} -{%- set ES = salt['pillar.get']('mainip', '') %} +{%- set ES = salt['pillar.get']('node:mainip', '') %} # Author: Justin Henderson # SANS Instructor and author of SANS SEC555: SIEM and Tactical Analytics # Email: justin@hasecuritysolution.com diff --git a/salt/logstash/files/dynamic/9001_output_switch.conf b/salt/logstash/files/dynamic/9001_output_switch.conf index 6d9804f9d..a649dbd2f 100644 --- a/salt/logstash/files/dynamic/9001_output_switch.conf +++ b/salt/logstash/files/dynamic/9001_output_switch.conf @@ -1,5 +1,5 @@ {%- if grains['role'] != 'so-master' %} -{%- set ES = salt['pillar.get']('mainip', '') %} +{%- set ES = salt['pillar.get']('node:mainip', '') %} # Author: Justin Henderson # SANS Instructor and author of SANS SEC555: SIEM and Tactical Analytics # Email: justin@hasecuritysolution.com diff --git a/salt/logstash/files/dynamic/9002_output_import.conf b/salt/logstash/files/dynamic/9002_output_import.conf index 67f761f02..954f6814c 100644 --- a/salt/logstash/files/dynamic/9002_output_import.conf +++ b/salt/logstash/files/dynamic/9002_output_import.conf @@ -1,5 +1,5 @@ {%- if grains['role'] != 'so-master' %} -{%- set ES = salt['pillar.get']('mainip', '') %} +{%- set ES = salt['pillar.get']('node:mainip', '') %} # Updated by: Doug Burks # Last Update: 5/16/2017 diff --git a/salt/logstash/files/dynamic/9004_output_flow.conf b/salt/logstash/files/dynamic/9004_output_flow.conf index 788d0e1d5..de991d686 100644 --- a/salt/logstash/files/dynamic/9004_output_flow.conf +++ b/salt/logstash/files/dynamic/9004_output_flow.conf @@ -1,5 +1,5 @@ {%- if grains['role'] != 'so-master' %} -{%- set ES = salt['pillar.get']('mainip', '') %} +{%- set ES = salt['pillar.get']('node:mainip', '') %} # Author: Justin Henderson # SANS Instructor and author of SANS SEC555: SIEM and Tactical Analytics # Email: justin@hasecuritysolution.com diff --git a/salt/logstash/files/dynamic/9026_output_dhcp.conf b/salt/logstash/files/dynamic/9026_output_dhcp.conf index 99e3df5de..0d3fd8db6 100644 --- a/salt/logstash/files/dynamic/9026_output_dhcp.conf +++ b/salt/logstash/files/dynamic/9026_output_dhcp.conf @@ -1,5 +1,5 @@ {%- if grains['role'] != 'so-master' %} -{%- set ES = salt['pillar.get']('mainip', '') %} +{%- set ES = salt['pillar.get']('node:mainip', '') %} # Author: Justin Henderson # SANS Instructor and author of SANS SEC555: SIEM and Tactical Analytics # Email: justin@hasecuritysolution.com diff --git a/salt/logstash/files/dynamic/9029_output_esxi.conf b/salt/logstash/files/dynamic/9029_output_esxi.conf index e59c5dc17..c639aeb1a 100644 --- a/salt/logstash/files/dynamic/9029_output_esxi.conf +++ b/salt/logstash/files/dynamic/9029_output_esxi.conf @@ -1,5 +1,5 @@ {%- if grains['role'] != 'so-master' %} -{%- set ES = salt['pillar.get']('mainip', '') %} +{%- set ES = salt['pillar.get']('node:mainip', '') %} # Author: Justin Henderson # SANS Instructor and author of SANS SEC555: SIEM and Tactical Analytics # Email: justin@hasecuritysolution.com diff --git a/salt/logstash/files/dynamic/9030_output_greensql.conf b/salt/logstash/files/dynamic/9030_output_greensql.conf index f9094e22a..4939b8f9c 100644 --- a/salt/logstash/files/dynamic/9030_output_greensql.conf +++ b/salt/logstash/files/dynamic/9030_output_greensql.conf @@ -1,5 +1,5 @@ {%- if grains['role'] != 'so-master' %} -{%- set ES = salt['pillar.get']('mainip', '') %} +{%- set ES = salt['pillar.get']('node:mainip', '') %} # Author: Justin Henderson # SANS Instructor and author of SANS SEC555: SIEM and Tactical Analytics # Email: justin@hasecuritysolution.com diff --git a/salt/logstash/files/dynamic/9031_output_iis.conf b/salt/logstash/files/dynamic/9031_output_iis.conf index f1bb75a1e..029ee7b62 100644 --- a/salt/logstash/files/dynamic/9031_output_iis.conf +++ b/salt/logstash/files/dynamic/9031_output_iis.conf @@ -1,5 +1,5 @@ {%- if grains['role'] != 'so-master' %} -{%- set ES = salt['pillar.get']('mainip', '') %} +{%- set ES = salt['pillar.get']('node:mainip', '') %} # Author: Justin Henderson # SANS Instructor and author of SANS SEC555: SIEM and Tactical Analytics # Email: justin@hasecuritysolution.com diff --git a/salt/logstash/files/dynamic/9032_output_mcafee.conf b/salt/logstash/files/dynamic/9032_output_mcafee.conf index 9aa4f4c50..28b685646 100644 --- a/salt/logstash/files/dynamic/9032_output_mcafee.conf +++ b/salt/logstash/files/dynamic/9032_output_mcafee.conf @@ -1,5 +1,5 @@ {%- if grains['role'] != 'so-master' %} -{%- set ES = salt['pillar.get']('mainip', '') %} +{%- set ES = salt['pillar.get']('node:mainip', '') %} # Author: Justin Henderson # SANS Instructor and author of SANS SEC555: SIEM and Tactical Analytics # Email: justin@hasecuritysolution.com diff --git a/salt/logstash/files/dynamic/9033_output_snort.conf b/salt/logstash/files/dynamic/9033_output_snort.conf index 038b1f46b..7a157d09e 100644 --- a/salt/logstash/files/dynamic/9033_output_snort.conf +++ b/salt/logstash/files/dynamic/9033_output_snort.conf @@ -1,5 +1,5 @@ {%- if grains['role'] != 'so-master' %} -{%- set ES = salt['pillar.get']('mainip', '') %} +{%- set ES = salt['pillar.get']('node:mainip', '') %} # Author: Justin Henderson # SANS Instructor and author of SANS SEC555: SIEM and Tactical Analytics # Email: justin@hasecuritysolution.com diff --git a/salt/logstash/files/dynamic/9034_output_syslog.conf b/salt/logstash/files/dynamic/9034_output_syslog.conf index e00adaf65..3c1c85ef5 100644 --- a/salt/logstash/files/dynamic/9034_output_syslog.conf +++ b/salt/logstash/files/dynamic/9034_output_syslog.conf @@ -1,5 +1,5 @@ {%- if grains['role'] != 'so-master' %} -{%- set ES = salt['pillar.get']('mainip', '') %} +{%- set ES = salt['pillar.get']('node:mainip', '') %} # Author: Justin Henderson # SANS Instructor and author of SANS SEC555: SIEM and Tactical Analytics # Updated by: Doug Burks diff --git a/salt/logstash/files/dynamic/9200_output_firewall.conf b/salt/logstash/files/dynamic/9200_output_firewall.conf index 158b2a811..1d1be2381 100644 --- a/salt/logstash/files/dynamic/9200_output_firewall.conf +++ b/salt/logstash/files/dynamic/9200_output_firewall.conf @@ -1,5 +1,5 @@ {%- if grains['role'] != 'so-master' %} -{%- set ES = salt['pillar.get']('mainip', '') %} +{%- set ES = salt['pillar.get']('node:mainip', '') %} # Author: Justin Henderson # SANS Instructor and author of SANS SEC555: SIEM and Tactical Analytics # Email: justin@hasecuritysolution.com diff --git a/salt/logstash/files/dynamic/9300_output_windows.conf b/salt/logstash/files/dynamic/9300_output_windows.conf index cca6b7548..79c6d9f18 100644 --- a/salt/logstash/files/dynamic/9300_output_windows.conf +++ b/salt/logstash/files/dynamic/9300_output_windows.conf @@ -1,5 +1,5 @@ {%- if grains['role'] != 'so-master' %} -{%- set ES = salt['pillar.get']('mainip', '') %} +{%- set ES = salt['pillar.get']('node:mainip', '') %} # Author: Justin Henderson # SANS Instructor and author of SANS SEC555: SIEM and Tactical Analytics # Email: justin@hasecuritysolution.com diff --git a/salt/logstash/files/dynamic/9301_output_dns_windows.conf b/salt/logstash/files/dynamic/9301_output_dns_windows.conf index 62c1f9deb..f4c74f3a9 100644 --- a/salt/logstash/files/dynamic/9301_output_dns_windows.conf +++ b/salt/logstash/files/dynamic/9301_output_dns_windows.conf @@ -1,5 +1,5 @@ {%- if grains['role'] != 'so-master' %} -{%- set ES = salt['pillar.get']('mainip', '') %} +{%- set ES = salt['pillar.get']('node:mainip', '') %} # Author: Justin Henderson # SANS Instructor and author of SANS SEC555: SIEM and Tactical Analytics # Email: justin@hasecuritysolution.com diff --git a/salt/logstash/files/dynamic/9400_output_suricata.conf b/salt/logstash/files/dynamic/9400_output_suricata.conf index 8ae056f0d..328951535 100644 --- a/salt/logstash/files/dynamic/9400_output_suricata.conf +++ b/salt/logstash/files/dynamic/9400_output_suricata.conf @@ -1,5 +1,5 @@ {%- if grains['role'] != 'so-master' %} -{%- set ES = salt['pillar.get']('mainip', '') %} +{%- set ES = salt['pillar.get']('node:mainip', '') %} # Author: Justin Henderson # SANS Instructor and author of SANS SEC555: SIEM and Tactical Analytics # Email: justin@hasecuritysolution.com diff --git a/salt/logstash/files/dynamic/9500_output_beats.conf b/salt/logstash/files/dynamic/9500_output_beats.conf index 6ad2592fc..61b7de4c9 100644 --- a/salt/logstash/files/dynamic/9500_output_beats.conf +++ b/salt/logstash/files/dynamic/9500_output_beats.conf @@ -1,5 +1,5 @@ {%- if grains['role'] != 'so-master' %} -{%- set ES = salt['pillar.get']('mainip', '') %} +{%- set ES = salt['pillar.get']('node:mainip', '') %} # Author: Wes Lambert # Last Update: 12/11/2017 filter { diff --git a/salt/logstash/files/dynamic/9998_output_test_data.conf b/salt/logstash/files/dynamic/9998_output_test_data.conf index dd7411a30..8097689e9 100644 --- a/salt/logstash/files/dynamic/9998_output_test_data.conf +++ b/salt/logstash/files/dynamic/9998_output_test_data.conf @@ -1,5 +1,5 @@ {%- if grains['role'] != 'so-master' %} -{%- set ES = salt['pillar.get']('mainip', '') %} +{%- set ES = salt['pillar.get']('node:mainip', '') %} # Author: Justin Henderson # SANS Instructor and author of SANS SEC555: SIEM and Tactical Analytics # Email: justin@hasecuritysolution.com