Commit Graph

9501 Commits

Author SHA1 Message Date
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
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
2e2eed9f42 PR's -> pull requests 2022-02-09 11:45:12 -05:00
William Wernert
3f83191083 Update CONTRIBUTING.md 2022-02-09 11:34:39 -05:00
Mike Reeves
d63fe73c90 Merge pull request #7157 from Security-Onion-Solutions/TOoSmOotH-patch-1
Update to 7.17.0
2022-02-09 09:46:25 -05:00
Mike Reeves
51bd266717 Update to 7.17.0 2022-02-09 09:44:28 -05:00
weslambert
380fa7d0c8 Merge pull request #7153 from Security-Onion-Solutions/fix/dtc_event_mappings
Add 'event.created' and 'event.ingested' keyword mapping
2022-02-08 16:36:49 -05:00
Wes Lambert
9b841fd872 Add 'event.created' and 'event.ingested' keyword mapping 2022-02-08 21:34:32 +00:00
weslambert
c216457a3e Merge pull request #7147 from Security-Onion-Solutions/fix/ct_snyk
Add Snyk component template
2022-02-08 10:25:27 -05:00
Wes Lambert
c2c4e4df17 Add Snyk component template 2022-02-08 15:23:43 +00:00
weslambert
7be1549d41 Merge pull request #7146 from Security-Onion-Solutions/feature/additional_dtc_ct
Additional component templates
2022-02-08 10:12:31 -05:00
Wes Lambert
f9a50d33c3 Add new templates 2022-02-08 13:17:23 +00:00
Wes Lambert
2951e12c96 Remove snyk component template for now and fix folder structure 2022-02-08 13:16:59 +00:00
Wes Lambert
6d0ca6fcbb Fix mangled key name/typo 2022-02-08 12:59:07 +00:00
Wes Lambert
2dd5db15b6 Add component and index template listing scripts 2022-02-08 03:40:42 +00:00
Wes Lambert
5090854d4d Add additional component templates and index template references 2022-02-08 03:03:55 +00:00
weslambert
b41c5439c6 Merge pull request #7141 from Security-Onion-Solutions/fix/index_template_mapping_reference
Add mapping references for new component templates to index templates
2022-02-07 15:06:19 -05:00
Wes Lambert
1366e5288e Add mappings references for new component templates to index templates 2022-02-07 19:54:23 +00:00
weslambert
f9196a8228 Merge pull request #7140 from Security-Onion-Solutions/feature/dtc_new_mappings
New DTC/Component Template Mappings
2022-02-07 14:47:07 -05:00
Wes Lambert
03bfb052ed Add component templates for Elasticsearch, Kibana, Logstash, Netflow, Suricata, and Zeek 2022-02-07 19:42:24 +00:00
weslambert
c9b40d8569 Merge pull request #7136 from Security-Onion-Solutions/feature/so_es_indices_list_sort
Sort index listing alphabetically and add header
2022-02-07 09:34:58 -05:00
Wes Lambert
50215c550b Sort index listing alphabetically and add header (@gebhard73) 2022-02-07 14:31:42 +00:00
Josh Patterson
ee17064585 Merge pull request #7122 from Security-Onion-Solutions/soup_docker_iso
Soup docker iso
2022-02-07 09:29:35 -05:00
Josh Patterson
e0c0eba24e Update soup 2022-02-07 09:23:30 -05:00
Josh Patterson
7d09d1f7e2 Update soup 2022-02-07 09:22:43 -05:00
Mike Reeves
77fc9df448 Merge pull request #7134 from Security-Onion-Solutions/mastermerger
Mastermerger
2022-02-07 08:38:27 -05:00
Mike Reeves
abd121733f Merge branch 'master' into mastermerger 2022-02-07 08:34:17 -05:00
m0duspwnens
7c31eb1288 mount iso at different point 2022-02-04 16:07:06 -05:00
m0duspwnens
780aace854 set AGDOCKER 2022-02-04 15:44:25 -05:00
m0duspwnens
eb0696b425 update dockers if -f used 2022-02-04 15:36:44 -05:00
m0duspwnens
267ef354c2 unmount iso after updating dockers 2022-02-04 15:09:35 -05:00
m0duspwnens
23fbf140ba soup with dockers from iso 2022-02-04 15:06:42 -05:00