clear_skies 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82eb78bcb0b8d0e46d77a658b8a46390441f6a61
-  data.tar.gz: 96bd95ac7fe050aab5c42705751651d465cc00fc
+  metadata.gz: 71658311ffdc9ed619d871de1c83e0536f973af9
+  data.tar.gz: a25bb06314702201194df39f39eb07456753aff6
 SHA512:
-  metadata.gz: ea88cec568d392ecdcaa6e9907c43d6d06558348234d83e5cfc4c6258377b986c0f4e0f38a778bbc9d9e3585f4543cff62c638207061debd3b887b741df4a1cd
-  data.tar.gz: adac7ec7203afb00fd939cabf39ea7b3e22d146946667372475506f3238727bb030e86345ae45e8ae7adaec1a9c8321c06b84c927016992183890ec9fd24b8e6
+  metadata.gz: ef27ddde07cc95c78d34dec964bf3251ee129d91081f7a0d2d0d1775b8a774f54a106c66dd6541dcffe69741812942ced6d56d93cd7e55dea62129f3b92eeb83
+  data.tar.gz: 129defa2139170c0a31133dedc835712ef912c3055070d2c2dfcd182b97760f09ae250329d1cff6677f020f317cbb08b7aa466bd6d4b81f4fd03e6844e0dab60

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    clear_skies (0.4.0)
+    clear_skies (0.4.1)
       awesome_print
       aws-sdk
       elasticsearch

data/lib/clear_skies/aws/reservation_utilization.rb

@@ -3,25 +3,27 @@ module ClearSkies
     class ReservationUtilization < GreekFire::MeasureSet
       def items
         client = Aws::EC2::Client.new()
-        reservations = client.describe_reserved_instances(filters: [{name: "state", values: ["active"]}]).reserved_instances.map { |x| ReservationMatcher.new(x) }
+        reservations = client.describe_reserved_instances.reserved_instances
+        active_reservations = reservations.map { |x| ReservationMatcher.new(x) if x.state == "active" }.compact
+        current_reservations = reservations.map { |x| ReservationMatcher.new(x) if x.start < Time.now && x.start + x.duration > Time.now && x.fixed_price > 0}.compact
 
         instance_counts = Hash.new { 0 }
 
-
         instance_spawns = client.describe_instances(filters: [{name: "instance-state-name", values: ["running"]}])
 
         instance_spawns.reservations.each do |spawn|
           spawn.instances.each do |instance|
-            reservations.find { |reservation| reservation.match(instance) }
+            active_reservations.find { |reservation| reservation.match(instance) }
 
             instance_counts[{instance_type: instance.instance_type, availability_zone: instance.placement.availability_zone, tenancy: instance.placement.tenancy}] += 1
           end
         end
 
         [
-            ReservationExpirationGauge.new(reservations),
-            ReservationPurchasedGauge.new(reservations),
-            ReservationUsageGauge.new(reservations),
+            ReservationExpirationGauge.new(active_reservations),
+            ReservationPurchasedGauge.new(active_reservations),
+            ReservationDailyCostGauge.new(current_reservations),
+            ReservationUsageGauge.new(active_reservations),
             InstancesGauge.new(instance_counts)
         ]
       end
@@ -41,6 +43,10 @@ module ClearSkies
         @reservation.end - Time.now
       end
 
+      def daily_cost
+        (reservation.fixed_price * instance_count) / (reservation.duration / 1.day)
+      end
+
       def match(instance)
         return false if match_count >= instance_count
         return false unless @reservation.instance_type == instance.instance_type
@@ -93,6 +99,22 @@ module ClearSkies
       end
     end
 
+    class ReservationDailyCostGauge < GreekFire::Gauge
+      def initialize(reservations)
+        super("aws_ec2_reservation_amortized_daily_price", description: "Amortized daily cost of reservation") do |labels|
+          labels.delete(:reservation).daily_cost
+        end
+
+        @reservations = reservations
+      end
+
+      def labels
+        @reservations.map do |reservation|
+          reservation.labels.merge(reservation: reservation)
+        end
+      end
+    end
+
     class ReservationUsageGauge < GreekFire::Gauge
       def initialize(reservations)
         super("aws_ec2_reservation_usage", description: "Number of instance reservations in use") do |labels|

data/lib/clear_skies/version.rb

@@ -1,3 +1,3 @@
 module ClearSkies
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clear_skies
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Chris Constantine