diff --git a/salt/logstash/files/dynamic/9000_output_bro.conf b/salt/logstash/files/dynamic/9000_output_bro.conf
index 01853270d..54d2d20ca 100644
--- a/salt/logstash/files/dynamic/9000_output_bro.conf
+++ b/salt/logstash/files/dynamic/9000_output_bro.conf
@@ -2,6 +2,7 @@
 {%- set ES = salt['pillar.get']('master:mainip', '') -%}
 {%- else %}
 {%- set ES = salt['pillar.get']('node:mainip', '') -%}
+{%- endif %}
 # Author: Justin Henderson
 #         SANS Instructor and author of SANS SEC555: SIEM and Tactical Analytics
 # Email: justin@hasecuritysolution.com
@@ -27,4 +28,3 @@ output {
     }
   }
 }
-{%- endif %}
diff --git a/salt/logstash/files/dynamic/9001_output_switch.conf b/salt/logstash/files/dynamic/9001_output_switch.conf
index 86ffbcec6..949a738ab 100644
--- a/salt/logstash/files/dynamic/9001_output_switch.conf
+++ b/salt/logstash/files/dynamic/9001_output_switch.conf
@@ -2,6 +2,7 @@
 {%- set ES = salt['pillar.get']('master:mainip', '') -%}
 {%- else %}
 {%- set ES = salt['pillar.get']('node:mainip', '') -%}
+{%- endif %}
 # Author: Justin Henderson
 #         SANS Instructor and author of SANS SEC555: SIEM and Tactical Analytics
 # Email: justin@hasecuritysolution.com
@@ -24,4 +25,3 @@ output {
     }
   }
 }
-{%- endif %}
diff --git a/salt/logstash/files/dynamic/9002_output_import.conf b/salt/logstash/files/dynamic/9002_output_import.conf
index 80ab621aa..88fbc7551 100644
--- a/salt/logstash/files/dynamic/9002_output_import.conf
+++ b/salt/logstash/files/dynamic/9002_output_import.conf
@@ -2,6 +2,7 @@
 {%- set ES = salt['pillar.get']('master:mainip', '') -%}
 {%- else %}
 {%- set ES = salt['pillar.get']('node:mainip', '') -%}
+{%- endif %}
 # Updated by: Doug Burks
 # Last Update: 5/16/2017
 
@@ -24,4 +25,3 @@ output {
     }
   }
 }
-{%- endif %}
diff --git a/salt/logstash/files/dynamic/9004_output_flow.conf b/salt/logstash/files/dynamic/9004_output_flow.conf
index 5ef3ca63e..3dbd34f16 100644
--- a/salt/logstash/files/dynamic/9004_output_flow.conf
+++ b/salt/logstash/files/dynamic/9004_output_flow.conf
@@ -2,6 +2,7 @@
 {%- set ES = salt['pillar.get']('master:mainip', '') -%}
 {%- else %}
 {%- set ES = salt['pillar.get']('node:mainip', '') -%}
+{%- endif %}
 # Author: Justin Henderson
 #         SANS Instructor and author of SANS SEC555: SIEM and Tactical Analytics
 # Email: justin@hasecuritysolution.com
@@ -24,4 +25,3 @@ output {
     }
   }
 }
-{%- endif %}
diff --git a/salt/logstash/files/dynamic/9026_output_dhcp.conf b/salt/logstash/files/dynamic/9026_output_dhcp.conf
index 0bc0b7233..a63ac5f98 100644
--- a/salt/logstash/files/dynamic/9026_output_dhcp.conf
+++ b/salt/logstash/files/dynamic/9026_output_dhcp.conf
@@ -2,6 +2,7 @@
 {%- set ES = salt['pillar.get']('master:mainip', '') -%}
 {%- else %}
 {%- set ES = salt['pillar.get']('node:mainip', '') -%}
+{%- endif %}
 # Author: Justin Henderson
 #         SANS Instructor and author of SANS SEC555: SIEM and Tactical Analytics
 # Email: justin@hasecuritysolution.com
@@ -23,4 +24,3 @@ output {
     }
   }
 }
-{%- endif %}
diff --git a/salt/logstash/files/dynamic/9029_output_esxi.conf b/salt/logstash/files/dynamic/9029_output_esxi.conf
index d0b9aedcb..229de6b9c 100644
--- a/salt/logstash/files/dynamic/9029_output_esxi.conf
+++ b/salt/logstash/files/dynamic/9029_output_esxi.conf
@@ -2,6 +2,7 @@
 {%- set ES = salt['pillar.get']('master:mainip', '') -%}
 {%- else %}
 {%- set ES = salt['pillar.get']('node:mainip', '') -%}
+{%- endif %}
 # Author: Justin Henderson
 #         SANS Instructor and author of SANS SEC555: SIEM and Tactical Analytics
 # Email: justin@hasecuritysolution.com
@@ -22,4 +23,3 @@ output {
     }
   }
 }
