Commit Graph

47 Commits

Author SHA1 Message Date
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
m0duspwnens
c7b4a5351c fix logic - https://github.com/Security-Onion-Solutions/securityonion/issues/1764 2020-11-05 18:17:11 -05:00
m0duspwnens
a95129b8c2 add color - https://github.com/Security-Onion-Solutions/securityonion/issues/1764 2020-11-05 18:03:42 -05:00
m0duspwnens
695bace3e8 https://github.com/Security-Onion-Solutions/securityonion/issues/1764 2020-11-05 17:54:10 -05:00
m0duspwnens
47cac59adb https://github.com/Security-Onion-Solutions/securityonion/issues/1764 2020-11-05 17:52:28 -05:00
m0duspwnens
1a75ebdca3 https://github.com/Security-Onion-Solutions/securityonion/issues/1764 2020-11-05 17:51:51 -05:00
m0duspwnens
8da070d511 https://github.com/Security-Onion-Solutions/securityonion/issues/1764 2020-11-05 17:46:23 -05:00
m0duspwnens
0bfdef274b update so-status to work with disabled containers - https://github.com/Security-Onion-Solutions/securityonion/issues/1601 2020-10-22 12:09:19 -04:00
m0duspwnens
b559e5dd32 change how we determine how to run so-status 2020-09-14 12:40:39 -04:00
m0duspwnens
b93d149631 fix so-status 2020-09-14 09:36:26 -04:00
m0duspwnens
77911acfb4 so-status module 2020-09-11 18:28:53 -04:00
m0duspwnens
39f200f565 fix whitespace 2020-09-09 14:59:21 -04:00
m0duspwnens
921262b9a5 prevent duplicate containers for so-stauts 2020-09-09 14:07:38 -04:00
m0duspwnens
0a6f0efdc5 Sort so-status output alphabetically - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/747 2020-05-21 09:21:28 -04:00
m0duspwnens
e2244bd839 use maps for so-status - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/619 2020-05-01 13:21:11 -04:00
William Wernert
ae4db04603 [fix] so-status docker api version fix
* Change Docker api version from 2 to 1.40
2020-04-03 13:28:53 -04:00
William Wernert
7709bfd28e [fix] Use v2 of Docker http api
Docker no longer exposes the default api path, so we need to use /v2 in our api call
2020-03-26 18:47:37 -04:00
Josh Brower
9bcba41882 Feature/Fleet-Standalone 2020-03-24 20:57:24 -04:00
William Wernert
301ff77501 [fix] Jinja2 templating comparisons 2020-02-09 22:30:39 -05:00
William Wernert
2804247f88 [fix] Syntax errors in so-status 2020-02-09 22:30:36 -05:00
William Wernert
7c00e7c286 [feature] Final changes for so-status re: predefined container list 2020-02-06 15:25:50 -05:00
William Wernert
981dfa1cb2 chmod +x script changes 2020-02-05 11:39:37 -05:00
William Wernert
f839f38553 Fix for jinja error 2020-01-30 12:40:39 -05:00
William Wernert
5bd037e88c Initial so-status script 2020-01-28 21:42:47 -05:00