diff --git a/www/default.css b/www/default.css index d5c560ed..ee537d23 100644 --- a/www/default.css +++ b/www/default.css @@ -12,12 +12,48 @@ body { color: #333; } -/* DataTables: http://datatables.net/blog/Twitter_Bootstrap_2 */ - -table.table { +#data { margin-top: 15px; } +#data td.name { + text-align: left; +} + +#data td.memory { + text-align: right; +} + +#data td.computeunits { + text-align: left; +} + +#data td.storage { + text-align: right; +} + +#data td.architecture { + text-align: right; +} + +#data td.ioperf { + text-align: left; +} + +#data td.maxips { + text-align: right; +} + +#data td.apiname { + text-align: left; +} + +/* Bootstrap overrides */ +.dropdown-menu .active a { + color: #fff !important; +} + +/* DataTables: http://datatables.net/blog/Twitter_Bootstrap_2 */ table.table thead .sorting, table.table thead .sorting_asc, table.table thead .sorting_desc, diff --git a/www/default.js b/www/default.js index 8d8dfc32..3cfdf5dd 100644 --- a/www/default.js +++ b/www/default.js @@ -40,7 +40,7 @@ $(function() { "bInfo": false, "aoColumnDefs": [ { - "aTargets": ["ioperf"], + "aTargets": ["memory", "computeunits", "storage", "ioperf"], "sType": "span-sort" } ] diff --git a/www/index.html b/www/index.html index 2a99e0fd..184fa5fc 100644 --- a/www/index.html +++ b/www/index.html @@ -46,208 +46,212 @@

EC2Instances.info Easy Amazon EC2 Instance Comparison

- - - - - + + + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + +
NameMemoryCompute UnitsStoragePlatformNameMemory + Compute Units + StorageArchitecture I/O PerfMax IPsAPI NameLinux costWindows cost + Max IPs + API NameLinux costWindows cost
Standard Small1.70 GB1 (1 core x 1 unit)160 GB32/64-bitModerate8m1.smallStandard Small1.70 GB1 (1 core x 1 unit)60 GB32/64-bitModerate8m1.small $0.065 per hour $0.115 per hour
Standard Medium3.75 GB2 (1 core x 2 units)410 GB32/64-bitModerate12m1.mediumStandard Medium3.75 GB2 (1 core x 2 units)410 GB32/64-bitModerate12m1.medium $0.13 per hour $0.23 per hour
Standard Large7.50 GB4 (2 cores x 2 units)850 GB (2 x 420 GB)64-bitHigh (EBS Optimized)30m1.largeStandard Large7.50 GB4 (2 cores x 2 units)850 GB (2 x 420 GB)64-bitHigh (EBS Optimized)30m1.large $0.26 per hour $0.46 per hour
Standard Extra Large15.00 GB8 (4 cores x 2 units)1690 GB (4 x 420 GB)64-bitHigh (EBS Optimized)60m1.xlargeStandard Extra Large15.00 GB8 (4 cores x 2 units)1690 GB (4 x 420 GB)64-bitHigh (EBS Optimized)60m1.xlarge $0.52 per hour $0.92 per hour
Micro0.60 GB2 (only for short bursts)0 GB (EBS only)32/64-bitLow1t1.microMicro0.60 GB2 (only for short bursts)0 GB (EBS only)32/64-bitLow1t1.micro $0.02 per hour $0.03 per hour
High-Memory Extra Large17.10 GB6.5 (2 cores x 3.25 units)420 GB64-bitModerate60m2.xlargeHigh-Memory Extra Large17.10 GB6.5 (2 cores x 3.25 units)420 GB64-bitModerate60m2.xlarge $0.45 per hour $0.57 per hour
High-Memory Double Extra Large34.20 GB13 (4 cores x 3.25 units)850 GB64-bitHigh120m2.2xlargeHigh-Memory Double Extra Large34.20 GB13 (4 cores x 3.25 units)850 GB64-bitHigh120m2.2xlarge $0.90 per hour $1.14 per hour
High-Memory Quadruple Extra Large68.40 GB26 (8 cores x 3.25 units)1690 GB (2 x 840 GB)64-bitHigh (EBS Optimized)240m2.4xlargeHigh-Memory Quadruple Extra Large68.40 GB26 (8 cores x 3.25 units)1690 GB (2 x 840 GB)64-bitHigh (EBS Optimized)240m2.4xlarge $1.80 per hour $2.28 per hour
2nd Gen Standard Extra Large15.00 GB13 (4 cores x 3.25 units)0 GB (EBS only)64-bitModerate60m3.xlarge2nd Gen Standard Extra Large15.00 GB13 (4 cores x 3.25 units)0 GB (EBS only)64-bitModerate60m3.xlarge $0.58 per hour $0.98 per hour
2nd Gen Standard Double Extra Large30.00 GB26 (8 cores x 3.25 units)0 GB (EBS only)64-bitHigh120m3.2xlarge2nd Gen Standard Double Extra Large30.00 GB26 (8 cores x 3.25 units)0 GB (EBS only)64-bitHigh120m3.2xlarge $1.16 per hour $1.96 per hour
High-CPU Medium1.70 GB5 (2 cores x 2.5 units)350 GB32/64-bitModerate12c1.mediumHigh-CPU Medium1.70 GB5 (2 cores x 2.5 units)350 GB32/64-bitModerate12c1.medium $0.165 per hour $0.285 per hour
High-CPU Extra Large7.00 GB20 (8 cores x 2.5 units)1690 GB (4 x 420 GB)64-bitHigh60c1.xlargeHigh-CPU Extra Large7.00 GB20 (8 cores x 2.5 units)1690 GB (4 x 420 GB)64-bitHigh60c1.xlarge $0.66 per hour $1.14 per hour
Cluster Compute Quadruple Extra Large23.00 GB33.5 (2 x Intel Xeon X5570)1690 GB (2 x 840 GB)64-bitVery High1cc1.4xlargeCluster Compute Quadruple Extra Large23.00 GB33.5 (2 x Intel Xeon X5570)1690 GB (2 x 840 GB)64-bitVery High1cc1.4xlarge $1.30 per hour $1.61 per hour
Cluster Compute Eight Extra Large60.50 GB88 (2 x Intel Xeon E5-2670)3370 GB (4 x 840 GB)64-bitVery High240cc2.8xlargeCluster Compute Eight Extra Large60.50 GB88 (2 x Intel Xeon E5-2670)3370 GB (4 x 840 GB)64-bitVery High240cc2.8xlarge $2.40 per hour $2.97 per hour
Cluster GPU Quadruple Extra Large22.00 GB33.5 (2 x Intel Xeon X5570)1690 GB (2 x 840 GB)64-bitVery High1cg1.4xlargeCluster GPU Quadruple Extra Large22.00 GB33.5 (2 x Intel Xeon X5570)1690 GB (2 x 840 GB)64-bitVery High1cg1.4xlarge $2.10 per hour $2.60 per hour
High I/O Quadruple Extra Large60.50 GB35 (2 x Intel Xeon X5570)2048 GB (2 x 1024 GB SSD)64-bitVery High1hi1.4xlargeHigh I/O Quadruple Extra Large60.50 GB35 (2 x Intel Xeon X5570)2048 GB (2 x 1024 GB SSD)64-bitVery High1hi1.4xlarge $3.10 per hour $3.58 per hour