cloudwatch-sender 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff1a63e62d0660b2cf330f15aa145c9012f69750
-  data.tar.gz: 987bd2e9c50204530cab7e1d5d211aeae9d011f3
+  metadata.gz: db3623e303865b8a0f9a3cc6de29d4bab86744ab
+  data.tar.gz: 71a77cee896132748aad7ed8cd5e1582a844c444
 SHA512:
-  metadata.gz: c4210d48cd37b9390a139193a1e24a86b7dd20705de7399159c8140cb56cc37ee7218b14b517075bf253c3c57b2ebda18c9573b2c9abd79c29fff58358e54416
-  data.tar.gz: ace96313d3ed532c539166bc83d88fa7ccdb2403e047a96f9448e8336af695bf6618a958fb49834c5b4fe29fdba716d1cda20d2b3a410683f986d31043a67507
+  metadata.gz: 527103a349e4e7ac3a02beadb61749b79999e32e7fd12f12da539baeddb486d763f89a0646a8d2724b00fd15bb56a791882fca19ce0227af5b568b5412862f2d
+  data.tar.gz: 6e336af7696e74afc34260921d41425d0615aa9e5ff291e163349590f4ecc603acae69041e5ab00bd4d83ddefbc7dfca1576d9cec19985443c00b025634ff4d9

data/.ruby-version

@@ -1 +1 @@
-2.1.3
+2.2.0

data/cloudwatch-sender.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "aws-sdk"
   spec.add_runtime_dependency "thor"
+  spec.add_runtime_dependency "influxdb"
 end

data/configs/example.yaml

@@ -1,7 +1,13 @@
 ---
 metric_prefix: "cloudwatch"
-influx_host: "influxdb.domain.com"
-influx_port: 2003
+influx_options:
+  influx_host: "influxdb.domain.com"
+  influx_database: cloudwatch
+  influx_ssl: true
+  influx_verify_ssl: true
+  influx_ssl_ca_cert: "/path/to/certs"
+  influx_username: "username"
+  influx_password: "password"
 
 metric_types:
 ## EC2 Metrics

data/lib/cloudwatch/sender/base.rb

@@ -1,27 +1,22 @@
-require "json"
-require "yaml"
-
 module Cloudwatch
   module Sender
     class Base
-      def initialize(server, port)
-        @influx_server = server
-        @influx_port   = port
-      end
+      attr_reader :influxdb, :metric_prefix
 
-      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
-        logger.debug "Error: #{e}"
-      ensure
-        sock.close
+      def initialize(options, metric_prefix)
+        @metric_prefix = metric_prefix
+        @influxdb = InfluxDB::Client.new "graphite",
+          :username    => options["influx_username"],
+          :password    => options["influx_password"],
+          :use_ssl     => options["influx_ssl"] || false,
+          :verify_ssl  => options["influx_verify_ssl"] || false,
+          :ssl_ca_cert => options["influx_ssl_ca_cert"] || false,
+          :host        => options["influx_host"] || false
       end
 
-      protected
-
-      attr_reader :influx_server, :influx_port
+      def write_data(data)
+        influxdb.write_point(metric_prefix, data)
+      end
     end
   end
 end

data/lib/cloudwatch/sender/cli.rb

@@ -1,5 +1,10 @@
 require "thor"
+require "json"
+require "yaml"
 require "logger"
+require "openssl"
+require "influxdb"
+require "cloudwatch/sender/base"
 require "cloudwatch/sender/ec2"
 require "cloudwatch/sender/credentials"
 require "cloudwatch/sender/metric_definition"
@@ -13,7 +18,7 @@ module Cloudwatch
     class CLI < Thor
       include Thor::Actions
 
