[plugins] let all plugins use add_copy_spec() instead of add_copy_spec_limit()

The difference between add_copy_spec() has been removed.
This is in preparation of removing the add_copy_spec_limit()
special case altogether.

Signed-off-by: Michael Adam <obnox@samba.org>

40 files changed, 129 insertions, 174 deletions

diff --git a/sos/plugins/apache.py b/sos/plugins/apache.py
index 5a12e32c..c32c283a 100644
--- a/sos/plugins/apache.py
+++ b/sos/plugins/apache.py
@@ -56,20 +56,20 @@ class RedHatApache(Apache, RedHatPlugin):
         self.add_forbidden_path("/etc/httpd/conf/password.conf")
 
         # collect only the current log set by default
-        self.add_copy_spec_limit("/var/log/httpd/access_log", 5)
-        self.add_copy_spec_limit("/var/log/httpd/error_log", 5)
-        self.add_copy_spec_limit("/var/log/httpd/ssl_access_log", 5)
-        self.add_copy_spec_limit("/var/log/httpd/ssl_error_log", 5)
+        self.add_copy_spec("/var/log/httpd/access_log", 5)
+        self.add_copy_spec("/var/log/httpd/error_log", 5)
+        self.add_copy_spec("/var/log/httpd/ssl_access_log", 5)
+        self.add_copy_spec("/var/log/httpd/ssl_error_log", 5)
         # JBoss Enterprise Web Server 2.x
-        self.add_copy_spec_limit("/var/log/httpd22/access_log", 5)
-        self.add_copy_spec_limit("/var/log/httpd22/error_log", 5)
-        self.add_copy_spec_limit("/var/log/httpd22/ssl_access_log", 5)
-        self.add_copy_spec_limit("/var/log/httpd22/ssl_error_log", 5)
+        self.add_copy_spec("/var/log/httpd22/access_log", 5)
+        self.add_copy_spec("/var/log/httpd22/error_log", 5)
+        self.add_copy_spec("/var/log/httpd22/ssl_access_log", 5)
+        self.add_copy_spec("/var/log/httpd22/ssl_error_log", 5)
         # Red Hat JBoss Web Server 3.x
-        self.add_copy_spec_limit("/var/log/httpd24/access_log", 5)
-        self.add_copy_spec_limit("/var/log/httpd24/error_log", 5)
-        self.add_copy_spec_limit("/var/log/httpd24/ssl_access_log", 5)
-        self.add_copy_spec_limit("/var/log/httpd24/ssl_error_log", 5)
+        self.add_copy_spec("/var/log/httpd24/access_log", 5)
+        self.add_copy_spec("/var/log/httpd24/error_log", 5)
+        self.add_copy_spec("/var/log/httpd24/ssl_access_log", 5)
+        self.add_copy_spec("/var/log/httpd24/ssl_error_log", 5)
         if self.get_option("log"):
             self.add_copy_spec([
                 "/var/log/httpd/*",
@@ -91,8 +91,8 @@ class DebianApache(Apache, DebianPlugin, UbuntuPlugin):
         ])
 
         # collect only the current log set by default
-        self.add_copy_spec_limit("/var/log/apache2/access_log", 15)
-        self.add_copy_spec_limit("/var/log/apache2/error_log", 15)
+        self.add_copy_spec("/var/log/apache2/access_log", 15)
+        self.add_copy_spec("/var/log/apache2/error_log", 15)
         if self.get_option("log"):
             self.add_copy_spec("/var/log/apache2/*")
 
diff --git a/sos/plugins/apport.py b/sos/plugins/apport.py
index a6b9ac49..29e223b0 100644
--- a/sos/plugins/apport.py
+++ b/sos/plugins/apport.py
@@ -26,10 +26,8 @@ class Apport(Plugin, DebianPlugin, UbuntuPlugin):
     def setup(self):
         if not self.get_option("all_logs"):
             limit = self.get_option("log_size")
-            self.add_copy_spec_limit("/var/log/apport.log",
-                                     sizelimit=limit)
-            self.add_copy_spec_limit("/var/log/apport.log.1",
-                                     sizelimit=limit)
+            self.add_copy_spec("/var/log/apport.log", sizelimit=limit)
+            self.add_copy_spec("/var/log/apport.log.1", sizelimit=limit)
         else:
             self.add_copy_spec("/var/log/apport*")
         self.add_copy_spec("/etc/apport/*")
