From 50b78681f2f26d6bdf04ffeeae7c6c6dbeb05b92 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Mon, 20 Sep 2021 17:24:47 -0400 Subject: [PATCH 01/10] Ubuntu 20.04 Support --- salt/common/init.sls | 7 +++++++ salt/mysql/init.sls | 6 +++++- salt/salt/init.sls | 4 ++++ salt/salt/scripts/bootstrap-salt.sh | 4 ++++ salt/ssl/init.sls | 4 ++++ setup/so-functions | 9 ++++++--- 6 files changed, 30 insertions(+), 4 deletions(-) diff --git a/salt/common/init.sls b/salt/common/init.sls index 0fa7794af..18c70747a 100644 --- a/salt/common/init.sls +++ b/salt/common/init.sls @@ -107,10 +107,17 @@ commonpkgs: heldpackages: pkg.installed: - pkgs: + {% if grains['codename'] == 'bionic' %} - containerd.io: 1.4.4-1 - docker-ce: 5:20.10.5~3-0~ubuntu-bionic - docker-ce-cli: 5:20.10.5~3-0~ubuntu-bionic - docker-ce-rootless-extras: 5:20.10.5~3-0~ubuntu-bionic + {% elif grains['codename'] == 'focal' %} + - containerd.io: 1.4.9-1 + - docker-ce: 5:20.10.8~3-0~ubuntu-focal + - docker-ce-cli: 5:20.10.5~3-0~ubuntu-focal + - docker-ce-rootless-extras: 5:20.10.5~3-0~ubuntu-focal + {% endif %} - hold: True - update_holds: True diff --git a/salt/mysql/init.sls b/salt/mysql/init.sls index be44b652c..04cbacc99 100644 --- a/salt/mysql/init.sls +++ b/salt/mysql/init.sls @@ -22,7 +22,11 @@ mysqlpkgs: - skip_suggestions: False - pkgs: {% if grains['os'] != 'CentOS' %} - - python-mysqldb + {% if grains['codename'] == 'bionic' %} + - python3-mysqldb + {% elif grains['codename'] == 'focal' %} + - python3-mysqldb + {% endif %} {% else %} - MySQL-python {% endif %} diff --git a/salt/salt/init.sls b/salt/salt/init.sls index 18be055db..d01fe1958 100644 --- a/salt/salt/init.sls +++ b/salt/salt/init.sls @@ -3,7 +3,11 @@ saltpymodules: pkg.installed: - pkgs: - python-docker + {% if grains['codename'] == 'bionic' %} - python-m2crypto + {% elif grains['codename'] == 'focal' %} + - python3-m2crypto + {% endif %} {% endif %} salt_bootstrap: diff --git a/salt/salt/scripts/bootstrap-salt.sh b/salt/salt/scripts/bootstrap-salt.sh index 70241a041..3e54afce0 100644 --- a/salt/salt/scripts/bootstrap-salt.sh +++ b/salt/salt/scripts/bootstrap-salt.sh @@ -3082,7 +3082,11 @@ install_ubuntu_git_deps() { __PACKAGES="${__PACKAGES} python3-setuptools" else # There is no m2crypto package for Py3 at this time - only install for Py2 + if [ $DISTRO_CODENAME == "focal" ]; then + __PACKAGES="${__PACKAGES} python3-m2crypto" + else __PACKAGES="${__PACKAGES} python-m2crypto" + fi fi __PACKAGES="${__PACKAGES} python${PY_PKG_VER}-crypto python${PY_PKG_VER}-jinja2" diff --git a/salt/ssl/init.sls b/salt/ssl/init.sls index f6cfaf4f4..54c48ab34 100644 --- a/salt/ssl/init.sls +++ b/salt/ssl/init.sls @@ -42,7 +42,11 @@ m2cryptopkgs: pkg.installed: - skip_suggestions: False - pkgs: + {% if grains['codename'] == 'bionic' %} - python-m2crypto + {% elif grains['codename'] == 'focal' %} + - python3-m2crypto + {% endif %} {% endif %} removefbcertdir: diff --git a/setup/so-functions b/setup/so-functions index 06ec7238a..f2cdbc237 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1104,8 +1104,8 @@ detect_os() { OS=ubuntu if grep -q "UBUNTU_CODENAME=bionic" /etc/os-release; then OSVER=bionic - elif grep -q "UBUNTU_CODENAME=xenial" /etc/os-release; then - OSVER=xenial + elif grep -q "UBUNTU_CODENAME=focal" /etc/os-release; then + OSVER=focal else echo "We do not support your current version of Ubuntu." exit 1 @@ -2159,9 +2159,12 @@ saltify() { else DEBIAN_FRONTEND=noninteractive retry 50 10 "apt-get -y -o Dpkg::Options::=\"--force-confdef\" -o Dpkg::Options::=\"--force-confold\" upgrade" >> "$setup_log" 2>&1 || exit 1 - if [ $OSVER != "xenial" ]; then + if [ $OSVER == "bionic" ]; then # Switch to Python 3 as default if this is not xenial update-alternatives --install /usr/bin/python python /usr/bin/python3.6 10 >> "$setup_log" 2>&1 + elif [ $OSVER == "focal" ]; then + # Switch to Python 3 as default if this is not xenial + update-alternatives --install /usr/bin/python python /usr/bin/python3.8 10 >> "$setup_log" 2>&1 fi local pkg_arr=( From 481ffb1cda760556f743092184c523a18b8eae46 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Mon, 20 Sep 2021 18:12:18 -0400 Subject: [PATCH 02/10] Fix Grain --- salt/common/init.sls | 4 ++-- salt/mysql/init.sls | 4 ++-- salt/salt/init.sls | 4 ++-- salt/ssl/init.sls | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/salt/common/init.sls b/salt/common/init.sls index 18c70747a..f993534b3 100644 --- a/salt/common/init.sls +++ b/salt/common/init.sls @@ -107,12 +107,12 @@ commonpkgs: heldpackages: pkg.installed: - pkgs: - {% if grains['codename'] == 'bionic' %} + {% if grains['oscodename'] == 'bionic' %} - containerd.io: 1.4.4-1 - docker-ce: 5:20.10.5~3-0~ubuntu-bionic - docker-ce-cli: 5:20.10.5~3-0~ubuntu-bionic - docker-ce-rootless-extras: 5:20.10.5~3-0~ubuntu-bionic - {% elif grains['codename'] == 'focal' %} + {% elif grains['oscodename'] == 'focal' %} - containerd.io: 1.4.9-1 - docker-ce: 5:20.10.8~3-0~ubuntu-focal - docker-ce-cli: 5:20.10.5~3-0~ubuntu-focal diff --git a/salt/mysql/init.sls b/salt/mysql/init.sls index 04cbacc99..46e62fcc0 100644 --- a/salt/mysql/init.sls +++ b/salt/mysql/init.sls @@ -22,9 +22,9 @@ mysqlpkgs: - skip_suggestions: False - pkgs: {% if grains['os'] != 'CentOS' %} - {% if grains['codename'] == 'bionic' %} + {% if grains['oscodename'] == 'bionic' %} - python3-mysqldb - {% elif grains['codename'] == 'focal' %} + {% elif grains['oscodename'] == 'focal' %} - python3-mysqldb {% endif %} {% else %} diff --git a/salt/salt/init.sls b/salt/salt/init.sls index d01fe1958..504ddbcd5 100644 --- a/salt/salt/init.sls +++ b/salt/salt/init.sls @@ -3,9 +3,9 @@ saltpymodules: pkg.installed: - pkgs: - python-docker - {% if grains['codename'] == 'bionic' %} + {% if grains['oscodename'] == 'bionic' %} - python-m2crypto - {% elif grains['codename'] == 'focal' %} + {% elif grains['oscodename'] == 'focal' %} - python3-m2crypto {% endif %} {% endif %} diff --git a/salt/ssl/init.sls b/salt/ssl/init.sls index 54c48ab34..5690691fc 100644 --- a/salt/ssl/init.sls +++ b/salt/ssl/init.sls @@ -42,9 +42,9 @@ m2cryptopkgs: pkg.installed: - skip_suggestions: False - pkgs: - {% if grains['codename'] == 'bionic' %} + {% if grains['oscodename'] == 'bionic' %} - python-m2crypto - {% elif grains['codename'] == 'focal' %} + {% elif grains['oscodename'] == 'focal' %} - python3-m2crypto {% endif %} {% endif %} From 5f475ff9cb4d604f9186745adec20035dec55ef7 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Mon, 20 Sep 2021 18:46:43 -0400 Subject: [PATCH 03/10] Fix Python Problem --- salt/salt/init.sls | 2 ++ 1 file changed, 2 insertions(+) diff --git a/salt/salt/init.sls b/salt/salt/init.sls index 504ddbcd5..aa27b7fdd 100644 --- a/salt/salt/init.sls +++ b/salt/salt/init.sls @@ -5,8 +5,10 @@ saltpymodules: - python-docker {% if grains['oscodename'] == 'bionic' %} - python-m2crypto + - python-docker {% elif grains['oscodename'] == 'focal' %} - python3-m2crypto + - python3-docker {% endif %} {% endif %} From c1537335b1a63c79fc015f593aa11934a6b5763a Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Mon, 20 Sep 2021 19:05:01 -0400 Subject: [PATCH 04/10] Fix Python Problem --- salt/salt/init.sls | 1 - 1 file changed, 1 deletion(-) diff --git a/salt/salt/init.sls b/salt/salt/init.sls index aa27b7fdd..fe340772e 100644 --- a/salt/salt/init.sls +++ b/salt/salt/init.sls @@ -2,7 +2,6 @@ saltpymodules: pkg.installed: - pkgs: - - python-docker {% if grains['oscodename'] == 'bionic' %} - python-m2crypto - python-docker From b069377c8a4ab1030292a5016d78d2fd0e848f66 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Mon, 27 Sep 2021 10:13:42 -0400 Subject: [PATCH 05/10] 2.3.80 --- VERIFY_ISO.md | 22 +++++++++++----------- sigs/securityonion-2.3.80.iso.sig | Bin 0 -> 543 bytes 2 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 sigs/securityonion-2.3.80.iso.sig diff --git a/VERIFY_ISO.md b/VERIFY_ISO.md index f6cc31508..dae008a8f 100644 --- a/VERIFY_ISO.md +++ b/VERIFY_ISO.md @@ -1,18 +1,18 @@ -### 2.3.70-WAZUH ISO image built on 2021/08/30 +### 2.3.80 ISO image built on 2021/08/30 ### Download and Verify -2.3.70-WAZUH ISO image: -https://download.securityonion.net/file/securityonion/securityonion-2.3.70-WAZUH.iso +2.3.80 ISO image: +https://download.securityonion.net/file/securityonion/securityonion-2.3.80.iso -MD5: CEDEF3C38089896C252F9E3C75F7CB15 -SHA1: FB420115C72DABDEB87C8B27F26E862C94628057 -SHA256: CC3E75A97163E9CD255DA0D9C3EB11922FA045651827F291025398943C1BC230 +MD5: 24F38563860416F4A8ABE18746913E14 +SHA1: F923C005F54EA2A17AB225ADA0DA46042707AAD9 +SHA256: 8E95D10AF664D9A406C168EC421D943CB23F0D0C1813C6C2DBA9B4E131984018 Signature for ISO image: -https://github.com/Security-Onion-Solutions/securityonion/raw/master/sigs/securityonion-2.3.70-WAZUH.iso.sig +https://github.com/Security-Onion-Solutions/securityonion/raw/master/sigs/securityonion-2.3.80.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-WAZUH.iso.sig +wget https://github.com/Security-Onion-Solutions/securityonion/raw/master/sigs/securityonion-2.3.80.iso.sig ``` Download the ISO image: ``` -wget https://download.securityonion.net/file/securityonion/securityonion-2.3.70-WAZUH.iso +wget https://download.securityonion.net/file/securityonion/securityonion-2.3.80.iso ``` Verify the downloaded ISO image using the signature file: ``` -gpg --verify securityonion-2.3.70-WAZUH.iso.sig securityonion-2.3.70-WAZUH.iso +gpg --verify securityonion-2.3.80.iso.sig securityonion-2.3.80.iso ``` The output should show "Good signature" and the Primary key fingerprint should match what's shown below: ``` -gpg: Signature made Mon 30 Aug 2021 06:13:14 PM EDT using RSA key ID FE507013 +gpg: Signature made Mon 27 Sep 2021 08:55:01 AM 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.80.iso.sig b/sigs/securityonion-2.3.80.iso.sig new file mode 100644 index 0000000000000000000000000000000000000000..4fa76de2e248663018bbb18c9494692be0d262d7 GIT binary patch literal 543 zcmV+)0^t3L0vrSY0RjL91p;AFza;<)2@re`V7LBIa1%185C42D7oKYXdOn02`!}QM z{*}VbE0))c!-F>4rLTz?`f}3am@^@Ms&As|xYR}E2Lqirc*45Rw5I~$UHyk4Ug9U3 z>BzgrCSICSp<|3-b%ftu}USBUI}2L4N&rBy1i6xFY4oY`72)xOu@ z){UdfrS~5@m-I2niyOU45*xGg&r_nyVWFego;#ROH?v9Ka#!9a2NsyEOuj; z_11h7PGq;5yj4*M75%|q&tj21D!pvGH-TjwGzNZ(#8Hi$<}mW0j8~?%;w#@2KT16v z^V<1Io)(!~R*kZpYJRhi?~`?Jg2?^N-49knv04lH%x$cyb}bBn!zx2I;3aDeDq?2p zw5Whgqc~6O7B6I&!4CV(;P(krWxHR*4BR&%Ap+Yn7;LlLvRN?;*jp`9W}AxS53L^Y z30$k>yLfzs3qeyd7I1}rXCkUIaa4jNVNJakIc=XT@MOA?Swu!Dp?LU;)~A*&`x7+n zvEo73A7ZP%F0-JMvJjkHK7x5o=))D`1KLEO>!d9vR7{gRwPhyS9ehYDwjA!*c2{`k h@5q%SJRbyLK4c~-4J8SqZ@nBfxC+)`(s7xyhC9cm1#18R literal 0 HcmV?d00001 From b1d0e3e93fe32613ef4dee5e81bf80d26be20dd5 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Mon, 27 Sep 2021 12:32:45 -0400 Subject: [PATCH 06/10] 2.3.80 --- VERIFY_ISO.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERIFY_ISO.md b/VERIFY_ISO.md index dae008a8f..1a8c028f3 100644 --- a/VERIFY_ISO.md +++ b/VERIFY_ISO.md @@ -1,4 +1,4 @@ -### 2.3.80 ISO image built on 2021/08/30 +### 2.3.80 ISO image built on 2021/09/27 From d0592c4293f7331e74bac689971b23e0f82307ab Mon Sep 17 00:00:00 2001 From: Jason Ertel Date: Tue, 28 Sep 2021 00:51:29 -0400 Subject: [PATCH 07/10] Update ElastAlert to use ElastAlert 2 --- salt/elastalert/init.sls | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/salt/elastalert/init.sls b/salt/elastalert/init.sls index f3f4af3f9..a5c3a3b67 100644 --- a/salt/elastalert/init.sls +++ b/salt/elastalert/init.sls @@ -111,13 +111,13 @@ so-elastalert: - image: {{ MANAGER }}:5000/{{ IMAGEREPO }}/so-elastalert:{{ VERSION }} - hostname: elastalert - name: so-elastalert - - user: elastalert + - user: so-elastalert - detach: True - binds: - /opt/so/rules/elastalert:/opt/elastalert/rules/:ro - /opt/so/log/elastalert:/var/log/elastalert:rw - /opt/so/conf/elastalert/modules/:/opt/elastalert/modules/:ro - - /opt/so/conf/elastalert/elastalert_config.yaml:/opt/config/elastalert_config.yaml:ro + - /opt/so/conf/elastalert/elastalert_config.yaml:/opt/elastalert/config.yaml:ro - extra_hosts: - {{MANAGER_URL}}:{{MANAGER_IP}} - require: From b1a5527e828eff4ea505a1b083f794c3ad5fc55f Mon Sep 17 00:00:00 2001 From: Jason Ertel Date: Tue, 28 Sep 2021 07:01:47 -0400 Subject: [PATCH 08/10] Update ElastAlert to use ElastAlert 2 --- salt/kibana/files/saved_objects.ndjson.jinja | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/kibana/files/saved_objects.ndjson.jinja b/salt/kibana/files/saved_objects.ndjson.jinja index 33d46d27a..abc722a9e 100644 --- a/salt/kibana/files/saved_objects.ndjson.jinja +++ b/salt/kibana/files/saved_objects.ndjson.jinja @@ -462,7 +462,7 @@ {"attributes":{"description":"","kibanaSavedObjectMeta":{"searchSourceJSON":"{\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"}}"},"savedSearchRefName":"search_0","title":"SMB - Action (Pie Chart)","uiStateJSON":"{}","version":1,"visState":"{\"title\":\"SMB - Action (Pie Chart)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true,\"type\":\"pie\",\"labels\":{\"show\":false,\"values\":true,\"last_level\":true,\"truncate\":100}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"action.keyword\",\"otherBucket\":false,\"otherBucketLabel\":\"Other\",\"missingBucket\":false,\"missingBucketLabel\":\"Missing\",\"size\":20,\"order\":\"desc\",\"orderBy\":\"1\"}}]}"},"id":"6f883480-3aad-11e7-8b17-0d8709b02c80","migrationVersion":{"visualization":"7.11.0"},"references":[{"id":"19849f30-3aab-11e7-8b17-0d8709b02c80","name":"search_0","type":"search"}],"type":"visualization","updated_at":"2021-03-19T14:35:12.119Z","version":"WzcwMTQzLDRd"} {"attributes":{"description":"","kibanaSavedObjectMeta":{"searchSourceJSON":"{\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.index\"}"},"title":"Security Onion - SSL - Subject","uiStateJSON":"{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}","version":1,"visState":"{\"title\":\"Security Onion - SSL - Subject\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMetricsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":false,\"totalFunc\":\"sum\",\"percentageCol\":\"\",\"dimensions\":{\"metrics\":[{\"accessor\":1,\"format\":{\"id\":\"number\"},\"params\":{},\"label\":\"Count\",\"aggType\":\"count\"}],\"buckets\":[{\"accessor\":0,\"format\":{\"id\":\"terms\",\"params\":{\"id\":\"string\",\"otherBucketLabel\":\"Other\",\"missingBucketLabel\":\"Missing\",\"parsedUrl\":{\"origin\":\"https://PLACEHOLDER\",\"pathname\":\"/kibana/app/kibana\",\"basePath\":\"/kibana\"}}},\"params\":{},\"label\":\"ssl.certificate.subject.keyword: Descending\",\"aggType\":\"terms\"}]},\"showToolbar\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"ssl.certificate.subject.keyword\",\"orderBy\":\"1\",\"order\":\"desc\",\"size\":100,\"otherBucket\":false,\"otherBucketLabel\":\"Other\",\"missingBucket\":false,\"missingBucketLabel\":\"Missing\",\"customLabel\":\"Subject\"}}]}"},"id":"6fccb600-75ec-11ea-9565-7315f4ee5cac","migrationVersion":{"visualization":"7.11.0"},"references":[{"id":"2289a0c0-6970-11ea-a0cd-ffa0f6a1bc29","name":"kibanaSavedObjectMeta.searchSourceJSON.index","type":"index-pattern"}],"type":"visualization","updated_at":"2021-03-19T14:35:12.119Z","version":"WzcwMTQ0LDRd"} {% endraw -%} -{"attributes":{"buildNum":39457,"defaultIndex":"2289a0c0-6970-11ea-a0cd-ffa0f6a1bc29","defaultRoute":"/app/dashboards#/view/a8411b30-6d03-11ea-b301-3d6c35840645","discover:sampleSize":{{DASHBOARD.discover.sampleSize}},"theme:darkMode":true,"timepicker:timeDefaults":"{\n \"from\": \"now-24h\",\n \"to\": \"now\"\n}"},"coreMigrationVersion":"7.13.4","id":"7.13.4","migrationVersion":{"config":"7.12.0"},"references":[],"type":"config","updated_at":"2021-04-29T21:42:52.430Z","version":"WzY3NTUsM10="} +{"attributes":{"buildNum":39457,"defaultIndex":"2289a0c0-6970-11ea-a0cd-ffa0f6a1bc29","defaultRoute":"/app/dashboards#/view/a8411b30-6d03-11ea-b301-3d6c35840645","discover:sampleSize":{{DASHBOARD.discover.sampleSize}},"theme:darkMode":true,"timepicker:timeDefaults":"{\n \"from\": \"now-24h\",\n \"to\": \"now\"\n}"},"coreMigrationVersion":"7.15.0","id":"7.15.0","migrationVersion":{"config":"7.12.0"},"references":[],"type":"config","updated_at":"2021-04-29T21:42:52.430Z","version":"WzY3NTUsM10="} {% raw -%} {"attributes":{"description":"","kibanaSavedObjectMeta":{"searchSourceJSON":"{\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.index\"}"},"title":"Strelka - File - MIME Flavors","uiStateJSON":"{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}","version":1,"visState":"{\"title\":\"Strelka - File - MIME Flavors\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMetricsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":false,\"totalFunc\":\"sum\",\"percentageCol\":\"\",\"dimensions\":{\"metrics\":[{\"accessor\":0,\"format\":{\"id\":\"number\"},\"params\":{},\"label\":\"Count\",\"aggType\":\"count\"}],\"buckets\":[]},\"showToolbar\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"file.flavors.mime.keyword\",\"orderBy\":\"1\",\"order\":\"desc\",\"size\":100,\"otherBucket\":false,\"otherBucketLabel\":\"Other\",\"missingBucket\":false,\"missingBucketLabel\":\"Missing\"}}]}"},"id":"70243970-772c-11ea-bee5-af7f7c7b8e05","migrationVersion":{"visualization":"7.11.0"},"references":[{"id":"2289a0c0-6970-11ea-a0cd-ffa0f6a1bc29","name":"kibanaSavedObjectMeta.searchSourceJSON.index","type":"index-pattern"}],"type":"visualization","updated_at":"2021-03-19T14:35:12.119Z","version":"WzcwMTQ2LDRd"} {"attributes":{"description":"","kibanaSavedObjectMeta":{"searchSourceJSON":"{\"filter\":[]}"},"savedSearchRefName":"search_0","title":"Modbus - Log Count","uiStateJSON":"{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}","version":1,"visState":"{\"title\":\"Modbus - Log Count\",\"type\":\"metric\",\"params\":{\"addTooltip\":true,\"addLegend\":false,\"type\":\"gauge\",\"gauge\":{\"verticalSplit\":false,\"autoExtend\":false,\"percentageMode\":false,\"gaugeType\":\"Metric\",\"gaugeStyle\":\"Full\",\"backStyle\":\"Full\",\"orientation\":\"vertical\",\"colorSchema\":\"Green to Red\",\"gaugeColorMode\":\"None\",\"useRange\":false,\"colorsRange\":[{\"from\":0,\"to\":100}],\"invertColors\":false,\"labels\":{\"show\":false,\"color\":\"black\"},\"scale\":{\"show\":false,\"labels\":false,\"color\":\"#333\",\"width\":2},\"type\":\"simple\",\"style\":{\"fontSize\":\"30\",\"bgColor\":false,\"labelColor\":false,\"subText\":\"\",\"bgFill\":\"#FB9E00\"}}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}}],\"listeners\":{}}"},"id":"AWDG_9KpxQT5EBNmq4Oo","migrationVersion":{"visualization":"7.11.0"},"references":[{"id":"52dc9fe0-342e-11e7-9e93-53b62e1857b2","name":"search_0","type":"search"}],"type":"visualization","updated_at":"2021-03-19T14:35:12.119Z","version":"WzcwMTQ3LDRd"} From 72a1b299ac7b8d3ce4c7834dd0f318bc97625e50 Mon Sep 17 00:00:00 2001 From: Jason Ertel Date: Mon, 4 Oct 2021 08:44:51 -0400 Subject: [PATCH 09/10] Bump to 2.3.90 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index d5c0d128d..6c91a811d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.3.80 +2.3.90 From 6ef9a5c95d60f05fac136d4ccf5eb7359977eab9 Mon Sep 17 00:00:00 2001 From: Jason Ertel Date: Mon, 4 Oct 2021 08:53:25 -0400 Subject: [PATCH 10/10] Use safe_load to avoid warnings - credit to @clairmont32 --- salt/common/tools/sbin/so-firewall | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/common/tools/sbin/so-firewall b/salt/common/tools/sbin/so-firewall index 9772305fe..9c16ffb15 100755 --- a/salt/common/tools/sbin/so-firewall +++ b/salt/common/tools/sbin/so-firewall @@ -71,7 +71,7 @@ def checkApplyOption(options): def loadYaml(filename): file = open(filename, "r") - return yaml.load(file.read()) + return yaml.safe_load(file.read()) def writeYaml(filename, content): file = open(filename, "w")