From cc60fa5ee25bffed9203a4f786256185b7fe0115 Mon Sep 17 00:00:00 2001

From: Nadia Pinaeva <npinaeva@redhat.com>

Date: Tue, 15 Mar 2022 11:49:57 +0100

Subject: [PATCH] Add ovs datapath and groups collection commands Add

 ct-zone-list command for openshift-ovn

Signed-off-by: Nadia Pinaeva <npinaeva@redhat.com>

---

 sos/report/plugins/openshift_ovn.py | 4 ++++

 sos/report/plugins/openvswitch.py   | 3 +++

 2 files changed, 7 insertions(+)

diff --git a/sos/report/plugins/openshift_ovn.py b/sos/report/plugins/openshift_ovn.py

index 168f1dd3..b4787b8e 100644

--- a/sos/report/plugins/openshift_ovn.py

+++ b/sos/report/plugins/openshift_ovn.py

@@ -34,6 +34,10 @@ class OpenshiftOVN(Plugin, RedHatPlugin):

             'ovn-appctl -t /var/run/ovn/ovnsb_db.ctl ' +

             'cluster/status OVN_Southbound'],

             container='ovnkube-master')

+        self.add_cmd_output([

+            'ovs-appctl -t /var/run/ovn/ovn-controller.*.ctl ' +

+            'ct-zone-list'],

+            container='ovnkube-node')

         self.add_cmd_output([

             'ovs-appctl -t ovs-monitor-ipsec tunnels/show',

             'ipsec status',

diff --git a/sos/report/plugins/openvswitch.py b/sos/report/plugins/openvswitch.py

index 179d1532..159b0bd2 100644

--- a/sos/report/plugins/openvswitch.py

+++ b/sos/report/plugins/openvswitch.py

@@ -124,6 +124,8 @@ class OpenVSwitch(Plugin):

             "ovs-vsctl -t 5 list interface",

             # Capture OVS detailed information from all the bridges

             "ovs-vsctl -t 5 list bridge",

+            # Capture OVS datapath list

+            "ovs-vsctl -t 5 list datapath",

             # Capture DPDK queue to pmd mapping

             "ovs-appctl dpif-netdev/pmd-rxq-show",

             # Capture DPDK pmd stats

@@ -229,6 +231,7 @@ class OpenVSwitch(Plugin):

                     "ovs-ofctl queue-get-config %s" % br,

                     "ovs-ofctl queue-stats %s" % br,

                     "ovs-ofctl show %s" % br,

+                    "ovs-ofctl dump-groups %s" % br,

                 ])

                 # Flow protocols currently supported

-- 

2.27.0

From af40be92f502b35fa9d39ce4d4fea7d80c367830 Mon Sep 17 00:00:00 2001

From: Nadia Pinaeva <npinaeva@redhat.com>

Date: Tue, 15 Mar 2022 13:09:55 +0100

Subject: [PATCH] Improve sos collect for OCP: 1. wait for sos tmp project to

 be deleted (just calling delete changes project state to Terminating, and

 running a new sos collect is not possible before this project is fully

 deleted) 2. use --retries flag to copy sos reports from the nodes more

 reliably. The flag has been recently added to kubectl, and the most reliable

 way to check if it's available or not is to check command error output for

 "unknown flag" substring

Signed-off-by: Nadia Pinaeva <npinaeva@redhat.com>

---

 sos/collector/clusters/ocp.py  | 5 +++++

 sos/collector/transports/oc.py | 6 +++++-

 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/sos/collector/clusters/ocp.py b/sos/collector/clusters/ocp.py

index f1714239..9beb2f9b 100644

--- a/sos/collector/clusters/ocp.py

+++ b/sos/collector/clusters/ocp.py

@@ -128,6 +128,11 @@

             if not ret['status'] == 0:

                 self.log_error("Error deleting temporary project: %s"

                                % ret['output'])

+            ret = self.exec_primary_cmd("oc wait namespace/%s --for=delete "

+                                        "--timeout=30s" % self.project)

+            if not ret['status'] == 0:

+                self.log_error("Error waiting for temporary project to be "

+                               "deleted: %s" % ret['output'])

             # don't leave the config on a non-existing project

             self.exec_master_cmd("oc project default")

             self.project = None

