You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by an...@apache.org on 2017/04/01 04:39:37 UTC

[5/8] libcloud git commit: Add r4 instance types for AWS

Add r4 instance types for AWS


Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/96e0c696
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/96e0c696
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/96e0c696

Branch: refs/heads/trunk
Commit: 96e0c696c90045836d0121171224adde0ca14ed5
Parents: 03c8714
Author: Jens Deppe <jd...@pivotal.io>
Authored: Wed Mar 1 18:18:31 2017 -0800
Committer: Anthony Shaw <an...@apache.org>
Committed: Sat Apr 1 15:20:25 2017 +1100

----------------------------------------------------------------------
 contrib/scrape-ec2-prices.py    |  12 +
 libcloud/compute/drivers/ec2.py | 138 +++++++++
 libcloud/data/pricing.json      | 551 +++++++++++++++++++++++++----------
 3 files changed, 552 insertions(+), 149 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/libcloud/blob/96e0c696/contrib/scrape-ec2-prices.py
----------------------------------------------------------------------
diff --git a/contrib/scrape-ec2-prices.py b/contrib/scrape-ec2-prices.py
index c2e646a..4f3ff9b 100755
--- a/contrib/scrape-ec2-prices.py
+++ b/contrib/scrape-ec2-prices.py
@@ -37,10 +37,13 @@ LINUX_PRICING_URLS = [
 
 EC2_REGIONS = [
     'us-east-1',
+    'us-east-2',
     'us-west-1',
     'us-west-2',
     'eu-west-1',
+    'eu-west-2',
     'eu-central-1',
+    'ca-central-1',
     'ap-southeast-1',
     'ap-southeast-2',
     'ap-northeast-1',
@@ -90,6 +93,12 @@ EC2_INSTANCE_TYPES = [
     'r3.2xlarge',
     'r3.4xlarge',
     'r3.8xlarge',
+    'r4.large',
+    'r4.xlarge',
+    'r4.2xlarge',
+    'r4.4xlarge',
+    'r4.8xlarge',
+    'r4.16xlarge',
     't2.micro',
     't2.small',
     't2.medium',
@@ -101,12 +110,15 @@ EC2_INSTANCE_TYPES = [
 REGION_NAME_MAP = {
     'us-east': 'ec2_us_east',
     'us-east-1': 'ec2_us_east',
+    'us-east-2': 'ec2_us_east',
     'us-west': 'ec2_us_west',
     'us-west-1': 'ec2_us_west',
     'us-west-2': 'ec2_us_west_oregon',
     'eu-west-1': 'ec2_eu_west',
+    'eu-west-2': 'ec2_eu_west',
     'eu-ireland': 'ec2_eu_west',
     'eu-central-1': 'ec2_eu_central',
+    'ca-central-1': 'ec2_ca_central',
     'apac-sin': 'ec2_ap_southeast',
     'ap-southeast-1': 'ec2_ap_southeast',
     'apac-syd': 'ec2_ap_southeast_2',

http://git-wip-us.apache.org/repos/asf/libcloud/blob/96e0c696/libcloud/compute/drivers/ec2.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py
index 9205a67..b429f38 100644
--- a/libcloud/compute/drivers/ec2.py
+++ b/libcloud/compute/drivers/ec2.py
@@ -625,6 +625,66 @@ INSTANCE_TYPES = {
             'cpu': 32
         }
     },
+    'r4.large': {
+        'id': 'r4.large',
+        'name': 'Memory Optimized Large instance',
+        'ram': GiB(15.25),
+        'disk': 0,  # GB
+        'bandwidth': None,
+        'extra': {
+            'cpu': 2
+        }
+    },
+    'r4.xlarge': {
+        'id': 'r4.xlarge',
+        'name': 'Memory Optimized Extra Large instance',
+        'ram': GiB(30.5),
+        'disk': 0,  # GB
+        'bandwidth': None,
+        'extra': {
+            'cpu': 4
+        }
+    },
+    'r4.2xlarge': {
+        'id': 'r4.2xlarge',
+        'name': 'Memory Optimized Double Extra Large instance',
+        'ram': GiB(61),
+        'disk': 0,  # GB
+        'bandwidth': None,
+        'extra': {
+            'cpu': 8
+        }
+    },
+    'r4.4xlarge': {
+        'id': 'r4.4xlarge',
+        'name': 'Memory Optimized Quadruple Extra Large instance',
+        'ram': GiB(122),
+        'disk': 0,  # GB
+        'bandwidth': None,
+        'extra': {
+            'cpu': 16
+        }
+    },
+    'r4.8xlarge': {
+        'id': 'r4.8xlarge',
+        'name': 'Memory Optimized Eight Extra Large instance',
+        'ram': GiB(244),
+        'disk': 0,  # GB
+        'bandwidth': None,
+        'extra': {
+            'cpu': 32
+        }
+    },
+    'r4.16xlarge': {
+        'id': 'r4.16xlarge',
+        'name': 'Memory Optimized Sixteen Extra Large instance',
+        'ram': GiB(488),
+        'disk': 0,  # GB
+        'bandwidth': None,
+        'extra': {
+            'cpu': 64
+        }
+    },
     # Burstable Performance General Purpose
     't2.nano': {
         'id': 't2.nano',
@@ -746,6 +806,12 @@ REGION_DETAILS = {
             'r3.2xlarge',
             'r3.4xlarge',
             'r3.8xlarge',
+            'r4.large',
+            'r4.xlarge',
+            'r4.2xlarge',
+            'r4.4xlarge',
+            'r4.8xlarge',
+            'r4.16xlarge',
             't2.nano',
             't2.micro',
             't2.small',
@@ -802,6 +868,12 @@ REGION_DETAILS = {
             'r3.2xlarge',
             'r3.4xlarge',
             'r3.8xlarge',
+            'r4.large',
+            'r4.xlarge',
+            'r4.2xlarge',
+            'r4.4xlarge',
+            'r4.8xlarge',
+            'r4.16xlarge',
             't2.nano',
             't2.micro',
             't2.small',
@@ -865,6 +937,12 @@ REGION_DETAILS = {
             'r3.2xlarge',
             'r3.4xlarge',
             'r3.8xlarge',
+            'r4.large',
+            'r4.xlarge',
+            'r4.2xlarge',
+            'r4.4xlarge',
+            'r4.8xlarge',
+            'r4.16xlarge',
             't2.nano',
             't2.micro',
             't2.small',
@@ -930,6 +1008,12 @@ REGION_DETAILS = {
             'r3.2xlarge',
             'r3.4xlarge',
             'r3.8xlarge',
+            'r4.large',
+            'r4.xlarge',
+            'r4.2xlarge',
+            'r4.4xlarge',
+            'r4.8xlarge',
+            'r4.16xlarge',
             't2.nano',
             't2.micro',
             't2.small',
@@ -992,6 +1076,12 @@ REGION_DETAILS = {
             'r3.2xlarge',
             'r3.4xlarge',
             'r3.8xlarge',
+            'r4.large',
+            'r4.xlarge',
+            'r4.2xlarge',
+            'r4.4xlarge',
+            'r4.8xlarge',
+            'r4.16xlarge',
             't2.nano',
             't2.micro',
             't2.small',
@@ -1040,6 +1130,12 @@ REGION_DETAILS = {
             'r3.2xlarge',
             'r3.4xlarge',
             'r3.8xlarge',
+            'r4.large',
+            'r4.xlarge',
+            'r4.2xlarge',
+            'r4.4xlarge',
+            'r4.8xlarge',
+            'r4.16xlarge',
             't2.micro',
             't2.small',
             't2.medium',
@@ -1075,6 +1171,12 @@ REGION_DETAILS = {
             'r3.2xlarge',
             'r3.4xlarge',
             'r3.8xlarge',
+            'r4.large',
+            'r4.xlarge',
+            'r4.2xlarge',
+            'r4.4xlarge',
+            'r4.8xlarge',
+            'r4.16xlarge',
             'i2.xlarge',
             'i2.2xlarge',
             'i2.4xlarge',
@@ -1136,6 +1238,12 @@ REGION_DETAILS = {
             't2.small',
             't2.medium',
             't2.large',
+            'r4.large',
+            'r4.xlarge',
+            'r4.2xlarge',
+            'r4.4xlarge',
+            'r4.8xlarge',
+            'r4.16xlarge',
             'x1.32xlarge'
         ]
     },
@@ -1192,6 +1300,12 @@ REGION_DETAILS = {
             'r3.2xlarge',
             'r3.4xlarge',
             'r3.8xlarge',
+            'r4.large',
+            'r4.xlarge',
+            'r4.2xlarge',
+            'r4.4xlarge',
+            'r4.8xlarge',
+            'r4.16xlarge',
             't2.nano',
             't2.micro',
             't2.small',
@@ -1231,6 +1345,12 @@ REGION_DETAILS = {
             'r3.2xlarge',
             'r3.4xlarge',
             'r3.8xlarge',
+            'r4.large',
+            'r4.xlarge',
+            'r4.2xlarge',
+            'r4.4xlarge',
+            'r4.8xlarge',
+            'r4.16xlarge',
             't2.nano',
             't2.micro',
             't2.small',
@@ -1266,6 +1386,12 @@ REGION_DETAILS = {
             'm4.16xlarge',
             'c1.medium',
             'c1.xlarge',
+            'r4.large',
+            'r4.xlarge',
+            'r4.2xlarge',
+            'r4.4xlarge',
+            'r4.8xlarge',
+            'r4.16xlarge',
             't2.nano',
             't2.micro',
             't2.small',
@@ -1324,6 +1450,12 @@ REGION_DETAILS = {
             'r3.2xlarge',
             'r3.4xlarge',
             'r3.8xlarge',
+            'r4.large',
+            'r4.xlarge',
+            'r4.2xlarge',
+            'r4.4xlarge',
+            'r4.8xlarge',
+            'r4.16xlarge',
             't2.micro',
             't2.small',
             't2.medium',
@@ -1380,6 +1512,12 @@ REGION_DETAILS = {
             'r3.2xlarge',
             'r3.4xlarge',
             'r3.8xlarge',
+            'r4.large',
+            'r4.xlarge',
+            'r4.2xlarge',
+            'r4.4xlarge',
+            'r4.8xlarge',
+            'r4.16xlarge',
             't2.nano',
             't2.micro',
             't2.small',

http://git-wip-us.apache.org/repos/asf/libcloud/blob/96e0c696/libcloud/data/pricing.json
----------------------------------------------------------------------
diff --git a/libcloud/data/pricing.json b/libcloud/data/pricing.json
index ac2fd8f..ba92fd6 100644
--- a/libcloud/data/pricing.json
+++ b/libcloud/data/pricing.json
@@ -36,11 +36,11 @@
             "c3.2xlarge": 0.511,
             "c3.4xlarge": 1.021,
             "c3.8xlarge": 2.043,
-            "c4.large": 0.12,
-            "c4.xlarge": 0.239,
-            "c4.2xlarge": 0.478,
-            "c4.4xlarge": 0.955,
-            "c4.8xlarge": 1.91,
+            "c4.large": 0.114,
+            "c4.xlarge": 0.227,
+            "c4.2xlarge": 0.454,
+            "c4.4xlarge": 0.907,
+            "c4.8xlarge": 1.815,
             "cc2.8xlarge": 2.349,
             "cr1.8xlarge": 4.105,
             "d2.xlarge": 0.844,
@@ -55,6 +55,12 @@
             "i2.2xlarge": 2.001,
             "i2.4xlarge": 4.002,
             "i2.8xlarge": 8.004,
+            "i3.large": 0.183,
+            "i3.xlarge": 0.366,
+            "i3.2xlarge": 0.732,
+            "i3.4xlarge": 1.464,
+            "i3.8xlarge": 2.928,
+            "i3.16xlarge": 5.856,
             "m1.small": 0.061,
             "m1.medium": 0.122,
             "m1.large": 0.243,
@@ -66,30 +72,40 @@
             "m3.large": 0.193,
             "m3.xlarge": 0.385,
             "m3.2xlarge": 0.77,
-            "m4.large": 0.165,
-            "m4.xlarge": 0.331,
-            "m4.2xlarge": 0.66,
-            "m4.4xlarge": 1.321,
-            "m4.10xlarge": 3.303,
+            "m4.large": 0.132,
+            "m4.xlarge": 0.265,
+            "m4.2xlarge": 0.528,
+            "m4.4xlarge": 1.057,
+            "m4.10xlarge": 2.642,
+            "m4.16xlarge": 4.228,
             "r3.large": 0.2,
             "r3.xlarge": 0.399,
             "r3.2xlarge": 0.798,
             "r3.4xlarge": 1.596,
             "r3.8xlarge": 3.192,
+            "r4.large": 0.16,
+            "r4.xlarge": 0.32,
+            "r4.2xlarge": 0.64,
+            "r4.4xlarge": 1.28,
+            "r4.8xlarge": 2.56,
+            "r4.16xlarge": 5.12,
             "t1.micro": 0.026,
-            "t2.micro": 0.02,
-            "t2.small": 0.04,
-            "t2.medium": 0.08,
-            "t2.large": 0.16,
-            "t2.nano": 0.01,
+            "t2.micro": 0.016,
+            "t2.small": 0.032,
+            "t2.medium": 0.064,
+            "t2.large": 0.128,
+            "t2.xlarge": 0.256,
+            "t2.nano": 0.008,
+            "t2.2xlarge": 0.512,
+            "x1.16xlarge": 9.671,
             "x1.32xlarge": 19.341
         },
         "ec2_ap_south_1": {
-            "c4.large": 0.137,
-            "c4.xlarge": 0.275,
-            "c4.2xlarge": 0.549,
-            "c4.4xlarge": 1.097,
-            "c4.8xlarge": 2.195,
+            "c4.large": 0.11,
+            "c4.xlarge": 0.22,
+            "c4.2xlarge": 0.439,
+            "c4.4xlarge": 0.878,
+            "c4.8xlarge": 1.756,
             "d2.xlarge": 0.827,
             "d2.2xlarge": 1.653,
             "d2.4xlarge": 3.306,
@@ -98,21 +114,38 @@
             "i2.2xlarge": 1.933,
             "i2.4xlarge": 3.867,
             "i2.8xlarge": 7.733,
-            "m4.large": 0.169,
-            "m4.xlarge": 0.337,
-            "m4.2xlarge": 0.675,
-            "m4.4xlarge": 1.35,
-            "m4.10xlarge": 3.375,
+            "i3.large": 0.177,
+            "i3.xlarge": 0.354,
+            "i3.2xlarge": 0.708,
+            "i3.4xlarge": 1.416,
+            "i3.8xlarge": 2.832,
+            "i3.16xlarge": 5.664,
+            "m4.large": 0.132,
+            "m4.xlarge": 0.263,
+            "m4.2xlarge": 0.527,
+            "m4.4xlarge": 1.053,
+            "m4.10xlarge": 2.633,
+            "m4.16xlarge": 4.212,
             "r3.large": 0.19,
             "r3.xlarge": 0.379,
             "r3.2xlarge": 0.758,
             "r3.4xlarge": 1.516,
             "r3.8xlarge": 3.032,
-            "t2.micro": 0.019,
-            "t2.small": 0.038,
-            "t2.medium": 0.076,
-            "t2.large": 0.152,
-            "t2.nano": 0.0095
+            "r4.large": 0.152,
+            "r4.xlarge": 0.304,
+            "r4.2xlarge": 0.608,
+            "r4.4xlarge": 1.216,
+            "r4.8xlarge": 2.432,
+            "r4.16xlarge": 4.864,
+            "t2.micro": 0.015,
+            "t2.small": 0.03,
+            "t2.medium": 0.059,
+            "t2.large": 0.119,
+            "t2.xlarge": 0.238,
+            "t2.nano": 0.0074,
+            "t2.2xlarge": 0.476,
+            "x1.16xlarge": 9.187,
+            "x1.32xlarge": 18.374
         },
         "ec2_ap_southeast": {
             "c1.medium": 0.164,
@@ -122,11 +155,11 @@
             "c3.2xlarge": 0.529,
             "c3.4xlarge": 1.058,
             "c3.8xlarge": 2.117,
-            "c4.large": 0.144,
-            "c4.xlarge": 0.289,
-            "c4.2xlarge": 0.578,
-            "c4.4xlarge": 1.155,
-            "c4.8xlarge": 2.31,
+            "c4.large": 0.115,
+            "c4.xlarge": 0.231,
+            "c4.2xlarge": 0.462,
+            "c4.4xlarge": 0.924,
+            "c4.8xlarge": 1.848,
             "d2.xlarge": 0.87,
             "d2.2xlarge": 1.74,
             "d2.4xlarge": 3.48,
@@ -138,6 +171,12 @@
             "i2.2xlarge": 2.035,
             "i2.4xlarge": 4.07,
             "i2.8xlarge": 8.14,
+            "i3.large": 0.187,
+            "i3.xlarge": 0.374,
+            "i3.2xlarge": 0.748,
+            "i3.4xlarge": 1.496,
+            "i3.8xlarge": 2.992,
+            "i3.16xlarge": 5.984,
             "m1.small": 0.058,
             "m1.medium": 0.117,
             "m1.large": 0.233,
@@ -149,22 +188,32 @@
             "m3.large": 0.196,
             "m3.xlarge": 0.392,
             "m3.2xlarge": 0.784,
-            "m4.large": 0.178,
-            "m4.xlarge": 0.355,
-            "m4.2xlarge": 0.711,
-            "m4.4xlarge": 1.421,
-            "m4.10xlarge": 3.553,
+            "m4.large": 0.134,
+            "m4.xlarge": 0.266,
+            "m4.2xlarge": 0.533,
+            "m4.4xlarge": 1.066,
+            "m4.10xlarge": 2.665,
+            "m4.16xlarge": 4.264,
             "r3.large": 0.2,
             "r3.xlarge": 0.399,
             "r3.2xlarge": 0.798,
             "r3.4xlarge": 1.596,
             "r3.8xlarge": 3.192,
+            "r4.large": 0.16,
+            "r4.xlarge": 0.32,
+            "r4.2xlarge": 0.64,
+            "r4.4xlarge": 1.28,
+            "r4.8xlarge": 2.56,
+            "r4.16xlarge": 5.12,
             "t1.micro": 0.02,
-            "t2.micro": 0.02,
-            "t2.small": 0.04,
-            "t2.medium": 0.08,
-            "t2.large": 0.16,
-            "t2.nano": 0.01,
+            "t2.micro": 0.015,
+            "t2.small": 0.03,
+            "t2.medium": 0.06,
+            "t2.large": 0.12,
+            "t2.xlarge": 0.24,
+            "t2.nano": 0.0075,
+            "t2.2xlarge": 0.48,
+            "x1.16xlarge": 9.671,
             "x1.32xlarge": 19.341
         },
         "ec2_ap_southeast_2": {
@@ -175,11 +224,11 @@
             "c3.2xlarge": 0.529,
             "c3.4xlarge": 1.058,
             "c3.8xlarge": 2.117,
-            "c4.large": 0.137,
-            "c4.xlarge": 0.275,
-            "c4.2xlarge": 0.549,
-            "c4.4xlarge": 1.097,
-            "c4.8xlarge": 2.195,
+            "c4.large": 0.13,
+            "c4.xlarge": 0.261,
+            "c4.2xlarge": 0.522,
+            "c4.4xlarge": 1.042,
+            "c4.8xlarge": 2.085,
             "d2.xlarge": 0.87,
             "d2.2xlarge": 1.74,
             "d2.4xlarge": 3.48,
@@ -191,6 +240,12 @@
             "i2.2xlarge": 2.035,
             "i2.4xlarge": 4.07,
             "i2.8xlarge": 8.14,
+            "i3.large": 0.187,
+            "i3.xlarge": 0.374,
+            "i3.2xlarge": 0.748,
+            "i3.4xlarge": 1.496,
+            "i3.8xlarge": 2.992,
+            "i3.16xlarge": 5.984,
             "m1.small": 0.058,
             "m1.medium": 0.117,
             "m1.large": 0.233,
@@ -202,35 +257,83 @@
             "m3.large": 0.186,
             "m3.xlarge": 0.372,
             "m3.2xlarge": 0.745,
-            "m4.large": 0.168,
-            "m4.xlarge": 0.336,
-            "m4.2xlarge": 0.673,
-            "m4.4xlarge": 1.345,
-            "m4.10xlarge": 3.363,
+            "m4.large": 0.134,
+            "m4.xlarge": 0.269,
+            "m4.2xlarge": 0.538,
+            "m4.4xlarge": 1.076,
+            "m4.10xlarge": 2.69,
+            "m4.16xlarge": 4.305,
             "r3.large": 0.2,
             "r3.xlarge": 0.399,
             "r3.2xlarge": 0.798,
             "r3.4xlarge": 1.596,
             "r3.8xlarge": 3.192,
+            "r4.large": 0.16,
+            "r4.xlarge": 0.319,
+            "r4.2xlarge": 0.638,
+            "r4.4xlarge": 1.277,
+            "r4.8xlarge": 2.554,
+            "r4.16xlarge": 5.107,
             "t1.micro": 0.02,
-            "t2.micro": 0.02,
-            "t2.small": 0.04,
-            "t2.medium": 0.08,
-            "t2.large": 0.16,
-            "t2.nano": 0.01,
+            "t2.micro": 0.016,
+            "t2.small": 0.032,
+            "t2.medium": 0.064,
+            "t2.large": 0.128,
+            "t2.xlarge": 0.256,
+            "t2.nano": 0.008,
+            "t2.2xlarge": 0.512,
+            "x1.16xlarge": 9.671,
             "x1.32xlarge": 19.341
         },
+        "ec2_ca_central": {
+            "c4.large": 0.11,
+            "c4.xlarge": 0.218,
+            "c4.2xlarge": 0.438,
+            "c4.4xlarge": 0.876,
+            "c4.8xlarge": 1.75,
+            "d2.xlarge": 0.759,
+            "d2.2xlarge": 1.518,
+            "d2.4xlarge": 3.036,
+            "d2.8xlarge": 6.072,
+            "i3.large": 0.172,
+            "i3.xlarge": 0.344,
+            "i3.2xlarge": 0.688,
+            "i3.4xlarge": 1.376,
+            "i3.8xlarge": 2.752,
+            "i3.16xlarge": 5.504,
+            "m4.large": 0.119,
+            "m4.xlarge": 0.237,
+            "m4.2xlarge": 0.474,
+            "m4.4xlarge": 0.948,
+            "m4.10xlarge": 2.37,
+            "m4.16xlarge": 3.792,
+            "r4.large": 0.146,
+            "r4.xlarge": 0.292,
+            "r4.2xlarge": 0.584,
+            "r4.4xlarge": 1.168,
+            "r4.8xlarge": 2.336,
+            "r4.16xlarge": 4.672,
+            "t2.micro": 0.013,
+            "t2.small": 0.026,
+            "t2.medium": 0.052,
+            "t2.large": 0.103,
+            "t2.xlarge": 0.206,
+            "t2.nano": 0.0065,
+            "t2.2xlarge": 0.412,
+            "x1.16xlarge": 7.336,
+            "x1.32xlarge": 14.672
+        },
         "ec2_eu_central": {
             "c3.large": 0.129,
             "c3.xlarge": 0.258,
             "c3.2xlarge": 0.516,
             "c3.4xlarge": 1.032,
             "c3.8xlarge": 2.064,
-            "c4.large": 0.134,
-            "c4.xlarge": 0.267,
-            "c4.2xlarge": 0.534,
-            "c4.4xlarge": 1.069,
-            "c4.8xlarge": 2.138,
+            "c4.large": 0.114,
+            "c4.xlarge": 0.227,
+            "c4.2xlarge": 0.454,
+            "c4.4xlarge": 0.909,
+            "c4.8xlarge": 1.817,
             "d2.xlarge": 0.794,
             "d2.2xlarge": 1.588,
             "d2.4xlarge": 3.176,
@@ -241,25 +344,41 @@
             "i2.2xlarge": 2.026,
             "i2.4xlarge": 4.051,
             "i2.8xlarge": 8.102,
+            "i3.large": 0.186,
+            "i3.xlarge": 0.372,
+            "i3.2xlarge": 0.744,
+            "i3.4xlarge": 1.488,
+            "i3.8xlarge": 2.976,
+            "i3.16xlarge": 5.952,
             "m3.medium": 0.079,
             "m3.large": 0.158,
             "m3.xlarge": 0.315,
             "m3.2xlarge": 0.632,
-            "m4.large": 0.143,
-            "m4.xlarge": 0.285,
-            "m4.2xlarge": 0.57,
-            "m4.4xlarge": 1.14,
-            "m4.10xlarge": 2.85,
+            "m4.large": 0.129,
+            "m4.xlarge": 0.257,
+            "m4.2xlarge": 0.513,
+            "m4.4xlarge": 1.026,
+            "m4.10xlarge": 2.565,
+            "m4.16xlarge": 4.104,
             "r3.large": 0.2,
             "r3.xlarge": 0.4,
             "r3.2xlarge": 0.8,
             "r3.4xlarge": 1.6,
             "r3.8xlarge": 3.201,
-            "t2.micro": 0.015,
-            "t2.small": 0.03,
-            "t2.medium": 0.06,
-            "t2.large": 0.12,
-            "t2.nano": 0.0075,
+            "r4.large": 0.16,
+            "r4.xlarge": 0.32,
+            "r4.2xlarge": 0.64,
+            "r4.4xlarge": 1.28,
+            "r4.8xlarge": 2.561,
+            "r4.16xlarge": 5.122,
+            "t2.micro": 0.014,
+            "t2.small": 0.027,
+            "t2.medium": 0.054,
+            "t2.large": 0.108,
+            "t2.xlarge": 0.216,
+            "t2.nano": 0.0068,
+            "t2.2xlarge": 0.432,
+            "x1.16xlarge": 9.337,
             "x1.32xlarge": 18.674
         },
         "ec2_eu_west": {
@@ -271,17 +390,17 @@
             "c3.4xlarge": 0.956,
             "c3.8xlarge": 1.912,
             "c4.large": 0.119,
-            "c4.xlarge": 0.238,
-            "c4.2xlarge": 0.477,
-            "c4.4xlarge": 0.953,
-            "c4.8xlarge": 1.906,
+            "c4.xlarge": 0.237,
+            "c4.2xlarge": 0.476,
+            "c4.4xlarge": 0.95,
+            "c4.8xlarge": 1.902,
             "cc2.8xlarge": 2.25,
             "cg1.4xlarge": 2.36,
             "cr1.8xlarge": 3.75,
-            "d2.xlarge": 0.735,
-            "d2.2xlarge": 1.47,
-            "d2.4xlarge": 2.94,
-            "d2.8xlarge": 5.88,
+            "d2.xlarge": 0.772,
+            "d2.2xlarge": 1.544,
+            "d2.4xlarge": 3.087,
+            "d2.8xlarge": 6.174,
             "g2.2xlarge": 0.702,
             "g2.8xlarge": 2.808,
             "hi1.4xlarge": 3.1,
@@ -290,6 +409,12 @@
             "i2.2xlarge": 1.876,
             "i2.4xlarge": 3.751,
             "i2.8xlarge": 7.502,
+            "i3.large": 0.181,
+            "i3.xlarge": 0.362,
+            "i3.2xlarge": 0.724,
+            "i3.4xlarge": 1.448,
+            "i3.8xlarge": 2.896,
+            "i3.16xlarge": 5.792,
             "m1.small": 0.047,
             "m1.medium": 0.095,
             "m1.large": 0.19,
@@ -301,23 +426,36 @@
             "m3.large": 0.146,
             "m3.xlarge": 0.293,
             "m3.2xlarge": 0.585,
-            "m4.large": 0.132,
-            "m4.xlarge": 0.264,
-            "m4.2xlarge": 0.528,
-            "m4.4xlarge": 1.056,
-            "m4.10xlarge": 2.641,
+            "m4.large": 0.125,
+            "m4.xlarge": 0.25,
+            "m4.2xlarge": 0.499,
+            "m4.4xlarge": 0.998,
+            "m4.10xlarge": 2.496,
+            "m4.16xlarge": 3.993,
+            "p2.xlarge": 0.972,
+            "p2.8xlarge": 7.776,
+            "p2.16xlarge": 15.552,
             "r3.large": 0.185,
             "r3.xlarge": 0.371,
             "r3.2xlarge": 0.741,
             "r3.4xlarge": 1.482,
             "r3.8xlarge": 2.964,
+            "r4.large": 0.156,
+            "r4.xlarge": 0.312,
+            "r4.2xlarge": 0.624,
+            "r4.4xlarge": 1.248,
+            "r4.8xlarge": 2.496,
+            "r4.16xlarge": 4.992,
             "t1.micro": 0.02,
             "t2.micro": 0.014,
-            "t2.small": 0.028,
-            "t2.medium": 0.056,
-            "t2.large": 0.112,
-            "t2.nano": 0.007,
-            "x1.32xlarge": 16.006
+            "t2.small": 0.026,
+            "t2.medium": 0.052,
+            "t2.large": 0.106,
+            "t2.xlarge": 0.212,
+            "t2.nano": 0.0066,
+            "t2.2xlarge": 0.424,
+            "x1.16xlarge": 8.403,
+            "x1.32xlarge": 16.806
         },
         "ec2_sa_east": {
             "c1.medium": 0.179,
@@ -327,6 +465,17 @@
             "c3.2xlarge": 0.65,
             "c3.4xlarge": 1.3,
             "c3.8xlarge": 2.6,
+            "c4.large": 0.155,
+            "c4.xlarge": 0.309,
+            "c4.2xlarge": 0.618,
+            "c4.4xlarge": 1.235,
+            "c4.8xlarge": 2.47,
+            "i3.large": 0.286,
+            "i3.xlarge": 0.572,
+            "i3.2xlarge": 1.144,
+            "i3.4xlarge": 2.288,
+            "i3.8xlarge": 4.576,
+            "i3.16xlarge": 9.152,
             "m1.small": 0.058,
             "m1.medium": 0.117,
             "m1.large": 0.233,
@@ -338,14 +487,31 @@
             "m3.large": 0.19,
             "m3.xlarge": 0.381,
             "m3.2xlarge": 0.761,
+            "m4.large": 0.171,
+            "m4.xlarge": 0.343,
+            "m4.2xlarge": 0.685,
+            "m4.4xlarge": 1.37,
+            "m4.10xlarge": 3.425,
+            "m4.16xlarge": 5.48,
+            "r3.large": 0.35,
+            "r3.xlarge": 0.7,
+            "r3.2xlarge": 1.399,
             "r3.4xlarge": 2.799,
             "r3.8xlarge": 5.597,
+            "r4.large": 0.28,
+            "r4.xlarge": 0.56,
+            "r4.2xlarge": 1.12,
+            "r4.4xlarge": 2.24,
+            "r4.8xlarge": 4.48,
+            "r4.16xlarge": 8.96,
             "t1.micro": 0.027,
-            "t2.micro": 0.027,
-            "t2.small": 0.054,
-            "t2.medium": 0.108,
-            "t2.large": 0.216,
-            "t2.nano": 0.0135
+            "t2.micro": 0.02,
+            "t2.small": 0.041,
+            "t2.medium": 0.081,
+            "t2.large": 0.162,
+            "t2.xlarge": 0.324,
+            "t2.nano": 0.0101,
+            "t2.2xlarge": 0.648
         },
         "ec2_us_east": {
             "c1.medium": 0.13,
@@ -355,11 +521,11 @@
             "c3.2xlarge": 0.42,
             "c3.4xlarge": 0.84,
             "c3.8xlarge": 1.68,
-            "c4.large": 0.105,
-            "c4.xlarge": 0.209,
-            "c4.2xlarge": 0.419,
-            "c4.4xlarge": 0.838,
-            "c4.8xlarge": 1.675,
+            "c4.large": 0.1,
+            "c4.xlarge": 0.199,
+            "c4.2xlarge": 0.398,
+            "c4.4xlarge": 0.796,
+            "c4.8xlarge": 1.591,
             "cc2.8xlarge": 2.0,
             "cg1.4xlarge": 2.1,
             "cr1.8xlarge": 3.5,
@@ -375,6 +541,12 @@
             "i2.2xlarge": 1.705,
             "i2.4xlarge": 3.41,
             "i2.8xlarge": 6.82,
+            "i3.large": 0.156,
+            "i3.xlarge": 0.312,
+            "i3.2xlarge": 0.624,
+            "i3.4xlarge": 1.248,
+            "i3.8xlarge": 2.496,
+            "i3.16xlarge": 4.992,
             "m1.small": 0.044,
             "m1.medium": 0.087,
             "m1.large": 0.175,
@@ -386,22 +558,35 @@
             "m3.large": 0.133,
             "m3.xlarge": 0.266,
             "m3.2xlarge": 0.532,
-            "m4.large": 0.12,
-            "m4.xlarge": 0.239,
-            "m4.2xlarge": 0.479,
-            "m4.4xlarge": 0.958,
-            "m4.10xlarge": 2.394,
+            "m4.large": 0.108,
+            "m4.xlarge": 0.215,
+            "m4.2xlarge": 0.431,
+            "m4.4xlarge": 0.862,
+            "m4.10xlarge": 2.155,
+            "m4.16xlarge": 3.447,
+            "p2.xlarge": 0.9,
+            "p2.8xlarge": 7.2,
+            "p2.16xlarge": 14.4,
             "r3.large": 0.166,
             "r3.xlarge": 0.333,
             "r3.2xlarge": 0.665,
             "r3.4xlarge": 1.33,
             "r3.8xlarge": 2.66,
+            "r4.large": 0.133,
+            "r4.xlarge": 0.266,
+            "r4.2xlarge": 0.532,
+            "r4.4xlarge": 1.064,
+            "r4.8xlarge": 2.128,
+            "r4.16xlarge": 4.256,
             "t1.micro": 0.02,
-            "t2.micro": 0.013,
-            "t2.small": 0.026,
-            "t2.medium": 0.052,
-            "t2.large": 0.104,
-            "t2.nano": 0.0065,
+            "t2.micro": 0.012,
+            "t2.small": 0.023,
+            "t2.medium": 0.047,
+            "t2.large": 0.094,
+            "t2.xlarge": 0.188,
+            "t2.nano": 0.0059,
+            "t2.2xlarge": 0.376,
+            "x1.16xlarge": 6.669,
             "x1.32xlarge": 13.338
         },
         "ec2_us_govwest": {
@@ -412,6 +597,11 @@
             "c3.2xlarge": 0.504,
             "c3.4xlarge": 1.008,
             "c3.8xlarge": 2.016,
+            "c4.large": 0.12,
+            "c4.xlarge": 0.239,
+            "c4.2xlarge": 0.479,
+            "c4.4xlarge": 0.958,
+            "c4.8xlarge": 1.915,
             "cc2.8xlarge": 2.25,
             "d2.xlarge": 0.828,
             "d2.2xlarge": 1.656,
@@ -422,6 +612,12 @@
             "i2.2xlarge": 2.046,
             "i2.4xlarge": 4.092,
             "i2.8xlarge": 8.184,
+            "i3.large": 0.188,
+            "i3.xlarge": 0.376,
+            "i3.2xlarge": 0.752,
+            "i3.4xlarge": 1.504,
+            "i3.8xlarge": 3.008,
+            "i3.16xlarge": 6.016,
             "m1.small": 0.053,
             "m1.medium": 0.106,
             "m1.large": 0.211,
@@ -433,17 +629,36 @@
             "m3.large": 0.168,
             "m3.xlarge": 0.336,
             "m3.2xlarge": 0.672,
+            "m4.large": 0.136,
+            "m4.xlarge": 0.273,
+            "m4.2xlarge": 0.545,
+            "m4.4xlarge": 1.089,
+            "m4.10xlarge": 2.723,
+            "m4.16xlarge": 4.356,
+            "p2.xlarge": 1.08,
+            "p2.8xlarge": 8.64,
+            "p2.16xlarge": 17.28,
             "r3.large": 0.2,
             "r3.xlarge": 0.399,
             "r3.2xlarge": 0.798,
             "r3.4xlarge": 1.596,
             "r3.8xlarge": 3.192,
+            "r4.large": 0.16,
+            "r4.xlarge": 0.319,
+            "r4.2xlarge": 0.638,
+            "r4.4xlarge": 1.277,
+            "r4.8xlarge": 2.554,
+            "r4.16xlarge": 5.107,
             "t1.micro": 0.024,
-            "t2.micro": 0.015,
-            "t2.small": 0.031,
-            "t2.medium": 0.062,
-            "t2.large": 0.124,
-            "t2.nano": 0.0075
+            "t2.micro": 0.014,
+            "t2.small": 0.028,
+            "t2.medium": 0.056,
+            "t2.large": 0.112,
+            "t2.xlarge": 0.224,
+            "t2.nano": 0.0068,
+            "t2.2xlarge": 0.448,
+            "x1.16xlarge": 8.003,
+            "x1.32xlarge": 16.006
         },
         "ec2_us_west": {
             "c1.medium": 0.148,
@@ -453,17 +668,27 @@
             "c3.2xlarge": 0.478,
             "c3.4xlarge": 0.956,
             "c3.8xlarge": 1.912,
-            "c4.large": 0.131,
-            "c4.xlarge": 0.262,
-            "c4.2xlarge": 0.524,
-            "c4.4xlarge": 1.049,
-            "c4.8xlarge": 2.098,
+            "c4.large": 0.124,
+            "c4.xlarge": 0.249,
+            "c4.2xlarge": 0.498,
+            "c4.4xlarge": 0.997,
+            "c4.8xlarge": 1.993,
+            "d2.xlarge": 0.781,
+            "d2.2xlarge": 1.563,
+            "d2.4xlarge": 3.125,
+            "d2.8xlarge": 6.25,
             "g2.2xlarge": 0.702,
             "g2.8xlarge": 2.808,
             "i2.xlarge": 0.938,
             "i2.2xlarge": 1.876,
             "i2.4xlarge": 3.751,
             "i2.8xlarge": 7.502,
+            "i3.large": 0.172,
+            "i3.xlarge": 0.344,
+            "i3.2xlarge": 0.688,
+            "i3.4xlarge": 1.376,
+            "i3.8xlarge": 2.752,
+            "i3.16xlarge": 5.504,
             "m1.small": 0.047,
             "m1.medium": 0.095,
             "m1.large": 0.19,
@@ -475,22 +700,31 @@
             "m3.large": 0.154,
             "m3.xlarge": 0.308,
             "m3.2xlarge": 0.616,
-            "m4.large": 0.14,
-            "m4.xlarge": 0.279,
-            "m4.2xlarge": 0.559,
-            "m4.4xlarge": 1.117,
-            "m4.10xlarge": 2.793,
+            "m4.large": 0.126,
+            "m4.xlarge": 0.251,
+            "m4.2xlarge": 0.503,
+            "m4.4xlarge": 1.005,
+            "m4.10xlarge": 2.514,
+            "m4.16xlarge": 4.022,
             "r3.large": 0.185,
             "r3.xlarge": 0.371,
             "r3.2xlarge": 0.741,
             "r3.4xlarge": 1.482,
             "r3.8xlarge": 2.964,
+            "r4.large": 0.148,
+            "r4.xlarge": 0.296,
+            "r4.2xlarge": 0.593,
+            "r4.4xlarge": 1.186,
+            "r4.8xlarge": 2.371,
+            "r4.16xlarge": 4.742,
             "t1.micro": 0.025,
-            "t2.micro": 0.017,
-            "t2.small": 0.034,
-            "t2.medium": 0.068,
-            "t2.large": 0.136,
-            "t2.nano": 0.0085
+            "t2.micro": 0.015,
+            "t2.small": 0.031,
+            "t2.medium": 0.061,
+            "t2.large": 0.122,
+            "t2.xlarge": 0.244,
+            "t2.nano": 0.0077,
+            "t2.2xlarge": 0.488
         },
         "ec2_us_west_oregon": {
             "c1.medium": 0.13,
@@ -500,11 +734,11 @@
             "c3.2xlarge": 0.42,
             "c3.4xlarge": 0.84,
             "c3.8xlarge": 1.68,
-            "c4.large": 0.105,
-            "c4.xlarge": 0.209,
-            "c4.2xlarge": 0.419,
-            "c4.4xlarge": 0.838,
-            "c4.8xlarge": 1.675,
+            "c4.large": 0.1,
+            "c4.xlarge": 0.199,
+            "c4.2xlarge": 0.398,
+            "c4.4xlarge": 0.796,
+            "c4.8xlarge": 1.591,
             "cc2.8xlarge": 2.0,
             "cr1.8xlarge": 3.5,
             "d2.xlarge": 0.69,
@@ -519,6 +753,12 @@
             "i2.2xlarge": 1.705,
             "i2.4xlarge": 3.41,
             "i2.8xlarge": 6.82,
+            "i3.large": 0.156,
+            "i3.xlarge": 0.312,
+            "i3.2xlarge": 0.624,
+            "i3.4xlarge": 1.248,
+            "i3.8xlarge": 2.496,
+            "i3.16xlarge": 4.992,
             "m1.small": 0.044,
             "m1.medium": 0.087,
             "m1.large": 0.175,
@@ -530,22 +770,35 @@
             "m3.large": 0.133,
             "m3.xlarge": 0.266,
             "m3.2xlarge": 0.532,
-            "m4.large": 0.12,
-            "m4.xlarge": 0.239,
-            "m4.2xlarge": 0.479,
-            "m4.4xlarge": 0.958,
-            "m4.10xlarge": 2.394,
+            "m4.large": 0.108,
+            "m4.xlarge": 0.215,
+            "m4.2xlarge": 0.431,
+            "m4.4xlarge": 0.862,
+            "m4.10xlarge": 2.155,
+            "m4.16xlarge": 3.447,
+            "p2.xlarge": 0.9,
+            "p2.8xlarge": 7.2,
+            "p2.16xlarge": 14.4,
             "r3.large": 0.166,
             "r3.xlarge": 0.333,
             "r3.2xlarge": 0.665,
             "r3.4xlarge": 1.33,
             "r3.8xlarge": 2.66,
+            "r4.large": 0.133,
+            "r4.xlarge": 0.266,
+            "r4.2xlarge": 0.532,
+            "r4.4xlarge": 1.064,
+            "r4.8xlarge": 2.128,
+            "r4.16xlarge": 4.256,
             "t1.micro": 0.02,
-            "t2.micro": 0.013,
-            "t2.small": 0.026,
-            "t2.medium": 0.052,
-            "t2.large": 0.104,
-            "t2.nano": 0.0065,
+            "t2.micro": 0.012,
+            "t2.small": 0.023,
+            "t2.medium": 0.047,
+            "t2.large": 0.094,
+            "t2.xlarge": 0.188,
+            "t2.nano": 0.0059,
+            "t2.2xlarge": 0.376,
+            "x1.16xlarge": 6.669,
             "x1.32xlarge": 13.338
         },
         "elastichosts": {
@@ -1035,5 +1288,5 @@
         }
     },
     "storage": {},
-    "updated": 1467125838
+    "updated": 1488413064
 }
\ No newline at end of file