From 0a976861f3b5905c2cb7d654fd1bab7b77652fa6 Mon Sep 17 00:00:00 2001
From: Jason Ertel <jason.ertel@securityonionsolutions.com>
Date: Wed, 15 Jul 2020 13:22:11 -0400
Subject: [PATCH] Dynamically set sensor checkin interval; allow overrides if
 var is preset

---
 salt/pcap/files/sensoroni.json |  3 ++-
 setup/so-functions             | 10 ++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/salt/pcap/files/sensoroni.json b/salt/pcap/files/sensoroni.json
index 81fc4569b..76fb0e502 100644
--- a/salt/pcap/files/sensoroni.json
+++ b/salt/pcap/files/sensoroni.json
@@ -1,10 +1,11 @@
 {%- set MANAGER = salt['grains.get']('master') -%}
 {%- set SENSORONIKEY = salt['pillar.get']('static:sensoronikey', '') -%}
+{%- set CHECKININTERVALMS = salt['pillar.get']('pcap:sensor_checkin_interval_ms') -%}
 {
   "logFilename": "/opt/sensoroni/logs/sensoroni.log",
   "logLevel":"debug",
   "agent": {
-    "pollIntervalMs": 10000,
+    "pollIntervalMs": {{ CHECKININTERVALMS }},
     "serverUrl": "https://{{ MANAGER }}/sensoroniagents",
     "verifyCert": false,
     "modules": {
diff --git a/setup/so-functions b/setup/so-functions
index f4f5d9ba1..0bbc013b2 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -923,6 +923,13 @@ manager_pillar() {
 
 	local pillar_file=$temp_install_dir/pillar/minions/$MINION_ID.sls
 
+	if [ -z "$SENSOR_CHECKIN_INTERVAL_MS" ]; then
+		SENSOR_CHECKIN_INTERVAL_MS=10000
+		if [ "$install_type" = 'EVAL' ] || [ "$install_type" = 'STANDALONE' ]; then
+			SENSOR_CHECKIN_INTERVAL_MS=1000
+		fi
+	fi
+
 	# Create the manager pillar
 	printf '%s\n'\
 		"manager:"\
@@ -969,6 +976,9 @@ manager_pillar() {
 		"  lsheap: $LS_HEAP_SIZE"\
 		"  ls_pipeline_workers: $num_cpu_cores"\
 		""\
+		"pcap:">> "$pillar_file"\
+		"  sensor_checkin_interval_ms: $SENSOR_CHECKIN_INTERVAL_MS"\
+		""\
 		"kratos:" >> "$pillar_file"
 
 	printf '%s\n'\