pingdom-to-graphite 0.0.7 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 966e39e720b02bdf667844172ed41a07f82de216
+  data.tar.gz: b3498c74b85f7fab28306014a7acadd28648e8d8
+SHA512:
+  metadata.gz: bb3bd92a0752a335d7f8b4ee3fb15dd3b067e85d792d1ffa5fa63eb2eda9290e195fa3eed819f0e495b920330fa5903720d70acb9f4d2d06b0c69ce472833aa0
+  data.tar.gz: f63971386435283d479dc8e72b5d2e24ec44899b4d9b2a50aa4d480ae0f2e2a8edcd9f729488a092a7603c7e3786327cae91be7d963499c6488ebf7ac3d98589

data/Gemfile

@@ -1,4 +1,3 @@
-# A sample Gemfile
 source "https://rubygems.org"
 
 gemspec
@@ -8,4 +7,4 @@ group :development do
   gem "aruba"
   gem "cucumber"
   gem "ronn"
-end
+end

data/lib/pingdom-to-graphite.rb

@@ -1,3 +1,3 @@
 module PingdomToGraphite
-  
-end
+
+end

data/lib/pingdom-to-graphite/cli.rb

@@ -6,6 +6,10 @@ require "thor"
 require "json"
 require "fileutils"
 require "logger"
+require "excon"
+
+# Handle certificate errors, does make this a little less secure!
+Excon.defaults[:ssl_verify_peer] = false
 
 class PingdomToGraphite::CLI < Thor
 
@@ -114,8 +118,8 @@ class PingdomToGraphite::CLI < Thor
   def results(check_id)
     load_config!
     load_probe_list!
-    start_time = (options.start_time) ? DateTime.parse(options.start_time).to_i : 1.hour.ago.to_i
-    end_time = (options.end_time) ? DateTime.parse(options.end_time).to_i : DateTime.now.to_i
+    start_time = (options.start_time) ? DateTime.parse(options.start_time).to_i : Time.now.to_i - 3600
+    end_time = (options.end_time) ? DateTime.parse(options.end_time).to_i : Time.now.to_i
     if start_time - end_time > 2764800
       error("Date range must be less then 32 days.")
     end
@@ -227,6 +231,12 @@ class PingdomToGraphite::CLI < Thor
   # Write the state to disk
   def write_state!
     state_file = File.expand_path(options.state)
+
+    # If the state dir doesn't exist create it first to prevent errors
+    unless File.directory?(File.dirname(state_file))
+      FileUtils.mkdir_p(File.dirname(state_file), :mode => 0700)
+    end
+
     File.open(state_file,"w",0600) do |f|
       f.write(JSON.generate(@state))
     end
@@ -288,14 +298,22 @@ class PingdomToGraphite::CLI < Thor
     # Pull the data
     rec_count = 0
     result_list = Array.new
-    datapull.full_results(check_id, latest_ts, earlist_ts, limit).each do |result|
-      result_list += parse_result(check_id, result)
-      latest_stored = result.time if latest_stored.nil? || result.time > latest_stored
-      earliest_stored = result.time if earliest_stored.nil? || result.time < earliest_stored
-      rec_count += 1
+    begin
+      datapull.full_results(check_id, latest_ts, earlist_ts, limit).each do |result|
+        result_list += parse_result(check_id, result)
+        latest_stored = result.time if latest_stored.nil? || result.time > latest_stored
+        earliest_stored = result.time if earliest_stored.nil? || result.time < earliest_stored
+        rec_count += 1
+      end
+    rescue Pingdom::Error => e
+      error("Caught error from Pingdom: #{e}")
     end
     # Push to graphite
-    datapush.to_graphite(result_list) unless result_list.empty?
+    begin
+      datapush.to_graphite(result_list) unless result_list.empty?
+    rescue Exception => e
+      error("Failed to push to graphite: #{e}")
+    end
     # Store the state
     @state[check_id] = Hash.new
     @state[check_id]["latest_ts"] = latest_stored

data/lib/pingdom-to-graphite/data-pull.rb

@@ -1,5 +1,5 @@
 require "pingdom-to-graphite"
-require "pingdom-client"
+require "pingdom-ruby"
 
 require "logger"
 
@@ -94,4 +94,4 @@ class PingdomToGraphite::DataPull
   end
 
 
-end
+end

data/lib/pingdom-to-graphite/data-push.rb

