|
 |
69a90f |
From c746b80e91bbab8c40a0c8cc5607a221b2bed09f Mon Sep 17 00:00:00 2001
|
|
|
69a90f |
From: "Bryn M. Reeves" <bmr@redhat.com>
|
|
|
69a90f |
Date: Fri, 15 Jul 2016 12:02:40 +0100
|
|
|
69a90f |
Subject: [PATCH] [monit] fix add_copy_spec() arguments
|
|
|
69a90f |
|
|
|
69a90f |
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
|
69a90f |
---
|
|
|
69a90f |
sos/plugins/monit.py | 3 ++-
|
|
|
69a90f |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
69a90f |
|
|
|
69a90f |
diff --git a/sos/plugins/monit.py b/sos/plugins/monit.py
|
|
|
69a90f |
index 825f770..9b7d30f 100644
|
|
|
69a90f |
--- a/sos/plugins/monit.py
|
|
|
69a90f |
+++ b/sos/plugins/monit.py
|
|
|
69a90f |
@@ -27,6 +27,7 @@ class Monit(Plugin, RedHatPlugin):
|
|
|
69a90f |
plugin_name = 'monit'
|
|
|
69a90f |
|
|
|
69a90f |
# Define configuration files
|
|
|
69a90f |
+ # FIXME: direct globs will fail in container environments.
|
|
|
69a90f |
monit_conf = glob("/etc/monit.d/*")
|
|
|
69a90f |
monit_conf.append("/etc/monit.conf")
|
|
|
69a90f |
monit_conf.append("/etc/monitrc")
|
|
|
69a90f |
@@ -38,7 +39,7 @@ class Monit(Plugin, RedHatPlugin):
|
|
|
69a90f |
|
|
|
69a90f |
def setup(self):
|
|
|
69a90f |
self.add_cmd_output("monit status")
|
|
|
69a90f |
- self.add_copy_spec([self.monit_log, self.monit_conf])
|
|
|
69a90f |
+ self.add_copy_spec(self.monit_log + self.monit_conf)
|
|
|
69a90f |
|
|
|
69a90f |
def postproc(self):
|
|
|
69a90f |
# Post process the files included to scrub any
|
|
|
69a90f |
--
|
|
|
69a90f |
2.4.11
|
|
|
69a90f |
|