From d8a43015339625f470b60a2afc3c6683c90901c6 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Thu, 3 Feb 2022 10:34:12 -0500 Subject: [PATCH 1/5] Update distributed-airgap-manager --- setup/automation/distributed-airgap-manager | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/automation/distributed-airgap-manager b/setup/automation/distributed-airgap-manager index 2c416fd2c..66765c38a 100644 --- a/setup/automation/distributed-airgap-manager +++ b/setup/automation/distributed-airgap-manager @@ -34,7 +34,7 @@ GRAFANA=1 # HELIXAPIKEY= HNMANAGER=10.0.0.0/8,192.168.0.0/16,172.16.0.0/12 HNSENSOR=inherit -HOSTNAME=distributed-manager +HOSTNAME=Distributed-manager install_type=MANAGER INTERWEBS=AIRGAP # LSINPUTBATCHCOUNT= From 5c39162aefcf1ecf18d86aed7681ef2b8a5159d1 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Thu, 3 Feb 2022 10:34:55 -0500 Subject: [PATCH 2/5] Update distributed-airgap-sensor --- setup/automation/distributed-airgap-sensor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/automation/distributed-airgap-sensor b/setup/automation/distributed-airgap-sensor index dea80f8e0..597cbd1d5 100644 --- a/setup/automation/distributed-airgap-sensor +++ b/setup/automation/distributed-airgap-sensor @@ -34,7 +34,7 @@ ZEEKVERSION=ZEEK # HELIXAPIKEY= HNMANAGER=10.0.0.0/8,192.168.0.0/16,172.16.0.0/12 HNSENSOR=inherit -HOSTNAME=distributed-sensor +HOSTNAME=Distributed-sensor install_type=SENSOR # LSINPUTBATCHCOUNT= # LSINPUTTHREADS= From 797d76966178ab5ed439b14d2e4b62b1d4b640d9 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Thu, 3 Feb 2022 10:36:18 -0500 Subject: [PATCH 3/5] use actual hostname in logstash:nodes pillar --- pillar/logstash/nodes.sls | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pillar/logstash/nodes.sls b/pillar/logstash/nodes.sls index 3658065cb..18c4b39bf 100644 --- a/pillar/logstash/nodes.sls +++ b/pillar/logstash/nodes.sls @@ -1,11 +1,13 @@ {% set node_types = {} %} +{% set cached_grains = salt.saltutil.runner('cache.grains', tgt='*') %} {% for minionid, ip in salt.saltutil.runner( 'mine.get', tgt='G@role:so-manager or G@role:so-managersearch or G@role:so-standalone or G@role:so-node or G@role:so-heavynode or G@role:so-receiver or G@role:so-helix ', fun='network.ip_addrs', - tgt_type='compound') | dictsort() + tgt_type='compound') | dictsort() %} -{% set hostname = minionid.split('_')[0] %} + +{% set hostname = cached_grains[minionid]['host'] %} {% set node_type = minionid.split('_')[1] %} {% if node_type not in node_types.keys() %} {% do node_types.update({node_type: {hostname: ip[0]}}) %} From 4f2952105e7efc4291f10fc39cd308ed23437e27 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Thu, 3 Feb 2022 15:06:18 -0500 Subject: [PATCH 4/5] Update HOTFIX --- HOTFIX | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HOTFIX b/HOTFIX index 1ff12871f..aa8e22a9c 100644 --- a/HOTFIX +++ b/HOTFIX @@ -1 +1 @@ -20220202 +20220202 20220203 From b7732fb14a627fbc330754edcf27ad0f3d7e99a3 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Thu, 3 Feb 2022 15:58:26 -0500 Subject: [PATCH 5/5] 2.3.100 Hotfix 2 --- VERIFY_ISO.md | 22 ++++++++++---------- sigs/securityonion-2.3.100-20220203.iso.sig | Bin 0 -> 543 bytes 2 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 sigs/securityonion-2.3.100-20220203.iso.sig diff --git a/VERIFY_ISO.md b/VERIFY_ISO.md index 6e1c7f9ed..376d4328f 100644 --- a/VERIFY_ISO.md +++ b/VERIFY_ISO.md @@ -1,18 +1,18 @@ -### 2.3.100-20220202 ISO image built on 2022/02/02 +### 2.3.100-20220203 ISO image built on 2022/02/03 ### Download and Verify -2.3.100-20220202 ISO image: -https://download.securityonion.net/file/securityonion/securityonion-2.3.100-20220202.iso +2.3.100-20220203 ISO image: +https://download.securityonion.net/file/securityonion/securityonion-2.3.100-20220203.iso -MD5: 170337342118DC32F8C2F687F332CA25 -SHA1: 202235BFE37F1F2E129F5D5DE13173A27A9D8CC0 -SHA256: F902C561D35F5B9DFB2D65BDAE97D30FD9E46F6822AFA36CA9C4043C50864484 +MD5: 14705B2F2F9C973D944A4545449799C5 +SHA1: D73405BE3DE404DE19979B58DEA6F22F434E622D +SHA256: 3DD54ACBFDE0047A5EA238415F025ADB6D6AAFF53BEE084A602327CB3242B580 Signature for ISO image: -https://github.com/Security-Onion-Solutions/securityonion/raw/master/sigs/securityonion-2.3.100-20220202.iso.sig +https://github.com/Security-Onion-Solutions/securityonion/raw/master/sigs/securityonion-2.3.100-20220203.iso.sig Signing key: https://raw.githubusercontent.com/Security-Onion-Solutions/securityonion/master/KEYS @@ -26,22 +26,22 @@ wget https://raw.githubusercontent.com/Security-Onion-Solutions/securityonion/ma Download the signature file for the ISO: ``` -wget https://github.com/Security-Onion-Solutions/securityonion/raw/master/sigs/securityonion-2.3.100-20220202.iso.sig +wget https://github.com/Security-Onion-Solutions/securityonion/raw/master/sigs/securityonion-2.3.100-20220203.iso.sig ``` Download the ISO image: ``` -wget https://download.securityonion.net/file/securityonion/securityonion-2.3.100-20220202.iso +wget https://download.securityonion.net/file/securityonion/securityonion-2.3.100-20220203.iso ``` Verify the downloaded ISO image using the signature file: ``` -gpg --verify securityonion-2.3.100-20220202.iso.sig securityonion-2.3.100-20220202.iso +gpg --verify securityonion-2.3.100-20220203.iso.sig securityonion-2.3.100-20220203.iso ``` The output should show "Good signature" and the Primary key fingerprint should match what's shown below: ``` -gpg: Signature made Wed 02 Feb 2022 12:12:39 PM EST using RSA key ID FE507013 +gpg: Signature made Thu 03 Feb 2022 03:35:03 PM EST using RSA key ID FE507013 gpg: Good signature from "Security Onion Solutions, LLC " gpg: WARNING: This key is not certified with a trusted signature! gpg: There is no indication that the signature belongs to the owner. diff --git a/sigs/securityonion-2.3.100-20220203.iso.sig b/sigs/securityonion-2.3.100-20220203.iso.sig new file mode 100644 index 0000000000000000000000000000000000000000..296efd987e1fa38527e412cd9bde35e593469e45 GIT binary patch literal 543 zcmV+)0^t3L0vrSY0RjL91p;CGJa+&J2@re`V7LBIa1+Tu5C2xyGf|yAh9R5+*84q@ zC#AG@TCn?PH<-4JvujiRi&(KNh5)KCPT`0jOC4PIbl1HJH+d;9$3<+Zp|;^{dPH>%s@~R8Vet(zISIt z9uNyqEepPMyq@;7b*SPgKzs3QE0xVa$-}0GqYVn~KW%;#Gq&8sRPLJ{~6J zJmVF42DVZCn4+SA8;sQ@2d8MsTA*C46L_)5vsP;eY~j;@{nB1_S3SBsb;VR#8?oPAPE z%8B}i8POr!pN(|%c*%6_A?+ud<)-_lfLvs7UrpAf!iWs)o4B{c%DfXlz5%(55M)L} h>M#(5>etjDHOmbhioa6L*-?T-1go*V1?ZWvP*OaI1MUC- literal 0 HcmV?d00001