aws_instance_list 1.2.6 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a88a496e99edde8c7d285a465cfe304c38fbf82
-  data.tar.gz: c5db25fd4d65f23a849fd817636f180e5e65f676
+  metadata.gz: d05c98e5aae6d7a2860094f1838a61d2a2529271
+  data.tar.gz: 4a5047d23b616bc8366c704dfa691bfe6e8eaa77
 SHA512:
-  metadata.gz: 9f2bff084b04f818baafcddd07bd24ed8635bcb48d43b473da90e2e8c26cf7acb063a1d532e85a8af6298dc372c36de1e621a9562e75bd8ccd6890926e20c52d
-  data.tar.gz: '02487fda68e8e17d02758a7e384f586d8f42e9b7be6c90d783facff877f3d11d855ec0173e2a5dd8133efbe82ddbd0a68eacce935ed708ebb7e41b926a5b726b'
+  metadata.gz: 18a92fcc6d8aad273103f4c5f6f28edd8921551af149cbbb4bac206062e62cb3aa7f4d44f4b17ef33b2bb27485cdea07221a6b43107911d715998f9f8caa87c3
+  data.tar.gz: 3e904bfcc67dbfa6ce0ca2c44745a17eda886cce7039ada66ad2bfcbb941d98f6b1975fd5c4c8eca0106cd4a97346ff09574187e9cb43e92e4b0c650a625296d

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    aws_instance_list (1.2.6)
+    aws_instance_list (1.3.1)
       aws-sdk-cloudwatch (~> 1.6)
       aws-sdk-ec2 (~> 1.37)
+      aws-sdk-elasticache (~> 1.7)
       aws-sdk-rds (~> 1.23)
       dotenv (~> 2.5)
 
@@ -11,20 +12,23 @@ GEM
   remote: https://rubygems.org/
   specs:
     aws-eventstream (1.0.1)
-    aws-partitions (1.95.0)
-    aws-sdk-cloudwatch (1.6.0)
-      aws-sdk-core (~> 3)
+    aws-partitions (1.105.0)
+    aws-sdk-cloudwatch (1.10.0)
+      aws-sdk-core (~> 3, >= 3.26.0)
       aws-sigv4 (~> 1.0)
-    aws-sdk-core (3.22.1)
+    aws-sdk-core (3.32.0)
       aws-eventstream (~> 1.0)
       aws-partitions (~> 1.0)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-ec2 (1.38.0)
-      aws-sdk-core (~> 3)
+    aws-sdk-ec2 (1.51.0)
+      aws-sdk-core (~> 3, >= 3.26.0)
       aws-sigv4 (~> 1.0)
-    aws-sdk-rds (1.23.0)
-      aws-sdk-core (~> 3)
+    aws-sdk-elasticache (1.7.0)
+      aws-sdk-core (~> 3, >= 3.26.0)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-rds (1.33.0)
+      aws-sdk-core (~> 3, >= 3.26.0)
       aws-sigv4 (~> 1.0)
     aws-sigv4 (1.0.3)
     byebug (10.0.2)

data/aws_instance_list.gemspec

@@ -39,5 +39,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "aws-sdk-rds", "~> 1.23"
   spec.add_dependency "aws-sdk-ec2", "~> 1.37"
   spec.add_dependency "aws-sdk-cloudwatch", "~> 1.6"
+  spec.add_dependency "aws-sdk-elasticache", "~> 1.7"
   spec.add_dependency "dotenv", "~> 2.5"
 end

data/lib/aws_instance_list/base.rb

@@ -0,0 +1,48 @@
+require 'yaml'
+
+module AwsInstanceList
+
+  class Base
+
+    attr_accessor :client, :region, :metric
+
+    def initialize region: 'eu-west-1'
+
+      @region=region
+
+      @metric = AwsInstanceList::Metric.new region: region
+
+      @instances = []
+
+    end
+
+    def instances options={}
+      ds=descriptions(options)
+      @instances+=ds.send( list_method )
+      if ds.marker
+        options[:marker]=ds.marker
+        instances(options)
+      else
+        @instances
+      end
+    end
+
+    def yaml
+      @yaml||=yaml_default.merge(yaml_file)[demodulize]
+    end
+
+    def yaml_default
+      YAML.load_file AwsInstanceList::DEFAULT_SETTINGS
+    end
+
+    def yaml_file
+      ENV.has_key?('AWS_INSTANCE_LIST_YAML') ? YAML.load_file(ENV['AWS_INSTANCE_LIST_YAML']) : {}
+    end
+
+    def demodulize
+      self.class.name.split('::').last
+    end
+
+  end
+
+end