diff --git a/sos/collector/transports/oc.py b/sos/collector/transports/oc.py

index 0fc9eee8..90a802b2 100644

--- a/sos/collector/transports/oc.py

+++ b/sos/collector/transports/oc.py

@@ -231,5 +231,9 @@ class OCTransport(RemoteTransport):

                 % (self.project, self.pod_name))

     def _retrieve_file(self, fname, dest):

-        cmd = self.run_oc("cp %s:%s %s" % (self.pod_name, fname, dest))

+        # check if --retries flag is available for given version of oc

+        result = self.run_oc("cp --retries", stderr=True)

+        flags = '' if "unknown flag" in result["output"] else '--retries=5'

+        cmd = self.run_oc("cp %s %s:%s %s"

+                          % (flags, self.pod_name, fname, dest))

         return cmd['status'] == 0

-- 

2.27.0

From 3b0676b90ff65f20eaba3062775ff72b89386ffc Mon Sep 17 00:00:00 2001

From: Jake Hunsaker <jhunsake@redhat.com>

Date: Tue, 22 Mar 2022 14:25:24 -0400

Subject: [PATCH] [Plugin] Allow plugins to define default command environment

 vars

Adds the ability for plugins to define a default set of environment vars

to pass to all commands executed by the plugin. This may be done either

via the new `set_default_cmd_environment()` or

`add_default_cmd_environment()` methods. The former will override any

previously set values, whereas the latter will add/update/modify any

existing values.

Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>

---

 sos/report/plugins/__init__.py                | 55 ++++++++++++++++++-

 .../plugin_tests/plugin_environment.py        | 44 +++++++++++++++

 .../fake_plugins/default_env_test.py          | 28 ++++++++++

 tests/unittests/plugin_tests.py               | 15 +++++

 4 files changed, 140 insertions(+), 2 deletions(-)

 create mode 100644 tests/report_tests/plugin_tests/plugin_environment.py

 create mode 100644 tests/test_data/fake_plugins/default_env_test.py

diff --git a/sos/report/plugins/__init__.py b/sos/report/plugins/__init__.py

index 336b4d22..74b4f4be 100644

--- a/sos/report/plugins/__init__.py

+++ b/sos/report/plugins/__init__.py

@@ -571,6 +571,7 @@ class Plugin():

         self.manifest = None

         self.skip_files = commons['cmdlineopts'].skip_files

         self.skip_commands = commons['cmdlineopts'].skip_commands

+        self.default_environment = {}

         self.soslog = self.commons['soslog'] if 'soslog' in self.commons \

             else logging.getLogger('sos')

@@ -542,6 +542,52 @@

         self.manifest.add_list('files', [])

         self.manifest.add_field('containers', {})

+    def set_default_cmd_environment(self, env_vars):

+        """

+        Specify a collection of environment variables that should always be

+        passed to commands being executed by this plugin.

+

+        :param env_vars:    The environment variables and their values to set

+        :type env_vars:     ``dict{ENV_VAR_NAME: ENV_VAR_VALUE}``

+        """

+        if not isinstance(env_vars, dict):

+            raise TypeError(

+                "Environment variables for Plugin must be specified by dict"

+            )

+        self.default_environment = env_vars

+        self._log_debug("Default environment for all commands now set to %s"

+                        % self.default_environment)

+

+    def add_default_cmd_environment(self, env_vars):

+        """

+        Add or modify a specific environment variable in the set of default

+        environment variables used by this Plugin.

+

+        :param env_vars:    The environment variables to add to the current

+                            set of env vars in use

+        :type env_vars:     ``dict``

+        """

+        if not isinstance(env_vars, dict):

+            raise TypeError("Environment variables must be added via dict")

+        self._log_debug("Adding %s to default environment" % env_vars)

+        self.default_environment.update(env_vars)

+

+    def _get_cmd_environment(self, env=None):

+        """

+        Get the merged set of environment variables for a command about to be

+        executed by this plugin.

+

+        :returns: The set of env vars to use for a command

+        :rtype: ``dict``

+        """

+        if env is None:

+            return self.default_environment

+        if not isinstance(env, dict):

+            raise TypeError("Command env vars must be passed as dict")

+        _env = self.default_environment.copy()

+        _env.update(env)

+        return _env

