joyent-cloud-pricing 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2111e58865d22fde24d32147061b876f61abd621
-  data.tar.gz: 8fc86f5970562d9758afe1638f58095022cc5ffb
+  metadata.gz: 9e21a4eda1ba831465a4959fbb54890ba6055193
+  data.tar.gz: 0f572f94cc18c4c4a923ec3b968c291497236c25
 SHA512:
-  metadata.gz: d9f9cf9eefc2c6f429830316b550ee2705441b5697a58bbffe2f47caa0bfb5304ae758748c1c120e1e55b1c50225b3ad3807282534d896ea9c889a6e7313aa5f
-  data.tar.gz: 4dbe5bc3c410a42f14f722fc8057a6088c27db829101d1ebfa4169141d11caa4d499bf4b338d761391fc45e74a66743165dacf08bae637d05ded22f030e5eac3
+  metadata.gz: 2869b73f42a968ae8197a46c52ad8f8945090876c7801877df14e9e1512622700e25b27d88ba5afbdc9466f21b90560ab6d635203b96b643f6e49432e889898b
+  data.tar.gz: e16a073a306ada4bd9f2a1bc3c0aed3e8980c7e4afd6f3483dcd045908d8da07f7ba0f7f5dd8c259779dee44396f1c245e7e486877415dea410b61815b4c9fe5

data/README.md

@@ -150,6 +150,22 @@ custom:
 The structure is the same as in the main file ```joyent_pricing.yml```, and the contents will
 simply be merged on top of Joyent's standard pricing, so you can even overwrite existing flavors.
 
+### On Demand Discounts
+
+If (hypothetically speaking) you were able to negotiate a flat percentage discount off the on-demand
+rates, you could add the following to the commit pricing file:
+
+```yaml
+defaults: &defaults
+    years: 1
+
+discount:
+    type: :percent
+    value: 5
+```
+
+This would apply %5 discount to all on-demand rates.  Any reserve pricing would not be affected.
+
 ### Reporter
 
 This module is used by ```knife joyent server price``` plugin to calculate pricing with and without

data/config/joyent_pricing.yml

@@ -1,90 +1,181 @@
 ---
-:date: '2014-03-30 00:02:20 -0700'
+:date: '2015-06-25 10:44:38 -0700'
 :pricing:
-  :g3-standard-0.625-smartos:
-    :name: g3-standard-0.625-smartos
+  :t4-standard-128M:
+    :name: t4-standard-128M
     :os: SmartOS
-    :cost: 0.02
-    :cpus: 0.15
-    :disk: 20
-    :ram: 0.625
-  :g3-standard-1.75-smartos:
-    :name: g3-standard-1.75-smartos
+    :cost: 0.003
+    :cpus: 0.0625
+    :disk: 3
+    :ram: 0.128
+  :t4-standard-256M:
+    :name: t4-standard-256M
     :os: SmartOS
-    :cost: 0.056
-    :cpus: 1.0
-    :disk: 56
-    :ram: 1.75
-  :g3-standard-3.75-smartos:
-    :name: g3-standard-3.75-smartos
+    :cost: 0.007
+    :cpus: 0.125
+    :disk: 6
+    :ram: 0.256
+  :t4-standard-512M:
+    :name: t4-standard-512M
     :os: SmartOS
-    :cost: 0.12
+    :cost: 0.013
+    :cpus: 0.25
+    :disk: 12
+    :ram: 0.512
+  :t4-standard-1G:
+    :name: t4-standard-1G
+    :os: Windows Enterprise
+    :cost: 0.226
+    :cpus: 0.5
+    :disk: 25
+    :ram: 1.0
+  :t4-standard-2G:
+    :name: t4-standard-2G
+    :os: Windows Enterprise
+    :cost: 0.253
     :cpus: 1.0
-    :disk: 123
-    :ram: 3.75
-  :g3-standard-7.5-smartos:
-    :name: g3-standard-7.5-smartos
-    :os: SmartOS
-    :cost: 0.24
+    :disk: 50
+    :ram: 2.0
+  :t4-standard-4G:
+    :name: t4-standard-4G
+    :os: Windows Enterprise
+    :cost: 0.305
     :cpus: 2.0
-    :disk: 738
-    :ram: 7.5
-  :g3-standard-15-smartos:
-    :name: g3-standard-15-smartos
+    :disk: 100
+    :ram: 4.0
+  :t4-standard-8G:
+    :name: t4-standard-8G
     :os: SmartOS
-    :cost: 0.48
+    :cost: 0.21
     :cpus: 4.0
-    :disk: 1467
-    :ram: 15.0
-  :g3-standard-30-smartos:
-    :name: g3-standard-30-smartos
+    :disk: 200
+    :ram: 8.0
+  :t4-standard-16G:
+    :name: t4-standard-16G
     :os: SmartOS
-    :cost: 0.96
+    :cost: 0.42
     :cpus: 8.0
-    :disk: 1683
-    :ram: 30.0
-  :g3-standard-48-smartos:
-    :name: g3-standard-48-smartos
-    :os: SmartOS
-    :cost: 1.536
-    :cpus: 12.0
-    :disk: 1683
-    :ram: 48.0
-  :g3-standard-64-smartos:
-    :name: g3-standard-64-smartos
+    :disk: 400
+    :ram: 16.0
+  :t4-standard-32G:
+    :name: t4-standard-32G
     :os: SmartOS
-    :cost: 2.048
+    :cost: 0.84
     :cpus: 16.0
-    :disk: 2100
+    :disk: 800
+    :ram: 32.0
+  :t4-standard-64G:
+    :name: t4-standard-64G
+    :os: Windows Standard
+    :cost: 1.74
+    :cpus: 32.0
+    :disk: 1600
     :ram: 64.0
-  :g3-standard-80-smartos:
-    :name: g3-standard-80-smartos
-    :os: SmartOS
-    :cost: 2.56
-    :cpus: 20.0
-    :disk: 2625
-    :ram: 80.0
-  :g3-standard-96-smartos:
-    :name: g3-standard-96-smartos
-    :os: SmartOS
-    :cost: 3.072
-    :cpus: 24.0
-    :disk: 3150
+  :t4-standard-96G:
+    :name: t4-standard-96G
+    :os: Windows Enterprise
+    :cost: 2.72
+    :cpus: 48.0
+    :disk: 2300
     :ram: 96.0
-  :g3-standard-128-smartos-cc:
-    :name: g3-standard-128-smartos-cc
-    :os: SmartOS
-    :cost: 4.096
-    :cpus: 32.0
-    :disk: 4200
+  :t4-standard-128G:
+    :name: t4-standard-128G
+    :os: Windows Enterprise
+    :cost: 3.56
+    :cpus: 64.0
+    :disk: 3100
     :ram: 128.0