-{%- endif %}
diff --git a/salt/logstash/files/dynamic/9030_output_greensql.conf b/salt/logstash/files/dynamic/9030_output_greensql.conf
index 87d73a2ce..a6d16b95d 100644
--- a/salt/logstash/files/dynamic/9030_output_greensql.conf
+++ b/salt/logstash/files/dynamic/9030_output_greensql.conf
@@ -2,6 +2,7 @@
 {%- set ES = salt['pillar.get']('master:mainip', '') -%}
 {%- else %}
 {%- set ES = salt['pillar.get']('node:mainip', '') -%}
+{%- endif %}
 # Author: Justin Henderson
 #         SANS Instructor and author of SANS SEC555: SIEM and Tactical Analytics
 # Email: justin@hasecuritysolution.com
@@ -22,4 +23,3 @@ output {
     }
   }
 }
-{%- endif %}
diff --git a/salt/logstash/files/dynamic/9031_output_iis.conf b/salt/logstash/files/dynamic/9031_output_iis.conf
index 7e03de66a..6650d8a7d 100644
--- a/salt/logstash/files/dynamic/9031_output_iis.conf
+++ b/salt/logstash/files/dynamic/9031_output_iis.conf
@@ -2,6 +2,7 @@
 {%- set ES = salt['pillar.get']('master:mainip', '') -%}
 {%- else %}
 {%- set ES = salt['pillar.get']('node:mainip', '') -%}
+{%- endif %}
 # Author: Justin Henderson
 #         SANS Instructor and author of SANS SEC555: SIEM and Tactical Analytics
 # Email: justin@hasecuritysolution.com
@@ -23,4 +24,3 @@ output {
     }
   }
 }
-{%- endif %}
diff --git a/salt/logstash/files/dynamic/9032_output_mcafee.conf b/salt/logstash/files/dynamic/9032_output_mcafee.conf
index 154e7ffc2..ca982967d 100644
--- a/salt/logstash/files/dynamic/9032_output_mcafee.conf
+++ b/salt/logstash/files/dynamic/9032_output_mcafee.conf
@@ -2,6 +2,7 @@
 {%- set ES = salt['pillar.get']('master:mainip', '') -%}
 {%- else %}
 {%- set ES = salt['pillar.get']('node:mainip', '') -%}
+{%- endif %}
 # Author: Justin Henderson
 #         SANS Instructor and author of SANS SEC555: SIEM and Tactical Analytics
 # Email: justin@hasecuritysolution.com
@@ -23,4 +24,3 @@ output {
     }
   }
 }
-{%- endif %}
diff --git a/salt/logstash/files/dynamic/9033_output_snort.conf b/salt/logstash/files/dynamic/9033_output_snort.conf
index 36edace12..a953a2db2 100644
--- a/salt/logstash/files/dynamic/9033_output_snort.conf
+++ b/salt/logstash/files/dynamic/9033_output_snort.conf
@@ -2,6 +2,7 @@
 {%- set ES = salt['pillar.get']('master:mainip', '') -%}
 {%- else %}
 {%- set ES = salt['pillar.get']('node:mainip', '') -%}
+{%- endif %}
 # Author: Justin Henderson
 #         SANS Instructor and author of SANS SEC555: SIEM and Tactical Analytics
 # Email: justin@hasecuritysolution.com
@@ -26,4 +27,3 @@ output {
     }
   }
 }
-{%- endif %}
diff --git a/salt/logstash/files/dynamic/9034_output_syslog.conf b/salt/logstash/files/dynamic/9034_output_syslog.conf
index 004373119..56a6527b8 100644
--- a/salt/logstash/files/dynamic/9034_output_syslog.conf
+++ b/salt/logstash/files/dynamic/9034_output_syslog.conf
@@ -2,6 +2,7 @@
 {%- set ES = salt['pillar.get']('master:mainip', '') -%}
 {%- else %}
 {%- set ES = salt['pillar.get']('node:mainip', '') -%}
+{%- endif %}
 # Author: Justin Henderson
 #         SANS Instructor and author of SANS SEC555: SIEM and Tactical Analytics
 # Updated by: Doug Burks
@@ -25,4 +26,3 @@ output {
     }
   }
 }
-{%- endif %}
diff --git a/salt/logstash/files/dynamic/9200_output_firewall.conf b/salt/logstash/files/dynamic/9200_output_firewall.conf
index 203372de1..b2ad43963 100644
--- a/salt/logstash/files/dynamic/9200_output_firewall.conf
+++ b/salt/logstash/files/dynamic/9200_output_firewall.conf
@@ -2,6 +2,7 @@
 {%- set ES = salt['pillar.get']('master:mainip', '') -%}
 {%- else %}
 {%- set ES = salt['pillar.get']('node:mainip', '') -%}
+{%- endif %}
 # Author: Justin Henderson
 #         SANS Instructor and author of SANS SEC555: SIEM and Tactical Analytics
 # Email: justin@hasecuritysolution.com
@@ -26,4 +27,3 @@ output {
     }
   }
 }