diff --git a/sos/plugins/auditd.py b/sos/plugins/auditd.py
index 563c2cae..bae94769 100644
--- a/sos/plugins/auditd.py
+++ b/sos/plugins/auditd.py
@@ -36,8 +36,7 @@ class Auditd(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
 
         if not self.get_option("all_logs"):
             limit = self.get_option("log_size")
-            self.add_copy_spec_limit("/var/log/audit/audit.log",
-                                     sizelimit=limit)
+            self.add_copy_spec("/var/log/audit/audit.log", sizelimit=limit)
         else:
             self.add_copy_spec("/var/log/audit")
 
diff --git a/sos/plugins/cups.py b/sos/plugins/cups.py
index ada3d7f1..8f35c8d2 100644
--- a/sos/plugins/cups.py
+++ b/sos/plugins/cups.py
@@ -27,11 +27,9 @@ class Cups(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     def setup(self):
         if not self.get_option("all_logs"):
             limit = self.get_option("log_size")
-            self.add_copy_spec_limit("/var/log/cups/access_log",
-                                     sizelimit=limit)
-            self.add_copy_spec_limit("/var/log/cups/error_log",
-                                     sizelimit=limit)
-            self.add_copy_spec_limit("/var/log/cups/page_log", sizelimit=limit)
+            self.add_copy_spec("/var/log/cups/access_log", sizelimit=limit)
+            self.add_copy_spec("/var/log/cups/error_log", sizelimit=limit)
+            self.add_copy_spec("/var/log/cups/page_log", sizelimit=limit)
         else:
             self.add_copy_spec("/var/log/cups")
 
diff --git a/sos/plugins/dnf.py b/sos/plugins/dnf.py
index ce963ff2..22c10706 100644
--- a/sos/plugins/dnf.py
+++ b/sos/plugins/dnf.py
@@ -39,15 +39,12 @@ class DNFPlugin(Plugin, RedHatPlugin):
 
         self.limit = self.get_option("log_size")
         if self.get_option("all_logs"):
-            self.add_copy_spec_limit("/var/log/dnf.*",
-                                     sizelimit=self.limit)
+            self.add_copy_spec("/var/log/dnf.*", sizelimit=self.limit)
         else:
-            self.add_copy_spec_limit("/var/log/dnf.log",
-                                     sizelimit=self.limit)
-            self.add_copy_spec_limit("/var/log/dnf.librepo.log",
-                                     sizelimit=self.limit)
-            self.add_copy_spec_limit("/var/log/dnf.rpm.log",
-                                     sizelimit=self.limit)
+            self.add_copy_spec("/var/log/dnf.log", sizelimit=self.limit)
+            self.add_copy_spec("/var/log/dnf.librepo.log",
+                               sizelimit=self.limit)
+            self.add_copy_spec("/var/log/dnf.rpm.log", sizelimit=self.limit)
 
         self.add_cmd_output("dnf --version",
                             suggest_filename="dnf_version")
diff --git a/sos/plugins/dpkg.py b/sos/plugins/dpkg.py
index 8d3afb0a..be6e3390 100644
--- a/sos/plugins/dpkg.py
+++ b/sos/plugins/dpkg.py
@@ -34,8 +34,7 @@ class Dpkg(Plugin, DebianPlugin, UbuntuPlugin):
         ])
         if not self.get_option("all_logs"):
             limit = self.get_option("log_size")
-            self.add_copy_spec_limit("/var/log/dpkg.log",
-                                     sizelimit=limit)
+            self.add_copy_spec("/var/log/dpkg.log", sizelimit=limit)
         else:
             self.add_copy_spec("/var/log/dpkg.log*")
 
diff --git a/sos/plugins/gluster.py b/sos/plugins/gluster.py
index 47fb40de..4aedafa2 100644
--- a/sos/plugins/gluster.py
+++ b/sos/plugins/gluster.py
@@ -107,7 +107,7 @@ class Gluster(Plugin, RedHatPlugin):
             for f in (glob.glob("/var/log/glusterfs/*log") +
                       glob.glob("/var/log/glusterfs/*/*log") +
                       glob.glob("/var/log/glusterfs/geo-replication/*/*log")):
-                self.add_copy_spec_limit(f, limit)
+                self.add_copy_spec(f, limit)
         else:
             self.add_copy_spec("/var/log/glusterfs")
 
diff --git a/sos/plugins/infiniband.py b/sos/plugins/infiniband.py
index e56c232c..6a071fc6 100644
--- a/sos/plugins/infiniband.py
+++ b/sos/plugins/infiniband.py
@@ -32,8 +32,8 @@ class Infiniband(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
             "/etc/rdma"
         ])
 
