Commit Graph

73 Commits

Author SHA1 Message Date
Jason Ertel
23414599ee use simple json (w/o template) to resolve sluggishness 2023-08-01 16:53:26 -04:00
Jason Ertel
05baaacc83 detect root using id command 2023-04-14 16:15:39 -04:00
Jason Ertel
66bb829505 if -i, either success or failure must be present 2023-03-06 22:18:08 -05:00
Jason Ertel
b641dc37b6 use high error code to flag an unrecoverable error 2023-03-06 18:56:04 -05:00
Jason Ertel
f77068f73f setup and so-verify/so-status interop 2023-03-06 18:37:37 -05:00
Jason Ertel
8e63909edf improve so-status rendering on terminals that only support 8 colors 2022-12-21 10:11:38 -05:00
Doug Burks
894434715b so-status should ignore commented entries in so-status.conf
Import mode comments out so-steno, so-suricata, and so-zeek in so-status.conf, so so-status should ignore these lines.
2022-12-20 09:05:07 -05:00
doug
b9e51fc7cf first round of fixes for eval mode 2022-12-16 13:24:02 -05:00
Jason Ertel
9542a5ada2 complete rewrite of so-status 2022-09-16 17:46:52 -04:00
Mike Reeves
3785b97d95 so-status 2022-09-08 08:48:49 -04:00
Mike Reeves
c9dd2beaaa Move In Day 2022-09-07 09:15:58 -04:00
Mike Reeves
2bd9dd80e2 Move In Day 2022-09-07 09:06:25 -04: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
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
Jason Ertel
eefcc929c2 Update copyright pattern to match other repos 2022-01-24 10:09:23 -05:00
Jason Ertel
7c22f46a55 Update copyright year for 2022 2022-01-24 09:35:29 -05:00
Mike Reeves
4ef38f8d04 Add EPS and RAID status collection for telegraf 2021-01-25 19:14:46 -05:00
m0duspwnens
83e7493691 add description for exit code 99 2021-01-07 11:23:39 -05:00
m0duspwnens
a5735e6654 return 99 if setup is running 2021-01-06 20:14:42 -05:00
m0duspwnens
ae7c0a26be add a quiet mode to so-status for automation testing 2021-01-06 18:46:21 -05:00
m0duspwnens
0d9b22fe2d fix so-status to work with so.status module and change padding 2020-11-16 16:33:29 -05:00
m0duspwnens
5a95159ec3 just use so-status.conf for containers to fix salt warning https://github.com/Security-Onion-Solutions/securityonion/issues/1681 2020-11-11 11:38:48 -05:00
m0duspwnens
1fca5e65df redo how containers get added to so-status https://github.com/Security-Onion-Solutions/securityonion/issues/1681 2020-11-10 15:31:47 -05:00
m0duspwnens
66cd91c0a7 make so-status line color same as service state https://github.com/Security-Onion-Solutions/securityonion/issues/1864 2020-11-09 18:16:02 -05:00
m0duspwnens
7eb0dab6c7 increase padding by 1 - https://github.com/Security-Onion-Solutions/securityonion/issues/1536 2020-11-05 19:08:19 -05:00
m0duspwnens
21b284fb10 show if disabled regardless of highstate status - https://github.com/Security-Onion-Solutions/securityonion/issues/1764 2020-11-05 18:46:11 -05:00