From dea88e4c6877b3b3b80c06172acd9a2b537f50ef Mon Sep 17 00:00:00 2001
From: Mike Reeves <luke@geekempire.com>
Date: Fri, 18 Dec 2020 13:27:08 -0500
Subject: [PATCH 1/2] Update soup

---
 salt/common/tools/sbin/soup | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup
index 4e9f46a74..5ee403418 100755
--- a/salt/common/tools/sbin/soup
+++ b/salt/common/tools/sbin/soup
@@ -291,7 +291,8 @@ rc3_to_2.3.0() {
   INSTALLEDVERSION=2.3.0
 }
 
-2.3.0_to_2.3.20(){DOCKERSTUFFBIP=$(echo $DOCKERSTUFF | awk -F'.' '{print $1,$2,$3,1}' OFS='.')/24
+2.3.0_to_2.3.20(){
+  DOCKERSTUFFBIP=$(echo $DOCKERSTUFF | awk -F'.' '{print $1,$2,$3,1}' OFS='.')/24
   # Remove PCAP from global
   sed '/pcap:/d' /opt/so/saltstack/local/pillar/global.sls
   sed '/sensor_checkin_interval_ms:/d' /opt/so/saltstack/local/pillar/global.sls
@@ -325,7 +326,7 @@ rc3_to_2.3.0() {
 
   fi
 
-  INSTALLEDVERSION=2.3.0
+  INSTALLEDVERSION=2.3.20
 
 }
 

From e756bbc4309a41c31b776abc0507e82937204002 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Fri, 18 Dec 2020 13:40:55 -0500
Subject: [PATCH 2/2] limit sensor uptime in grafana dash to 2 decimal

---
 salt/grafana/dashboards/sensor_nodes/sensor.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/salt/grafana/dashboards/sensor_nodes/sensor.json b/salt/grafana/dashboards/sensor_nodes/sensor.json
index 9136a7838..ea0a6a63b 100644
--- a/salt/grafana/dashboards/sensor_nodes/sensor.json
+++ b/salt/grafana/dashboards/sensor_nodes/sensor.json
@@ -34,7 +34,8 @@
               }
             ]
           },
-          "unit": "s"
+          "unit": "s",
+          "decimals": 2
         },
         "overrides": []
       },