+

     def timeout_from_options(self, optname, plugoptname, default_timeout):

         """Returns either the default [plugin|cmd] timeout value, the value as

         provided on the commandline via -k plugin.[|cmd-]timeout=value, or the

@@ -2258,6 +2305,8 @@ class Plugin():

         _tags = list(set(_tags))

+        _env = self._get_cmd_environment(env)

+

         if chroot or self.commons['cmdlineopts'].chroot == 'always':

             root = self.sysroot

         else:

@@ -2068,7 +2068,7 @@

         result = sos_get_command_output(

             cmd, timeout=timeout, stderr=stderr, chroot=root,

-            chdir=runat, env=env, binary=binary, sizelimit=sizelimit,

+            chdir=runat, env=_env, binary=binary, sizelimit=sizelimit,

             poller=self.check_timeout, foreground=foreground

         )

@@ -2510,6 +2559,8 @@ class Plugin():

         else:

             root = None

+        _env = self._get_cmd_environment(env)

+

         if container:

             if self._get_container_runtime() is None:

                 self._log_info("Cannot run cmd '%s' in container %s: no "

@@ -2522,7 +2573,7 @@ class Plugin():

                                "container is running." % (cmd, container))

         return sos_get_command_output(cmd, timeout=timeout, chroot=root,

-                                      chdir=runat, binary=binary, env=env,

+                                      chdir=runat, binary=binary, env=_env,

                                       foreground=foreground, stderr=stderr)

     def _add_container_file_to_manifest(self, container, path, arcpath, tags):

diff --git a/tests/report_tests/plugin_tests/plugin_environment.py b/tests/report_tests/plugin_tests/plugin_environment.py

new file mode 100644

index 00000000..3158437a

--- /dev/null

+++ b/tests/report_tests/plugin_tests/plugin_environment.py

@@ -0,0 +1,44 @@

+# This file is part of the sos project: https://github.com/sosreport/sos

+#

+# This copyrighted material is made available to anyone wishing to use,

+# modify, copy, or redistribute it subject to the terms and conditions of

+# version 2 of the GNU General Public License.

+#

+# See the LICENSE file in the source distribution for further information.

+

+import os

+

+from sos_tests import StageTwoReportTest

+

+

+class PluginDefaultEnvironmentTest(StageTwoReportTest):

+    """

+    Ensure that being able to set a default set of environment variables is

+    working correctly and does not leave a lingering env var on the system

+

+    :avocado: tags=stageone