@@ -17,4 +17,4 @@ class PingdomToGraphite::DataPush
     graphite.close
   end
 
-end
+end

data/lib/pingdom-to-graphite/version.rb

@@ -1,3 +1,3 @@
 module PingdomToGraphite
-  VERSION = "0.0.7"
+  VERSION = "0.1.0"
 end

data/pingdom-to-graphite.gemspec

@@ -7,11 +7,12 @@ Gem::Specification.new do |s|
   s.version     = PingdomToGraphite::VERSION
   s.authors     = ["Lew Goettner"]
   s.email       = ["lew@goettner.net"]
+  s.license     = "MIT"
   s.homepage    = "https://github.com/lewg/pingdom-to-graphite"
   s.summary     = %q{A command line tool for pulling stats from pingdom and shipping them to graphite.}
-  s.description = %q{A tool for copying metrics from Pingdom to graphite. Pingdom, although 
-    allowing access to effectively all your metrics through the API, does have some limits 
-    in place to prevent abuse. This tool tries to be mindful of that, although does provide a 
+  s.description = %q{A tool for copying metrics from Pingdom to graphite. Pingdom, although
+    allowing access to effectively all your metrics through the API, does have some limits
+    in place to prevent abuse. This tool tries to be mindful of that, although does provide a
     "backfill" option if you care to burn up your daily api limit in one fell swoop.}
 
   s.files         = `git ls-files`.split("\n")
@@ -19,10 +20,17 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency "bundler", "~> 1.2"
-  s.add_runtime_dependency "thor", "~> 0.17"
-  s.add_runtime_dependency "pingdom-client", "~> 0.0.6.alpha"
-  s.add_runtime_dependency "json", "~> 1.7"
-  s.add_runtime_dependency "graphite-metric", "~> 0.3.0"
+  s.add_runtime_dependency "bundler", "~> 1.7"
+  s.add_runtime_dependency "thor", "~> 0.19"
+  s.add_runtime_dependency "json", "~> 1.8"
+  s.add_runtime_dependency "graphite-metric", "~> 0.3"
+  s.add_runtime_dependency "activesupport", "~> 3.0"
+  s.add_runtime_dependency "i18n", "~> 0.5" # ActiveSupport dependency"
+  s.add_runtime_dependency "pingdom-ruby", "~> 1.0.4"
+  # for pingdom-ruby (not built into their gemspec)
+  s.add_runtime_dependency "faraday", "~> 0.5.7"
+  s.add_runtime_dependency "excon", "~> 0.41"
+  s.add_runtime_dependency "yajl-ruby", '~> 1.2.1'
 
-end
+
+end

metadata

@@ -1,101 +1,160 @@
 --- !ruby/object:Gem::Specification
 name: pingdom-to-graphite
 version: !ruby/object:Gem::Version
-  version: 0.0.7
-  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - Lew Goettner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-23 00:00:00.000000000 Z
+date: 2014-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: '0.19'
 - !ruby/object:Gem::Dependency
-  name: pingdom-client
+  name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.6.alpha
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.6.alpha
+        version: '1.8'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: graphite-metric
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: graphite-metric
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: pingdom-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.4
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.7
+- !ruby/object:Gem::Dependency
+  name: excon
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.41'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.41'
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
-description: ! "A tool for copying metrics from Pingdom to graphite. Pingdom, although
-  \n    allowing access to effectively all your metrics through the API, does have
-  some limits \n    in place to prevent abuse. This tool tries to be mindful of that,
-  although does provide a \n    \"backfill\" option if you care to burn up your daily
-  api limit in one fell swoop."
+        version: 1.2.1
+description: |-
+  A tool for copying metrics from Pingdom to graphite. Pingdom, although
+      allowing access to effectively all your metrics through the API, does have some limits
+      in place to prevent abuse. This tool tries to be mindful of that, although does provide a
+      "backfill" option if you care to burn up your daily api limit in one fell swoop.
 email:
 - lew@goettner.net
 executables:
@@ -103,7 +162,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - README.md
 - Rakefile
@@ -118,27 +177,27 @@ files:
 - lib/pingdom-to-graphite/version.rb
 - pingdom-to-graphite.gemspec
 homepage: https://github.com/lewg/pingdom-to-graphite
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A command line tool for pulling stats from pingdom and shipping them to graphite.
 test_files: []