-        self.add_copy_spec_limit("/var/log/opensm*",
-                                 sizelimit=self.get_option("log_size"))
+        self.add_copy_spec("/var/log/opensm*",
+                           sizelimit=self.get_option("log_size"))
 
         self.add_cmd_output([
             "ibv_devices",
diff --git a/sos/plugins/insights.py b/sos/plugins/insights.py
index 7978ce35..7cdfd172 100644
--- a/sos/plugins/insights.py
+++ b/sos/plugins/insights.py
@@ -27,11 +27,11 @@ class RedHatInsights(Plugin, RedHatPlugin):
         self.add_copy_spec(self.conf_file)
         self.limit = self.get_option("log_size")
         if self.get_option("all_logs"):
-            self.add_copy_spec_limit("/var/log/redhat-access-insights/*.log*",
-                                     sizelimit=self.limit)
+            self.add_copy_spec("/var/log/redhat-access-insights/*.log*",
+                               sizelimit=self.limit)
         else:
-            self.add_copy_spec_limit("/var/log/redhat-access-insights/*.log",
-                                     sizelimit=self.limit)
+            self.add_copy_spec("/var/log/redhat-access-insights/*.log",
+                               sizelimit=self.limit)
 
     def postproc(self):
         self.do_file_sub(
diff --git a/sos/plugins/juju.py b/sos/plugins/juju.py
index 629753fc..51760423 100644
--- a/sos/plugins/juju.py
+++ b/sos/plugins/juju.py
@@ -78,10 +78,8 @@ class Juju(Plugin, UbuntuPlugin):
 
     def setup(self):
         limit = self.get_option("log_size")
-        self.add_copy_spec_limit("/var/log/upstart/juju-db.log",
-                                 sizelimit=limit)
-        self.add_copy_spec_limit("/var/log/upstart/juju-db.log.1",
-                                 sizelimit=limit)
+        self.add_copy_spec("/var/log/upstart/juju-db.log", sizelimit=limit)
+        self.add_copy_spec("/var/log/upstart/juju-db.log.1", sizelimit=limit)
         if not self.get_option("all_logs"):
             # We need this because we want to collect to the limit of all
             # *.logs in the directory.
@@ -89,7 +87,7 @@ class Juju(Plugin, UbuntuPlugin):
                 for filename in os.listdir("/var/log/juju/"):
                     if filename.endswith(".log"):
                         fullname = os.path.join("/var/log/juju/" + filename)
-                        self.add_copy_spec_limit(fullname, sizelimit=limit)
+                        self.add_copy_spec(fullname, sizelimit=limit)
             self.add_cmd_output('ls -alRh /var/log/juju*')
             self.add_cmd_output('ls -alRh /var/lib/juju/*')
 
diff --git a/sos/plugins/kimchi.py b/sos/plugins/kimchi.py
index efb469ec..3097ed4a 100644
--- a/sos/plugins/kimchi.py
+++ b/sos/plugins/kimchi.py
@@ -28,12 +28,10 @@ class Kimchi(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin):
         log_limit = self.get_option('log_size')
         self.add_copy_spec('/etc/kimchi/')
         if not self.get_option('all_logs'):
-            self.add_copy_spec_limit('/var/log/kimchi/*.log',
-                                     sizelimit=log_limit)
-            self.add_copy_spec_limit('/etc/kimchi/kimchi*',
-                                     sizelimit=log_limit)
-            self.add_copy_spec_limit('/etc/kimchi/distros.d/*.json',
-                                     sizelimit=log_limit)
+            self.add_copy_spec('/var/log/kimchi/*.log', sizelimit=log_limit)
+            self.add_copy_spec('/etc/kimchi/kimchi*', sizelimit=log_limit)
+            self.add_copy_spec('/etc/kimchi/distros.d/*.json',
+                               sizelimit=log_limit)
         else:
             self.add_copy_spec('/var/log/kimchi/')
 
diff --git a/sos/plugins/landscape.py b/sos/plugins/landscape.py
index 7dfd4653..105c6d89 100644
--- a/sos/plugins/landscape.py
+++ b/sos/plugins/landscape.py
@@ -32,10 +32,9 @@ class Landscape(Plugin, UbuntuPlugin):
         self.add_copy_spec("/etc/default/landscape-server")
         if not self.get_option("all_logs"):
             limit = self.get_option("log_size")
-            self.add_copy_spec_limit("/var/log/landscape/*.log",
-                                     sizelimit=limit)
-            self.add_copy_spec_limit("/var/log/landscape-server/*.log",
-                                     sizelimit=limit)
+            self.add_copy_spec("/var/log/landscape/*.log", sizelimit=limit)
+            self.add_copy_spec("/var/log/landscape-server/*.log",
+                               sizelimit=limit)
         else:
             self.add_copy_spec("/var/log/landscape")
             self.add_copy_spec("/var/log/landscape-server")
diff --git a/sos/plugins/libvirt.py b/sos/plugins/libvirt.py
index eb444f3b..cbb4fb42 100644
--- a/sos/plugins/libvirt.py
+++ b/sos/plugins/libvirt.py
@@ -50,12 +50,10 @@ class Libvirt(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin):
         ])
 
         if not self.get_option("all_logs"):
-            self.add_copy_spec_limit("/var/log/libvirt/libvirtd.log",
-                                     sizelimit=5)
-            self.add_copy_spec_limit("/var/log/libvirt/qemu/*.log",
-                                     sizelimit=5)
-            self.add_copy_spec_limit("/var/log/libvirt/lxc/*.log", sizelimit=5)
-            self.add_copy_spec_limit("/var/log/libvirt/uml/*.log", sizelimit=5)
+            self.add_copy_spec("/var/log/libvirt/libvirtd.log", sizelimit=5)
+            self.add_copy_spec("/var/log/libvirt/qemu/*.log", sizelimit=5)
+            self.add_copy_spec("/var/log/libvirt/lxc/*.log", sizelimit=5)
+            self.add_copy_spec("/var/log/libvirt/uml/*.log", sizelimit=5)
         else:
             self.add_copy_spec("/var/log/libvirt")
 
diff --git a/sos/plugins/lightdm.py b/sos/plugins/lightdm.py
index 5c91860b..2a048e95 100644
--- a/sos/plugins/lightdm.py
+++ b/sos/plugins/lightdm.py
@@ -33,12 +33,10 @@ class LightDm(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
         ])
         if not self.get_option("all_logs"):
             limit = self.get_option("log_size")
-            self.add_copy_spec_limit("/var/log/lightdm/lightdm.log",
-                                     sizelimit=limit)
-            self.add_copy_spec_limit("/var/log/lightdm/x-0-greeter.log",
-                                     sizelimit=limit)
-            self.add_copy_spec_limit("/var/log/lightdm/x-0.log",
-                                     sizelimit=limit)
+            self.add_copy_spec("/var/log/lightdm/lightdm.log", sizelimit=limit)
+            self.add_copy_spec("/var/log/lightdm/x-0-greeter.log",
+                               sizelimit=limit)
+            self.add_copy_spec("/var/log/lightdm/x-0.log", sizelimit=limit)
         else:
             self.add_copy_spec("/var/log/lightdm")
 
