Commit Graph

5803 Commits

Author SHA1 Message Date
Josh Brower
0362afb260 IDH - Finalize Firewall config 2022-02-18 13:23:48 -05:00
m0duspwnens
cb55af4c1c dont allow $ to be used for elasticsearch:auth or kibana:secrets - https://github.com/Security-Onion-Solutions/securityonion/issues/7233 2022-02-18 13:13:56 -05:00
weslambert
87a5e64f12 Merge pull request #7249 from Security-Onion-Solutions/fix/component_index_association
Update component -> index association for file/scan mappings for Strelka
2022-02-18 12:19:41 -05:00
Josh Brower
8de5a054d4 Merge pull request #7248 from Security-Onion-Solutions/feature/kratos-log-ingest
Ingest Kratos logs
2022-02-18 11:56:20 -05:00
William Wernert
786b01c85a Merge pull request #6496 from JamesMConroy/so-staus-tty
so-staus detects tty
2022-02-18 11:52:18 -05:00
Josh Brower
118277ebc5 Ingest Kratos logs 2022-02-18 11:49:02 -05:00
Mike Reeves
6f4ee4123a Update networks.cfg.jinja 2022-02-18 11:26:58 -05:00
Mike Reeves
e4148818d8 Merge pull request #7226 from Security-Onion-Solutions/zeekhn
Add Zeek Homenet in networks.cfg
2022-02-18 11:11:56 -05:00
Mike Reeves
95eab61615 Rename to the .jinja standard 2022-02-18 11:06:33 -05:00
Mike Reeves
9341669a15 Merge pull request #7244 from christopherwoodall/patch-6
Update config.map.jinja
2022-02-18 09:57:33 -05:00
Jason Ertel
fdc63b5816 Clarify so-user update usage/help 2022-02-18 09:41:09 -05:00
Christopher Woodall
eaff6a12de Update config.map.jinja
Extend the array instead of appending.
2022-02-18 08:50:28 -05:00
weslambert
6ee3287d2d Update component -> index association for file/scan mappings for Strelka 2022-02-18 08:12:34 -05:00
James Conroy
91c207cd38 Update salt/common/tools/sbin/so-status
Removed # {% raw %} from line 170

Co-authored-by: William Wernert <william.wernert@gmail.com>
2022-02-17 20:37:43 -06:00
James Conroy
b774e62dfa Update salt/common/tools/sbin/so-status
Add salt raw directive

