opentsdb-consumer 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 120fe03858090bf837aea765cb2b8b8f56bdee40
-  data.tar.gz: 512c438dd6b56f325829f2b6267c5993d7a55827
+  metadata.gz: 0c0623e847a6d3b545478b8f88ac2713f6c59ce8
+  data.tar.gz: 2582a841255df62953b4bf9449abe1d88c650491
 SHA512:
-  metadata.gz: 6b5aa02ca4b1d2b906f2307eee3bb2054f79685a443805677d59675bacb5e44533fc46acbfaf2ed676f1e99fd7fcfb409f0f0122e33c31f51e890a91e7d70916
-  data.tar.gz: 0dabff64a9cfc3668df20b7c061724cf801ca83fa2138b7ca064bcbffe96421ba33f46c265fddfb3affff308e694f717338cbb51853e5af390dd120771384b7a
+  metadata.gz: 6502e41191581754ae67e3a40096fea1ed1b8b6c764358d0d6bd2b3a7a5234b2bbc354754c596fb6e3b983d8c4cc7024fc8e5857028429668f5ec827285d57f7
+  data.tar.gz: c9ad627a9fc31950b5a5742469093e51a98a9d844029518e8dac69303d0c349924665607b185154646e9ade46d2f73044dd4cd7135d366538fdbd9d9086f02a6

data/Gemfile

@@ -1,4 +1,4 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 gem 'excon', '~> 0.45.0'
 

data/Gemfile.lock

@@ -1,5 +1,5 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     addressable (2.3.8)
     builder (3.2.2)

data/README.md

@@ -20,7 +20,7 @@ gem 'opentsdb-consumer'
 ```ruby
 client = OpenTSDBConsumer::Client.new host: 'metrics.yourdomain.com', port: 4242
 metric = OpenTSDBConsumer::Metric.new name: 'my.metric', rate: true, aggregator: 'avg'
-OpenTSDBConsumer::Query.new(metric, client).run start: '24h-ago'
+OpenTSDBConsumer::Query.new([metric], client).run start: '24h-ago'
 ```
 
 ## Contributing to opentsdb-consumer

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/lib/opentsdb-consumer/client.rb

@@ -1,19 +1,20 @@
 require 'excon'
+require 'forwardable'
 
 module OpenTSDBConsumer
   class Client
+    extend Forwardable
     attr_reader :host, :port, :connection
 
+    delegate get:  :connection
+    delegate post: :connection
+
     def initialize(host: 'localhost', port: 4242, options: {})
       @host = host
       @port = port
       @connection = Excon.new url, options
     end
 
-    def get(params)
-      connection.get params
-    end
-
     def url
       "http://#{host}:#{port}/api/query"
     end

data/lib/opentsdb-consumer/metric.rb

@@ -1,17 +1,28 @@
 module OpenTSDBConsumer
   class Metric
-    attr_reader :name, :aggregator, :rate, :tags
+    attr_reader :name, :aggregator, :rate, :downsample, :tags
 
-    def initialize(name: nil, aggregator: 'sum', rate: false, tags: {})
+    def initialize(name: nil, aggregator: 'sum', rate: false, downsample: '10m-avg', tags: {})
       @name = name
       @aggregator = aggregator
       @rate = rate
+      @downsample = downsample
       @tags = tags
     end
 
     def to_s
       query = tags.any? ? "{#{tags_to_query}}" : ''
-      [aggregator, rate_to_query, name].compact.join(':') + query
+      [aggregator, downsample, rate_to_query, name].compact.join(':') + query
+    end
+
+    def to_h
+      {
+        aggregator: aggregator,
+        downsample: downsample,
+        metric: name,
+        rate: rate,
+        tags: tags,
+      }
     end
 
     private

data/lib/opentsdb-consumer/query.rb

@@ -2,15 +2,15 @@ require 'json'
 
 module OpenTSDBConsumer
   class Query
-    attr_accessor :metric, :client
+    attr_accessor :metrics, :client
 
-    def initialize(metric, client)
-      @metric = metric
+    def initialize(metrics, client)
+      @metrics = [metrics].flatten
       @client = client
     end
 
     def run(start: '1h-ago')