data/lib/aws_instance_list/elasti_cache.rb

@@ -0,0 +1,61 @@
+require 'aws-sdk-elasticache'
+
+module AwsInstanceList
+
+  class ElastiCache < AwsInstanceList::Base
+
+    def initialize region: 'eu-west-1'
+
+      super region: region
+
+      @client=Aws::ElastiCache::Client.new region: region
+
+    end
+
+    def list_method
+      :cache_clusters
+    end
+
+    def descriptions options={}
+      client.describe_cache_clusters(options)
+    end
+
+    def bytes_used_for_cache cache_cluster_id
+      metric.bytes_used_for_cache cache_cluster_id
+    end
+
+    def freeable_memory cache_cluster_id
+      metric.freeable_memory cache_cluster_id
+    end
+
+    def cache_list options: {}, fields: nil
+
+      fields||=load_cache_fields
+
+      instances(options).map do |i|
+        fields.map { |f| i.send(f) } + metrics(i) << region
+      end
+    end
+
+    def group_name i
+      i.cache_parameter_group.cache_parameter_group_name
+    end
+
+    def maxmemory cache_node_type
+      yaml['maxmemory'][cache_node_type]
+    end
+
+    def load_cache_fields
+      yaml['cache']['fields']
+    end
+
+    def metrics instance
+      used=bytes_used_for_cache(instance.cache_cluster_id)
+      total=maxmemory instance.cache_node_type
+      [used, total, used / total * 100.0]
+    end
+
+  end
+end
+
+

data/lib/aws_instance_list/list.rb

@@ -6,37 +6,45 @@ module AwsInstanceList
 
     def initialize
       @regions=AwsInstanceList::Region.list
-      @db_list={}
+      @list={}
     end
 
     def db_list
+      list
+    end
 
-      if @db_list.empty?
+    def rds_db_list region:
+      rds=AwsInstanceList::RDS.new region: region
+      rds.db_list
+    end
 
-        threads = []
+    def list call_to: :rds_db_list
 
-        regions.each do |region|
+      threads = []
 
-          threads << Thread.new do
-            @db_list[region]=rds_db_list region: region
-          end
+      regions.each do |region|
 
+        threads << Thread.new do
+          @list[region]=self.send( call_to, region: region)
         end
 
-        loop do
-          break if threads.count { |th| th.alive? } == 0
-        end
+      end
 
+      loop do
+        break if threads.count { |th| th.alive? } == 0
       end
 
-      @db_list.values.flatten(1)
+      @list.values.flatten(1)
 
     end
 
-    def rds_db_list region:
-      rds=AwsInstanceList::RDS.new region: region
-      rds.db_instances
-      rds.db_list
+    def cache_list
+      list call_to: :cache_instance_list
+    end
+
+    def cache_instance_list region:
+      ec=AwsInstanceList::ElastiCache.new region: region
+      ec.cache_list
     end
 
   end

data/lib/aws_instance_list/metric.rb

@@ -34,7 +34,52 @@ module AwsInstanceList
         statistics: ["Minimum"]
       })
 
-      resp.datapoints.last.minimum / ( 1024.0 ** 3)
+      if resp.datapoints.empty?
+        '-'
+      else
+        resp.datapoints.last.minimum / ( 1024.0 ** 3)
+      end
+
+    end
+
+    def bytes_used_for_cache cache_cluster_id
+      resp=statistics( {
+        namespace: "AWS/ElastiCache",
+        metric_name: "BytesUsedForCache",
+        dimensions: [
+          {
+            name: "CacheClusterId",
+            value: cache_cluster_id,
+          },
+        ],
+        start_time: Time.now - 600,
+        end_time: Time.now ,
+        period: 60,
+        statistics: ["Maximum"]
+      })
+
+      resp.datapoints.last.maximum
+
+    end
+
+
+    def freeable_memory cache_cluster_id
+      resp=statistics( {
+        namespace: "AWS/ElastiCache",
+        metric_name: "FreeableMemory",
+        dimensions: [
+          {
+            name: "CacheClusterId",
+            value: cache_cluster_id,
+          },
+        ],
+        start_time: Time.now - 600,
+        end_time: Time.now ,
+        period: 60,
+        statistics: ["Maximum"]
+      })
+
+      resp.datapoints.last.maximum
 
     end
 

data/lib/aws_instance_list/rds.rb

@@ -1,42 +1,30 @@
 require 'aws-sdk-rds'
-require 'yaml'
 
 module AwsInstanceList
 
-  class RDS
-
-    attr_accessor :client, :region
+  class RDS < AwsInstanceList::Base
 
     def initialize region: 'eu-west-1'
 
-      @region=region
+      super region: region
 
       @client=Aws::RDS::Client.new region: region
 
-      @db_instances = []
-
     end
 
-    def db_descriptions options={}
-      client.describe_db_instances(options)
+    def list_method
+      :db_instances
     end
 
-    def db_instances options={}
-      descriptions=db_descriptions(options)
-      @db_instances+=descriptions.db_instances
-      if descriptions.marker
-        options[:marker]=descriptions.marker
-        db_instances(options)
-      else
-        @db_instances
-      end
+    def descriptions options={}
+      client.describe_db_instances(options)
     end
 
     def db_list options: {}, fields: nil
 
       fields||=load_db_fields
 
-      db_instances(options).map do |i|
+      instances(options).map do |i|
         fields.map { |f| i.send(f) } << free_storage_space(i.db_instance_identifier) << region
       end
     end
@@ -45,24 +33,7 @@ module AwsInstanceList
       yaml['db']['fields']
     end
 
-    def yaml
-      @yaml||=yaml_default.merge(yaml_file)[demodulize]
-    end
-
-    def yaml_default
-      YAML.load_file AwsInstanceList::DEFAULT_SETTINGS
-    end
-
-    def yaml_file
-      ENV.has_key?('AWS_INSTANCE_LIST_YAML') ? YAML.load_file(ENV['AWS_INSTANCE_LIST_YAML']) : {}
-    end
-
-    def demodulize
-      self.class.name.split('::').last
-    end
-
     def free_storage_space db_instance_identifier
-      metric = AwsInstanceList::Metric.new region: region
       metric.free_storage_space db_instance_identifier
     end
 

data/lib/aws_instance_list/version.rb

@@ -1,3 +1,3 @@
 module AwsInstanceList
-  VERSION = "1.2.6"
+  VERSION = "1.3.1"
 end

data/lib/aws_instance_list.rb

@@ -1,7 +1,9 @@
+require 'aws_instance_list/base'
 require 'aws_instance_list/list'
 require 'aws_instance_list/region'
 require 'aws_instance_list/metric'
 require 'aws_instance_list/rds'
+require 'aws_instance_list/elasti_cache'
 require 'aws_instance_list/version'
 
 require 'dotenv/load'

data/lib/config/default_settings.yaml

@@ -6,3 +6,42 @@ RDS:
       - engine
       - allocated_storage
       - db_instance_status
+ElastiCache:
+  cache:
+    fields:
+      - cache_cluster_id
+      - engine
+      - cache_node_type
+  maxmemory:
+    cache.t1.micro:       142606336
+    cache.t2.micro:       581959680
+    cache.t2.small:      1665138688
+    cache.t2.medium:     3461349376
+    cache.m1.small:       943718400
+    cache.m1.medium:     3093299200
+    cache.m1.large:      7025459200
+    cache.m1.xlarge:    14889779200
+    cache.m2.xlarge:    17091788800
+    cache.m2.2xlarge:   35022438400
+    cache.m2.4xlarge:   70883737600
+    cache.m3.medium:     2988441600
+    cache.m3.large:      6501171200
+    cache.m3.xlarge:    14260633600
+    cache.m3.2xlarge:   29989273600
+    cache.m4.large:      6892593152
+    cache.m4.xlarge:    15328501760
+    cache.m4.2xlarge:   31889126359
+    cache.m4.4xlarge:   65257290629
+    cache.m4.10xlarge: 166047614239
+    cache.c1.xlarge:     6501171200
+    cache.r3.large:     14470348800
+    cache.r3.xlarge:    30513561600
+    cache.r3.2xlarge:   62495129600
+    cache.r3.4xlarge:  126458265600
+    cache.r3.8xlarge:  254384537600
+    cache.r4.large:     13201781556
+    cache.r4.xlarge:    26898228839
+    cache.r4.2xlarge:   54197537997
+    cache.r4.4xlarge:  108858546586
+    cache.r4.8xlarge:  218255432090
+    cache.r4.16xlarge: 437021573120

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws_instance_list
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.3.1
 platform: ruby
 authors:
 - Diego PL
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-11 00:00:00.000000000 Z
+date: 2018-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-elasticache
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
@@ -144,6 +158,8 @@ files:
 - bin/console
 - bin/setup
 - lib/aws_instance_list.rb
+- lib/aws_instance_list/base.rb
+- lib/aws_instance_list/elasti_cache.rb
 - lib/aws_instance_list/list.rb
 - lib/aws_instance_list/metric.rb
 - lib/aws_instance_list/rds.rb