cloudwatchtographite 0.0.0.pre1 → 0.0.1

data/Gemfile

@@ -5,6 +5,7 @@ gem 'bundler'
 gem 'unf'
 gem "fog", "~> 1.19.0"
 gem 'hashifiable', '>= 0.1.3'
+gem 'log4r', '~> 1.1.10'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/README.md

@@ -10,6 +10,7 @@ submit them to a Graphite server of your choosing.
 - [Graphite](http://graphite.wikidot.com/)
 - [AWS CloudWatch](http://aws.amazon.com/cloudwatch/)
 
+[![Gem Version](https://badge.fury.io/rb/cloudwatchtographite.png)](http://badge.fury.io/rb/cloudwatchtographite)
 [![Build Status](https://travis-ci.org/zsprackett/cloudwatchtographite.png?branch=master)](https://travis-ci.org/zsprackett/cloudwatchtographite)
 [![Code Climate](https://codeclimate.com/github/zsprackett/cloudwatchtographite.png)](https://codeclimate.com/github/zsprackett/cloudwatchtographite)
 [![Coverage Status](https://coveralls.io/repos/zsprackett/cloudwatchtographite/badge.png)](https://coveralls.io/r/zsprackett/cloudwatchtographite)

data/bin/cloudwatch_to_graphite

@@ -17,6 +17,13 @@
 
 require 'optparse'
 require 'pp'
+require 'log4r'
+
+logger = Log4r::Logger.new('cloudwatchtographite')
+logger.level      = Log4r::ERROR
+f = Log4r::Outputter.stderr
+f.formatter  = Log4r::PatternFormatter.new(:pattern => "[%d] %C: %m")
+logger.outputters = f
 
 begin
   require 'cloudwatchtographite'
@@ -37,7 +44,6 @@ options = {
   :graphite_server  => 'localhost',
   :graphite_port    => 2003,
   :carbon_prefix    => 'cloudwatch',
-  :verbose          => false
 }
 opt_parser = OptionParser.new do |opt|
   opt.banner = "Usage: %s [OPTIONS]" % File.basename($0)
@@ -69,8 +75,17 @@ opt_parser = OptionParser.new do |opt|
   opt.on("-c","--carbon-prefix=prefix","Carbon Prefix (Default: #{options[:carbon_prefix]})") do |prefix|
     options[:carbon_prefix] = prefix
   end
+  opt.on("-l","--logfile=prefix","Log file (Default: stderr") do |logfile|
+    f = Log4r::FileOutputter.new(
+      'logfile',
+      :filename => logfile,
+      :trunc    => false
+    )
+    f.formatter  = Log4r::PatternFormatter.new(:pattern => "[%l] %d %C: %m")
+    logger.outputters = f
+  end
   opt.on("-v","--verbose","Increase verbosity") do
-    options[:verbose] = true
+    logger.level = Log4r::DEBUG
   end
   opt.on("-V","--version","Print version and exit") do
     puts File.basename($0) + " " + CloudwatchToGraphite::VERSION::STRING
@@ -109,25 +124,27 @@ end
 metrics = nil
 begin
   if not options[:json_metrics].nil?
+    logger.debug('Parsing JSON metrics')
     metrics = CloudwatchToGraphite::LoadMetrics.from_json_file(options[:json_metrics])
   else
+    logger.debug('Parsing YAML metrics')
     metrics = CloudwatchToGraphite::LoadMetrics.from_yaml_file(options[:yaml_metrics])
   end
 rescue CloudwatchToGraphite::ParseError
-  warn "Failed to parse option file"
+  logger.fatal('Failed to parse option file')
   exit 1
 end
 
 if metrics.empty?
-  warn "Exiting due to lack of metric definitions"
+  logger.fatal('Exiting due to lack of metric definitions')
   exit 1
 end
 
+logger.debug('Initializing CloudwatchToGraphite::Base')
 cwtg = CloudwatchToGraphite::Base.new(
   options[:access_key],
   options[:secret_key],
   options[:region],
-  options[:verbose]
 )
 
 cwtg.carbon_prefix = options[:carbon_prefix]
@@ -135,8 +152,11 @@ cwtg.protocol = options[:protocol]
 cwtg.graphite_server = options[:graphite_server]
 cwtg.graphite_port = options[:graphite_port]
 
+logger.debug('Fetching and forwarding metrics')
 if cwtg.fetch_and_forward(metrics)
+  logger.info('Exiting Success')
   exit 0
 else
+  logger.info('Exiting Failure')
   exit 1
 end

data/lib/cloudwatchtographite/version.rb

@@ -16,8 +16,8 @@ module CloudwatchToGraphite
   class VERSION
     MAJOR = 0
     MINOR = 0
-    PATCH = 0
-    BUILD = 'pre1'
+    PATCH = 1
+    BUILD = ''
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.') \
       + (BUILD.empty? ? '' : ".#{BUILD}")

data/lib/cloudwatchtographite.rb

@@ -13,6 +13,7 @@ require_relative './cloudwatchtographite/validator'
 require 'socket'
 require 'fog'
 require 'pp'
+require 'log4r'
 
 module CloudwatchToGraphite
   # This class is responsible for retrieving metrics from CloudWatch and
@@ -29,14 +30,14 @@ module CloudwatchToGraphite
     # region:: The AWS region (eg: us-west-1)
     # verbose:: boolean to enable verbose output
     #
-    def initialize(aws_access_key, aws_secret_key, region, verbose=false)
+    def initialize(aws_access_key, aws_secret_key, region)
+      @logger          = Log4r::Logger.new('cloudwatchtographite::base')
       @protocol        = 'udp'
       @carbon_prefix   = 'cloudwatch'
       @graphite_server = 'localhost'
       @graphite_port   = 2003
-      @verbose         = verbose
 
-      debug_log "Fog setting up for region #{region}"
+      @logger.debug("Fog setting up for region #{region}")
 
       @cloudwatch = Fog::AWS::CloudWatch.new(
         :aws_access_key_id => aws_access_key,
@@ -52,15 +53,15 @@ module CloudwatchToGraphite
       sock = nil
       contents = contents.join("\n") if contents.kind_of?(Array)
 
-      debug_log "Attempting to send #{contents.length}  bytes " +
-        "to #{@graphite_server}:#{@graphite_port} via udp"
+      @logger.debug("Attempting to send #{contents.length}  bytes " +
+        "to #{@graphite_server}:#{@graphite_port} via udp")
 
       begin
         sock = UDPSocket.open
         sock.send(contents, 0, @graphite_server, @graphite_port)
         retval = true
       rescue Exception => e
-        debug_log "Caught exception! [#{e}]"
+        @logger.debug("Caught exception! [#{e}]")
         retval = false
       ensure
         sock.close if sock
@@ -75,8 +76,8 @@ module CloudwatchToGraphite
       sock = nil
       contents = contents.join("\n") if contents.kind_of?(Array)
 
-      debug_log "Attempting to send #{contents.length}  bytes " +
-        "to #{@graphite_server}:#{@graphite_port} via tcp"
+      @logger.debug("Attempting to send #{contents.length}  bytes " +
+        "to #{@graphite_server}:#{@graphite_port} via tcp")
 
       retval = false
       begin
@@ -84,7 +85,7 @@ module CloudwatchToGraphite
         sock.print(contents)
         retval = true
       rescue Exception => e
-        debug_log "Caught exception! [#{e}]"
+        @logger.debug("Caught exception! [#{e}]")
       ensure
         sock.close if sock
       end
@@ -97,22 +98,22 @@ module CloudwatchToGraphite
         begin
           ret.concat retrieve_one_datapoint(m)
         rescue Excon::Errors::SocketError, Excon::Errors::BadRequest => e
-          warn "[Error in CloudWatch call] #{e.message}"
+          @logger.error("[Error in CloudWatch call] #{e.message}")
         rescue Excon::Errors::Forbidden
-          warn "[Error in CloudWatch call] permission denied - check keys!"
+          @logger.error(
+            "[Error in CloudWatch call] permission denied - check keys!"
+          )
         end
       end
       ret
     end
 
     def retrieve_one_datapoint(metric)
-      debug_log "Sending to CloudWatch:"
-      debug_object metric.to_h
+      @logger.debug("Sending to CloudWatch: #{metric.to_h}")
       data_points = @cloudwatch.get_metric_statistics(
         metric.to_h
       ).body['GetMetricStatisticsResult']['Datapoints']
-      debug_log "Received from CloudWatch:"
-      debug_object data_points
+      @logger.debug("Received from CloudWatch: #{data_points}")
 
       return retrieve_statistics(metric, order_data_points(data_points))
     end
@@ -125,8 +126,7 @@ module CloudwatchToGraphite
           ret.push "#{name} #{d[stat]} #{d['Timestamp'].utc.to_i}"
         end
       end
-      debug_log "Returning Statistics:"
-      debug_object ret
+      @logger.debug("Returning Statistics: #{ret}")
       ret
     end
 
@@ -141,7 +141,7 @@ module CloudwatchToGraphite
         when 'udp'
           send_udp(results)
         else
-          debug_log "Unknown protocol #{@protocol}"
+          @logger.debug("Unknown protocol #{@protocol}")
           raise ProtocolError
         end
       end
@@ -163,23 +163,11 @@ module CloudwatchToGraphite
       end
 
       if data_points.length == 0
-        warn "No data points!"
+        logger.debug("No data points!")
         data_points
       else
         data_points = data_points.sort_by {|array| array['Timestamp'] }
       end
     end
-
-    def debug_log(s)
-      if @verbose
-        warn s
-      end
-    end
-
-    def debug_object(s)
-      if @verbose
-        warn PP.pp(s, "")
-      end
-    end
   end
 end

data/spec/cloudwatchtographite_spec.rb

@@ -2,11 +2,11 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe CloudwatchToGraphite::Base do
   before :each do
-    @base = CloudwatchToGraphite::Base.new 'foo', 'bar', 'us-east-1', false
+    @base = CloudwatchToGraphite::Base.new 'foo', 'bar', 'us-east-1'
   end
 
   describe ".new" do
-    it "takes four parameters and returns a CloudwatchToGraphite::Base" do
+    it "takes three parameters and returns a CloudwatchToGraphite::Base" do
       @base.should be_an_instance_of CloudwatchToGraphite::Base
     end
   end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: cloudwatchtographite
 version: !ruby/object:Gem::Version
-  version: 0.0.0.pre1
-  prerelease: 6
+  version: 0.0.1
+  prerelease: 
 platform: ruby
 authors:
 - S. Zachariah Sprackett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-20 00:00:00.000000000 Z
+date: 2013-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,6 +75,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.3
+- !ruby/object:Gem::Dependency
+  name: log4r
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.10
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.10
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -220,13 +236,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4332474145690514089
+      hash: -2454461472709138499
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23