cloudwatch-sender 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0de3762390f886fad8a077d0cecd0e2f1e1ad48f
-  data.tar.gz: cde93ef7efa2f1286dffb59c3139aad87cd222a8
+  metadata.gz: ff1a63e62d0660b2cf330f15aa145c9012f69750
+  data.tar.gz: 987bd2e9c50204530cab7e1d5d211aeae9d011f3
 SHA512:
-  metadata.gz: 8c6c836c2c5051ddd48438b930279041ac8c5da3a5f48495e866018e58f0d8f81274de1133a1f5582c83ee4b5ff07028a33b9847fdc0309669ab1c4eac59bc1e
-  data.tar.gz: e7b8c961bb55cfdcc3b12f579e145217bddb24ca46de1f8351062ac959de3006c2b48a223e0b746b24ef192658d682d28bb8a81593f53ecd82cb5a0d45ecc276
+  metadata.gz: c4210d48cd37b9390a139193a1e24a86b7dd20705de7399159c8140cb56cc37ee7218b14b517075bf253c3c57b2ebda18c9573b2c9abd79c29fff58358e54416
+  data.tar.gz: ace96313d3ed532c539166bc83d88fa7ccdb2403e047a96f9448e8336af695bf6618a958fb49834c5b4fe29fdba716d1cda20d2b3a410683f986d31043a67507

data/README.md

@@ -37,24 +37,28 @@ gem install cloudwatch-sender
 ### Command Line
 
 ```sh
-cloudwatch-sender send_metrics /path/to/config.yaml $AWS_ACCESS_KEY $AWS_SECRET_KEY $AWS_REGION
+cloudwatch-sender send_metrics /path/to/config.yaml --region=eu-west-1 --access-key-id=$AWS_ACCESS_KEY --secret-access-key= $AWS_SECRET_KEY
 ```
 
 If you would like to stream metrics to your endpoint at a set interval, use `continuous`:
 
 ```sh
-cloudwatch-sender continuous /path/to/config.yaml $AWS_ACCESS_KEY $AWS_SECRET_KEY $AWS_REGION $INTERVAL
+cloudwatch-sender continuous /path/to/config.yaml --region=eu-west-1 $INTERVAL --access-key-id=$AWS_ACCESS_KEY --secret-access-key= $AWS_SECRET_KEY
 ```
 
 **Note** - the default `$INTERVAL` is 60 seconds.
 
+```sh
+cloudwatch-sender continuous /path/to/config.yaml --region=eu-west-1 $INTERVAL --provider=iam
+```
+
 ### Programmatically
 
 ```ruby
 require "cloudwatch/sender/cli"
 
 loop do
-  Cloudwatch::Sender::CLI.new.send_metrics(config_path, key_id, access_key, region)
+  Cloudwatch::Sender::CLI.new.send_metrics(config_path = './configs/default.yml', { 'region' => 'eu-west-1', 'provider' => 'iam'})
   sleep 120
 end
 ```
@@ -62,7 +66,7 @@ end
 ```ruby
 require "cloudwatch/sender/cli"
 
-Cloudwatch::Sender::CLI.new.continuous(config_path, key_id, access_key, region, sleep_time)
+Cloudwatch::Sender::CLI.new.continuous(config_path = './configs/default.yml', 60, { 'region' => 'eu-west-1', 'provider' => 'iam'})
 ```
 
 ## Configs

data/lib/cloudwatch/sender/base.rb

@@ -10,6 +10,7 @@ module Cloudwatch
       end
 
       def send_tcp(contents)
+        puts "#{influx_server}:#{influx_port} - #{contents}" if ENV['DEBUG']
         sock = TCPSocket.open(influx_server, influx_port)
         sock.print contents
       rescue StandardError => e

data/lib/cloudwatch/sender/cli.rb

@@ -1,6 +1,7 @@
 require "thor"
 require "logger"
 require "cloudwatch/sender/ec2"
+require "cloudwatch/sender/credentials"
 require "cloudwatch/sender/metric_definition"
 require "cloudwatch/sender/fetcher/base"
 require "cloudwatch/sender/fetcher/ec2"
@@ -12,34 +13,54 @@ module Cloudwatch
     class CLI < Thor
       include Thor::Actions
 
-      desc "send_metrics [metrics_file] [key_id] [access_key] [region]", "Gets metrics from Cloudwatch and sends them to influx"
-      def send_metrics(metrics_file, key_id, access_key, region)
-        setup_aws(key_id, access_key, region)
+      class_option :provider, :desc => "AWS security provider", :required => false, :enum => ["iam", "instance_profile"]
+      class_option :access_key_id, :desc => "AWS access_key_id", :required => false
+      class_option :secret_access_key, :desc => "AWS secret_key_id", :required => false
+      class_option :region, :desc => "AWS region", :required => false
+
+      desc "send_metrics [metrics_file]", "Gets metrics from Cloudwatch and sends them to influx"
+      def send_metrics(metrics_file, opts = {})
+        setup_aws(options.merge(opts), opts["provider"])
         MetricDefinition.metric_type load_metrics(metrics_file)
       end
 
-      desc "continuous [metrics_file] [key_id] [access_key] [region] [sleep time]", "Continuously sends metrics to Influx/Cloudwatch"
-      def continuous(metrics_file, key_id, access_key, region, sleep_time = 60)
+      desc "continuous [metrics_file] [sleep time]", "Continuously sends metrics to Influx/Cloudwatch"
+      def continuous(metrics_file, sleep_time = 60, opts = {})
         logger = Logger.new(STDOUT)
 
         loop do
           begin
-            send_metrics(metrics_file, key_id, access_key, region)
+            send_metrics(metrics_file, options.merge(opts))
             sleep sleep_time.to_i
+          rescue RequiredArgumentMissingError, ArgumentError => e
+            logger.error("Required argument invalid or missing '#{e}'")
+            exit(1)
+          rescue Aws::Errors::MissingCredentialsError => e
+            logger.error("#{e}")
+            exit(1)
           rescue => e
             logger.debug("Unable to complete operation #{e}")
           end
         end
       end
 
+
       no_commands do
         def load_metrics(metrics_file)
           YAML.load(File.open(metrics_file))
         end
 
-        def setup_aws(key_id, access_key, region)
-          Aws.config.update(:region      => region,
-                            :credentials => Aws::Credentials.new(key_id, access_key))
+        def setup_aws(options, provider)
+          SetupAwsCredentials.send("#{validate_provider(provider)}".to_sym, options)
+        end
+
+        def validate_provider(provider)
+          return "access_key_id" if provider.nil?
+          if %w(iam instance_profile).include? provider.downcase
+            provider.downcase
+          else
+            fail ArgumentError.new("'--provider' invalid argument '#{options['provider']}'")
+          end
         end
       end
     end

data/lib/cloudwatch/sender/credentials.rb

@@ -0,0 +1,30 @@
+module Cloudwatch
+  module Sender
+    class SetupAwsCredentials
+      def self.iam(options)
+        provider(options)
+      end
+
+      def self.instance_profile(options)
+        provider(options)
+      end
+
+      def self.access_key_id(options)
+        credentials = Aws::Credentials.new(options["access_key_id"], options["secret_access_key"])
+        Aws.config.update(:region => (options["region"] || ENV["AWS_REGION"]), :credentials => credentials)
+      rescue
+        RequiredArgumentMissingError.new("'--access_key_id' and '--secret_access_key' required")
+      end
+
+      private
+
+      def self.credentials
+        Aws::InstanceProfileCredentials.new
+      end
+
+      def self.provider(options)
+        Aws.config.update(:region => (options["region"] || ENV["AWS_REGION"]), :credentials => credentials)
+      end
+    end
+  end
+end

data/lib/cloudwatch/sender/version.rb

@@ -1,5 +1,5 @@
 module Cloudwatch
   module Sender
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudwatch-sender
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - DaveBlooman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-16 00:00:00.000000000 Z
+date: 2015-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -87,6 +87,7 @@ files:
 - configs/example.yaml
 - lib/cloudwatch/sender/base.rb
 - lib/cloudwatch/sender/cli.rb
+- lib/cloudwatch/sender/credentials.rb
 - lib/cloudwatch/sender/ec2.rb
 - lib/cloudwatch/sender/fetcher/base.rb
 - lib/cloudwatch/sender/fetcher/custom.rb