From b053f29a89aabf5cb98e621820cffc1184ce0c48 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Mon, 23 Aug 2021 12:58:52 -0400 Subject: [PATCH 1/6] only create dashboards for certain node types - https://github.com/Security-Onion-Solutions/securityonion/issues/5268 --- salt/grafana/init.sls | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/salt/grafana/init.sls b/salt/grafana/init.sls index b74fa2495..eca1786cc 100644 --- a/salt/grafana/init.sls +++ b/salt/grafana/init.sls @@ -12,16 +12,21 @@ {% if grains['role'] in ['so-manager', 'so-managersearch', 'so-standalone'] or (grains.role == 'so-eval' and GRAFANA == 1) %} +{% set ALLOWED_DASHBOARDS = ['overview', 'standalone', 'manager', 'managersearch', 'sensor', 'searchnode', 'heavynode', 'eval'] %} {% set DASHBOARDS = ['overview'] %} {% if grains.role == 'so-eval' %} {% do DASHBOARDS.append('eval') %} {% else %} {# Grab a unique listing of nodetypes that exists so that we create only the needed dashboards #} {% for dashboard in salt['cmd.shell']("ls /opt/so/saltstack/local/pillar/minions/|awk -F'_' {'print $2'}|awk -F'.' {'print $1'}").split() %} - {% do DASHBOARDS.append(dashboard) %} + {% if dashboard id ALLOWED_DASHBOARDS %} + {% do DASHBOARDS.append(dashboard) %} + {% endif %} {% endfor %} {% endif %} + + # Grafana all the things grafanadir: file.directory: From a9cc68f89e82d9db7263f449188c5b07b4c37890 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Mon, 23 Aug 2021 13:02:49 -0400 Subject: [PATCH 2/6] add unique identifier for hotfix - https://github.com/Security-Onion-Solutions/securityonion/issues/5268 --- HOTFIX | 1 + 1 file changed, 1 insertion(+) diff --git a/HOTFIX b/HOTFIX index 393a7e913..7e7c96536 100644 --- a/HOTFIX +++ b/HOTFIX @@ -1,2 +1,3 @@ CURATOR +GRAFANA_DASH_ALLOW From 80f4d0325487c033dcb587aeffae03b4b5711601 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Mon, 23 Aug 2021 13:05:28 -0400 Subject: [PATCH 3/6] place unique identifier on same line for hotfix - https://github.com/Security-Onion-Solutions/securityonion/issues/5268 --- HOTFIX | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/HOTFIX b/HOTFIX index 7e7c96536..100732042 100644 --- a/HOTFIX +++ b/HOTFIX @@ -1,3 +1,2 @@ -CURATOR -GRAFANA_DASH_ALLOW +CURATOR GRAFANA_DASH_ALLOW From f87cf123b065ba67365ca49cca679569e1abd9eb Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Mon, 23 Aug 2021 13:08:11 -0400 Subject: [PATCH 4/6] fix typo - https://github.com/Security-Onion-Solutions/securityonion/issues/5268 --- salt/grafana/init.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/grafana/init.sls b/salt/grafana/init.sls index eca1786cc..42df29af4 100644 --- a/salt/grafana/init.sls +++ b/salt/grafana/init.sls @@ -19,7 +19,7 @@ {% else %} {# Grab a unique listing of nodetypes that exists so that we create only the needed dashboards #} {% for dashboard in salt['cmd.shell']("ls /opt/so/saltstack/local/pillar/minions/|awk -F'_' {'print $2'}|awk -F'.' {'print $1'}").split() %} - {% if dashboard id ALLOWED_DASHBOARDS %} + {% if dashboard in ALLOWED_DASHBOARDS %} {% do DASHBOARDS.append(dashboard) %} {% endif %} {% endfor %} From 2f8b68e67ad22cf5576d1da0a244b995ce02b691 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Tue, 24 Aug 2021 09:58:28 -0400 Subject: [PATCH 5/6] sig files and iso info --- VERIFY_ISO.md | 22 +++++++++++----------- sigs/securityonion-2.3.70-GRAFANA.iso.sig | Bin 0 -> 543 bytes 2 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 sigs/securityonion-2.3.70-GRAFANA.iso.sig diff --git a/VERIFY_ISO.md b/VERIFY_ISO.md index 7b75e8583..ccece2d2d 100644 --- a/VERIFY_ISO.md +++ b/VERIFY_ISO.md @@ -1,18 +1,18 @@ -### 2.3.70-CURATOR ISO image built on 2021/08/20 +### 2.3.70-GRAFANA ISO image built on 2021/08/20 ### Download and Verify -2.3.70-CURATOR ISO image: -https://download.securityonion.net/file/securityonion/securityonion-2.3.70-CURATOR.iso +2.3.70-GRAFANA ISO image: +https://download.securityonion.net/file/securityonion/securityonion-2.3.70-GRAFANA.iso -MD5: E0F7882E37B1B6BC4F9A6C8FD6F213F6 -SHA1: 82E1204BAD9489B275A083A642F175E352F9A332 -SHA256: 147CA7F5082273EDCC32EF6322D86A04CCB2E96B3A7F0B01EFA8A029BD84C3D7 +MD5: A16683FC8F2151C290E359FC6066B1F2 +SHA1: A93329C103CCCE665968F246163FBE5D41EF0510 +SHA256: 3ED0177CADF203324363916AA240A10C58DC3E9044A9ADE173A80674701A50A3 Signature for ISO image: -https://github.com/Security-Onion-Solutions/securityonion/raw/master/sigs/securityonion-2.3.70-CURATOR.iso.sig +https://github.com/Security-Onion-Solutions/securityonion/raw/master/sigs/securityonion-2.3.70-GRAFANA.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.70-CURATOR.iso.sig +wget https://github.com/Security-Onion-Solutions/securityonion/raw/master/sigs/securityonion-2.3.70-GRAFANA.iso.sig ``` Download the ISO image: ``` -wget https://download.securityonion.net/file/securityonion/securityonion-2.3.70-CURATOR.iso +wget https://download.securityonion.net/file/securityonion/securityonion-2.3.70-GRAFANA.iso ``` Verify the downloaded ISO image using the signature file: ``` -gpg --verify securityonion-2.3.70-CURATOR.iso.sig securityonion-2.3.70-CURATOR.iso +gpg --verify securityonion-2.3.70-GRAFANA.iso.sig securityonion-2.3.70-GRAFANA.iso ``` The output should show "Good signature" and the Primary key fingerprint should match what's shown below: ``` -gpg: Signature made Fri 20 Aug 2021 01:23:59 PM EDT using RSA key ID FE507013 +gpg: Signature made Mon 23 Aug 2021 01:43:00 PM EDT 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.70-GRAFANA.iso.sig b/sigs/securityonion-2.3.70-GRAFANA.iso.sig new file mode 100644 index 0000000000000000000000000000000000000000..8abec2097636d1a0a617713e6242fc3da0601c32 GIT binary patch literal 543 zcmV+)0^t3L0vrSY0RjL91p;9s-Xs7D2@re`V7LBIa1&*n5C44arQs$-!yk#kQT4^& zU9S!CIy8L7Tmw<*3Q_bFL(v!z&N?J8Nbi6QN7|&bad=ps=Rs9BE7B+iq)6tF)Nsbz z1V!;S77Pj6#DJ_jfX1SU&^>!1JO_NZD&>WAQzo^jhD-XmEJC-L@>O~Y4fDABv|SNf~gLi7`LIE)9Gh2-8l3k^e|g7{DGq^79)&VbTg-#pc>sd$4k}aszK3 zBYelljMlBthc$cXW9d0PAk7~~_7%MXBRJq zBzV6kK_(&RVgr8cYB!x@wDj>gX&L(izTn9v3V@01yPqWH98?vp;*&K!s=qn&Nsk{* z%8%LKgo62LH!dgf(fy literal 0 HcmV?d00001 From 6e921415eaeff7f9b30afc676aec3e956bf9c899 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Tue, 24 Aug 2021 10:00:06 -0400 Subject: [PATCH 6/6] sig files and iso info --- VERIFY_ISO.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERIFY_ISO.md b/VERIFY_ISO.md index ccece2d2d..2be975430 100644 --- a/VERIFY_ISO.md +++ b/VERIFY_ISO.md @@ -1,4 +1,4 @@ -### 2.3.70-GRAFANA ISO image built on 2021/08/20 +### 2.3.70-GRAFANA ISO image built on 2021/08/23