opentsdb-ruby 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a99bf6c5e5081e76e7acaf6eb4be0da7fd1fff8
-  data.tar.gz: 908b257a99ee6a17acc14a306418ee0c3eebcaac
+  metadata.gz: a1285259961020932f0391df4f5cd77dbf56b499
+  data.tar.gz: a01d76c47e616c708612ca0ebcf4cf33e8d76f07
 SHA512:
-  metadata.gz: 3dcf66e50ca1b1a0ec62882d743c78c5dcf967696931975cf65a4e1219346562fd485284151a9b51bd69b9f8aaeab4114d336aafcd8bfa029fe49967b762d3c5
-  data.tar.gz: 4dbc3ea4fe4caeb35ffcd660d336e0c45244814d0d8f252bf0c8823ce193130888fd222ca5e0938072e276b8b6db91e50329160ea6c4023815602c5648b1ed21
+  metadata.gz: 3d5665f76f11f40d806197e7c7ed1cab4ed5ba098d2d4644b1e6c263e958e89bb95681dea62519788a53dd76b3a2aa8aaf49079ef5c96afaf7cc709a302f36e1
+  data.tar.gz: f9258a781d687b1933d32c667424194a4d6cdf74c563ca0d5a870650076afb9bf55789b4101a1ea7f8d76ec851405f12bdb13741b7ef00e1d0e5c4025d90d617

data/README.md