diff --git a/sos/plugins/logs.py b/sos/plugins/logs.py
index b6551e73..dc40b855 100644
--- a/sos/plugins/logs.py
+++ b/sos/plugins/logs.py
@@ -30,8 +30,8 @@ class Logs(Plugin):
         ])
 
         self.limit = self.get_option("log_size")
-        self.add_copy_spec_limit("/var/log/boot.log", sizelimit=self.limit)
-        self.add_copy_spec_limit("/var/log/cloud-init*", sizelimit=self.limit)
+        self.add_copy_spec("/var/log/boot.log", sizelimit=self.limit)
+        self.add_copy_spec("/var/log/cloud-init*", sizelimit=self.limit)
         self.add_journal(boot="this")
         self.add_journal(boot="this", allfields=True, output="verbose")
         self.add_cmd_output("journalctl --disk-usage")
@@ -48,7 +48,7 @@ class Logs(Plugin):
                 if i.startswith("-"):
                     i = i[1:]
                 if os.path.isfile(i):
-                    self.add_copy_spec_limit(i, sizelimit=self.limit)
+                    self.add_copy_spec(i, sizelimit=self.limit)
 
     def postproc(self):
         self.do_path_regex_sub(
@@ -72,8 +72,8 @@ class RedHatLogs(Logs, RedHatPlugin):
     def setup(self):
         super(RedHatLogs, self).setup()
         messages = "/var/log/messages"
-        self.add_copy_spec_limit("/var/log/secure*", sizelimit=self.limit)
-        self.add_copy_spec_limit(messages + "*", sizelimit=self.limit)
+        self.add_copy_spec("/var/log/secure*", sizelimit=self.limit)
+        self.add_copy_spec(messages + "*", sizelimit=self.limit)
         # collect three days worth of logs by default if the system is
         # configured to use the journal and not /var/log/messages
         if not os.path.exists(messages) and self.is_installed("systemd"):
@@ -94,15 +94,14 @@ class DebianLogs(Logs, DebianPlugin, UbuntuPlugin):
         super(DebianLogs, self).setup()
         if not self.get_option("all_logs"):
             limit = self.get_option("log_size")
-            self.add_copy_spec_limit("/var/log/syslog", sizelimit=limit)
-            self.add_copy_spec_limit("/var/log/syslog.1", sizelimit=limit)
-            self.add_copy_spec_limit("/var/log/kern.log", sizelimit=limit)
-            self.add_copy_spec_limit("/var/log/kern.log.1", sizelimit=limit)
-            self.add_copy_spec_limit("/var/log/udev", sizelimit=limit)
-            self.add_copy_spec_limit("/var/log/dist-upgrade", sizelimit=limit)
-            self.add_copy_spec_limit("/var/log/installer", sizelimit=limit)
-            self.add_copy_spec_limit("/var/log/unattended-upgrades",
-                                     sizelimit=limit)
+            self.add_copy_spec("/var/log/syslog", sizelimit=limit)
+            self.add_copy_spec("/var/log/syslog.1", sizelimit=limit)
+            self.add_copy_spec("/var/log/kern.log", sizelimit=limit)
+            self.add_copy_spec("/var/log/kern.log.1", sizelimit=limit)
+            self.add_copy_spec("/var/log/udev", sizelimit=limit)
+            self.add_copy_spec("/var/log/dist-upgrade", sizelimit=limit)
+            self.add_copy_spec("/var/log/installer", sizelimit=limit)
+            self.add_copy_spec("/var/log/unattended-upgrades", sizelimit=limit)
             self.add_cmd_output('ls -alRh /var/log/')
         else:
             self.add_copy_spec("/var/log/")
diff --git a/sos/plugins/lxd.py b/sos/plugins/lxd.py
index d7f1526a..af531980 100644
--- a/sos/plugins/lxd.py
+++ b/sos/plugins/lxd.py
@@ -28,8 +28,8 @@ class LXD(Plugin, UbuntuPlugin):
             "/etc/default/lxc-bridge",
         ])
 
