From 1b390c433c03e1c177235bdc759e5f95260d36f2 Mon Sep 17 00:00:00 2001
From: Mike Reeves <luke@geekempire.com>
Date: Thu, 17 May 2018 15:29:45 -0400
Subject: [PATCH] Logstash Module - Add plugin config based on node type

---
 pillar/nodes/example.sls                               |  2 +-
 salt/logstash/{files => conf}/conf.enabled.node        |  0
 salt/logstash/{files => conf}/conf.enabled.txt         |  0
 salt/logstash/{files => conf}/conf.enabled.txt.eval    |  0
 salt/logstash/{files => conf}/conf.enabled.txt.forward |  0
 salt/logstash/{files => conf}/conf.enabled.txt.master  |  0
 salt/logstash/init.sls                                 | 10 ++++++++++
 7 files changed, 11 insertions(+), 1 deletion(-)
 rename salt/logstash/{files => conf}/conf.enabled.node (100%)
 rename salt/logstash/{files => conf}/conf.enabled.txt (100%)
 rename salt/logstash/{files => conf}/conf.enabled.txt.eval (100%)
 rename salt/logstash/{files => conf}/conf.enabled.txt.forward (100%)
 rename salt/logstash/{files => conf}/conf.enabled.txt.master (100%)

diff --git a/pillar/nodes/example.sls b/pillar/nodes/example.sls
index 22dd54908..5516e7052 100644
--- a/pillar/nodes/example.sls
+++ b/pillar/nodes/example.sls
@@ -2,4 +2,4 @@
 node:
   ls_heapsize: CHANGEME
   es_heapsize: CHANGEME
-  nodetype: CHANGEME
+  node_type: CHANGEME
diff --git a/salt/logstash/files/conf.enabled.node b/salt/logstash/conf/conf.enabled.node
similarity index 100%
rename from salt/logstash/files/conf.enabled.node
rename to salt/logstash/conf/conf.enabled.node
diff --git a/salt/logstash/files/conf.enabled.txt b/salt/logstash/conf/conf.enabled.txt
similarity index 100%
rename from salt/logstash/files/conf.enabled.txt
rename to salt/logstash/conf/conf.enabled.txt
diff --git a/salt/logstash/files/conf.enabled.txt.eval b/salt/logstash/conf/conf.enabled.txt.eval
similarity index 100%
rename from salt/logstash/files/conf.enabled.txt.eval
rename to salt/logstash/conf/conf.enabled.txt.eval
diff --git a/salt/logstash/files/conf.enabled.txt.forward b/salt/logstash/conf/conf.enabled.txt.forward
similarity index 100%
rename from salt/logstash/files/conf.enabled.txt.forward
rename to salt/logstash/conf/conf.enabled.txt.forward
diff --git a/salt/logstash/files/conf.enabled.txt.master b/salt/logstash/conf/conf.enabled.txt.master
similarity index 100%
rename from salt/logstash/files/conf.enabled.txt.master
rename to salt/logstash/conf/conf.enabled.txt.master
diff --git a/salt/logstash/init.sls b/salt/logstash/init.sls
index 2ea7ecb49..fba4b38f3 100644
--- a/salt/logstash/init.sls
+++ b/salt/logstash/init.sls
@@ -25,6 +25,7 @@
 {% set lsaccessip = salt['pillar.get']('master:lsaccessip', '') %}
 {% set freq = salt['pillar.get']('master:freq', '0') %}
 {% set dstats = salt['pillar.get']('master:domainstats', '0') %}
+{% set nodetype = salt['pillar_get']('node:node_type', 'master') %}
 
 {% endif %}
 
@@ -58,6 +59,15 @@ lssync:
     - group: 939
     - template: jinja
 
+# Copy the config file for enabled logstash plugins/parsers
+lsconfsync:
+  file.managed:
+    - name: /opt/so/donf/logstash/conf.enabled.txt
+    - source: salt://logstash/conf/conf.enabled.txt.{{ nodetype }}
+    - user: 931
+    - group: 939
+    - template: jinja
+
 # Create the import directory
 importdir:
   file.directory: