From 5cde216b0d67ecfda40260557dad26c5f9d9c50a Mon Sep 17 00:00:00 2001
From: Justin Killen <Justin.Killen@citygridmedia.com>
Date: Mon, 16 Oct 2017 11:49:29 -0700
Subject: [PATCH] update pricing, add m3

---
 src/main/clj/com/climate/services/aws/ec2.clj | 70 ++++++++++++++-----
 1 file changed, 53 insertions(+), 17 deletions(-)

diff --git a/src/main/clj/com/climate/services/aws/ec2.clj b/src/main/clj/com/climate/services/aws/ec2.clj
index c1ac9e9..bc89e53 100644
--- a/src/main/clj/com/climate/services/aws/ec2.clj
+++ b/src/main/clj/com/climate/services/aws/ec2.clj
@@ -29,8 +29,8 @@
    {:cpu "20",
     :family "high-cpu",
     :arch "64",
-    :us-east-demand "0.66",
-    :us-east-reserve "0.24",
+    :us-east-demand "0.52",
+    :us-east-reserve "0.364",
     :mem "7.0",
     :type "c1.xlarge",
     :io "high"},
@@ -38,8 +38,8 @@
    {:cpu "5",
     :family "high-cpu",
     :arch "32",
-    :us-east-demand "0.165",
-    :us-east-reserve "0.06",
+    :us-east-demand "0.13",
+    :us-east-reserve "0.091",
     :mem "1.7",
     :type "c1.medium",
     :io "moderate"},
@@ -47,8 +47,8 @@
    {:cpu "26",
     :family "high-mem",
     :arch "64",
-    :us-east-demand "1.8",
-    :us-east-reserve "0.532",
+    :us-east-demand "0.98",
+    :us-east-reserve "0.444",
     :mem "68.4",
     :type "m2.4xlarge",
     :io "high"},
@@ -56,8 +56,8 @@
    {:cpu "13",
     :family "high-mem",
     :arch "64",
-    :us-east-demand "0.90",
-    :us-east-reserve "0.266",
+    :us-east-demand "0.49",
+    :us-east-reserve "0.222",
     :mem "34.2",
     :type "m2.2xlarge",
     :io "high"},
@@ -65,8 +65,8 @@
    {:cpu "6.5",
     :family "high-mem",
     :arch "64",
-    :us-east-demand "0.45",
-    :us-east-reserve "0.133",
+    :us-east-demand "0.245",
+    :us-east-reserve "0.111",
     :mem "17.1",
     :type "m2.xlarge",
     :io "moderate"},
@@ -74,8 +74,8 @@
    {:cpu "8",
     :family "standard",
     :arch "64",
-    :us-east-demand "0.64",
-    :us-east-reserve "0.192",
+    :us-east-demand "0.35",
+    :us-east-reserve "0.224",
     :mem "15",
     :type "m1.xlarge",
     :io "high"},
@@ -83,8 +83,8 @@
    {:cpu "4",
     :family "standard",
     :arch "64",
-    :us-east-demand "0.32",
-    :us-east-reserve "0.096",
+    :us-east-demand "0.175",
+    :us-east-reserve "0.112",
     :mem "7.5",
     :type "m1.large",
     :io "high"},
@@ -92,11 +92,47 @@
    {:cpu "1",
     :family "standard",
     :arch "32",
-    :us-east-demand "0.08",
-    :us-east-reserve "0.024",
+    :us-east-demand "0.044",
+    :us-east-reserve "0.028",
     :mem "1.7",
     :type "m1.small",
-    :io "moderate"}})
+    :io "moderate"},
+   "m3.medium"
+   {:cpu "1",
+    :family "standard",
+    :arch "64",
+    :us-east-demand "0.067",
+    :us-east-reserve "0.048",
+    :mem "3.75",
+    :type "m3.medium",
+    :io "moderate"},
+   "m3.large"
+   {:cpu "2",
+    :family "standard",
+    :arch "64",
+    :us-east-demand "0.133",
+    :us-east-reserve "0.095",
+    :mem "7.5",
+    :type "m3.large",
+    :io "moderate"},
+   "m3.xlarge"
+   {:cpu "4",
+    :family "standard",
+    :arch "64",
+    :us-east-demand "0.266",
+    :us-east-reserve "0.19",
+    :mem "15",
+    :type "m3.xlarge",
+    :io "high"},
+   "m3.2xlarge"
+   {:cpu "8",
+    :family "standard",
+    :arch "64",
+    :us-east-demand "0.532",
+    :us-east-reserve "0.38",
+    :mem "30",
+    :type "m3.2xlarge",
+    :io "high"}})
 
 (defn- price
   ([market instance-type]