Commit Graph

1146 Commits

Author SHA1 Message Date
m0duspwnens 8d667795a7 only add soc:es_index_patterns to pillar if not already present 2021-12-02 10:28:17 -05:00
m0duspwnens 7a664ab8f7 more error proof up_to_2.3.90 function 2021-12-02 10:02:26 -05:00
m0duspwnens 5e0ac89841 merge with master 2021-12-01 14:27:58 -05:00
m0duspwnens c571b2c499 handle redirect if more than 1 match from compgen 2021-12-01 13:17:14 -05:00
Josh Patterson 63cb486698 remove redirect to /dev/null for compgen 2021-12-01 10:16:04 -05:00
Jason Ertel 4f283c2d86 Suppres grep output 2021-11-23 14:52:40 -05:00
Jason Ertel 801d42ed20 Correct if check to inline the command instead of checking for emptiness of a variable 2021-11-23 14:51:06 -05:00
Jason Ertel 59fc122eec Force restart of wazuh since conf file is changing 2021-11-23 13:29:04 -05:00
Jason Ertel bd59d65f02 Strip trailing newlines from version and hotfix files 2021-11-23 13:12:27 -05:00
Jason Ertel 01ceded223 Handle CRs in hotfix 2021-11-23 13:03:40 -05:00
Jason Ertel 3c37bd61ab Add debug logging 2021-11-23 12:46:59 -05:00
Jason Ertel 7627d37386 Add 2.3.90 WAZUH hotfix corrective function 2021-11-23 12:21:28 -05:00
Josh Patterson c67b2b6936 Update soup
only check if salt was upgraded if upgrade_salt function was called
2021-11-23 11:14:10 -05:00
Jason Ertel af4c04be59 Fix #6325 - Prevent XML header from outputting to ossec.conf 2021-11-23 10:57:21 -05:00
Jason Ertel 4672b0c15c Fix #6317 - Do not attempt to whitelist when wazuh isn't enabled 2021-11-23 10:06:14 -05:00
m0duspwnens c0f183fb5e add comment 2021-11-19 16:37:27 -05:00
m0duspwnens d602339c45 render and md5sum soup and so-common 2021-11-19 16:32:59 -05:00
William Wernert bebd62187d Check soup in /usr/sbin rather than the saltstack default dir 2021-11-19 11:23:32 -05:00
William Wernert 23b91ee7e5 Fix indent on playbook_admin and playbook_automation secrets 2021-11-19 10:27:11 -05:00
William Wernert 4149236cda Check for more invalid cidr syntax 2021-11-18 15:18:12 -05:00
Mike Reeves 12546a8efa Merge pull request #6271 from Security-Onion-Solutions/fix/fleet-users
Fix soup - fleetdm SA user
2021-11-17 19:48:15 -05:00
Josh Brower 3f5956b56d Fix soup - fleetdm SA user 2021-11-17 19:47:16 -05:00
Josh Brower 66e2de0934 Merge pull request #6268 from Security-Onion-Solutions/fix/fleet-users
Fix soup - fleetdm SA user
2021-11-17 18:26:11 -05:00
Josh Brower c93794a402 Fix soup - fleetdm SA user 2021-11-17 18:22:34 -05:00
Josh Brower 922657afbc Merge pull request #6266 from Security-Onion-Solutions/fix/fleet-users
Unset pw reset for new Fleet users
2021-11-17 17:10:27 -05:00
Josh Brower 5f3601ac78 Unset pw reset for new Fleet users 2021-11-17 17:06:01 -05:00
Josh Brower 2fe4fa06a6 Merge pull request #6265 from Security-Onion-Solutions/fix/fleet-users
Fix FleetDM SA Creation for SOUP
2021-11-17 14:09:59 -05:00
Josh Brower 773c580e77 Fix FleetDM SA Creation for SOUP 2021-11-17 14:08:34 -05:00
Mike Reeves aca684d55a Merge pull request #6264 from Security-Onion-Solutions/fix/fleet-users
Migrate FleetDM user mgt to fleetctl
2021-11-17 13:16:05 -05:00
Josh Brower 6f391dbe50 Migrate FleetDM user mgt to fleetctl 2021-11-17 13:13:25 -05:00
William Wernert 262d2023b5 Add new ipv4 address w/ cidr mask validator 2021-11-17 12:41:25 -05:00
m0duspwnens ac400f1c41 change how soc endgame added to manager pillar in soup 2021-11-17 11:07:12 -05:00
Josh Patterson a16e6aca22 Merge pull request #6257 from Security-Onion-Solutions/es_soup_ingest
escape raw and endraw
2021-11-17 07:56:01 -05:00
m0duspwnens ce21ae11f5 escape raw and endraw 2021-11-17 07:53:15 -05:00
Mike Reeves fdd9706669 Merge pull request #6255 from Security-Onion-Solutions/kilo 2021-11-16 18:09:40 -05:00
Jason Ertel 8fa9a180b2 Refactor upgrade and post-upgrade version to function mappings; fix missing version upgrades from older 2.3.61 releases and earlier; Drop support for upgrading ancient RC releases 2021-11-16 18:08:28 -05:00
Josh Patterson 6288365a50 Merge pull request #6254 from Security-Onion-Solutions/es_soup_ingest
wrap common ingest in raw endraw since json and no jinja
2021-11-16 16:47:53 -05:00
m0duspwnens 5448107310 wrap common ingest in raw endraw since json and no jinja 2021-11-16 16:43:33 -05:00
Jason Ertel 1bd8e226b4 Force DB migration since installations on 2.3.50 or earlier will skip the Kratos 0.6 version 2021-11-16 15:58:04 -05:00
m0duspwnens 5945326817 soup for es ingest common and watch esingestdynamicconf for so-elastic docker 2021-11-16 14:00:41 -05:00
Josh Brower 8bb2789c6f Merge pull request #6237 from Security-Onion-Solutions/kilo
Migrate to email field instead of username due to breaking change in …
2021-11-16 12:06:08 -05:00
Jason Ertel 11fc0da971 Migrate to email field instead of username due to breaking change in FleetDM 4.x 2021-11-16 12:03:46 -05:00
Mike Reeves b51405d5e8 Update soup 2021-11-15 17:04:46 -05:00
William Wernert f674555290 Check CIDR validity completely 2021-11-15 15:43:05 -05:00
Mike Reeves 146e1f4297 Update soup 2021-11-15 14:05:29 -05:00
William Wernert 052192e1d6 Revert "Use python lib to make cidr validation more strict"
This reverts commit 569cb24861.
2021-11-15 09:43:18 -05:00
m0duspwnens cc1dea446c Merge branch 'dev' of https://github.com/Security-Onion-Solutions/securityonion into issue/5809 2021-11-12 15:02:22 -05:00
m0duspwnens 7f3379e034 verify manager pillars can be rendered before proceeding with soup - https://github.com/Security-Onion-Solutions/securityonion/issues/5809 2021-11-12 15:02:16 -05:00
weslambert 8c46a2d1db Merge pull request #6210 from Security-Onion-Solutions/fix/soc_pillar_soup
Add SOC pillar entry
2021-11-12 13:35:46 -05:00
William Wernert ba621639bd Merge pull request #6201 from Security-Onion-Solutions/fix/cidr-ip-validation
Improve cidr validation in setup and match ip validation to similar method
2021-11-12 13:34:19 -05:00