[redhat] Backports of enhancements for RHEL7

sos/plugins/candlepin.py

@@ -83,6 +83,13 @@ def setup(self):
         self.add_cmd_output(_cmd, suggest_filename='candlepin_db_tables_sizes',
                             env=self.env)
 
+	_cmd = self.build_query_cmd("\
+            SELECT displayname, content_access_mode \
+            FROM cp_owner;")
+        self.add_cmd_output(_cmd,
+                            suggest_filename='simple_content_access',
+                            env=self.env)
+
     def build_query_cmd(self, query, csv=False):
         """
         Builds the command needed to invoke the pgsql query as the postgres

sos/plugins/foreman.py

@@ -290,7 +290,12 @@ def postproc(self):
             "/var/log/foreman-installer/sat*",
             sat_debug_reg,
             r"\1 \2 ********")
+        # also hide passwords in yet different formats
         self.do_path_regex_sub(
+            "/var/log/foreman-installer/sat*",
+	    r"(\.|_|-)password(=\'|=|\", \")(\w*)",
+            r"\1password\2********")
+	self.do_path_regex_sub(
             "/var/log/foreman-installer/foreman-proxy*",
             r"(\s*proxy_password\s=) (.*)",
             r"\1 ********")

sos/plugins/rpm.py

@@ -61,4 +61,6 @@ def add_rpm_cmd(query_fmt, filter_cmd, symlink, suggest):
                                 suggest_filename='lsof_D_var_lib_rpm')
             self.add_copy_spec("/var/lib/rpm")
 
+        self.add_cmd_output("rpm --showrc")
+
 # vim: set et ts=4 sw=4 :