 Jason Ertel
|
36d13dd414
|
Merge branch 'dev' into kilo
|
2021-05-21 17:26:50 -04:00 |
|
 Mike Reeves
|
18922ed6f5
|
Merge pull request #4263 from Security-Onion-Solutions/feature/merge-2.3.51
Merge 2.3.51 into dev
|
2021-05-21 12:47:15 -04:00 |
|
 William Wernert
|
c1dd4dafe4
|
Fix influx state
|
2021-05-21 12:41:10 -04:00 |
|
|
William Wernert
|
fe3aec173f
|
Merge branch 'master' into feature/merge-2.3.51
# Conflicts:
# VERSION
# salt/influxdb/init.sls
|
2021-05-21 12:31:54 -04:00 |
|
|
Mike Reeves
|
c5d0286e24
|
Merge pull request #4254 from Security-Onion-Solutions/2.3.51
2.3.51
2.3.51
|
2021-05-21 12:15:04 -04:00 |
|
 Mike Reeves
|
7aed01658f
|
Sig file for 2.3.51
|
2021-05-20 22:10:36 -04:00 |
|
|
Mike Reeves
|
de4fde4ee3
|
Merge pull request #4248 from Masaya-A/MAC-Address
Showing Mac Address to select suitable NICs (Discussions #4214)
|
2021-05-19 21:18:15 -04:00 |
|
 Masaya-A
|
3450219bc7
|
Drop error to /dev/null
|
2021-05-20 09:33:14 +09:00 |
|
|
Jason Ertel
|
b440f73336
|
Truncate wait_for_web_response.log before each wait invocation
|
2021-05-19 18:37:08 -04:00 |
|
|
Masaya-A
|
6af126b872
|
Fix array
|
2021-05-19 10:02:19 +09:00 |
|
|
Masaya-A
|
ac42cba50b
|
Adding MAC Address for NIC List
|
2021-05-19 09:06:02 +09:00 |
|
|
Masaya-A
|
5d263f63cb
|
Merge pull request #10 from Security-Onion-Solutions/dev
Dev Sync
|
2021-05-19 08:59:49 +09:00 |
|
|
Jason Ertel
|
25e2edc6d2
|
Reset HOTFIX with new release
|
2021-05-18 12:31:33 -04:00 |
|
|
Jason Ertel
|
c207504657
|
Merge branch '2.3.51' of ssh://github.com/security-onion-solutions/securityonion into 2.3.51
|
2021-05-18 09:52:07 -04:00 |
|
|
Jason Ertel
|
fe155222c2
|
Introduce mixed-case sensor into distributed test
|
2021-05-18 09:51:54 -04:00 |
|
 Josh Patterson
|
9b4325662b
|
Merge pull request #4218 from Security-Onion-Solutions/issue/4207
Issue/4207
|
2021-05-18 09:04:26 -04:00 |
|
|
m0duspwnens
|
0de1c9a669
|
removing unreference pillar file docker/config.sls
|
2021-05-18 07:57:00 -04:00 |
|
|
m0duspwnens
|
ef32bff302
|
fix up soc.json
|
2021-05-17 18:29:27 -04:00 |
|
|
m0duspwnens
|
e50002e0ca
|
influx and grafana default for manager nodes - https://github.com/Security-Onion-Solutions/securityonion/issues/4207
|
2021-05-17 16:26:12 -04:00 |
|
|
Mike Reeves
|
d001597e52
|
Update README.md
|
2021-05-17 15:56:46 -04:00 |
|
|
Mike Reeves
|
4c7cee4ebc
|
Update VERSION
|
2021-05-17 15:55:49 -04:00 |
|
|
Mike Reeves
|
6eed730209
|
Merge pull request #4213 from Security-Onion-Solutions/zeekhotfix
Zeekhotfix
|
2021-05-17 15:55:17 -04:00 |
|
|
Josh Patterson
|
891e414cb6
|
Merge pull request #4202 from Security-Onion-Solutions/issue/3264
Issue/3264
|
2021-05-14 16:30:16 -04:00 |
|
|
m0duspwnens
|
54f9e3ff9d
|
remove leading space on comment line
|
2021-05-14 16:24:16 -04:00 |
|
|
m0duspwnens
|
1c0cc15fdb
|
Merge remote-tracking branch 'remotes/origin/dev' into issue/3264
|
2021-05-14 15:19:58 -04:00 |
|
|
m0duspwnens
|
231e07dbbd
|
circumvent file.patch putting ERROR in log if patch doesnt need applied
|
2021-05-14 15:19:45 -04:00 |
|
|
m0duspwnens
|
3859f6464a
|
dont be quiet on first grep
|
2021-05-14 08:56:42 -04:00 |
|
|
Josh Patterson
|
3668d1aadf
|
Merge pull request #4188 from Security-Onion-Solutions/issue/3264
install influxdb and grafana during setup prior to final highstate
|
2021-05-13 11:46:57 -04:00 |
|
|
m0duspwnens
|
d3af06e7a4
|
handle exception if influxdb module doesnt exist
|
2021-05-13 11:00:42 -04:00 |
|
|
m0duspwnens
|
74f2a61b25
|
install influxdb and grafana during setup prior to final highstate
|
2021-05-13 09:06:47 -04:00 |
|
|
m0duspwnens
|
a7e6dec51d
|
Merge remote-tracking branch 'remotes/origin/dev' into kilo
|
2021-05-10 09:57:50 -04:00 |
|
|
Josh Patterson
|
26335a9b42
|
Merge pull request #4140 from Security-Onion-Solutions/issue/3264
https://github.com/Security-Onion-Solutions/securityonion/issues/3264
|
2021-05-10 08:14:12 -04:00 |
|
|
m0duspwnens
|
1c103f92f2
|
Merge remote-tracking branch 'remotes/origin/issue/3264' into kilo
|
2021-05-07 14:48:42 -04:00 |
|
|
m0duspwnens
|
e3ce683970
|
Merge remote-tracking branch 'remotes/origin/dev' into issue/3264
|
2021-05-07 14:48:16 -04:00 |
|
|
m0duspwnens
|
9eb63b17f9
|
exit if retry fails
|
2021-05-07 14:48:02 -04:00 |
|
|
m0duspwnens
|
755370eff0
|
Merge remote-tracking branch 'remotes/origin/dev' into kilo
|
2021-05-07 14:46:08 -04:00 |
|
 Jason Ertel
|
407ad51244
|
Merge pull request #4139 from Security-Onion-Solutions/issue/4081
FEATURE: Pivot from Alerts/Hunt to CyberChef #4081
|
2021-05-07 13:31:21 -04:00 |
|
 Doug Burks
|
293fb0a76d
|
FEATURE: Pivot from Alerts/Hunt to CyberChef #4081
|
2021-05-07 13:23:46 -04:00 |
|
|
Doug Burks
|
2e228c8355
|
FEATURE: Pivot from Alerts/Hunt to CyberChef #4081
|
2021-05-07 13:22:03 -04:00 |
|
|
m0duspwnens
|
009f7617c1
|
check salt-master is responding
|
2021-05-07 12:47:22 -04:00 |
|
|
m0duspwnens
|
b39c8c1f1f
|
exit after 50 tries if manager cant connect to iteself via salt
|
2021-05-07 11:02:23 -04:00 |
|
|
m0duspwnens
|
d0e084b8ea
|
change command to test if salt-master is accepting connections
|
2021-05-07 10:20:04 -04:00 |
|
|
m0duspwnens
|
46223e0b30
|
add quotes around minionid
|
2021-05-07 08:59:47 -04:00 |
|
|
m0duspwnens
|
5d3b147b42
|
change retry command
|
2021-05-06 20:32:26 -04:00 |
|
|
m0duspwnens
|
6474c296e1
|
dont need to specify dest rp
|
2021-05-06 20:26:13 -04:00 |
|
|
m0duspwnens
|
b8ad80ae35
|
update comment
|
2021-05-06 17:49:40 -04:00 |
|
|
m0duspwnens
|
78240b4b52
|
change retry command
|
2021-05-06 17:49:02 -04:00 |
|
|
m0duspwnens
|
e7c716ede4
|
merge with dev, use retry to check if manager up instead of sleep in soup
|
2021-05-06 16:44:34 -04:00 |
|
|
m0duspwnens
|
fb986b5cff
|
set both log levels to error
|
2021-05-06 14:55:14 -04:00 |
|
|
m0duspwnens
|
a49f2e2d98
|
change log_level_logfile to error for /opt/so/log/salt/minion
|
2021-05-06 13:38:16 -04:00 |
|