-      class_option :provider, :desc => "AWS security provider", :required => false, :enum => ["iam", "instance_profile"]
+      class_option :provider, :desc => "AWS security provider", :required => false, :enum => %w(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
@@ -44,7 +49,6 @@ module Cloudwatch
         end
       end
 
-
       no_commands do
         def load_metrics(metrics_file)
           YAML.load(File.open(metrics_file))

data/lib/cloudwatch/sender/fetcher/base.rb

@@ -1,5 +1,3 @@
-require "cloudwatch/sender/base"
-
 module Cloudwatch
   module Sender
     module Fetcher
@@ -28,8 +26,7 @@ module Cloudwatch
         end
 
         def fetcher(component_meta)
-          namespace.start_with?("AWS/") ? Object.const_get(class_namespace component_meta)
-                                        : Cloudwatch::Sender::Fetcher::Custom
+          namespace.start_with?("AWS/") ? Object.const_get(class_namespace component_meta) : Cloudwatch::Sender::Fetcher::Custom
         end
 
         def class_namespace(component_meta)
@@ -42,13 +39,13 @@ module Cloudwatch
 
         def metric_type(component_meta, metric)
           fetcher(component_meta).new(
-            cloudwatch, sender, metric_prefix
+            cloudwatch, sender
           ).metrics(component_meta, metric)
         end
 
         def sender
           Cloudwatch::Sender::Base.new(
-            components["influx_host"], components["influx_port"]
+            components["influx_options"], metric_prefix
           )
         end
       end

data/lib/cloudwatch/sender/fetcher/custom.rb

@@ -2,12 +2,11 @@ module Cloudwatch
   module Sender
     module Fetcher
       class Custom
-        attr_reader :metric_prefix, :cloudwatch, :sender
+        attr_reader :cloudwatch, :sender, :database
 
-        def initialize(cloudwatch, sender, metric_prefix)
+        def initialize(cloudwatch, sender)
           @cloudwatch = cloudwatch
           @sender = sender
-          @metric_prefix = metric_prefix
         end
 
         START_TIME = 180
@@ -37,7 +36,15 @@ module Cloudwatch
 
         def check_statistics(name, label, statistics, time, data)
           statistics.each do |stat|
-            sender.send_tcp("#{metric_prefix}.#{name}.#{label.downcase}.#{stat.downcase}" " " "#{data[stat.downcase]}" " "  "#{time}")
+            data = {
+              :tags      => {
+                name.tr("^A-Za-z0-9", "") => label.downcase
+              },
+              :timestamp => time,
+              :values    => { :value => data[stat.downcase] }
+            }
+
+            sender.write_data(data)
           end
         end
       end

data/lib/cloudwatch/sender/fetcher/ec2.rb

@@ -2,10 +2,9 @@ module Cloudwatch
   module Sender
     module Fetcher
       class EC2
-        def initialize(cloudwatch, sender, metric_prefix)
+        def initialize(cloudwatch, sender)
           @cloudwatch = cloudwatch
           @sender = sender
-          @metric_prefix = metric_prefix
         end
 
         def metrics(component_meta, metric)
@@ -14,7 +13,7 @@ module Cloudwatch
 
         private
 
-        attr_reader :metric_prefix, :cloudwatch, :sender
+        attr_reader :cloudwatch, :sender
 
         START_TIME = 180
 
@@ -61,7 +60,13 @@ module Cloudwatch
 
         def check_statistics(instanceid, name, label, statistics, time, data)
           statistics.each do |stat|
-            sender.send_tcp("#{metric_prefix}.#{name}.#{instanceid}.#{label.downcase}.#{stat}" " " "#{data[stat.downcase]}" " "  "#{time}")
+            data = {
+              :tags      => { name.tr("^A-Za-z0-9", "") => label.downcase, "instance" => instanceid.tr("-", "") },
+              :timestamp => time,
+              :values    => { :value => data[stat.downcase] }
+            }
+
+            sender.write_data(data)
           end
         end
       end

data/lib/cloudwatch/sender/fetcher/sqs.rb

@@ -2,12 +2,11 @@ module Cloudwatch
   module Sender
     module Fetcher
       class SQS
-        attr_reader :metric_prefix, :cloudwatch, :sender
+        attr_reader :cloudwatch, :sender
 
-        def initialize(cloudwatch, sender, metric_prefix)
+        def initialize(cloudwatch, sender)
           @cloudwatch = cloudwatch
           @sender = sender
-          @metric_prefix = metric_prefix
         end
 
         START_TIME = 1200
@@ -39,7 +38,13 @@ module Cloudwatch
 
         def check_statistics(name, label, statistics, time, data, queue_name)
           statistics.each do |stat|
-            sender.send_tcp("#{metric_prefix}.#{name}.#{queue_name}.#{label.downcase}.#{stat.downcase}" " " "#{data[stat.downcase]}" " "  "#{time}")
+            data = {
+              :tags      => { name => label.downcase, "queue_name" => queue_name },
+              :timestamp => time,
+              :values    => { :value => data[stat.downcase] }
+            }
+
+            sender.write_data(data)
           end
         end
       end

data/lib/cloudwatch/sender/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudwatch-sender
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - DaveBlooman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-22 00:00:00.000000000 Z
+date: 2015-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,6 +67,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: influxdb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Get metrics from Cloudwatch and send to Graphite/InfluxDB
 email:
 - david.blooman@gmail.com
@@ -116,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Cloudwatch Metrics Sender