-        self.add_copy_spec_limit("/var/log/lxd*",
-                                 sizelimit=self.get_option("log_size"))
+        self.add_copy_spec("/var/log/lxd*",
+                           sizelimit=self.get_option("log_size"))
 
         # List of containers available on the machine
         self.add_cmd_output([
diff --git a/sos/plugins/nscd.py b/sos/plugins/nscd.py
index 499bbdae..35470636 100644
--- a/sos/plugins/nscd.py
+++ b/sos/plugins/nscd.py
@@ -34,7 +34,6 @@ class Nscd(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
         if (len(opt) > 0):
             for o in opt:
                 f = o.split()
-                self.add_copy_spec_limit(f[1],
-                                         sizelimit=self.get_option("log_size"))
+                self.add_copy_spec(f[1], sizelimit=self.get_option("log_size"))
 
 # vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/numa.py b/sos/plugins/numa.py
index 9e0c8fdd..4fe4a9ae 100644
--- a/sos/plugins/numa.py
+++ b/sos/plugins/numa.py
@@ -31,7 +31,7 @@ class Numa(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
             "/etc/numad.conf",
             "/etc/logrotate.d/numad"
         ])
-        self.add_copy_spec_limit(
+        self.add_copy_spec(
             "/var/log/numad.log*",
             sizelimit=self.get_option("log_size")
         )
diff --git a/sos/plugins/openstack_ceilometer.py b/sos/plugins/openstack_ceilometer.py
index fd36ee2e..94b73b67 100644
--- a/sos/plugins/openstack_ceilometer.py
+++ b/sos/plugins/openstack_ceilometer.py
@@ -32,11 +32,10 @@ class OpenStackCeilometer(Plugin):
         # Ceilometer
         self.limit = self.get_option("log_size")
         if self.get_option("all_logs"):
-            self.add_copy_spec_limit("/var/log/ceilometer/",
-                                     sizelimit=self.limit)
+            self.add_copy_spec("/var/log/ceilometer/", sizelimit=self.limit)
         else:
-            self.add_copy_spec_limit("/var/log/ceilometer/*.log",
-                                     sizelimit=self.limit)
+            self.add_copy_spec("/var/log/ceilometer/*.log",
+                               sizelimit=self.limit)
         self.add_copy_spec("/etc/ceilometer/")
         if self.get_option("verify"):
             self.add_cmd_output("rpm -V %s" % ' '.join(packages))
diff --git a/sos/plugins/openstack_cinder.py b/sos/plugins/openstack_cinder.py
index 0b6768d4..157f23d7 100644
--- a/sos/plugins/openstack_cinder.py
+++ b/sos/plugins/openstack_cinder.py
@@ -40,11 +40,10 @@ class OpenStackCinder(Plugin):
 
         self.limit = self.get_option("log_size")
         if self.get_option("all_logs"):
-            self.add_copy_spec_limit("/var/log/cinder/",
-                                     sizelimit=self.limit)
+            self.add_copy_spec("/var/log/cinder/", sizelimit=self.limit)
         else:
-            self.add_copy_spec_limit("/var/log/cinder/*.log",
-                                     sizelimit=self.limit)
+            self.add_copy_spec("/var/log/cinder/*.log", sizelimit=self.limit)
+
         if self.get_option("verify"):
             self.add_cmd_output("rpm -V %s" % ' '.join(packages))
 
diff --git a/sos/plugins/openstack_glance.py b/sos/plugins/openstack_glance.py
index c8e7550f..e18be9c9 100644
--- a/sos/plugins/openstack_glance.py
+++ b/sos/plugins/openstack_glance.py
@@ -38,11 +38,9 @@ class OpenStackGlance(Plugin):
 
         self.limit = self.get_option("log_size")
         if self.get_option("all_logs"):
-            self.add_copy_spec_limit("/var/log/glance/",
-                                     sizelimit=self.limit)
+            self.add_copy_spec("/var/log/glance/", sizelimit=self.limit)
         else:
-            self.add_copy_spec_limit("/var/log/glance/*.log",
-                                     sizelimit=self.limit)
+            self.add_copy_spec("/var/log/glance/*.log", sizelimit=self.limit)
 
         self.add_copy_spec("/etc/glance/")
 
diff --git a/sos/plugins/openstack_heat.py b/sos/plugins/openstack_heat.py
index 4e7abd28..c002bbd2 100644
--- a/sos/plugins/openstack_heat.py
+++ b/sos/plugins/openstack_heat.py
@@ -45,11 +45,9 @@ class OpenStackHeat(Plugin):
 
         self.limit = self.get_option("log_size")
         if self.get_option("all_logs"):
-            self.add_copy_spec_limit("/var/log/heat/",
-                                     sizelimit=self.limit)
+            self.add_copy_spec("/var/log/heat/", sizelimit=self.limit)
         else:
-            self.add_copy_spec_limit("/var/log/heat/*.log",
-                                     sizelimit=self.limit)
+            self.add_copy_spec("/var/log/heat/*.log", sizelimit=self.limit)
 
         self.add_copy_spec("/etc/heat/")
 
diff --git a/sos/plugins/openstack_horizon.py b/sos/plugins/openstack_horizon.py
index ec0dcca8..25a9916e 100644
--- a/sos/plugins/openstack_horizon.py
+++ b/sos/plugins/openstack_horizon.py
@@ -32,11 +32,9 @@ class OpenStackHorizon(Plugin):
 
         self.limit = self.get_option("log_size")
         if self.get_option("all_logs"):
-            self.add_copy_spec_limit("/var/log/horizon/",
-                                     sizelimit=self.limit)
+            self.add_copy_spec("/var/log/horizon/", sizelimit=self.limit)
         else:
-            self.add_copy_spec_limit("/var/log/horizon/*.log",
-                                     sizelimit=self.limit)
+            self.add_copy_spec("/var/log/horizon/*.log", sizelimit=self.limit)
 
         self.add_copy_spec("/etc/openstack-dashboard/")
         self.add_forbidden_path("*.py[co]")
diff --git a/sos/plugins/openstack_ironic.py b/sos/plugins/openstack_ironic.py
index 23f7cf04..760ca43f 100644
--- a/sos/plugins/openstack_ironic.py
+++ b/sos/plugins/openstack_ironic.py
@@ -31,11 +31,9 @@ class OpenStackIronic(Plugin):
 
         self.limit = self.get_option("log_size")
         if self.get_option("all_logs"):
-            self.add_copy_spec_limit("/var/log/ironic/",
-                                     sizelimit=self.limit)
+            self.add_copy_spec("/var/log/ironic/", sizelimit=self.limit)
         else:
-            self.add_copy_spec_limit("/var/log/ironic/*.log",
-                                     sizelimit=self.limit)
+            self.add_copy_spec("/var/log/ironic/*.log", sizelimit=self.limit)
 
         self.add_cmd_output('ls -laRt /var/lib/ironic/')
 
diff --git a/sos/plugins/openstack_keystone.py b/sos/plugins/openstack_keystone.py
index e33aaf05..ce177fbd 100644
--- a/sos/plugins/openstack_keystone.py
+++ b/sos/plugins/openstack_keystone.py
@@ -37,11 +37,10 @@ class OpenStackKeystone(Plugin):
 
         self.limit = self.get_option("log_size")
         if self.get_option("all_logs"):
-            self.add_copy_spec_limit("/var/log/keystone/",
-                                     sizelimit=self.limit)
+            self.add_copy_spec("/var/log/keystone/", sizelimit=self.limit)
         else:
-            self.add_copy_spec_limit("/var/log/keystone/*.log",
-                                     sizelimit=self.limit)
+            self.add_copy_spec("/var/log/keystone/*.log", sizelimit=self.limit)
+
         if self.get_option("verify"):
             self.add_cmd_output("rpm -V %s" % ' '.join(packages))
 
diff --git a/sos/plugins/openstack_neutron.py b/sos/plugins/openstack_neutron.py
index a54cba0e..590194c5 100644
--- a/sos/plugins/openstack_neutron.py
+++ b/sos/plugins/openstack_neutron.py
@@ -29,11 +29,9 @@ class OpenStackNeutron(Plugin):
 
         self.limit = self.get_option("log_size")
         if self.get_option("all_logs"):
-            self.add_copy_spec_limit("/var/log/neutron/",
-                                     sizelimit=self.limit)
+            self.add_copy_spec("/var/log/neutron/", sizelimit=self.limit)
         else:
-            self.add_copy_spec_limit("/var/log/neutron/*.log",
-                                     sizelimit=self.limit)
+            self.add_copy_spec("/var/log/neutron/*.log", sizelimit=self.limit)
 
         self.add_copy_spec("/etc/neutron/")
         self.add_copy_spec("/var/lib/neutron/")
diff --git a/sos/plugins/openstack_nova.py b/sos/plugins/openstack_nova.py
index 4e82a9ec..8e0a19a1 100644
--- a/sos/plugins/openstack_nova.py
+++ b/sos/plugins/openstack_nova.py
@@ -63,11 +63,9 @@ class OpenStackNova(Plugin):
 
         self.limit = self.get_option("log_size")
         if self.get_option("all_logs"):
-            self.add_copy_spec_limit("/var/log/nova/",
-                                     sizelimit=self.limit)
+            self.add_copy_spec("/var/log/nova/", sizelimit=self.limit)
         else:
-            self.add_copy_spec_limit("/var/log/nova/*.log",
-                                     sizelimit=self.limit)
+            self.add_copy_spec("/var/log/nova/*.log", sizelimit=self.limit)
 
         self.add_copy_spec("/etc/nova/")
 
diff --git a/sos/plugins/openstack_sahara.py b/sos/plugins/openstack_sahara.py
index 5fdb03fe..5a2a5c37 100644
--- a/sos/plugins/openstack_sahara.py
+++ b/sos/plugins/openstack_sahara.py
@@ -32,11 +32,9 @@ class OpenStackSahara(Plugin):
 
         self.limit = self.get_option("log_size")
         if self.get_option("all_logs"):
-            self.add_copy_spec_limit("/var/log/sahara/",
-                                     sizelimit=self.limit)
+            self.add_copy_spec("/var/log/sahara/", sizelimit=self.limit)
         else:
-            self.add_copy_spec_limit("/var/log/sahara/*.log",
-                                     sizelimit=self.limit)
+            self.add_copy_spec("/var/log/sahara/*.log", sizelimit=self.limit)
 
         if self.get_option("verify"):
             self.add_cmd_output("rpm -V %s" % ' '.join(packages))
diff --git a/sos/plugins/openstack_swift.py b/sos/plugins/openstack_swift.py
index dd411414..1ac35091 100644
--- a/sos/plugins/openstack_swift.py
+++ b/sos/plugins/openstack_swift.py
@@ -31,11 +31,9 @@ class OpenStackSwift(Plugin):
 
         self.limit = self.get_option("log_size")
         if self.get_option("all_logs"):
-            self.add_copy_spec_limit("/var/log/swift/",
-                                     sizelimit=self.limit)
+            self.add_copy_spec("/var/log/swift/", sizelimit=self.limit)
         else:
-            self.add_copy_spec_limit("/var/log/swift/*.log",
-                                     sizelimit=self.limit)
+            self.add_copy_spec("/var/log/swift/*.log", sizelimit=self.limit)
 
         self.add_copy_spec("/etc/swift/")
 
diff --git a/sos/plugins/openstack_trove.py b/sos/plugins/openstack_trove.py
index 17dd3390..e8306e51 100644
--- a/sos/plugins/openstack_trove.py
+++ b/sos/plugins/openstack_trove.py
@@ -30,11 +30,9 @@ class OpenStackTrove(Plugin):
 
         self.limit = self.get_option("log_size")
         if self.get_option("all_logs"):
-            self.add_copy_spec_limit("/var/log/trove/",
-                                     sizelimit=self.limit)
+            self.add_copy_spec("/var/log/trove/", sizelimit=self.limit)
         else:
-            self.add_copy_spec_limit("/var/log/trove/*.log",
-                                     sizelimit=self.limit)
+            self.add_copy_spec("/var/log/trove/*.log", sizelimit=self.limit)
 
         self.add_copy_spec('/etc/trove/')
 
diff --git a/sos/plugins/ovirt_hosted_engine.py b/sos/plugins/ovirt_hosted_engine.py
index bef11a52..3a4d17f0 100644
--- a/sos/plugins/ovirt_hosted_engine.py
+++ b/sos/plugins/ovirt_hosted_engine.py
@@ -63,7 +63,7 @@ class OvirtHostedEngine(Plugin, RedHatPlugin):
             self.add_copy_spec(all_setup_logs[0])
         # Add older ovirt-hosted-engine-setup log files only if requested
         if self.get_option('all_logs'):
-            self.add_copy_spec_limit(
+            self.add_copy_spec(
                 self.SETUP_LOG_GLOB,
                 sizelimit=self.limit
             )
@@ -74,7 +74,7 @@ class OvirtHostedEngine(Plugin, RedHatPlugin):
         ])
         # Add older ovirt-hosted-engine-ha log files only if requested
         if self.get_option('all_logs'):
-            self.add_copy_spec_limit(
+            self.add_copy_spec(
                 self.HA_LOG_GLOB,
                 sizelimit=self.limit,
             )
diff --git a/sos/plugins/pcp.py b/sos/plugins/pcp.py
index 64adeb16..adab1ac2 100644
--- a/sos/plugins/pcp.py
+++ b/sos/plugins/pcp.py
@@ -113,7 +113,7 @@ class Pcp(Plugin, RedHatPlugin, DebianPlugin):
         # As a default strategy, collect PCP_LOG_DIR/pmlogger/* only if the
         # total size is moderately small: < 100MB. Override is possible via
         # the 'all_pcplogs' option.
-        # FIXME: Doing a recursive size check because add_copy_spec_limit
+        # FIXME: Doing a recursive size check because add_copy_spec
         # won't work for directory trees. I.e. we can't say fetch /foo/bar/
         # only if it is < 100MB. To be killed once the Plugin base class will
         # add a method for this use case via issue #281
diff --git a/sos/plugins/rabbitmq.py b/sos/plugins/rabbitmq.py
index 25d9ed20..01be6063 100644
--- a/sos/plugins/rabbitmq.py
+++ b/sos/plugins/rabbitmq.py
@@ -29,6 +29,6 @@ class RabbitMQ(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
         self.add_cmd_output("rabbitmqctl list_policies")
 
         self.add_copy_spec("/etc/rabbitmq/*")
-        self.add_copy_spec_limit("/var/log/rabbitmq/*",
-                                 sizelimit=self.get_option('log_size'))
+        self.add_copy_spec("/var/log/rabbitmq/*",
+                           sizelimit=self.get_option('log_size'))
 # vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/redis.py b/sos/plugins/redis.py
index 7664478a..d3c869f8 100644
--- a/sos/plugins/redis.py
+++ b/sos/plugins/redis.py
@@ -32,11 +32,11 @@ class Redis(Plugin, RedHatPlugin):
         self.limit = self.get_option("log_size")
         self.add_cmd_output("redis-cli info")
         if self.get_option("all_logs"):
-            self.add_copy_spec_limit("/var/log/redis/redis.log*",
-                                     sizelimit=self.limit)
+            self.add_copy_spec("/var/log/redis/redis.log*",
+                               sizelimit=self.limit)
         else:
-            self.add_copy_spec_limit("/var/log/redis/redis.log",
-                                     sizelimit=self.limit)
+            self.add_copy_spec("/var/log/redis/redis.log",
+                               sizelimit=self.limit)
 
     def postproc(self):
         self.do_file_sub(
diff --git a/sos/plugins/samba.py b/sos/plugins/samba.py
index e57546e6..33f4d79b 100644
--- a/sos/plugins/samba.py
+++ b/sos/plugins/samba.py
@@ -30,21 +30,17 @@ class Samba(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
             "/etc/samba/lmhosts",
         ])
 
-        self.add_copy_spec_limit("/var/log/samba/log.smbd",
-                                 sizelimit=self.limit)
-        self.add_copy_spec_limit("/var/log/samba/log.nmbd",
-                                 sizelimit=self.limit)
-        self.add_copy_spec_limit("/var/log/samba/log.winbindd",
-                                 sizelimit=self.limit)
-        self.add_copy_spec_limit("/var/log/samba/log.winbindd-idmap",
-                                 sizelimit=self.limit)
-        self.add_copy_spec_limit("/var/log/samba/log.winbindd-dc-connet",
-                                 sizelimit=self.limit)
-        self.add_copy_spec_limit("/var/log/samba/log.wb-*",
-                                 sizelimit=self.limit)
+        self.add_copy_spec("/var/log/samba/log.smbd", sizelimit=self.limit)
+        self.add_copy_spec("/var/log/samba/log.nmbd", sizelimit=self.limit)
+        self.add_copy_spec("/var/log/samba/log.winbindd", sizelimit=self.limit)
+        self.add_copy_spec("/var/log/samba/log.winbindd-idmap",
+                           sizelimit=self.limit)
+        self.add_copy_spec("/var/log/samba/log.winbindd-dc-connet",
+                           sizelimit=self.limit)
+        self.add_copy_spec("/var/log/samba/log.wb-*", sizelimit=self.limit)
 
         if self.get_option("all_logs"):
-            self.add_copy_spec_limit("/var/log/samba/", sizelimit=self.limit)
+            self.add_copy_spec("/var/log/samba/", sizelimit=self.limit)
 
         self.add_cmd_output([
             "wbinfo --domain='.' -g",
diff --git a/sos/plugins/sar.py b/sos/plugins/sar.py
index 73c910e4..13867a97 100644
--- a/sos/plugins/sar.py
+++ b/sos/plugins/sar.py
@@ -38,11 +38,11 @@ class Sar(Plugin,):
         # Copy all sa??, sar??, sa??.* and sar??.* files, which will net
         # compressed and uncompressed versions, typically.
         for suffix in ('', '.*'):
-            self.add_copy_spec_limit(
+            self.add_copy_spec(
                 os.path.join(self.sa_path, "sa[0-3][0-9]" + suffix),
                 sizelimit=self.sa_size, tailit=False
             )
-            self.add_copy_spec_limit(
+            self.add_copy_spec(
                 os.path.join(self.sa_path, "sar[0-3][0-9]" + suffix),
                 sizelimit=self.sa_size, tailit=False
             )
diff --git a/sos/plugins/squid.py b/sos/plugins/squid.py
index 93fe43be..626e4efe 100644
--- a/sos/plugins/squid.py
+++ b/sos/plugins/squid.py
@@ -32,9 +32,9 @@ class RedHatSquid(Squid, RedHatPlugin):
         log_size = self.get_option('log_size')
         log_path = "/var/log/squid/"
         self.add_copy_spec("/etc/squid/squid.conf")
-        self.add_copy_spec_limit(log_path + "access.log", sizelimit=log_size)
-        self.add_copy_spec_limit(log_path + "cache.log", sizelimit=log_size)
-        self.add_copy_spec_limit(log_path + "squid.out", sizelimit=log_size)
+        self.add_copy_spec(log_path + "access.log", sizelimit=log_size)
+        self.add_copy_spec(log_path + "cache.log", sizelimit=log_size)
+        self.add_copy_spec(log_path + "squid.out", sizelimit=log_size)
 
 
 class DebianSquid(Squid, DebianPlugin, UbuntuPlugin):
@@ -44,11 +44,11 @@ class DebianSquid(Squid, DebianPlugin, UbuntuPlugin):
     packages = ('squid3',)
 
     def setup(self):
-        self.add_copy_spec_limit("/etc/squid3/squid.conf",
-                                 sizelimit=self.get_option('log_size'))
-        self.add_copy_spec_limit("/var/log/squid3/*",
-                                 sizelimit=self.get_option('log_size'))
+        self.add_copy_spec("/etc/squid3/squid.conf",
+                           sizelimit=self.get_option('log_size'))
+        self.add_copy_spec("/var/log/squid3/*",
+                           sizelimit=self.get_option('log_size'))
         self.add_copy_spec(['/etc/squid-deb-proxy'])
-        self.add_copy_spec_limit("/var/log/squid-deb-proxy/*",
-                                 sizelimit=self.get_option('log_size'))
+        self.add_copy_spec("/var/log/squid-deb-proxy/*",
+                           sizelimit=self.get_option('log_size'))
 # vim: set et ts=4 sw=4 :
diff --git a/sos/plugins/tomcat.py b/sos/plugins/tomcat.py
index 0ee5ca83..46fb167f 100644
--- a/sos/plugins/tomcat.py
+++ b/sos/plugins/tomcat.py
@@ -37,13 +37,13 @@ class Tomcat(Plugin, RedHatPlugin):
 
         if not self.get_option("all_logs"):
             log_glob = "/var/log/tomcat*/catalina.out"
-            self.add_copy_spec_limit(log_glob, sizelimit=limit)
+            self.add_copy_spec(log_glob, sizelimit=limit)
 
             # get today's date in iso format so that days/months below 10
             # prepend 0
             today = datetime.date(datetime.now()).isoformat()
             log_glob = "/var/log/tomcat*/catalina.%s.log" % today
-            self.add_copy_spec_limit(log_glob, sizelimit=limit)
+            self.add_copy_spec(log_glob, sizelimit=limit)
         else:
             self.add_copy_spec("/var/log/tomcat*/*")
 
diff --git a/sos/plugins/upstart.py b/sos/plugins/upstart.py
index fafb6119..5007c208 100644
--- a/sos/plugins/upstart.py
+++ b/sos/plugins/upstart.py
@@ -44,8 +44,8 @@ class Upstart(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
         self.add_copy_spec('/var/log/upstart/upstart.state')
 
         # Log files
-        self.add_copy_spec_limit('/var/log/upstart/*',
-                                 sizelimit=self.get_option('log_size'))
+        self.add_copy_spec('/var/log/upstart/*',
+                           sizelimit=self.get_option('log_size'))
         # Session Jobs (running Upstart as a Session Init)
         self.add_copy_spec('/usr/share/upstart/')
 
diff --git a/sos/plugins/virsh.py b/sos/plugins/virsh.py
index 7d4ab4ea..a0ad47b4 100644
--- a/sos/plugins/virsh.py
+++ b/sos/plugins/virsh.py
@@ -29,7 +29,7 @@ class LibvirtClient(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin):
     def setup(self):
         # virt-manager logs
         if not self.get_option("all_logs"):
-            self.add_copy_spec_limit("/root/.virt-manager/*", sizelimit=5)
+            self.add_copy_spec("/root/.virt-manager/*", sizelimit=5)
         else:
             self.add_copy_spec("/root/.virt-manager/*")