CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-08 18:22:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/dev' into fix/sensoroni_fw

Browse Source
This commit is contained in:
m0duspwnens
2020-12-18 14:14:55 -05:00
parent 4bbedfa027 5275583098
commit 66f62b912e
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
salt/common/tools/sbin/soup
View File

@@ -291,7 +291,8 @@ rc3_to_2.3.0() {
INSTALLEDVERSION=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 # Remove PCAP from global
sed '/pcap:/d' /opt/so/saltstack/local/pillar/global.sls sed '/pcap:/d' /opt/so/saltstack/local/pillar/global.sls
sed '/sensor_checkin_interval_ms:/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 fi
INSTALLEDVERSION=2.3.0 INSTALLEDVERSION=2.3.20
} }

3
salt/grafana/dashboards/sensor_nodes/sensor.json
View File

@@ -34,7 +34,8 @@
} }
] ]
}, },
"unit": "s" "unit": "s",
"decimals": 2
}, },
"overrides": [] "overrides": []
}, },