newrelic-metrics 0.0.4 → 0.1.01

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: bc497481ce38d254f1f8a3188f2901390160bbfe
+  data.tar.gz: 83906f78d545be5a46376c44950dba36613eb35b
+SHA512:
+  metadata.gz: 7be5c3706c40e88e2ab52fac74006418e18aa83fb2a5e74ac92512b03194ffd39cd0a1372b29e172ac30c9e595b57ceda7e236ec096a95c36ad11b6e952cb83a
+  data.tar.gz: cde7e16dc50eb7f71cf3b4b10b7701e5bcd92c41cca3ccef9fc211f04842f21e0d3d3cb493d6576494cfaa1576608fb381a058f9a7719e914ed9ecfdc2da5c77

data/lib/newrelic-metrics.rb

@@ -3,63 +3,96 @@ require 'json'
 require 'uri'
 require 'chronic'
 
-class NewRelicMetrics
-  BASE = 'https://api.newrelic.com/v2'
-
-  def initialize(api_key,ids={})
-    @api_key = api_key
-    raise ArgumentError, "Need to define either an application or server id" if ids.keys.length!=1
-    raise ArgumentError, "#{ids.keys.first} must be `application` or `server`" if ids.keys.first != :server && ids.keys.first != :application
-    @resource = "#{ids.keys.first}s"
-    @resource_id = ids.values.first
+module NewRelicMetrics
+  class Configuration
+    attr_accessor :api_key
+    def initialize(api_key:nil,&block)
+      @api_key=api_key
+      yield(self) if block
+    end
   end
 
-  def names
-    get("metrics")
+  class << self
+    attr_accessor :configuration
   end
 
-  def summarize(metrics={},range={})
-    throw ArgumentError, "Range must be an array with the from and to time" if range.length>2
-
-    settings = {summarize:true}.merge(range)
+  def self.configure
+    self.configuration ||= Configuration.new
+    yield(configuration)
+  end
 
-    metrics(metrics,settings)
+  class RequestFailed < StandardError
   end
 
-  def metrics(metrics={},options={})
-    query = ""
-    conditions = []
+  class Client
+    BASE = 'https://api.newrelic.com/v2'
 
-    names = metrics.keys
-    values = metrics.values.flatten
+    def initialize(config=nil)
+      @config = config || NewRelicMetrics.configuration
 
-    names.each {|name| conditions << "names[]=#{URI.encode(name)}" }
-    values.each {|val| conditions << "values[]=#{URI.encode(val)}" }
+      raise ArgumentError, "No API Key is configured" unless @config && @config.api_key
+    end
 
-    if options[:from]
-      from_time = Chronic.parse(options[:from], context: :past)
-      to_time = Chronic.parse(options[:to]) if options[:to]
-      to_time ||= Time.now
-      if from_time
-        conditions << "from=#{from_time.getlocal('+00:00').iso8601}"
-        conditions << "to=#{to_time.getlocal('+00:00').iso8601}"
-      end
+    def names(application:nil, server:nil)
+      raise ArgumentError, "Need to define either an application or server id" unless application || server
+      raise ArgumentError, "Need to define either an application or server id, but not both" if application && server
+      resource = application ? 'applications' : 'servers'
+      resource_id = application || server
+      get(resource, resource_id, "metrics")
     end
 
-    conditions << "summarize=true" if options[:summarize]
+    def metrics(application:nil, server:nil, metrics:, range:{}, summarize: false)
+      if range && range!={}
+        raise ArgumentError, "Range must only contain a :to and :from time" unless range.keys.all?{|k| k==:to || k==:from }
+        raise ArgumentError, "Range must contain a :from time" unless range.keys.include?(:from)
+      end
 
-    query = conditions.join('&')
-    get("metrics/data",query)
-  end
+      raise ArgumentError, "Need to define either an application or server id" unless application || server
+      raise ArgumentError, "Need to define either an application or server id, but not both" if application && server
+
+      resource = application ? 'applications' : 'servers'
+      resource_id = application || server
+
+      conditions = []
 
-  private
+      metrics.keys.each {|name| conditions << "names[]=#{URI.encode(name)}" }
+      metrics.values.flatten.each {|val| conditions << "values[]=#{URI.encode(val)}" }
 
-  def get(path,query=nil)
-    uri = URI.parse('https://api.newrelic.com/')
-    uri.path = "/v2/#{@resource}/#{@resource_id}/#{path}.json"
-    uri.query = query if query && query != ""
+      if range[:from]
+        from_time = Chronic.parse(range[:from], context: :past)
+        to_time = Chronic.parse(range[:to]) if range[:to]
+        to_time ||= Time.now
+        if from_time
+          conditions << "from=#{from_time.getlocal('+00:00').iso8601}"
+          conditions << "to=#{to_time.getlocal('+00:00').iso8601}"
+        end
+      end
+
+      conditions << "summarize=true" if summarize
+
+      query = conditions.join('&')
+      get(resource, resource_id, "metrics/data", query)
+    end
+
+    private
 
-    response = RestClient.get(uri.to_s,'X-Api-Key'=>@api_key)
-    JSON.parse(response).values.first
+    def get(resource, resource_id, path, query=nil)
+      uri = URI.parse('https://api.newrelic.com/')
+      uri.path = "/v2/#{resource}/#{resource_id}/#{path}.json"
+      uri.query = query if query && query != ""
+
+      puts uri.to_s
+
+      begin
+        response = RestClient.get(uri.to_s,'X-Api-Key'=>@config.api_key)
+      rescue => ex
+        if ex.response
+          message = JSON.parse(ex.response).values.first['title']
+          raise RequestFailed, message
+        else
+          raise RequestFailed, ex.message
+        end
+      end
+    end
   end
-end
+end

metadata

@@ -1,64 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: newrelic-metrics
 version: !ruby/object:Gem::Version
-  version: 0.0.4
-  prerelease: 
+  version: 0.1.01
 platform: ruby
 authors:
 - Maciej Skierkowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-14 00:00:00.000000000 Z
+date: 2014-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.7.2
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.2
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.1
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 10.3.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 10.3.2
 description: 
 email:
 - maciej@factor.io
@@ -69,26 +104,25 @@ files:
 - lib/newrelic-metrics.rb
 homepage: https://factor.io
 licenses: []
+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.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Easily get metrics out of New Relic for your application or servers
 test_files: []