influxdb 0.3.12 → 0.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b721d82a22974293685ba5fc0275d58e14d91c95
-  data.tar.gz: 8b45e5a10d9d8018c3919bdc8b62651819cf18d5
+  metadata.gz: 01adedbe7674717e14ed72845cfff4e156f2689a
+  data.tar.gz: ceefc5493edfa1144ec139d2dc07dc0ae5fe1db4
 SHA512:
-  metadata.gz: ed273daa7368a7529acfd072273345056eb4001402d4869e5021776fe3a9e89ce967e519a1224aaa74e01d8205982a3109e2a250e35c997d96aed01e699d8409
-  data.tar.gz: 02f5b7f0c6e4050be231d33b5dd56068faa6ec7607a20ef48d885b6c38e04f628c88673d449cc34a15c8c488951e02c987be6797421da5a2c3394371a69c3243
+  metadata.gz: b86ea8d1c86d8f90e5d11bca3654d7e4462071a126ecbc2bf737514538235da8e0e91836fc12b290c5d8a5c968a5b14a7d1f5308743157762c0796d505b8c52a
+  data.tar.gz: 7564b0e19b8e80eb82734054481371459900608324a3d5d844f16680867f3cddf581c4d35e23ed98a1451acd2757465e26884807f28c0e3f63fa21e478b3ebb8

data/CHANGELOG.md