Co-authored-by: William Wernert <william.wernert@gmail.com>
2022-02-17 20:37:25 -06:00
Josh Brower
f995d0768f IDH - Initial firewall support 2022-02-17 15:54:20 -05:00
Doug Burks
b4b7938ce2 so-ip-update needs to queue the Kibana dashboard update in case a salt operation is already running 2022-02-17 15:47:33 -05:00
Doug Burks
1a96162966 so-ip-update needs to update Kibana dashboards 2022-02-17 14:49:55 -05:00
Mike Reeves
3e194c9b4b Walk the homenet for zeek 2022-02-17 11:33:22 -05:00
Josh Brower
6c124733b5 IDH - Enable default states 2022-02-17 10:50:26 -05:00
Wes Lambert
5c1f61bda8 Switch from dns.answers to dns.answers.name for DTC 2022-02-17 15:03:46 +00:00
Josh Brower
ef4df58510 IDH - Jinjafy hostname 2022-02-17 09:00:57 -05:00
Jason Ertel
cb9712aa08 Merge pull request #7217 from Security-Onion-Solutions/kilo
MFA
2022-02-16 16:47:40 -05:00
weslambert
e71b606dd6 Add pillar update for ES index templates for 2.3.110 2022-02-16 16:22:06 -05:00
weslambert
185ea2fd99 Fix indent for so-netflow component template references 2022-02-16 14:46:12 -05:00
Mike Reeves
89eb2d0a8b Add netowrks.cfg to Zeek 2022-02-16 14:24:58 -05:00
Jason Ertel
2c4ba75c0c Merge branch 'dev' into kilo 2022-02-15 17:05:24 -05:00
Josh Brower
3ccef12df7 IDH - Pillarize OpenCanary Config 2022-02-15 13:57:31 -05:00
Wes Lambert
4fa3749418 Remove bind or ES templates 2022-02-15 18:08:03 +00:00
Wes Lambert
786a189f65 Merge branch 'feature/template-reorg' of https://github.com/security-onion-solutions/securityonion into feature/template-reorg 2022-02-15 17:06:02 +00:00
Wes Lambert
3df58eadd1 Modify logic to include custom templates 2022-02-15 17:00:24 +00:00
weslambert
1a53ec4372 Fix malformed copy/paste 2022-02-15 11:14:10 -05:00
Wes Lambert
dce3b7a874 Update defaults file to include ES index templates 2022-02-15 15:53:07 +00:00
Jason Ertel
377fe1987d Merge branch 'dev' into kilo 2022-02-15 07:49:26 -05:00
Jason Ertel
d97423e9f8 Enable MFA support 2022-02-15 07:49:12 -05:00
Wes Lambert
8e389bf6e5 Add ES template map file 2022-02-14 15:38:32 +00:00
Wes Lambert
ebce67060f Initial template refactor 2022-02-14 15:20:33 +00:00
James Conroy
a43ac2aea2 Move the jinja endraw directive below is_tty
This will prevent jninja from interpreting the shell string length
expansion as the start of jninja comments
2022-02-12 12:25:24 -06:00
James Conroy
95b4f7b4ef Update the PADDING_CONSTENT to 15
As suggested by @rwwiv

Co-authored-by: William Wernert <william.wernert@gmail.com>
2022-02-12 12:25:24 -06:00
James Conroy
3046e811f0 Use spaces to define centerd justification output
As suggested by @rwwiv

Co-authored-by: William Wernert <william.wernert@gmail.com>
2022-02-12 12:25:24 -06:00
James Conroy
6a1e586b8c Changed color variables to Attributes
As suggested by @rwwiv

Co-authored-by: William Wernert <william.wernert@gmail.com>
2022-02-12 12:25:24 -06:00
James Conroy
01346cbb06 Changed color variables to Attributes
As suggested by @rwwiv

Co-authored-by: William Wernert <william.wernert@gmail.com>
2022-02-12 12:25:24 -06:00
James Conroy
3adb6c1389 Renamed colors to attributes
Also correctly used tput to assign blue color

As suggested by @rwwiv

Co-authored-by: William Wernert <william.wernert@gmail.com>
2022-02-12 12:25:23 -06:00
James Conroy
dabae3888f Renamed colors to attributes
As suggested by rwwiv

Co-authored-by: William Wernert <william.wernert@gmail.com>
2022-02-12 12:25:23 -06:00
James Conroy
c69e968790 Renamed Colors to Attributes
As suggested by @rwwiv

Co-authored-by: William Wernert <william.wernert@gmail.com>
2022-02-12 12:25:23 -06:00
James Conroy
dfcabb5722 Seperate bold attribute from colors
As suggested by @rwwiv

Co-authored-by: William Wernert <william.wernert@gmail.com>
2022-02-12 12:25:23 -06:00
James Conroy
b9b3876069 Exit with an error code if the user isn't root 2022-02-12 12:25:23 -06:00
James Conroy
bfcfad2e7d Check for tty in main
So that the value is set every time it is checked
2022-02-12 12:25:23 -06:00
James Conroy
163182c858 Don't set the padding constant if not in a tty
This will preserve the original width from before my changes
2022-02-12 12:25:23 -06:00
James Conroy
6b4549499d Don't split lines after standalone tests
This is to make the formatting consistent with the rest of the scripts
2022-02-12 12:25:23 -06:00