-{%- endif %}
diff --git a/salt/logstash/files/dynamic/9300_output_windows.conf b/salt/logstash/files/dynamic/9300_output_windows.conf
index 89aa6f724..d3f9d1919 100644
--- a/salt/logstash/files/dynamic/9300_output_windows.conf
+++ b/salt/logstash/files/dynamic/9300_output_windows.conf
@@ -2,6 +2,7 @@
 {%- set ES = salt['pillar.get']('master:mainip', '') -%}
 {%- else %}
 {%- set ES = salt['pillar.get']('node:mainip', '') -%}
+{%- endif %}
 # Author: Justin Henderson
 #         SANS Instructor and author of SANS SEC555: SIEM and Tactical Analytics
 # Email: justin@hasecuritysolution.com
@@ -24,4 +25,3 @@ output {
     }
   }
 }
-{%- endif %}
diff --git a/salt/logstash/files/dynamic/9301_output_dns_windows.conf b/salt/logstash/files/dynamic/9301_output_dns_windows.conf
index d8857ee3b..8a56b7044 100644
--- a/salt/logstash/files/dynamic/9301_output_dns_windows.conf
+++ b/salt/logstash/files/dynamic/9301_output_dns_windows.conf
@@ -2,6 +2,7 @@
 {%- set ES = salt['pillar.get']('master:mainip', '') -%}
 {%- else %}
 {%- set ES = salt['pillar.get']('node:mainip', '') -%}
+{%- endif %}
 # Author: Justin Henderson
 #         SANS Instructor and author of SANS SEC555: SIEM and Tactical Analytics
 # Email: justin@hasecuritysolution.com
@@ -24,4 +25,3 @@ output {
     }
   }
 }
-{%- endif %}
diff --git a/salt/logstash/files/dynamic/9400_output_suricata.conf b/salt/logstash/files/dynamic/9400_output_suricata.conf
index f5846ab00..4bffd7f0a 100644
--- a/salt/logstash/files/dynamic/9400_output_suricata.conf
+++ b/salt/logstash/files/dynamic/9400_output_suricata.conf
@@ -2,6 +2,7 @@
 {%- set ES = salt['pillar.get']('master:mainip', '') -%}
 {%- else %}
 {%- set ES = salt['pillar.get']('node:mainip', '') -%}
+{%- endif %}
 # Author: Justin Henderson
 #         SANS Instructor and author of SANS SEC555: SIEM and Tactical Analytics
 # Email: justin@hasecuritysolution.com
@@ -24,4 +25,3 @@ output {
     }
   }
 }
-{%- endif %}
diff --git a/salt/logstash/files/dynamic/9500_output_beats.conf b/salt/logstash/files/dynamic/9500_output_beats.conf
index 50952441d..30900cb93 100644
--- a/salt/logstash/files/dynamic/9500_output_beats.conf
+++ b/salt/logstash/files/dynamic/9500_output_beats.conf
@@ -2,6 +2,7 @@
 {%- set ES = salt['pillar.get']('master:mainip', '') -%}
 {%- else %}
 {%- set ES = salt['pillar.get']('node:mainip', '') -%}
+{%- endif %}
 # Author: Wes Lambert
 # Last Update: 09/14/2018
 filter {
@@ -22,4 +23,3 @@ output {
     }
   }
 }
-{%- endif %}
diff --git a/salt/logstash/files/dynamic/9600_output_ossec.conf b/salt/logstash/files/dynamic/9600_output_ossec.conf
index 23a8af16b..71d0c28aa 100644
--- a/salt/logstash/files/dynamic/9600_output_ossec.conf
+++ b/salt/logstash/files/dynamic/9600_output_ossec.conf
@@ -2,6 +2,7 @@
 {%- set ES = salt['pillar.get']('master:mainip', '') -%}
 {%- else %}
 {%- set ES = salt['pillar.get']('node:mainip', '') -%}
+{%- endif %}
 # Author: Justin Henderson
 #         SANS Instructor and author of SANS SEC555: SIEM and Tactical Analytics
 # Updated by: Doug Burks
@@ -26,4 +27,3 @@ output {
     }
   }
 }
-{%- endif %}
diff --git a/salt/logstash/files/dynamic/9998_output_test_data.conf b/salt/logstash/files/dynamic/9998_output_test_data.conf
index 225ede01d..4e83aa185 100644
--- a/salt/logstash/files/dynamic/9998_output_test_data.conf
+++ b/salt/logstash/files/dynamic/9998_output_test_data.conf
@@ -2,6 +2,7 @@
 {%- set ES = salt['pillar.get']('master:mainip', '') -%}
 {%- else %}
 {%- set ES = salt['pillar.get']('node:mainip', '') -%}
+{%- endif %}
 # Author: Justin Henderson
 #         SANS Instructor and author of SANS SEC555: SIEM and Tactical Analytics
 # Email: justin@hasecuritysolution.com
@@ -23,4 +24,3 @@ output {
     }
   }
 }
-{%- endif %}