@@ -6,6 +6,13 @@ For the full commit log, [see here](https://github.com/influxdata/influxdb-ruby/
 
 - None.
 
+## v0.3.13, released 2016-11-23
+
+- You can now `InfluxDB::Client#query`, `#write_points`, `#write_point` and
+  `#write` now accept an additional parameter to override the database on
+  invokation time (#173, #176, @jfragoulis).
+
+
 ## v0.3.12, released 2016-11-15
 
 - Bugfix for broken Unicode support (regression introduced in #169).

data/README.md

@@ -334,6 +334,32 @@ data = {
 influxdb.write_point(name, data, precision, retention)
 ```
 
+Write data while choosing the database:
+
+``` ruby
+require 'influxdb'
+
+username  = 'foo'
+password  = 'bar'
+database  = 'site_development'
+name      = 'foobar'
+precision = 's'
+retention = '1h.cpu'
+
+influxdb = InfluxDB::Client.new {
+  username: username,
+  password: password
+}
+
+data = {
+  values:    { value: 0 },
+  tags:      { foo: 'bar', bar: 'baz' }
+  timestamp: Time.now.to_i
+}
+
+influxdb.write_point(name, data, precision, retention, database)
+```
+
 Write multiple points in a batch (performance boost):
 
 ``` ruby
@@ -458,7 +484,7 @@ influxdb = InfluxDB::Client.new database,
   password: password
 
 # without a block:
-influxdb.query 'select * from time_series_1'
+influxdb.query 'select * from time_series_1 group by region'
 
 # results are grouped by name, but also their tags:
 #
@@ -481,7 +507,7 @@ influxdb.query 'select * from time_series_1'
 # ]
 
 # with a block:
-influxdb.query 'select * from time_series_1' do |name, tags, points|
+influxdb.query 'select * from time_series_1 group by region' do |name, tags, points|
   puts "#{name} [ #{tags.inspect} ]"
   points.each do |pt|
     puts "  -> #{pt.inspect}"
@@ -503,7 +529,7 @@ If you would rather receive points with integer timestamp, it's possible to set
 # globally, on client initialization:
 influxdb = InfluxDB::Client.new database, epoch: 's'
 
-influxdb.query 'select * from time_series'
+influxdb.query 'select * from time_series group by region'
 # [
 #   {
 #     "name"=>"time_series",
@@ -515,7 +541,7 @@ influxdb.query 'select * from time_series'
 # ]
 
 # or for a specific query call:
-influxdb.query 'select * from time_series', epoch: 'ms'
+influxdb.query 'select * from time_series group by region', epoch: 'ms'
 # [
 #   {
 #     "name"=>"time_series",
@@ -551,7 +577,7 @@ columns and rows). If you want to get *raw* data add `denormalize: false` to
 the initialization options or to query itself:
 
 ``` ruby
-influxdb.query 'select * from time_series_1', denormalize: false
+influxdb.query 'select * from time_series_1 group by region', denormalize: false
 
 # [
 #   {
@@ -574,7 +600,7 @@ influxdb.query 'select * from time_series_1', denormalize: false
 # ]
 
 
-influxdb.query 'select * from time_series_1', denormalize: false do |name, tags, points|
+influxdb.query 'select * from time_series_1 group by region', denormalize: false do |name, tags, points|
   puts "#{name} [ #{tags.inspect} ]"
   points.each do |key, values|
     puts "  #{key.inspect} -> #{values.inspect}"
@@ -590,6 +616,12 @@ end
 #   values -> [["2015-07-09T09:02:54Z", 55, 0.4343]]}
 ```
 
+You can also pick the database to query from:
+
+```
+influxdb.query 'select * from time_series_1', database: 'database'
+```
+
 #### Streaming response
 
 If you expect large quantities of data in a response, you may want to enable

data/lib/influxdb/query/core.rb

@@ -51,21 +51,24 @@ module InfluxDB
       #     values: {value: 0.9999},
       #   }
       # ])
-      def write_points(data, precision = nil, retention_policy = nil)
+      def write_points(data, precision = nil, retention_policy = nil, database = nil)
         data = data.is_a?(Array) ? data : [data]
         payload = generate_payload(data)
-        writer.write(payload, precision, retention_policy)
+        writer.write(payload, precision, retention_policy, database)
       end
 
       # Example:
       # write_point('cpu', tags: {region: 'us'}, values: {internal: 60})
-      def write_point(series, data, precision = nil, retention_policy = nil)
-        write_points(data.merge(series: series), precision, retention_policy)
+      def write_point(series, data, precision = nil, retention_policy = nil, database = nil)
+        write_points(data.merge(series: series), precision, retention_policy, database)
       end
 
-      def write(data, precision, retention_policy = nil)
-        precision ||= config.time_precision
-        params      = { db: config.database, precision: precision }
+      def write(data, precision, retention_policy = nil, database = nil)
+        params = {
+          db: database || config.database,
+          precision: precision || config.time_precision
+        }
+
         params[:rp] = retention_policy if retention_policy
         url = full_url("/write", params)
         post(url, data)
@@ -73,12 +76,14 @@ module InfluxDB
 
       private
 
+      # rubocop:disable Metrics/MethodLength
       def query_params(query, opts)
         precision   = opts.fetch(:precision, config.time_precision)
         epoch       = opts.fetch(:epoch, config.epoch)
         chunk_size  = opts.fetch(:chunk_size, config.chunk_size)
+        database    = opts.fetch(:database, config.database)
 
-        params = { q: query, db: config.database, precision: precision }
+        params = { q: query, db: database, precision: precision }
         params[:epoch] = epoch if epoch
 
         if chunk_size
@@ -88,6 +93,7 @@ module InfluxDB
 
         params
       end
+      # rubocop:enable Metrics/MethodLength
 
       def denormalized_series_list(series)
         series.map do |s|

data/lib/influxdb/version.rb

@@ -1,3 +1,3 @@
 module InfluxDB # :nodoc:
-  VERSION = "0.3.12".freeze
+  VERSION = "0.3.13".freeze
 end

data/lib/influxdb/writer/async.rb

@@ -12,7 +12,7 @@ module InfluxDB
         @config = config
       end
 
-      def write(data, _precision = nil, _retention_policy = nil)
+      def write(data, _precision = nil, _retention_policy = nil, _database = nil)
         data = data.is_a?(Array) ? data : [data]
         data.map { |p| worker.push(p) }
       end

data/lib/influxdb/writer/udp.rb

@@ -13,7 +13,7 @@ module InfluxDB
         socket.connect(host, port)
       end
 
-      def write(payload, _precision = nil, _retention_policy = nil)
+      def write(payload, _precision = nil, _retention_policy = nil, _database = nil)
         socket.send(payload, 0)
       end
     end

data/spec/influxdb/cases/querying_spec.rb

@@ -159,6 +159,25 @@ describe InfluxDB::Client do
         expect(subject.query(query)).to eq(expected_result)
       end
     end
+
+    context "with database" do
+      let(:extra_params) { { db: 'overriden_db' } }
+      let(:response) do
+        { "results" => [{ "series" => [{ "name" => "cpu", "tags" => { "region" => "us" },
+                                         "columns" => %w(time temp value),
+                                         "values" => [["2015-07-07T14:58:37Z", 92, 0.3445], ["2015-07-07T14:59:09Z", 68, 0.8787]] }] }] }
+      end
+      let(:expected_result) do
+        [{ "name" => "cpu", "tags" => { "region" => "us" },
+           "values" => [{ "time" => "2015-07-07T14:58:37Z", "temp" => 92, "value" => 0.3445 },
+                        { "time" => "2015-07-07T14:59:09Z", "temp" => 68, "value" => 0.8787 }] }]
+      end
+      let(:query) { 'SELECT * FROM cpu' }
+
+      it "should return array with single hash containing multiple values" do
+        expect(subject.query(query, database: 'overriden_db')).to eq(expected_result)
+      end
+    end
   end
 
   describe "multiple select queries" do

data/spec/influxdb/cases/write_points_spec.rb

@@ -154,5 +154,31 @@ describe InfluxDB::Client do
         expect(subject.write_points(data, nil, 'rp_1_hour')).to be_a(Net::HTTPNoContent)
       end
     end
+
+    context "with database" do
+      let(:data) do
+        [{ series: 'cpu',
+           values: { temp: 88, value: 54 } },
+         { series: 'gpu',
+           values: { value: 0.5435345 } }]
+      end
+
+      let(:body) do
+        data.map do |point|
+          InfluxDB::PointValue.new(point).dump
+        end.join("\n")
+      end
+
+      before do
+        stub_request(:post, "http://influxdb.test:9999/write").with(
+          query: { u: "username", p: "password", precision: 's', db: 'overriden_db' },
+          headers: { "Content-Type" => "application/octet-stream" },
+          body: body
+        ).to_return(status: 204)
+      end
+      it "should POST multiple points" do
+        expect(subject.write_points(data, nil, nil, 'overriden_db')).to be_a(Net::HTTPNoContent)
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxdb
 version: !ruby/object:Gem::Version
-  version: 0.3.12
+  version: 0.3.13
 platform: ruby
 authors:
 - Todd Persen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-15 00:00:00.000000000 Z
+date: 2016-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json