+    """

+

+    install_plugins = ['default_env_test']

+    sos_cmd = '-o default_env_test'

+

+    def test_environment_used_in_cmd(self):

+        self.assertFileHasContent(

+            'sos_commands/default_env_test/env_var_test',

+            'Does Linus play hockey?'

+        )

+

+    def test_environment_setting_logged(self):

+        self.assertSosLogContains(

+            'Default environment for all commands now set to'

+        )

+

+    def test_environment_not_set_on_host(self):

+        self.assertTrue('TORVALDS' not in os.environ)

+        self.assertTrue('GREATESTSPORT' not in os.environ)

+

+    def test_environment_not_captured(self):

+        # we should still have an empty environment file

+        self.assertFileCollected('environment')

+        self.assertFileNotHasContent('environment', 'TORVALDS')

+        self.assertFileNotHasContent('environment', 'GREATESTSPORT')

diff --git a/tests/test_data/fake_plugins/default_env_test.py b/tests/test_data/fake_plugins/default_env_test.py

new file mode 100644

index 00000000..d1d1fb78

--- /dev/null

+++ b/tests/test_data/fake_plugins/default_env_test.py

@@ -0,0 +1,28 @@

+# This file is part of the sos project: https://github.com/sosreport/sos

+#

+# This copyrighted material is made available to anyone wishing to use,

+# modify, copy, or redistribute it subject to the terms and conditions of

+# version 2 of the GNU General Public License.

+#

+# See the LICENSE file in the source distribution for further information.

+

+from sos.report.plugins import Plugin, IndependentPlugin

+

+

+class DefaultEnv(Plugin, IndependentPlugin):

+

+    plugin_name = 'default_env_test'

+    short_desc = 'Fake plugin to test default env var handling'

+

+    def setup(self):

+        self.set_default_cmd_environment({

+            'TORVALDS': 'Linus',

+            'GREATESTSPORT': 'hockey'

+        })

+

+        self.add_cmd_output(

+            "sh -c 'echo Does '$TORVALDS' play '$GREATESTSPORT'?'",

+            suggest_filename='env_var_test'

+        )

+

+        self.add_env_var(['TORVALDS', 'GREATESTSPORT'])

diff --git a/tests/unittests/plugin_tests.py b/tests/unittests/plugin_tests.py

index 0dfa243d..e469b78e 100644

--- a/tests/unittests/plugin_tests.py

+++ b/tests/unittests/plugin_tests.py

@@ -305,6 +305,21 @@ class PluginTests(unittest.TestCase):

         p.postproc()

         self.assertTrue(p.did_postproc)

+    def test_set_default_cmd_env(self):

+        p = MockPlugin({

+            'sysroot': self.sysroot,

+            'policy': LinuxPolicy(init=InitSystem(), probe_runtime=False),

+            'cmdlineopts': MockOptions(),

+            'devices': {}

+        })

+        e = {'TORVALDS': 'Linus'}

+        p.set_default_cmd_environment(e)

+        self.assertEquals(p.default_environment, e)

+        add_e = {'GREATESTSPORT': 'hockey'}

+        p.add_default_cmd_environment(add_e)

+        self.assertEquals(p.default_environment['GREATESTSPORT'], 'hockey')

+        self.assertEquals(p.default_environment['TORVALDS'], 'Linus')

+

 class AddCopySpecTests(unittest.TestCase):

-- 

2.27.0

From 1e12325efaa500d304dcbfbeeb50e72ed0f938f5 Mon Sep 17 00:00:00 2001

From: Vladislav Walek <22072258+vwalek@users.noreply.github.com>

Date: Thu, 17 Mar 2022 14:10:26 -0700

Subject: [PATCH] [openshift] Adding ability to use the localhost.kubeconfig

 and KUBECONFIG env to use system:admin

Signed-off-by: Vladislav Walek <22072258+vwalek@users.noreply.github.com>

---

 sos/report/plugins/openshift.py | 45 +++++++++++++++++++++++++++++++--

 1 file changed, 43 insertions(+), 2 deletions(-)

diff --git a/sos/report/plugins/openshift.py b/sos/report/plugins/openshift.py

index 5ae38178..d643f04c 100644

--- a/sos/report/plugins/openshift.py

+++ b/sos/report/plugins/openshift.py

@@ -60,11 +60,18 @@

     profiles = ('openshift',)

     packages = ('openshift-hyperkube',)

+    master_localhost_kubeconfig = (

+        '/etc/kubernetes/static-pod-resources/'

+        'kube-apiserver-certs/secrets/node-kubeconfigs/localhost.kubeconfig'

+        )

+

     option_list = [

         ('token', 'admin token to allow API queries', 'fast', None),

+        ('kubeconfig', 'Path to a locally available kubeconfig file',

+         'fast', None),

         ('host', 'host address to use for oc login, including port', 'fast',

          'https://localhost:6443'),

-        ('no-oc', 'do not collect `oc` command output', 'fast', False),

+        ('no-oc', 'do not collect `oc` command output', 'fast', True),

         ('podlogs', 'collect logs from each pod', 'fast', True),

         ('podlogs-filter', ('limit podlogs collection to pods matching this '

          'regex'), 'fast', ''),

@@ -73,6 +80,10 @@ class Openshift(Plugin, RedHatPlugin):

         """Check to see if we can run `oc` commands"""

         return self.exec_cmd('oc whoami')['status'] == 0

+    def _check_localhost_kubeconfig(self):

+        """Check if the localhost.kubeconfig exists with system:admin user"""

+        return self.path_exists(self.get_option('kubeconfig'))

+

     def _check_oc_logged_in(self):

         """See if we're logged in to the API service, and if not attempt to do

         so using provided plugin options

@@ -80,8 +91,38 @@ class Openshift(Plugin, RedHatPlugin):

         if self._check_oc_function():

             return True

-        # Not logged in currently, attempt to do so

+        if self.get_option('kubeconfig') is None:

+            # If admin doesn't add the kubeconfig

+            # use default localhost.kubeconfig

+            self.set_option(

+                'kubeconfig',

+                self.master_localhost_kubeconfig

+            )

