From cb46ca4832e79486f913756ab7b63acf60a44edb Mon Sep 17 00:00:00 2001
From: Jason Ertel <jason.ertel@securityonionsolutions.com>
Date: Wed, 22 Jul 2020 14:26:55 -0400
Subject: [PATCH] Ensure distributed installations have the check-in interval
 correctly set

---
 salt/pcap/files/sensoroni.json | 2 +-
 setup/so-functions             | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/salt/pcap/files/sensoroni.json b/salt/pcap/files/sensoroni.json
index 76fb0e502..e379d5003 100644
--- a/salt/pcap/files/sensoroni.json
+++ b/salt/pcap/files/sensoroni.json
@@ -1,6 +1,6 @@
 {%- set MANAGER = salt['grains.get']('master') -%}
 {%- set SENSORONIKEY = salt['pillar.get']('static:sensoronikey', '') -%}
-{%- set CHECKININTERVALMS = salt['pillar.get']('pcap:sensor_checkin_interval_ms') -%}
+{%- set CHECKININTERVALMS = salt['pillar.get']('pcap:sensor_checkin_interval_ms', 10000) -%}
 {
   "logFilename": "/opt/sensoroni/logs/sensoroni.log",
   "logLevel":"debug",
diff --git a/setup/so-functions b/setup/so-functions
index 89d0fdc7a..12bdf3a4c 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -979,9 +979,6 @@ manager_pillar() {
 		"  lsheap: $LS_HEAP_SIZE"\
 		"  ls_pipeline_workers: $num_cpu_cores"\
 		""\
-		"pcap:">> "$pillar_file"\
-		"  sensor_checkin_interval_ms: $SENSOR_CHECKIN_INTERVAL_MS"\
-		""\
 		"idstools:"\
 		"  config:"\
 		"    ruleset: $RULESETUP"\
@@ -1036,6 +1033,8 @@ manager_static() {
 		"  wazuh: $WAZUH"\
         "  managerupdate: $MANAGERUPDATES"\
 		"  imagerepo: $IMAGEREPO"\
+		"pcap:"\
+		"  sensor_checkin_interval_ms: $SENSOR_CHECKIN_INTERVAL_MS"\
 		"strelka:"\
 		"  enabled: $STRELKA"\
 		"  rules: $STRELKARULES"\