From a3d5b1fd00087886ec08d98d7070ba641f4e0155 Mon Sep 17 00:00:00 2001 From: Jose Castillo Date: Sat, 2 Nov 2024 08:13:47 +0000 Subject: [PATCH] [manpages|policies] Update location of presets and collect groups Continue changes started in #3829 from /var/lib to /etc/sos Related: #3829, #3826 Signed-off-by: Jose Castillo --- man/en/sos-collect.1 | 6 +++--- sos/policies/__init__.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/man/en/sos-collect.1 b/man/en/sos-collect.1 index 183e11a082..ba083f3724 100644 --- a/man/en/sos-collect.1 +++ b/man/en/sos-collect.1 @@ -161,7 +161,7 @@ rather than key-pair encryption. Specify an existing host group definition to use. Host groups are pre-defined settings for the cluster-type, primary node, and nodes options -saved in JSON-formatted files under /var/lib/sos collect/. +saved in JSON-formatted files under /etc/sos/groups.d/. If cluster_type and/or primary are set in the group, sos collect behaves as if these values were specified on the command-line. @@ -169,7 +169,7 @@ these values were specified on the command-line. If nodes is defined, sos collect \fBextends\fR the \fB\-\-nodes\fR option, if set, with the nodes or regexes listed in the group. -Note that sos collect will only write group definitions to /var/lib/sos collect/ +Note that sos collect will only write group definitions to /etc/sos/groups.d/ however the GROUP value may be a filename for any group definitions that exist outside of the default location. If you are manually writing these files, use the value \fBnull\fR when a python NoneType is expected. Caveat: use \fBstring\fR 'none' if setting cluster_type @@ -178,7 +178,7 @@ to none. \fB\-\-save\-group\fR GROUP Save the results of this run of sos collect to a host group definition. -sos-collector will write a JSON-formatted file with name GROUP to /var/lib/sos collect/ +sos-collector will write a JSON-formatted file with name GROUP to /etc/sos/groups.d/ with the settings for cluster-type, primary, and the node list as discovered by cluster enumeration. Note that this means regexes are not directly saved to host groups, but the results of matching against those regexes are. diff --git a/sos/policies/__init__.py b/sos/policies/__init__.py index 4394f29e7f..35b3a53261 100644 --- a/sos/policies/__init__.py +++ b/sos/policies/__init__.py @@ -548,7 +548,7 @@ def load_presets(self, presets_path=None): """Load presets from disk. Read JSON formatted preset data from the specified path, - or the default location at ``/var/lib/sos/presets``. + or the default location at ``/etc/sos/presets.d``. :param presets_path: a directory containing JSON presets. """