+

+        # Check first if we can use the localhost.kubeconfig before

+        # using token. We don't want to use 'host' option due we use

+        # cluster url from kubeconfig. Default is localhost.

+        if self._check_localhost_kubeconfig():

+            self.set_default_cmd_environment({

+                'KUBECONFIG': self.get_option('kubeconfig')

+            })

+

+            oc_res = self.exec_cmd(

+                "oc login -u system:admin "

+                "--insecure-skip-tls-verify=True"

+            )

+            if oc_res['status'] == 0 and self._check_oc_function():

+                return True

+

+            self._log_warn(

+                "The login command failed with status: %s and error: %s"

+                % (oc_res['status'], oc_res['output'])

+            )

+            return False

+

+        # If kubeconfig is not defined, check if token is provided.

         token = self.get_option('token') or os.getenv('SOSOCPTOKEN', None)

+

         if token:

             oc_res = self.exec_cmd("oc login %s --token=%s "

                                    "--insecure-skip-tls-verify=True"

-- 

2.27.0

From 3b84b4ccfa9e4924a5a3829d3810568dfb69bf63 Mon Sep 17 00:00:00 2001

From: Jake Hunsaker <jhunsake@redhat.com>

Date: Fri, 18 Mar 2022 16:25:35 -0400

Subject: [PATCH 1/2] [pacemaker] Redesign node enumeration logic

It has been found that `pcs status` output is liable to change, which

ends up breaking our parsing of node lists when using it on newer

versions.

Instead, first try to parse through `crm_mon` output, which is what `pcs

status` uses under the hood, but as a stable and reliable xml format.

Failing that, for example if the `--primary` node is not functioning as

part of the cluster, source `/etc/corosync/corosync.conf` instead.

Related: RHBZ2065805

Related: RHBZ2065811

Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>

---

 sos/collector/clusters/pacemaker.py | 110 +++++++++++++++++++---------

 1 file changed, 76 insertions(+), 34 deletions(-)

diff --git a/sos/collector/clusters/pacemaker.py b/sos/collector/clusters/pacemaker.py

index 55024314..49d0ce51 100644

--- a/sos/collector/clusters/pacemaker.py

+++ b/sos/collector/clusters/pacemaker.py

@@ -8,7 +8,11 @@

 #

 # See the LICENSE file in the source distribution for further information.

+import re

+

 from sos.collector.clusters import Cluster

+from setuptools._vendor.packaging import version

+from xml.etree import ElementTree

 class pacemaker(Cluster):

@@ -18,42 +22,80 @@ class pacemaker(Cluster):

     packages = ('pacemaker',)

     option_list = [

         ('online', True, 'Collect nodes listed as online'),

-        ('offline', True, 'Collect nodes listed as offline')

+        ('offline', True, 'Collect nodes listed as offline'),

+        ('only-corosync', False, 'Only use corosync.conf to enumerate nodes')

     ]

     def get_nodes(self):

-        self.res = self.exec_primary_cmd('pcs status')

-        if self.res['status'] != 0:

-            self.log_error('Cluster status could not be determined. Is the '

-                           'cluster running on this node?')

-            return []

-        if 'node names do not match' in self.res['output']:

-            self.log_warn('Warning: node name mismatch reported. Attempts to '

-                          'connect to some nodes may fail.\n')

-        return self.parse_pcs_output()

-

-    def parse_pcs_output(self):

-        nodes = []

-        if self.get_option('online'):

-            nodes += self.get_online_nodes()

-        if self.get_option('offline'):

-            nodes += self.get_offline_nodes()

-        return nodes

-

-    def get_online_nodes(self):

-        for line in self.res['output'].splitlines():

-            if line.startswith('Online:'):

-                nodes = line.split('[')[1].split(']')[0]

-                return [n for n in nodes.split(' ') if n]

-

-    def get_offline_nodes(self):

-        offline = []

-        for line in self.res['output'].splitlines():

-            if line.startswith('Node') and line.endswith('(offline)'):

-                offline.append(line.split()[1].replace(':', ''))

-            if line.startswith('OFFLINE:'):

-                nodes = line.split('[')[1].split(']')[0]

-                offline.extend([n for n in nodes.split(' ') if n])

-        return offline

+        self.nodes = []

+        # try crm_mon first

+        try:

+            if not self.get_option('only-corosync'):

+                try:

+                    self.get_nodes_from_crm()

+                except Exception as err:

+                    self.log_warn("Falling back to sourcing corosync.conf. "

+                                  "Could not parse crm_mon output: %s" % err)

+            if not self.nodes:

+                # fallback to corosync.conf, in case the node we're inspecting

+                # is offline from the cluster

+                self.get_nodes_from_corosync()

+        except Exception as err:

+            self.log_error("Could not determine nodes from cluster: %s" % err)

+

+        _shorts = [n for n in self.nodes if '.' not in n]

+        if _shorts:

+            self.log_warn(

+                "WARNING: Node addresses '%s' may not resolve locally if you "

+                "are not running on a node in the cluster. Try using option "

+                "'-c pacemaker.only-corosync' if these connections fail."

+                % ','.join(_shorts)

+            )

+        return self.nodes

+

+    def get_nodes_from_crm(self):

+        """

+        Try to parse crm_mon output for node list and status.

+        """

+        xmlopt = '--output-as=xml'

+        # older pacemaker had a different option for xml output

+        _ver = self.exec_primary_cmd('crm_mon --version')

+        if _ver['status'] == 0:

+            cver = _ver['output'].split()[1].split('-')[0]

+            if not version.parse(cver) > version.parse('2.0.3'):

+                xmlopt = '--as-xml'

+        else:

+            return

+        _out = self.exec_primary_cmd(

+            "crm_mon --one-shot --inactive %s" % xmlopt,

+            need_root=True

+        )

+        if _out['status'] == 0:

+            self.parse_crm_xml(_out['output'])

+

+    def parse_crm_xml(self, xmlstring):

+        """

+        Parse the xml output string provided by crm_mon

+        """

+        _xml = ElementTree.fromstring(xmlstring)

+        nodes = _xml.find('nodes')

+        for node in nodes:

+            _node = node.attrib

+            if self.get_option('online') and _node['online'] == 'true':

+                self.nodes.append(_node['name'])

+            elif self.get_option('offline') and _node['online'] == 'false':

+                self.nodes.append(_node['name'])

+

+    def get_nodes_from_corosync(self):

+        """

+        As a fallback measure, read corosync.conf to get the node list. Note

+        that this prevents us from separating online nodes from offline nodes.

+        """

+        self.log_warn("WARNING: unable to distinguish online nodes from "

+                      "offline nodes when sourcing from corosync.conf")

+        cc = self.primary.read_file('/etc/corosync/corosync.conf')

+        nodes = re.findall(r'((\sring0_addr:)(.*))', cc)

+        for node in nodes:

+            self.nodes.append(node[-1].strip())

 # vim: set et ts=4 sw=4 :

-- 

2.27.0

From 6701a7d77ecc998b018b54ecc00f9fd102ae9518 Mon Sep 17 00:00:00 2001

From: Jake Hunsaker <jhunsake@redhat.com>

Date: Mon, 21 Mar 2022 12:05:59 -0400

Subject: [PATCH 2/2] [clusters] Allow clusters to not add localhost to node

 list

For most of our supported clusters, we end up needing to add the

local host executing `sos collect` to the node list (unless `--no-local`

is used) as that accounts for the primary node that may otherwise be

left off. However, this is not helpful for clusters that may reports

node names as something other than resolveable names. In those cases,

such as with pacemaker, adding the local hostname may result in

duplicate collections.

Add a toggle to cluster profiles via a new `strict_node_list` class attr

that, if True, will skip this addition. This toggle is default `False`

to preserve existing behavior, and is now enabled for `pacemaker`

specifically.

Related: RHBZ#2065821

Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>

---

 sos/collector/__init__.py           | 3 ++-

 sos/collector/clusters/__init__.py  | 4 ++++

 sos/collector/clusters/pacemaker.py | 1 +

 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/sos/collector/__init__.py b/sos/collector/__init__.py

index a8bb0064..d898ca34 100644

--- a/sos/collector/__init__.py

+++ b/sos/collector/__init__.py

@@ -1073,7 +1073,8 @@ class SoSCollector(SoSComponent):

             for node in self.node_list:

                 if host == node.split('.')[0]:

                     self.node_list.remove(node)

-            self.node_list.append(self.hostname)

+            if not self.cluster.strict_node_list:

+                self.node_list.append(self.hostname)

         self.reduce_node_list()

         try:

             _node_max = len(max(self.node_list, key=len))

diff --git a/sos/collector/clusters/__init__.py b/sos/collector/clusters/__init__.py

index f3f550ad..f00677b8 100644

--- a/sos/collector/clusters/__init__.py

+++ b/sos/collector/clusters/__init__.py

@@ -56,6 +56,10 @@

     sos_plugin_options = {}

     sos_preset = ''

     cluster_name = None

+    # set this to True if the local host running collect should *not* be

+    # forcibly added to the node list. This can be helpful in situations where

+    # the host's fqdn and the name the cluster uses are different

+    strict_node_list = False

     def __init__(self, commons):

         self.master = None

diff --git a/sos/collector/clusters/pacemaker.py b/sos/collector/clusters/pacemaker.py

index 49d0ce51..bebcb265 100644

--- a/sos/collector/clusters/pacemaker.py

+++ b/sos/collector/clusters/pacemaker.py

@@ -20,6 +20,7 @@ class pacemaker(Cluster):

     cluster_name = 'Pacemaker High Availability Cluster Manager'

     sos_plugins = ['pacemaker']

     packages = ('pacemaker',)

+    strict_node_list = True

     option_list = [

         ('online', True, 'Collect nodes listed as online'),

         ('offline', True, 'Collect nodes listed as offline'),

-- 

2.27.0

From 61765992812afb785e9552e01e3b5579118a6963 Mon Sep 17 00:00:00 2001

From: Nadia Pinaeva <npinaeva@redhat.com>

Date: Fri, 1 Apr 2022 12:05:36 +0200

Subject: [PATCH] Add one more container for plugin enablement

Signed-off-by: Nadia Pinaeva <npinaeva@redhat.com>

---

 sos/report/plugins/openshift_ovn.py | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sos/report/plugins/openshift_ovn.py b/sos/report/plugins/openshift_ovn.py

index b4787b8e..98522b1e 100644

--- a/sos/report/plugins/openshift_ovn.py

+++ b/sos/report/plugins/openshift_ovn.py

@@ -16,7 +16,7 @@ class OpenshiftOVN(Plugin, RedHatPlugin):

     """

     short_desc = 'Openshift OVN'

     plugin_name = "openshift_ovn"

-    containers = ('ovnkube-master', 'ovn-ipsec')

+    containers = ('ovnkube-master', 'ovnkube-node', 'ovn-ipsec')

     profiles = ('openshift',)

     def setup(self):

-- 

2.27.0

From d3aa071efc85507341cf65dd61414a734654f50a Mon Sep 17 00:00:00 2001

From: Jake Hunsaker <jhunsake@redhat.com>

Date: Mon, 28 Mar 2022 14:47:09 -0400

Subject: [PATCH] [presets] Adjust OCP preset options

Adjust the options used by the 'ocp' preset to better reflect the

current collection needs and approach.

This includes disabling the `cgroups` plugin due to the large amount of

mostly irrelevant data captured due to the high number of containers

present on OCP nodes, ensuring the `--container-runtime` option is set

to `crio` to align container-based collections, disabling HTML report

generation and increasing the base log size rather than blindly enabling

all-logs.

Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>

---

 sos/presets/redhat/__init__.py | 13 +++++++++----

 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/sos/presets/redhat/__init__.py b/sos/presets/redhat/__init__.py

index 865c9b6b..0b9f6f11 100644

--- a/sos/presets/redhat/__init__.py

+++ b/sos/presets/redhat/__init__.py

@@ -36,10 +36,15 @@ RHOSP_OPTS = SoSOptions(plugopts=[

 RHOCP = "ocp"

 RHOCP_DESC = "OpenShift Container Platform by Red Hat"

-RHOCP_OPTS = SoSOptions(all_logs=True, verify=True, plugopts=[

-                             'networking.timeout=600',

-                             'networking.ethtool_namespaces=False',

-                             'networking.namespaces=200'])

+RHOCP_OPTS = SoSOptions(

+    verify=True, skip_plugins=['cgroups'], container_runtime='crio',

+    no_report=True, log_size=100,