+  :t4-standard-160G:
+    :name: t4-standard-160G
+    :os: Windows Enterprise
+    :cost: 4.4
+    :cpus: 80.0
+    :disk: 3900
+    :ram: 160.0
+  :t4-standard-196G:
+    :name: t4-standard-196G
+    :os: Windows Enterprise
+    :cost: 5.24
+    :cpus: 96.0
+    :disk: 4700
+    :ram: 196.0
+  :t4-standard-224G:
+    :name: t4-standard-224G
+    :os: SmartOS
+    :cost: 5.88
+    :cpus: 112.0
+    :disk: 5500
+    :ram: 224.0
+  :g3-highmemory-17.125-kvm:
+    :name: g3-highmemory-17.125-kvm
+    :os: Linux
+    :cost: 0.409
+    :cpus: 2.0
+    :disk: 420
+    :ram: 17.13
+  :g3-highmemory-34.25-kvm:
+    :name: g3-highmemory-34.25-kvm
+    :os: Linux
+    :cost: 0.817
+    :cpus: 4.0
+    :disk: 843
+    :ram: 34.25
+  :g3-highmemory-68.375-kvm:
+    :name: g3-highmemory-68.375-kvm
+    :os: Linux
+    :cost: 1.63
+    :cpus: 8.0
+    :disk: 1122
+    :ram: 68.38
+  :g3-highcpu-1.75-kvm:
+    :name: g3-highcpu-1.75-kvm
+    :os: Linux
+    :cost: 0.127
+    :cpus: 2.0
+    :disk: 75
+    :ram: 1.75
+  :g3-highcpu-7-kvm:
+    :name: g3-highcpu-7-kvm
+    :os: Linux
+    :cost: 0.508
+    :cpus: 7.0
+    :disk: 263
+    :ram: 7.0
+  :g3-highio-15-kvm:
+    :name: g3-highio-15-kvm
+    :os: Linux
+    :cost: 0.76
+    :cpus: 2.0
+    :disk: 360
+    :ram: 15.0
+  :g3-highio-30-kvm:
+    :name: g3-highio-30-kvm
+    :os: Linux
+    :cost: 1.52
+    :cpus: 4.0
+    :disk: 725
+    :ram: 30.0
+  :g3-highio-60.5-kvm:
+    :name: g3-highio-60.5-kvm
+    :os: Linux
+    :cost: 3.067
+    :cpus: 8.0
+    :disk: 1452
+    :ram: 60.5
+  :g3-highstorage-32-kvm:
+    :name: g3-highstorage-32-kvm
+    :os: Linux
+    :cost: 0.863
+    :cpus: 8.0
+    :disk: 7680
+    :ram: 32.0
   :g3-highmemory-17.125-smartos:
     :name: g3-highmemory-17.125-smartos
     :os: SmartOS
     :cost: 0.409
     :cpus: 2.0
     :disk: 420
-    :ram: 17.125
+    :ram: 17.13
   :g3-highmemory-34.25-smartos:
     :name: g3-highmemory-34.25-smartos
     :os: SmartOS
@@ -98,7 +189,7 @@
     :cost: 1.63
     :cpus: 8.0
     :disk: 1122
-    :ram: 68.375
+    :ram: 68.38
   :g3-highmemory-144-smartos:
     :name: g3-highmemory-144-smartos
     :os: SmartOS
@@ -125,7 +216,7 @@
     :os: SmartOS
     :cost: 0.508
     :cpus: 7.0
-    :disk: 262
+    :disk: 263
     :ram: 7.0
   :g3-highcpu-16-smartos:
     :name: g3-highcpu-16-smartos
@@ -204,108 +295,3 @@
     :cpus: 32.0
     :disk: 30720
     :ram: 128.0
