Skip to content
This repository has been archived by the owner on Aug 30, 2024. It is now read-only.

Commit

Permalink
Merge pull request #52 from jeevanullas/master
Browse files Browse the repository at this point in the history
Tested pull request.  Results of tests are as follows:

```
$ sudo sosreport -o eucadb,eucafrontend
....
# cat odc-d-06-07-2014040323171396567041/sos_commands/eucafrontend/euca-describe-instance-types-show-capacity
INSTANCETYPE	Name         CPUs  Memory (MB)  Disk (GB)  Used / Total  Used %
INSTANCETYPE	m1.small        1          512          5     1 /     6     17%
INSTANCETYPE	t1.micro        1          512          5     1 /     6     17%
INSTANCETYPE	c1.medium       2         1024         10     1 /     3     33%
INSTANCETYPE	m1.medium       1         1024         15     1 /     6     17%
INSTANCETYPE	m1.large        2         1024         15     1 /     3     33%
INSTANCETYPE	c1.xlarge       2         2048         15     1 /     3     33%
INSTANCETYPE	m1.xlarge       2         1024         20     1 /     3     33%
INSTANCETYPE	m2.xlarge       2         2048         20     1 /     3     33%
INSTANCETYPE	m3.xlarge       4         2048         25     0 /     1      0%
INSTANCETYPE	m2.2xlarge      2         4096         40     1 /     3     33%
INSTANCETYPE	m3.2xlarge      4         4096         50     0 /     1      0%
INSTANCETYPE	cc1.4xlarge     8         3072         60     0 /     0
INSTANCETYPE	m2.4xlarge      8         4096         60     0 /     0
INSTANCETYPE	hi1.4xlarge     8         6144        120     0 /     0
INSTANCETYPE	cc2.8xlarge    16         6144        120     0 /     0
INSTANCETYPE	cg1.4xlarge    16        12288        200     0 /     0
INSTANCETYPE	cr1.8xlarge    16        16384        240     0 /     0
INSTANCETYPE	hs1.8xlarge    48       119808      24000     0 /     0
....
# cat odc-d-06-07-2014040323171396567041/sos_commands/eucadb/database_sizes.txt
         datname          | pg_database_size | pg_size_pretty
--------------------------+------------------+----------------
 eucalyptus_reporting     |        534299448 | 510 MB
 eucalyptus_cloudwatch    |        352928568 | 337 MB
 eucalyptus_walrus        |         12370744 | 12 MB
 eucalyptus_cloud         |         11445048 | 11 MB
 eucalyptus_auth          |         10109752 | 9873 kB
 eucalyptus_autoscaling   |          8233784 | 8041 kB
 eucalyptus_storage       |          7553848 | 7377 kB
 eucalyptus_loadbalancing |          7258936 | 7089 kB
 eucalyptus_config        |          7111480 | 6945 kB
 eucalyptus_dns           |          6841144 | 6681 kB
 eucalyptus_general       |          6398776 | 6249 kB
 eucalyptus_imaging       |          6390584 | 6241 kB
 eucalyptus_records       |          6390584 | 6241 kB
 eucalyptus_faults        |          6357816 | 6209 kB
 database_events          |          6333240 | 6185 kB
 postgres                 |          6308664 | 6161 kB
 template1                |          6201860 | 6057 kB
 template0                |          6201860 | 6057 kB
(18 rows)
```
  • Loading branch information
hspencer77 committed Apr 4, 2014
2 parents b2ad71d + 692dc48 commit 016d950
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 0 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.DS_Store
2 changes: 2 additions & 0 deletions sos/plugins/eucadb.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,6 @@ 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 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)
return
1 change: 1 addition & 0 deletions sos/plugins/eucafrontend.py
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,7 @@ def setup(self):
self.addDiagnose("### Grabbing Cloud Resource Data ###")
self.collectExtOutput("/usr/bin/euca-describe-addresses verbose --region admin@sosreport", suggest_filename="euca-describe-addresses-verbose")
self.collectExtOutput("/usr/bin/euca-describe-availability-zones verbose --region admin@sosreport", suggest_filename="euca-describe-availability-zones-verbose")
self.collectExtOutput("/usr/bin/euca-describe-instance-types --show-capacity --region admin@sosreport", suggest_filename="euca-describe-instance-types-show-capacity")
self.collectExtOutput("/usr/bin/euca-describe-groups verbose --region admin@sosreport", suggest_filename="euca-describe-groups-verbose")
self.collectExtOutput("/usr/bin/euca-describe-images --all --region admin@sosreport", suggest_filename="euca-describe-images-all")
self.collectExtOutput("/usr/bin/eustore-describe-images -v --region admin@sosreport", suggest_filename="eustore-describe-images")
Expand Down

0 comments on commit 016d950

Please sign in to comment.