-      response = client.get query: { m: metric, start: start }
+      response = client.post body: request_body(start)
       parsed_body = JSON.parse(response.body)
       return OpenTSDBConsumer::Result.build(parsed_body) if response.status < 400
 
@@ -20,6 +20,10 @@ module OpenTSDBConsumer
 
     private
 
+    def request_body(start)
+      { start: start, queries: metrics.map(&:to_h) }.to_json
+    end
+
     def error_for_response(response_message)
       case response_message
       when /^No such name for 'tagv'/

data/opentsdb-consumer.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: opentsdb-consumer 0.1.1 ruby lib
+# stub: opentsdb-consumer 0.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "opentsdb-consumer"
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Philippe H\u{e4}ssig"]
-  s.date = "2015-11-10"
+  s.date = "2015-11-18"
   s.description = "Client library to consume metrics from OpenTSDB"
   s.email = "phil@nine.ch"
   s.executables = ["opentsdb-consumer"]

data/spec/opentsdb-consumer/metric_spec.rb

@@ -6,23 +6,32 @@ RSpec.describe OpenTSDBConsumer::Metric do
   let(:aggregator) { 'avg' }
   let(:rate) { false }
   let(:tags) { {} }
-  let(:metric) { described_class.new name: name, aggregator: aggregator, rate: rate, tags: tags }
+  let(:downsample) { '1h-avg' }
+  let(:metric) do
+    described_class.new name: name, aggregator: aggregator, rate: rate, tags: tags, downsample: downsample
+  end
 
   describe '#to_s' do
     subject { metric.to_s }
 
     context 'without tags' do
-      it { should eq 'avg:my.metric' }
+      it { should eq 'avg:1h-avg:my.metric' }
     end
 
     context 'with tags' do
       let(:tags) { { host: 'metrics01', cpu: 0 } }
-      it { should eq 'avg:my.metric{host=metrics01,cpu=0}' }
+      it { should eq 'avg:1h-avg:my.metric{host=metrics01,cpu=0}' }
     end
 
     context 'with rate' do
       let(:rate) { true }
-      it { should eq 'avg:rate:my.metric' }
+      it { should eq 'avg:1h-avg:rate:my.metric' }
     end
   end
+
+  describe '#to_h' do
+    subject { metric.to_h }
+
+    it { should eq(aggregator: aggregator, downsample: downsample, metric: name, rate: rate, tags: tags) }
+  end
 end

data/spec/opentsdb-consumer/query_spec.rb

@@ -2,30 +2,33 @@ require 'spec_helper'
 
 RSpec.describe OpenTSDBConsumer::Query do
   let(:metric) { OpenTSDBConsumer::Metric.new name: 'my.metric' }
-  let(:client) { instance_double 'OpenTSDBConsumer::Client', get: mock_response }
+  let(:client) { instance_double 'OpenTSDBConsumer::Client', post: mock_response }
   let(:query) { described_class.new metric, client }
   let(:status) { 200 }
   let(:response_body) { '[{}]' }
   let(:mock_response) { instance_double 'Excon::Response', status: status, body: response_body }
+  let(:expected_query) do
+    { aggregator: 'sum', downsample: '10m-avg', metric: 'my.metric', rate: false, tags: {} }
+  end
 
   describe '#run' do
     context 'successfuly' do
       it 'queries the server for the given metric' do
-        expect(client).to receive(:get).
-          with(query: { m: metric, start: '1h-ago' }).
+        expect(client).to receive(:post).
+          with(body: { start: '1h-ago', queries: [expected_query] }.to_json).
           and_return(mock_response)
         query.run
       end
 
       it 'allows to set a start time' do
-        expect(client).to receive(:get).
-          with(query: { m: metric, start: '24h-ago' }).
+        expect(client).to receive(:post).
+          with(body: { start: '24h-ago', queries: [expected_query] }.to_json).
           and_return(mock_response)
         query.run start: '24h-ago'
       end
 
       it 'returns the parsed body' do
-        expect(client).to receive(:get).and_return(mock_response)
+        expect(client).to receive(:post).and_return(mock_response)
         expect(query.run).to be_a OpenTSDBConsumer::Result
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentsdb-consumer
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Philippe Hässig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-10 00:00:00.000000000 Z
+date: 2015-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon