diff --git a/salt/logstash/pipelines/config/so/9050_output_elasticsearch.jinja b/salt/logstash/pipelines/config/so/9050_output_elasticsearch_log.jinja
similarity index 100%
rename from salt/logstash/pipelines/config/so/9050_output_elasticsearch.jinja
rename to salt/logstash/pipelines/config/so/9050_output_elasticsearch_log.jinja
diff --git a/salt/logstash/pipelines/config/so/9050_output_kibana_log.jinja b/salt/logstash/pipelines/config/so/9050_output_kibana_log.jinja
new file mode 100644
index 000000000..bf79e1073
--- /dev/null
+++ b/salt/logstash/pipelines/config/so/9050_output_kibana_log.jinja
@@ -0,0 +1,20 @@
+{%- if grains['role'] == 'so-eval' -%}
+{%- set ES = salt['pillar.get']('manager:mainip', '') -%}
+{%- else %}
+{%- set ES = salt['pillar.get']('elasticsearch:mainip', '') -%}
+{%- endif %}
+output {
+ if [event][module] == 'kibana' {
+   elasticsearch {
+     id => "kibana_logs"
+     pipeline => "filebeat-%{[agent][version]}-kibana-%{[fileset][name]}-pipeline"
+     hosts => "{{ ES }}"
+     index => "so-grid-%{+YYYY.MM.dd}"
+     template_name => "so-common"
+     template => "/templates/so-common-template.json"
+     template_overwrite => true
+     ssl => true
+     ssl_certificate_verification => false
+   }
+ }
+}
diff --git a/salt/logstash/pipelines/config/so/9050_output_logstash_log.jinja b/salt/logstash/pipelines/config/so/9050_output_logstash_log.jinja
new file mode 100644
index 000000000..df6fba0e0
--- /dev/null
+++ b/salt/logstash/pipelines/config/so/9050_output_logstash_log.jinja
@@ -0,0 +1,20 @@
+{%- if grains['role'] == 'so-eval' -%}
+{%- set ES = salt['pillar.get']('manager:mainip', '') -%}
+{%- else %}
+{%- set ES = salt['pillar.get']('elasticsearch:mainip', '') -%}
+{%- endif %}
+output {
+ if [event][module] == 'logstash' {
+   elasticsearch {
+     id => "logstash_logs"
+     pipeline => "filebeat-%{[agent][version]}-logstash-%{[fileset][name]}-pipeline"
+     hosts => "{{ ES }}"
+     index => "so-grid-%{+YYYY.MM.dd}"
+     template_name => "so-common"
+     template => "/templates/so-common-template.json"
+     template_overwrite => true
+     ssl => true
+     ssl_certificate_verification => false
+   }
+ }
+}
diff --git a/salt/logstash/pipelines/config/so/9050_output_redis_log.jinja b/salt/logstash/pipelines/config/so/9050_output_redis_log.jinja
new file mode 100644
index 000000000..9cc37de35
--- /dev/null
+++ b/salt/logstash/pipelines/config/so/9050_output_redis_log.jinja
@@ -0,0 +1,20 @@
+{%- if grains['role'] == 'so-eval' -%}
+{%- set ES = salt['pillar.get']('manager:mainip', '') -%}
+{%- else %}
+{%- set ES = salt['pillar.get']('elasticsearch:mainip', '') -%}
+{%- endif %}
+output {
+ if [event][module] == 'redis' {
+   elasticsearch {
+     id => "redis_logs"
+     pipeline => "filebeat-%{[agent][version]}-redis-%{[fileset][name]}-pipeline"
+     hosts => "{{ ES }}"
+     index => "so-grid-%{+YYYY.MM.dd}"
+     template_name => "so-common"
+     template => "/templates/so-common-template.json"
+     template_overwrite => true
+     ssl => true
+     ssl_certificate_verification => false
+   }
+ }
+}