From b61ffa8af1445104da075f172342d62cab13c837 Mon Sep 17 00:00:00 2001 From: Pavel Moravec Date: Wed, 20 Dec 2017 12:13:30 +0100 Subject: [opendaylight] collect more logs and puppet config collect puppet-generated config, container and docker logs Resolves: #1171 Signed-off-by: Pavel Moravec Signed-off-by: Bryn M. Reeves --- sos/plugins/opendaylight.py | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/sos/plugins/opendaylight.py b/sos/plugins/opendaylight.py index 44e12b01..6d886611 100644 --- a/sos/plugins/opendaylight.py +++ b/sos/plugins/opendaylight.py @@ -24,15 +24,26 @@ class OpenDaylight(Plugin, RedHatPlugin): packages = ('opendaylight', 'puppet-opendaylight') + var_puppet_gen = "/var/lib/config-data/puppet-generated/opendaylight" + def setup(self): - self.add_copy_spec("/opt/opendaylight/etc/") + self.add_copy_spec([ + "/opt/opendaylight/etc/", + self.var_puppet_gen + "/opt/opendaylight/etc/", + ]) self.limit = self.get_option("log_size") if self.get_option("all_logs"): - self.add_copy_spec("/opt/opendaylight/data/log/", - sizelimit=self.limit) + self.add_copy_spec([ + "/opt/opendaylight/data/log/", + "/var/log/containers/opendaylight/", + ], sizelimit=self.limit) else: - self.add_copy_spec("/opt/opendaylight/data/log/*log", - sizelimit=self.limit) + self.add_copy_spec([ + "/opt/opendaylight/data/log/*.log*", + "/var/log/containers/opendaylight/*.log*", + ], sizelimit=self.limit) + + self.add_cmd_output("docker logs opendaylight_api") # vim: set et ts=4 sw=4 : -- cgit