Merge pull request #60 from eucalyptus/r2.2

Update to 0.1.6. Tested on 3.4.2 and 3.2.2.

eucalyptus-sos-plugins.spec

@@ -2,7 +2,7 @@
 
 Summary: A plugin to sosreport to collect data about Eucalyptus clouds
 Name: eucalyptus-sos-plugins
-Version: 0.1.5
+Version: 0.1.6
 Release: 0%{?dist}
 Source0: %{name}-%{version}.tar.gz
 Group: Applications/System

sos/plugins/eucacore.py

@@ -30,9 +30,12 @@ def checkenabled(self):
     def setup(self):
         self.addCopySpec("/etc/eucalyptus")
         self.addCopySpec("/var/log/eucalyptus/*")
+        self.addCopySpec("/var/lib/eucalyptus/keys")
         if os.path.isfile('/usr/bin/sha1sum'):
             self.collectExtOutput("find /var/lib/eucalyptus/keys -type f -print | xargs -I {} sha1sum {}", suggest_filename="sha1sum-eucalyptus-keys")
         hprof_list = glob.glob('/var/log/eucalyptus/*.hprof')
         if hprof_list:
             self.collectExtOutput("rm -rf /var/log/eucalyptus/*.hprof", suggest_filename="hprof-removal")
+        if os.path.isfile('/sbin/iptables-save'):
+            self.collectExtOutput("/sbin/iptables-save --counters", suggest_filename="iptables-save-counters")
         return

sos/plugins/eucadb.py

@@ -66,6 +66,25 @@ def setup(self):
             self.collectExtOutput("/usr/pgsql-9.1/bin/pg_dump -c -o -h /var/lib/eucalyptus/db/data -p 8777 -U root --exclude-table=reporting_instance_usage_events eucalyptus_reporting", suggest_filename="eucalyptus_reporting.sql", timeout = 600)
             self.collectExtOutput("/usr/pgsql-9.1/bin/pg_dump -c -o -h /var/lib/eucalyptus/db/data -p 8777 -U root eucalyptus_storage", suggest_filename="eucalyptus_storage.sql", timeout = 600)
             self.collectExtOutput("/usr/pgsql-9.1/bin/pg_dump -c -o -h /var/lib/eucalyptus/db/data -p 8777 -U root eucalyptus_walrus", suggest_filename="eucalyptus_walrus.sql", timeout = 600)
+            if self.isInstalled("eucalyptus-enterprise-vmware-broker"):
+                self.collectExtOutput("/usr/pgsql-9.1/bin/pg_dump -c -o -h /var/lib/eucalyptus/db/data -p 8777 -U root eucalyptus_vmwarebroker", suggest_filename="eucalyptus_vmwarebroker.sql", timeout = 600)
+
         if os.path.isfile('/usr/pgsql-9.1/bin/psql') and self.check_postgres():
             self.collectExtOutput("/usr/pgsql-9.1/bin/psql -h /var/lib/eucalyptus/db/data -p 8777 -U root -c \"SELECT pg_database.datname,pg_database_size(pg_database.datname),pg_size_pretty(pg_database_size(pg_database.datname)) FROM pg_database ORDER BY pg_database_size DESC;\" -d database_events", suggest_filename="database_sizes.txt", timeout = 600)
+
+        if os.path.isfile('/var/lib/eucalyptus/db/data/pg_hba.conf'):
+            self.addCopySpec('/var/lib/eucalyptus/db/data/pg_hba.conf')
+
+        if os.path.isfile('/var/lib/eucalyptus/db/data/pg_hba.conf.org'):
+            self.addCopySpec('/var/lib/eucalyptus/db/data/pg_hba.conf.org')
+
+        if os.path.isfile('/var/lib/eucalyptus/db/data/pg_ident.conf'):
+            self.addCopySpec('/var/lib/eucalyptus/db/data/pg_ident.conf')
+
+        if os.path.isfile('/var/lib/eucalyptus/db/data/postgresql.conf'):
+            self.addCopySpec('/var/lib/eucalyptus/db/data/postgresql.conf')
+
+        if os.path.isfile('/var/lib/eucalyptus/db/data/postgresql.conf.org'):
+            self.addCopySpec('/var/lib/eucalyptus/db/data/postgresql.conf.org')
+
         return