diff options
| author | Bryn M. Reeves <bmr@redhat.com> | 2013-04-26 18:17:35 +0100 |
|---|---|---|
| committer | Bryn M. Reeves <bmr@redhat.com> | 2013-04-26 18:17:35 +0100 |
| commit | d063b064542c397a9b30c3b2caa76044499536b5 (patch) | |
| tree | cc5745b01fd2cc1af9d5b288e90b22d07ddc5edd | |
| parent | 511fcff6b3c9f798e0e715597629704b278f45ef (diff) | |
| download | sos-d063b064542c397a9b30c3b2caa76044499536b5.tar.gz | |
Remove ntp data from system plug-in
Ntp information belongs in the ntp plug-in.. Duh. Move the few
files collected in the system module to ntp.py.
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
| -rw-r--r-- | sos/plugins/ntp.py | 6 | ||||
| -rw-r--r-- | sos/plugins/system.py | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/sos/plugins/ntp.py b/sos/plugins/ntp.py index dff9f985..639b292a 100644 --- a/sos/plugins/ntp.py +++ b/sos/plugins/ntp.py @@ -23,7 +23,11 @@ class Ntp(Plugin): packages = ('ntp',) def setup(self): - self.add_copy_spec("/etc/ntp.conf") + self.add_copy_specs([ + "/etc/ntp.conf", + "/etc/ntp/step-tickers", + "/etc/ntp/ntpservers" + ]) self.add_cmd_output("ntptime") diff --git a/sos/plugins/system.py b/sos/plugins/system.py index 40c87805..d3e25c77 100644 --- a/sos/plugins/system.py +++ b/sos/plugins/system.py @@ -25,9 +25,7 @@ class RedHatSystem(System, RedHatPlugin): "/proc/sys", "/etc/syslog.conf", "/etc/rsyslog.conf", - "/etc/ntp.conf", - "/etc/ntp/step-tickers", - "/etc/ntp/ntpservers"]) + ]) self.add_forbidden_path( "/proc/sys/net/ipv8/neigh/*/retrans_time") self.add_forbidden_path( @@ -42,7 +40,6 @@ class DebianSystem(System, DebianPlugin, UbuntuPlugin): "/proc/sys", "/etc/syslog.conf", "/etc/rsyslog.conf", - "/etc/ntp.conf" ]) self.add_forbidden_path( "/proc/sys/net/ipv8/neigh/*/retrans_time") self.add_forbidden_path( |