Commit Graph

6856 Commits

Author SHA1 Message Date
m0duspwnens
b3c08229db Merge remote-tracking branch 'remotes/origin/sslstate/timeouts_retry' into delta 2021-02-01 15:33:31 -05:00
Jason Ertel
f736d9f8dd Adjust automation files for distributed AMI 2021-02-01 15:27:53 -05:00
m0duspwnens
8cf0a3da98 remove seconds 2021-02-01 15:19:47 -05:00
William Wernert
8d01b87ab5 Merge branch 'dev' into foxtrot 2021-02-01 13:56:33 -05:00
William Wernert
8f476bbbdd [fix] Add back removed if statement 2021-02-01 13:11:51 -05:00
m0duspwnens
8ff6d1639a Merge remote-tracking branch 'remotes/origin/dev' into issue/1191 2021-02-01 12:51:00 -05:00
William Wernert
daebe90b6e [fix] fix retry command handling
* use eval "$cmd" to handle strings correctly
* add-apt-repo doesn't need dpkg lock so don't use retry for those lines
2021-02-01 12:06:19 -05:00
William Wernert
44617fdddf [fix] Run command being retried within quotes 2021-02-01 11:28:28 -05:00
William Wernert
02f0ef989b [fix] <cmd> || <fail_reactor>; exit 1 will always exit, fix this 2021-02-01 11:11:01 -05:00
William Wernert
36ce389202 Remove wait_for_apt, use common retry function to run apt commands 2021-02-01 10:55:14 -05:00
Jason Ertel
1c8a8f6b7b Merge pull request #2805 from Security-Onion-Solutions/elasticrollback
Add features option back
2021-01-30 21:00:10 -05:00
Mike Reeves
160d307f4a Disable ML for features #2788 2021-01-30 20:00:41 -05:00
Mike Reeves
4212afe0c9 Add features option back 2021-01-30 19:57:18 -05:00
m0duspwnens
0ea504c16a remove space 2021-01-29 17:32:48 -05:00
m0duspwnens
8ca15a6679 Merge remote-tracking branch 'remotes/origin/dev' into issue/1191 2021-01-29 16:54:26 -05:00
Mike Reeves
929896c191 Merge pull request #2797 from Security-Onion-Solutions/raid2
Raid Setup for Appliances
2021-01-29 16:30:43 -05:00
Mike Reeves
22e6e45667 Remove other changes 2021-01-29 16:14:14 -05:00
William Wernert
edfd985353 Merge branch 'bugfix/zeek-prompts' into foxtrot 2021-01-29 16:04:56 -05:00
Mike Reeves
18f2c7b482 Raid Setup for Appliances 2021-01-29 16:03:18 -05:00
Mike Reeves
aa93e2b48f Merge pull request #2794 from Security-Onion-Solutions/foxtrot
Add retry capabilities to image/sig pulls
2021-01-29 15:57:41 -05:00
William Wernert
7a3c7322fc [fix] Only check for ZEEKVERSION on manager installs 2021-01-29 15:36:50 -05:00
m0duspwnens
618b94b9b6 add newline 2021-01-29 15:31:05 -05:00
m0duspwnens
f50a89a0cf watch elastalert config and restart docker if chagnes 2021-01-29 15:28:59 -05:00
m0duspwnens
482b6eb699 Merge remote-tracking branch 'remotes/origin/dev' into sslstate/timeouts_retry 2021-01-29 13:44:27 -05:00
m0duspwnens
e6ecd609cc change timeouts to 30s 2021-01-29 13:44:11 -05:00
Jason Ertel
2926527ad0 Place sig keys in same dir as other sig files 2021-01-29 13:21:58 -05:00
Jason Ertel
73909c4dea Place sig keys in same dir as other sig files 2021-01-29 13:00:56 -05:00
Jason Ertel
c055427e40 Add support for image key/sig retries 2021-01-29 11:18:06 -05:00
Jason Ertel
194f480017 Airgap fix for import nodes missing rules 2021-01-28 13:03:47 -05:00
m0duspwnens
0936dbdb1c add timeouts and retries to ca/ssl states 2021-01-28 11:40:31 -05:00
Jason Ertel
f12947362b Adjust test network IPs 2021-01-28 11:35:10 -05:00
Jason Ertel
bfa6aabc4b Correct automation for airgap import to avoid infinite loop during setup 2021-01-28 10:38:03 -05:00
Jason Ertel
34c2116669 Adjust test network allocation 2021-01-27 16:02:36 -05:00
m0duspwnens
b7aef32eeb fix missing } 2021-01-27 15:50:23 -05:00
m0duspwnens
8df9e020ac pillarize elastalert https://github.com/Security-Onion-Solutions/securityonion/issues/1191 2021-01-27 15:35:29 -05:00
m0duspwnens
0ac19142c4 Merge branch 'dev' of https://github.com/Security-Onion-Solutions/securityonion into dev 2021-01-27 10:52:05 -05:00
Josh Brower
d277bf6d05 Merge pull request #2749 from Security-Onion-Solutions/bugfix/osquery-wel-parsing
Update Osquery Windows Eventlog Parsing
2021-01-27 09:17:17 -05:00
Josh Brower
13ab4c66eb Update Osquery Windows Eventlog Parsing 2021-01-27 09:15:54 -05:00
William Wernert
f5c044e3e3 [fix] Log directory fixes
* The playbook log dir is owned by the socore group, so we can use `su root socore`
* Addresses https://github.com/Security-Onion-Solutions/securityonion/pull/2681#issuecomment-767761670
---
* influxdb runs as root, so we can set the log directory permissions to 755 for this service
2021-01-26 16:07:34 -05:00
m0duspwnens
be0b2b99e9 Merge branch 'dev' of https://github.com/Security-Onion-Solutions/securityonion into dev 2021-01-26 13:48:49 -05:00
William Wernert
1939fe85d7 [fix] Revert directory permission changes 2021-01-26 13:41:10 -05:00
Josh Patterson
f8242a931c Merge pull request #2733 from Security-Onion-Solutions/automation/ssh_prompts
fix if statement for isntalling sshpass
2021-01-26 09:57:32 -05:00
m0duspwnens
ffd01d6975 fix if statement for isntalling sshpass 2021-01-26 09:49:19 -05:00
m0duspwnens
f1faab7b1a Merge branch 'dev' of https://github.com/Security-Onion-Solutions/securityonion into dev 2021-01-26 09:04:00 -05:00
William Wernert
7b2ec05dbf [fix] Add missing fi 2021-01-25 19:57:34 -05:00
Mike Reeves
bcd5bdd82d Merge pull request #2730 from Security-Onion-Solutions/telegraf3
Add EPS and RAID status collection for telegraf
2021-01-25 19:37:03 -05:00
Mike Reeves
3b1cea94d1 Merge branch 'dev' into telegraf3 2021-01-25 19:36:49 -05:00
Mike Reeves
88abd284a7 Fix Conflicts 2021-01-25 19:35:32 -05:00
Mike Reeves
891a7592d8 Fix Conflicts 2021-01-25 19:33:49 -05:00
Mike Reeves
e43a80b9c6 Add EPS and RAID status collection for telegraf 2021-01-25 19:28:30 -05:00