CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2026-04-25 14:07:49 +02:00
Code Issues Packages Projects Releases Wiki Activity
9,738 Commits 40 Branches 125 Tags
406267a892d92f0e5a754c87708b6d2e45058f47
Commit Graph

9738 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
weslambert d309c4fc0a Update pillar structure for index_settings/shards 2022-02-17 07:10:29 -05:00
Jason Ertel cb9712aa08 Merge pull request #7217 from Security-Onion-Solutions/kilo 
MFA
 2022-02-16 16:47:40 -05:00
weslambert d084625ee0 Merge pull request #7218 from Security-Onion-Solutions/fix/composable_templates_soup 
Add pillar update for ES index templates for 2.3.110
 2022-02-16 16:24:57 -05:00
weslambert e71b606dd6 Add pillar update for ES index templates for 2.3.110 2022-02-16 16:22:06 -05:00
weslambert f1f9322bee Merge pull request #7216 from Security-Onion-Solutions/fix/es_template_netflow_mappings_indent 
Fix indent for so-netflow component template references
 2022-02-16 14:47:31 -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
weslambert 9e222b1464 Merge pull request #7206 from Security-Onion-Solutions/feature/template-reorg 
Re-organize Elasticsearch Index Templates
 2022-02-15 16:50:14 -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 de731fc05d Remove default templates from ES template pillar since they are now managed in the defaults file. 2022-02-15 17:04:57 +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
James Conroy 68a5826d70 Always print a line of '-' 
Even when not printing to a tty

This is behavior preferred by the team
 2022-02-12 12:25:22 -06:00
James Conroy daa73c8845 Removed MYNAME variable 
Preferring to just use the value of $0 instead
 2022-02-12 12:25:22 -06:00
James Conroy 7f694c17ed Revert improvements to usage function 
Made to make it more consistent with the rest of the scripts in
Security Onion
 2022-02-12 12:25:22 -06:00
James Conroy fd9a03a77f Added Changes Suggested by Reviewer 
Added a missing semi colon between a local variable's declaration and
assignment
Removed an unused return value
Made a TODO more descriptive
 2022-02-12 12:25:22 -06:00
James Conroy 2993a20947 Moved line declaration out of tty conditional 
This way it will always be set to ""
 2022-02-12 12:25:22 -06:00
James Conroy ac5527e1ab Added Comments for future enhancements 2022-02-12 12:25:22 -06:00
James Conroy 715f9da6e2 Reworked tty detection and status printing 
I was able to reduce the line count and make the script more reliable
 2022-02-12 12:25:22 -06:00
James Conroy caa06b026f Refactored to reduce length and number of lines 2022-02-12 12:25:21 -06:00
James Conroy a048de65ca Print help message if not running as root 2022-02-12 12:25:21 -06:00
James Conroy f807471a17 Only print color codes if we're printing to a tty 
If we're not printing to a tty the escape sequences can only clutter the
screen.

Also removed a redundant function to print lines if not printing to a
tty. It was only called if docker wasn't running, not if the output
wasn't a tty.
 2022-02-12 12:25:21 -06:00
James Conroy 81122d0693 Updated the useage function to use printf 
Using a hear doc means we have to exactly specify the formatting. Useing
printf handles formatting for us
 2022-02-12 12:25:21 -06:00
Josh Brower 1e5b9ef0bf IDH - Enable Filebeat 2022-02-10 11:37:10 -05:00
Josh Brower b66472eced IDH - disable nginx 2022-02-09 14:56:56 -05:00
Josh Brower f31fbbf1ed IDH - states allowed 2022-02-09 13:57:18 -05:00
William Wernert 1fee5e6a60 Merge pull request #7162 from Security-Onion-Solutions/rwwiv-contributing-patch-1 
Also merge CONTRIBUTING.md changes to dev
 2022-02-09 11:59:00 -05:00
William Wernert bc5fa55ecd Merge pull request #7160 from Security-Onion-Solutions/rwwiv-contributing-patch-1 
Update CONTRIBUTING.md
 2022-02-09 11:49:52 -05:00
William Wernert 2e2eed9f42 PR's -> pull requests 2022-02-09 11:45:12 -05:00