aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Moravec <pmoravec@redhat.com>2014-06-16 15:43:49 +0200
committerPavel Moravec <pmoravec@redhat.com>2014-06-16 15:43:49 +0200
commit6f538168a82d1e7dfa9b829de7dc52281d978688 (patch)
tree0e210a44b7b1eb3756d53331ffedad9da17c867a
parentbe940a48f4ed842f8422d19cc0d50512b4fea90a (diff)
downloadsos-6f538168a82d1e7dfa9b829de7dc52281d978688.tar.gz
[qpid] update of qpid plugin
resolves issue #308 Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
-rw-r--r--sos/plugins/qpid.py27
1 files changed, 18 insertions, 9 deletions
diff --git a/sos/plugins/qpid.py b/sos/plugins/qpid.py
index f51e3359..1e711ee5 100644
--- a/sos/plugins/qpid.py
+++ b/sos/plugins/qpid.py
@@ -23,21 +23,31 @@ class Qpid(Plugin, RedHatPlugin):
packages = ('qpidd', 'qpid-cpp-server', 'qpid-tools')
def setup(self):
- """ performs data collection for mrg """
+ """ performs data collection for qpid broker """
self.add_cmd_outputs([
- "qpid-stat -e",
- "qpid-stat -b",
- "qpid-config",
- "qpid-config -b exchanges",
- "qpid-config -b queues",
+ "qpid-stat -g", # applies since 0.18 version
+ "qpid-stat -b", # applies to pre-0.18 versions
"qpid-stat -c",
+ "qpid-stat -e",
+ "qpid-stat -q",
+ "qpid-stat -u",
+ "qpid-stat -m", # applies since 0.18 version
+ "qpid-config exchanges"
+ "qpid-config queues"
+ "qpid-config exchanges -b", # applies to pre-0.18 versions
+ "qpid-config queues -b", # applies to pre-0.18 versions
+ "qpid-config exchanges -r", # applies since 0.18 version
+ "qpid-config queues -r", # applies since 0.18 version
"qpid-route link list",
"qpid-route route list",
+ "qpid-cluster", # applies to pre-0.22 versions
+ "qpid-ha query", # applies since 0.22 version
"ls -lanR /var/lib/qpidd"
])
self.add_copy_specs([
- "/etc/qpidd.conf",
+ "/etc/qpidd.conf", # applies to pre-0.22 versions
+ "/etc/qpid/qpidd.conf", # applies since 0.22 version
"/var/lib/qpid/syslog",
"/etc/ais/openais.conf",
"/var/log/cumin.log",
@@ -50,8 +60,7 @@ class Qpid(Plugin, RedHatPlugin):
"/var/lib/sesame",
"/var/log/qpidd.log",
"/var/log/sesame",
- "/var/log/cumin",
- "/var/log/cluster"
+ "/var/log/cumin"
])
# vim: et ts=4 sw=4