-  :g3-standard-0.625-kvm:
-    :name: g3-standard-0.625-kvm
-    :os: Linux
-    :cost: 0.02
-    :cpus: 0.15
-    :disk: 20
-    :ram: 0.625
-  :g3-standard-1.75-kvm:
-    :name: g3-standard-1.75-kvm
-    :os: Linux
-    :cost: 0.056
-    :cpus: 1.0
-    :disk: 56
-    :ram: 1.75
-  :g3-standard-3.75-kvm:
-    :name: g3-standard-3.75-kvm
-    :os: Linux
-    :cost: 0.12
-    :cpus: 1.0
-    :disk: 123
-    :ram: 3.75
-  :g3-standard-7.5-kvm:
-    :name: g3-standard-7.5-kvm
-    :os: Linux
-    :cost: 0.24
-    :cpus: 2.0
-    :disk: 738
-    :ram: 7.5
-  :g3-standard-15-kvm:
-    :name: g3-standard-15-kvm
-    :os: Linux
-    :cost: 0.48
-    :cpus: 4.0
-    :disk: 1467
-    :ram: 15.0
-  :g3-standard-30-kvm:
-    :name: g3-standard-30-kvm
-    :os: Linux
-    :cost: 0.96
-    :cpus: 8.0
-    :disk: 1683
-    :ram: 30.0
-  :g3-highmemory-17.125-kvm:
-    :name: g3-highmemory-17.125-kvm
-    :os: Linux
-    :cost: 0.409
-    :cpus: 2.0
-    :disk: 420
-    :ram: 17.125
-  :g3-highmemory-34.25-kvm:
-    :name: g3-highmemory-34.25-kvm
-    :os: Linux
-    :cost: 0.817
-    :cpus: 4.0
-    :disk: 843
-    :ram: 34.25
-  :g3-highmemory-68.375-kvm:
-    :name: g3-highmemory-68.375-kvm
-    :os: Linux
-    :cost: 1.63
-    :cpus: 8.0
-    :disk: 1122
-    :ram: 68.375
-  :g3-highcpu-1.75-kvm:
-    :name: g3-highcpu-1.75-kvm
-    :os: Linux
-    :cost: 0.127
-    :cpus: 2.0
-    :disk: 75
-    :ram: 1.75
-  :g3-highcpu-7-kvm:
-    :name: g3-highcpu-7-kvm
-    :os: Linux
-    :cost: 0.508
-    :cpus: 7.0
-    :disk: 262
-    :ram: 7.0
-  :g3-highio-15-kvm:
-    :name: g3-highio-15-kvm
-    :os: Linux
-    :cost: 0.76
-    :cpus: 2.0
-    :disk: 360
-    :ram: 15.0
-  :g3-highio-30-kvm:
-    :name: g3-highio-30-kvm
-    :os: Linux
-    :cost: 1.52
-    :cpus: 4.0
-    :disk: 725
-    :ram: 30.0
-  :g3-highio-60.5-kvm:
-    :name: g3-highio-60.5-kvm
-    :os: Linux
-    :cost: 3.067
-    :cpus: 8.0
-    :disk: 1452
-    :ram: 60.5
-  :g3-highstorage-32-kvm:
-    :name: g3-highstorage-32-kvm
-    :os: Linux
-    :cost: 0.863
-    :cpus: 8.0
-    :disk: 7680
-    :ram: 32.0

data/lib/pricing/report.txt.erb

@@ -6,17 +6,17 @@ Joyent Pricing Calculator: https://github.com/kigster/joyent-cloud-pricing
   were excluded from calculations. You could add them to the "custom"
   section of your reserve pricing file, and specify their cost.
 
-  Total # of zones with unknown flavors:     <%= sprintf("%20d", unknown_zone_total).red %>
+  Total # of instances with unknown flavors:     <%= sprintf("%20d", unknown_zone_total).red %>
   List of unknown flavors below:
 
 <%= unknown_zones_for_print.red %>
 <%= separator %>
 
 <%- end -%>
-ZONE COUNTS:
-  Total # of zones                           <%= sprintf("%20d", zones_in_use.size).cyan %>
+INSTANCE COUNTS:
+  Total # of instances                           <%= sprintf("%20d", zones_in_use.size).cyan %>
 <%- if have_commit_pricing? -%>
-  Total # of reserved zones                  <%= sprintf("%20d", commit.total_zones).green %>
+  Total # of reserved instances                  <%= sprintf("%20d", commit.total_zones).green %>
 <%-     if have_over_reserved_zones? -%>
   Total # of reserved but absent flavors     <%= value = sprintf("%20d", over_reserved_zone_counts.size || 0); value == "0" ? value.blue : value.red %>
 <%= over_reserved_zones_for_print.magenta %>
@@ -42,7 +42,7 @@ MONTHLY COSTS:
 <%- end -%>
   On demand monthly                          <%= format_price(monthly_overages_price, 20).yellow %>
 <%- if have_commit_pricing? -%>
-  Zones under reserve pricing                <%= format_price(commit.monthly_price, 20).green %>
+  Instances under reserve pricing                <%= format_price(commit.monthly_price, 20).green %>
 <%- end -%>
 <%- if have_commit_pricing? -%>
                                                       <%= "___________".cyan %>

data/lib/pricing/version.rb

@@ -1,7 +1,7 @@
 module Joyent
   module Cloud
     module Pricing
-      VERSION = '1.1.0'
+      VERSION = '1.1.1'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: joyent-cloud-pricing
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Konstantin Gredeskoul
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-18 00:00:00.000000000 Z
+date: 2015-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -190,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Tools for calculating monthly and yearly price of infrastructure hosted on