Commit Graph
8 Commits
Author SHA1 Message Date
PeteandGitHub e53e7768a0 check status before stopping service
resolves #12811 so-verify detects rare false error

If salt is uninstalled during call to so-setup where it detects a previous install, the "Failed" keyword from "systemctl stop $service" causes so-verify to falsely detect an installation error.  This might happen if the user removes the salt packages between calls to so-setup, or if upgrading from Ubuntu 20.04 to 22.04 then installing 2.4.xx on top of a 2.3.xx installation.

The fix is to wrap the call to stop the service in a check if the service is running.

This ignores the setting of pid var, as the next use of pid is within a while loop that will not execute for the same reason the systemctl stop call was not launched in the background.
2024-04-23 21:24:39 +00:00
PeteandGitHub cf83d1cb86 feat: use mountpoint for Elastic log limit
Instead of just existence, this checks if the directories are separate mountpoints when determining disk size and log_size_limit calculations.

It also sets the percentage to 80 if /nsm/elasticsearch is a separate mountpoint.  This allows for better disk utilization on server configurations where /nsm is based on large slow HDDs for increased PCAP retention but /nsm/elasticsearch is based on SSDs for faster Elasticsearch performance.
2024-02-02 12:25:16 -05:00
PeteandGitHub 7a29b3a529 call salt before stopping salt services
salt-call does not work when the salt-master is not running.  If these calls are to succeed, they should occur before the salt services are stopped.
2024-02-02 08:45:01 -05:00
PeteandGitHub 1192dbd530 also remove intca symlink
The symlink is created in init.sls; it should be removed here.
2024-01-31 09:01:56 -05:00
PeteandGitHub e7581036f7 remove tty/interactive flags
This call to docker exec simply returns a number.  No interaction (stdin) or tty is required.  Specifically, having the -t option prevents running via salt using a command such as:

> salt '*' cmd.run 'so-redis-count'
2021-10-13 13:51:05 -04:00
PeteandGitHub 19efa493ad missing dollarsign 2021-09-21 11:21:07 -04:00
PeteandGitHub b80dd1ef3e fix 5-second sleep
using wait here instead of sleep tries to wait until pid 5 exits and generates the error
> /usr/sbin/so-playbook-reset: line 25: wait: pid 5 is not a child of this shell
2021-04-30 20:21:50 +00:00
PeteandGitHub 29c5f3212f make log_size_limit calculation more specific
Extend the directory traversal into /nsm/elasticsearch in case that's a separate mountpoint from /nsm/.
2021-02-17 16:53:31 +00:00