@@ -3,22 +3,27 @@
 Ruby client for OpenTSDB HTTP Query API. 
 
 [![Gem Version](http://img.shields.io/gem/v/opentsdb-ruby.svg)](https://rubygems.org/gems/opentsdb-ruby) [![Build Status](https://travis-ci.org/cloudinsight/opentsdb-ruby.png)](https://travis-ci.org/cloudinsight/opentsdb-ruby) [![Code Climate](https://codeclimate.com/github/cloudinsight/opentsdb-ruby/badges/gpa.svg)](https://codeclimate.com/github/cloudinsight/opentsdb-ruby) [![Test Coverage](https://codeclimate.com/github/cloudinsight/opentsdb-ruby/badges/coverage.svg)](https://codeclimate.com/github/cloudinsight/opentsdb-ruby/coverage)
+[![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE.md)
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
 ```ruby
-  gem 'opentsdb-ruby', require 'opentsdb'
+gem 'opentsdb-ruby', require 'opentsdb'
 ```
 
 And then execute:
 
-    $ bundle
+```shell
+$ bundle
+```
 
 Or install it yourself as:
 
-    $ gem install opentsdb-ruby
+```shell
+$ gem install opentsdb-ruby
+```
 
 
 ## Quick Start Guide
@@ -26,66 +31,67 @@ Or install it yourself as:
 ### Configure opentsdb
 
 ```ruby
-  #config/initializers/opentsdb.rb
-  #require 'opentsdb'
-  Opentsdb.configure do |config|
-    config.host = 'localhost'  # opentsdb server host default: localhost
-    config.port =  4242        # opentsdb server port default: 4242
-  end 
+#config/initializers/opentsdb.rb
+#require 'opentsdb'
+Opentsdb.configure do |config|
+  config.host = 'localhost'  # opentsdb server host default: localhost
+  config.port =  4242        # opentsdb server port default: 4242
+end
 ```
 
 ### Usage
 
 ```ruby
-
-  # define simple query params
-  params = { begin: Time.now.ago(1.hour), q: 'avg:system.load.1{host=*}' }
-  client = Opentsdb::Client.new(params)
-  result = client.query
-  # => { status: 'ok', condition: #<Opentsdb::QueryParam: @metric="system.load.1",..., result: '[{"metric": "system.load.1", "tags": ... "dps":[...]}]}'
-
-  # complicate query params
-  params = { begin: Time.now.ago(1.hour), end: Time.now, q: 'avg:system.load.1{host=server1, host=server2, tagk=tagv}by{host}', interval: 360 }
-  client = Opentsdb::Client.new(params)
-  result = client.query
-  # => { status: 'ok', condition: #<Opentsdb::QueryParam: @metric="system.load.1",..., result: '[{"metric": "system.load.1", "tags": ... "dps":[...]}]}'
-
-  # reconfig opentsdb host and port
-  params = { host: '192.168.0.100', port: 8000, q: 'avg:system.load.1{host=*}' }
-  client = Opentsdb::Client.new(params)
-  result = client.query
-  # => { status: 'ok', condition: #<Opentsdb::QueryParam: @metric="system.load.1",..., result: '[{"metric": "system.load.1", "tags": ... "dps":[...]}]}'
-
-  #query exception
-  client = Opentsdb::Client.new(q: 'avg:unknown_metric')
-  result = client.query
-  # => { status: 'error', condition: #<Opentsdb::QueryParam: @metric="system.load.1",..., result: '{"error":{"code":400,"message":"No such name for 'metrics'...}}'
-
+# define simple query params
+params = { begin: Time.now.ago(1.hour), q: 'avg:system.load.1{host=*}' }
+client = Opentsdb::Client.new(params)
+result = client.query
+# => { status: 'ok', condition: #<Opentsdb::QueryParam: @metric="system.load.1",..., result: '[{"metric": "system.load.1", "tags": ... "dps":[...]}]}'
+
+# complicate query params
+params = { begin: Time.now.ago(1.hour), end: Time.now, q: 'avg:system.load.1{host=server1, host=server2, tagk=tagv}by{host}', interval: 360 }
+client = Opentsdb::Client.new(params)
+result = client.query
+# => { status: 'ok', condition: #<Opentsdb::QueryParam: @metric="system.load.1",..., result: '[{"metric": "system.load.1", "tags": ... "dps":[...]}]}'
+
+# reconfig opentsdb host and port
+params = { host: '192.168.0.100', port: 8000, q: 'avg:system.load.1{host=*}' }
+client = Opentsdb::Client.new(params)
+result = client.query
+# => { status: 'ok', condition: #<Opentsdb::QueryParam: @metric="system.load.1",..., result: '[{"metric": "system.load.1", "tags": ... "dps":[...]}]}'
+
+#query exception
+client = Opentsdb::Client.new(q: 'avg:unknown_metric')
+result = client.query
+# => { status: 'error', condition: #<Opentsdb::QueryParam: @metric="system.load.1",..., result: '{"error":{"code":400,"message":"No such name for 'metrics'...}}'
 ```
 
 ### Contributing
   
 #### Fork the Project
   
-  ```
-  $ git https://github.com/cloudinsight/opentsdb-ruby.git
-  $ cd opentsdb-ruby
-  $ git remote add upstream https://github.com/cloudinsight/opentsdb-ruby.git  
-  ```
+```shell
+$ git https://github.com/cloudinsight/opentsdb-ruby.git
+$ cd opentsdb-ruby
+$ git remote add upstream https://github.com/cloudinsight/opentsdb-ruby.git  
+```
 #### Create a Toptic Branch
 
-  ```
-  $ git checkout master
-  $ git pull upstream master
-  $ git checkout -b my-feature-branch
-  ```
+```shell
+$ git checkout master
+$ git pull upstream master
+$ git checkout -b my-feature-branch
+```
+
 #### Run Test 
-  ```
-  $ bundle exec rake test
-  ```
+
+```shell
+$ bundle exec rake test
+```
+
 #### Make a Pull Request
 
-  Click the `'Pull Request'` button and fill out the form.
+Click the `'Pull Request'` button and fill out the form.
 
 ### License
 

data/lib/opentsdb.rb

@@ -2,7 +2,7 @@
 module Opentsdb
   #:nodoc:
   class << self
-    attr_accessor :host, :port
+    attr_accessor :host, :port, :logger
 
     def configure
       yield self

data/lib/opentsdb/client.rb

@@ -18,7 +18,11 @@ module Opentsdb
     def query
       [].tap do |results|
         query_commads.each do |query_commad|
+          start = Time.now
+          Opentsdb.logger.debug "[OpenTSDB] query: #{query_commad.to_json}"
           res = post query_commad.to_json
+          Opentsdb.logger.debug "[OpenTSDB] result: #{res.body}"
+          Opentsdb.logger.info "[OpenTSDB] consume: #{Time.now - start} s"
           status = res.status.to_i == 200 ? 'ok' : 'error'
           results << { status: status, condition: query_commad, result: res.body }
         end

data/lib/opentsdb/faraday.rb

@@ -14,6 +14,7 @@ module Opentsdb
         req.headers         = headers
         req.body            = body
         req.options.timeout = 5
+        req.options.open_timeout = 5
       end
     end
 
@@ -26,8 +27,8 @@ module Opentsdb
     def connection
       @connection ||= begin
         ::Faraday.new(url: url) do |faraday|
-          faraday.request :url_encoded        # form-encode POST params
-          faraday.response :logger            # log requests to STDOUT
+          faraday.request  :url_encoded              # form-encode POST params
+          faraday.response :logger                   # log requests to STDOUT
           faraday.adapter auto_detect_adapter
         end
       end

data/lib/opentsdb/query_param.rb

@@ -2,17 +2,19 @@ module Opentsdb
   # :nodoc:
   class QueryParam
     attr_accessor :aggregator, :rate, :metric, :tags, :interval, :downsample, :rate_options, :group
+    attr_accessor :excluding_tags
     attr_accessor :start_time, :end_time
 
     def initialize(options = {})
-      @aggregator   = options[:aggregator]
-      @rate         = options[:rate] || false
-      @metric       = options[:metric]
-      @tags         = options[:tags] || {}
-      @rate_options = options[:rate_options]
-      @group        = options[:group] || []
-      @start_time   = 0
-      @end_time     = 0
+      @aggregator     = options[:aggregator]
+      @rate           = options[:rate] || false
+      @metric         = options[:metric]
+      @tags           = options[:tags] || {}
+      @excluding_tags = options[:excluding_tags] || {}
+      @rate_options   = options[:rate_options]
+      @group          = options[:group] || []
+      @start_time     = 0
+      @end_time       = 0
     end
 
     def start_time

data/lib/opentsdb/query_parser.rb

@@ -27,7 +27,7 @@ module Opentsdb
         {}.tap do |h|
           h[:metric] = metric[0...start_index]
           end_index = metric.index('}')
-          h[:tags] = parse_tags metric[(start_index + 1)...end_index].strip
+          h[:tags], h[:excluding_tags] = parse_tags metric[(start_index + 1)...end_index].strip
           groups_str = metric[(end_index + 1)..-1]
           if groups_str.size > 5 # length of by{} is 4
             h[:group] = parse_groups groups_str
@@ -51,14 +51,22 @@ module Opentsdb
 
       def parse_tags(tags)
         return if tags.nil?
-        Hash.new { |h, k| h[k] = [] }.tap do |rtags|
-          split_for(tags, ',').each do |tag|
-            tagk, tagv = split_for(tag, '=')
-            next if tagk.nil? || tagv.nil?
-            rtags[tagk] ||= []
-            rtags[tagk].concat tagv.split('|').uniq
+        over_tags = Hash.new { |h, k| h[k] = [] }
+        excluding_tags = Hash.new { |h, k| h[k] = [] }
+        split_for(tags, ',').each do |tag|
+          if tag =~ /!=/
+            append_tags(excluding_tags, tag, '!=')
+          else
+            append_tags(over_tags, tag)
           end
         end
+        [over_tags, excluding_tags]
+      end
+
+      def append_tags(tags, tag, token = '=')
+        tagk, tagv = tag.split(token)
+        return if tagk.nil? || tagv.nil?
+        tags[tagk].concat tagv.split('|').uniq
       end
 
       def parse_groups(groups_str)

data/lib/opentsdb/version.rb

@@ -1,3 +1,3 @@
 module Opentsdb
-  VERSION = '0.0.6'.freeze
+  VERSION = '0.0.7'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opentsdb-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - lizhe
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-13 00:00:00.000000000 Z
+date: 2016-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday