aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Schuppert <mschuppert@redhat.com>2017-06-28 16:21:05 +0200
committerBryn M. Reeves <bmr@redhat.com>2017-08-08 16:28:32 +0100
commitf379776da6d2d3f4e3f31bf34b12908674dc122d (patch)
tree1172454d70adaf48e0bb88b0dc89f53c7ea0cebb
parent08458f8637528b71beed573c1f13e36d15c4d18a (diff)
downloadsos-f379776da6d2d3f4e3f31bf34b12908674dc122d.tar.gz
[gnocchi] Tripleo specific containerized services logs
This is an addition to pull request 1046 to collect gnocchi logs correct when service is running in a container. Signed-off-by: Martin Schuppert mschuppert@redhat.com
-rw-r--r--sos/plugins/gnocchi.py14
1 files changed, 10 insertions, 4 deletions
diff --git a/sos/plugins/gnocchi.py b/sos/plugins/gnocchi.py
index dc79a0fe..724e41bc 100644
--- a/sos/plugins/gnocchi.py
+++ b/sos/plugins/gnocchi.py
@@ -38,11 +38,17 @@ class GnocchiPlugin(Plugin, RedHatPlugin):
self.limit = self.get_option("log_size")
if self.get_option("all_logs"):
- self.add_copy_spec("/var/log/gnocchi/",
- sizelimit=self.limit)
+ self.add_copy_spec([
+ "/var/log/gnocchi/*",
+ "/var/log/containers/gnocchi/*"],
+ sizelimit=self.limit
+ )
else:
- self.add_copy_spec("/var/log/gnocchi/*.log",
- sizelimit=self.limit)
+ self.add_copy_spec([
+ "/var/log/gnocchi/*.log",
+ "/var/log/containers/gnocchi/*.log"],
+ sizelimit=self.limit
+ )
vars_all = [p in os.environ for p in [
'OS_USERNAME', 'OS_PASSWORD']]