From 7274635e8c33d8fe515c974eb7250b45e620f789 Mon Sep 17 00:00:00 2001
From: Mika Borner <mika.borner@gmail.com>
Date: Tue, 5 Jul 2016 13:36:15 +0200
Subject: [PATCH] Added support for parallelIngestionPipelines and
 forceTimebasedAutoLB

---
 README/spec/outputs_conf.spec                 |  4 +++
 README/spec/server_conf.spec                  |  6 ++++
 .../group_vars/heavyforwarder/outputs.conf    |  1 +
 .../group_vars/heavyforwarder/server.conf     |  1 +
 roles/conf/outputs/tasks/main.yml             |  1 +
 .../general/parallelIngestionPipelines.yml    | 28 +++++++++++++++++++
 roles/conf/server/tasks/main.yml              |  1 +
 7 files changed, 42 insertions(+)
 create mode 100644 roles/conf/server/tasks/general/parallelIngestionPipelines.yml

diff --git a/README/spec/outputs_conf.spec b/README/spec/outputs_conf.spec
index 8aa6159..7e6188e 100644
--- a/README/spec/outputs_conf.spec
+++ b/README/spec/outputs_conf.spec
@@ -39,6 +39,10 @@ splunk_outputs_conf:
 
         indexerDiscovery: <name>
         * Instructs the forwarder to fetch the list of indexers from the master node specified in the corresponding [indexer_discovery:<name>] stanza.
+ 
+        forceTimebasedAutoLB: [true|false]
+        * Will force existing streams to switch to newly elected indexer every AutoLB cycle.
+        * Defaults to false
 
       [target_groupN:]
       ...
diff --git a/README/spec/server_conf.spec b/README/spec/server_conf.spec
index 3359ca3..4fb88a6 100644
--- a/README/spec/server_conf.spec
+++ b/README/spec/server_conf.spec
@@ -8,6 +8,12 @@
 
 splunk_server_conf:
   general:
+   
+    parallelIngestionPipelines: <integer>
+    * Data being loaded into splunk, whether for indexing or forwarding, progresses through a series of steps arranged into "pipelines".
+      By setting this to more than one, more processor threads can be set up to perform this work.
+    * Defaults to 1
+
     pass4SymmKey: <password>
     * Encrypted password
 
diff --git a/README/templates/group_vars/heavyforwarder/outputs.conf b/README/templates/group_vars/heavyforwarder/outputs.conf
index ef1a86f..f125c0c 100644
--- a/README/templates/group_vars/heavyforwarder/outputs.conf
+++ b/README/templates/group_vars/heavyforwarder/outputs.conf
@@ -9,6 +9,7 @@ splunk_outputs_conf:
     defaultGroup: production
     target_group: 
       production:
+        forceTimebasedAutoLB: true
         useACK: true
         indexerDiscovery: production
         sslPassword: password
diff --git a/README/templates/group_vars/heavyforwarder/server.conf b/README/templates/group_vars/heavyforwarder/server.conf
index a84313b..32890cc 100644
--- a/README/templates/group_vars/heavyforwarder/server.conf
+++ b/README/templates/group_vars/heavyforwarder/server.conf
@@ -7,6 +7,7 @@
 splunk_server_conf:
   general:
     site: site0
+    parallelIngestionPipelines: 2
   license:
     master_uri: dynamic
   sslConfig:
diff --git a/roles/conf/outputs/tasks/main.yml b/roles/conf/outputs/tasks/main.yml
index 4a5a180..050f8f5 100644
--- a/roles/conf/outputs/tasks/main.yml
+++ b/roles/conf/outputs/tasks/main.yml
@@ -1,6 +1,7 @@
 ---
 - include: touch.yml
 - include: tcpout/defaultGroup.yml
+- include: tcpout:target_group/forceTimebasedAutoLB.yml
 - include: tcpout:target_group/indexerDiscovery.yml
 - include: tcpout:target_group/server.yml
 - include: tcpout:target_group/sslCertPath.yml
diff --git a/roles/conf/server/tasks/general/parallelIngestionPipelines.yml b/roles/conf/server/tasks/general/parallelIngestionPipelines.yml
new file mode 100644
index 0000000..62b53c8
--- /dev/null
+++ b/roles/conf/server/tasks/general/parallelIngestionPipelines.yml
@@ -0,0 +1,28 @@
+---
+#####################################################################################################################
+# Configurations for Splunk server.conf
+#####################################################################################################################
+
+#####################################################################################################################
+# [general]
+#####################################################################################################################
+
+# parallelIngestionPipelines
+
+- name: "Configure server.conf [general] - parallelIngestionPipelines state=present (static)"
+  ini_file: dest={{ splunk_conf_path }}/server.conf
+            section=general
+            option=parallelIngestionPipelines
+            value={{ splunk_server_conf.general.parallelIngestionPipelines }}
+            state=present
+  when: splunk_server_conf.general.parallelIngestionPipelines is defined and
+        splunk_server_conf.general.parallelIngestionPipelines != "1"
+  notify: splunk restart
+
+- name: "Configure server.conf [general] - parallelIngestionPipelines state=absent (default)"
+  ini_file: dest={{ splunk_conf_path }}/server.conf
+            section=general
+            option=parallelIngestionPipelines
+            state=absent
+  when: splunk_server_conf.general.parallelIngestionPipelines is undefined
+  notify: splunk restart
diff --git a/roles/conf/server/tasks/main.yml b/roles/conf/server/tasks/main.yml
index 793e0a5..7812ddb 100644
--- a/roles/conf/server/tasks/main.yml
+++ b/roles/conf/server/tasks/main.yml
@@ -9,6 +9,7 @@
 - include: clustering/search_factor.yml
 - include: clustering/site_replication_factor.yml
 - include: diskUsage/minFreeSpace.yml
+- include: general/parallelIngestionPipelines.yml
 - include: general/pass4SymmKey.yml
 - include: general/site.yml
 - include: general/trustedIP.yml