influxdb 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ea0ef1fdc75be35c711e62cbe12f80755c2b8985
-  data.tar.gz: 776b4cd261b825af89a42d16e7be8e5e51869e44
+SHA256:
+  metadata.gz: e35aa9d868bebe5d807a839115e59b08519d13acb5e9e9b5670ae993916046da
+  data.tar.gz: 72df33e054794f0037630183bfb355144d0c3fc049e76ebca4a86e90400bf709
 SHA512:
-  metadata.gz: e68245d292c220601eee90a27c992f6516c52ddf3f144081879623a9f334ec11ac4ccffb8de51b74759d924b5d7e5344ce0023b4c9c1f9b1a86ec43c5a8b164c
-  data.tar.gz: e0d6a1c802d56e51aa6935d75dfe2c2a3e1270183e62640599922bc66a27da69d8cc50c9460211fbe4757768e32e945f489096b2a3911f1b6a60460a9af690a8
+  metadata.gz: 13de608b885545523c03fc1da9922e31c7e7499bac3c51790b174cb8a0611a9f66dc98e0d1f91d1a12bb088a928c11cdc21d1725555cba2b623ed0aa34f2877d
+  data.tar.gz: bf50560b3838a9092af6ee8fff18acea15281e81d3f7353677a7510a508852d637d971bc67258570e1afb753b8752b66f6533e3e946a7f845937cc567c1d0cc7

data/.travis.yml

@@ -9,6 +9,7 @@ rvm:
   - "2.4"
   - "2.5"
   - "2.6"
+  - "2.7"
   - ruby-head
 env:
   - TEST_TASK=spec
@@ -18,37 +19,37 @@ matrix:
     - rvm: jruby-head
     - rvm: ruby-head
     - rvm: jruby-9.1.17.0
-    - rvm: jruby-9.2.5.0
-    - rvm: "2.6"
+    - rvm: jruby-9.2.9.0
+    - rvm: "2.7"
       env: influx_version=nightly channel=nightlies
   include:
-    - rvm: "2.6"
+    - rvm: "2.7"
       env: TEST_TASK=rubocop
 
     - rvm: jruby-9.1.17.0
       env: JRUBY_OPTS='--client -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-Xss2m -J-Xmx256M'
-    - rvm: jruby-9.2.5.0
+    - rvm: jruby-9.2.9.0
       env: JRUBY_OPTS='--client -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-Xss2m -J-Xmx256M'
     - rvm: jruby-head
       env: JRUBY_OPTS='--client -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-Xss2m -J-Xmx256M'
 
-    - rvm: "2.6"
+    - rvm: "2.7"
       env: influx_version=1.0.2 pkghash=88f6c30fec2c6e612e802e23b9161fdfc7c5c29f6be036f0376326445aff0037
-    - rvm: "2.6"
+    - rvm: "2.7"
       env: influx_version=1.1.5 pkghash=0ecb9385cc008f6e5094e6e8f8ea70522023a16d4397e401898f3973176d3b21
-    - rvm: "2.6"
+    - rvm: "2.7"
       env: influx_version=1.2.4 pkghash=2fac8391e04aa1bec9151e8f0d8f18df030c866af2b4963ab7d86c6ddc172182
-    - rvm: "2.6"
+    - rvm: "2.7"
       env: influx_version=1.3.8 pkghash=35c9cb2943bbde04aa5e94ad6d8caf5fc9b1480bdbcde7c34078de135cc4f788
-    - rvm: "2.6"
+    - rvm: "2.7"
       env: influx_version=1.4.3 pkghash=0477080f1d1cf8e1242dc7318280b9010c4c45cf6a415a2a5de607ae17fa0359
-    - rvm: "2.6"
+    - rvm: "2.7"
       env: influx_version=1.5.4 pkghash=fa6f8d3196d13ffc376d533581b534692c738181ce3427c53484c138d9e6b902
-    - rvm: "2.6"
+    - rvm: "2.7"
       env: influx_version=1.6.4 pkghash=dbfa13a0f9e38a8e7b19294c30144903bb681ac0aba0a3a8f4f349c37d5de5f9
-    - rvm: "2.6"
-      env: influx_version=1.7.2 pkghash=0bce61b7d89bf3216a7d3cb7a38423bd1c3a1b7d2ea8086b39cb26130ad78995
-    - rvm: "2.6"
+    - rvm: "2.7"
+      env: influx_version=1.7.9 pkghash=02759d70cef670d336768fd38a9cf2f046a1bf40618be78ba215e7ce75b5075f
+    - rvm: "2.7"
       env: influx_version=nightly channel=nightlies
 addons:
   apt:

data/CHANGELOG.md

@@ -2,7 +2,16 @@
 
 For the full commit log, [see here](https://github.com/influxdata/influxdb-ruby/commits/master).
 
-## v0.7.0, released 2018-01-11
+## v0.8.0, released 2020-02-05
+
+- Allow dropping of specific series from specific DBs (#233, @cantino)
+- Add support for MRI 2.7 (#235, @jeffkowalski)
+- Raise a LineProtocolError if attempting to write empty values as field
+  set is required. This adds descriptive feedback to the error "unable to
+  parse '{series},{tags} ': invalid field format" (#236, @todtb)
+- Add support for configuring HTTP Proxy (#238, @epchris)
+
+## v0.7.0, released 2019-01-11
 
 - Drop support for Ruby 2.2, since Bundler dropped it and we want to use
   Bundler in the development cycle as well.

data/README.md

@@ -94,6 +94,21 @@ url = "https://influxdb.example.com:8086/database_name?open_timeout=3"
 influxdb = InfluxDB::Client.new url: url, open_timeout: 10
 ```
 
+#### Using a custom HTTP Proxy
+
+By default, the `Net::HTTP` proxy behavior is used (see [Net::HTTP Proxy][proxy])
+You can optionally set a proxy address and port via the `proxy_addr` and
+`proxy_port` options:
+
+``` ruby
+influxdb = InfluxDB::Client.new database,
+  host:       "influxdb.domain.com",
+  proxy_addr: "your.proxy.addr",
+  proxy_port: 8080
+```
+
+[proxy]: https://docs.ruby-lang.org/en/2.7.0/Net/HTTP.html#class-Net::HTTP-label-Proxies
+
 ### Writing data
 
 Write some data:
@@ -195,7 +210,7 @@ influxdb = InfluxDB::Client.new {
 
 data = {
   values:    { value: 0 },
-  tags:      { foo: 'bar', bar: 'baz' }
+  tags:      { foo: 'bar', bar: 'baz' },
   timestamp: Time.now.to_i
 }
 

data/bin/provision.sh

@@ -36,7 +36,7 @@ echo "-- Download has SHA256 hash: ${sha2_sum}"
 echo "== Installing"
 
 sudo dpkg -i "${HOME}/${package_name}"
-sudo /etc/init.d/influxdb start
+sudo service influxdb start || true
 
 echo "-- waiting for daemon to start"
 while ! curl --head --fail --silent http://localhost:8086/ping; do
@@ -78,7 +78,7 @@ if [ ! -f /etc/influxdb/influxdb.conf ]; then
 fi
 
 sudo sed -i 's/auth-enabled = false/auth-enabled = true/' /etc/influxdb/influxdb.conf
-sudo /etc/init.d/influxdb restart
+sudo service influxdb restart || true
 
 echo "-- waiting for daemon to restart"
 while ! curl --head --fail --silent http://localhost:8086/ping; do

data/lib/influxdb/client.rb

@@ -51,7 +51,7 @@ module InfluxDB
     # +:retry+:: number of times a failed request should be retried. Defaults to infinite.
     def initialize(database = nil, **opts)
       opts[:database] = database if database.is_a? String
-      @config = InfluxDB::Config.new(opts)
+      @config = InfluxDB::Config.new(**opts)
       @stopped = false
       @writer = find_writer
 

data/lib/influxdb/client/http.rb

@@ -45,7 +45,7 @@ module InfluxDB
       retry_count = 0
 
       begin
-        http = Net::HTTP.new(host, config.port)
+        http = build_http(host, config.port)
         http.open_timeout = config.open_timeout
         http.read_timeout = config.read_timeout
 
@@ -133,6 +133,16 @@ module InfluxDB
       end
       store
     end
+
+    # Builds an http instance, taking into account any configured
+    # proxy configuration
+    def build_http(host, port)
+      if config.proxy_addr
+        Net::HTTP.new(host, port, config.proxy_addr, config.proxy_port)
+      else
+        Net::HTTP.new(host, port)
+      end
+    end
   end
   # rubocop:enable Metrics/MethodLength
   # rubocop:enable Metrics/AbcSize

data/lib/influxdb/config.rb

@@ -16,6 +16,8 @@ module InfluxDB
     open_timeout:         5,
     read_timeout:         300,
     auth_method:          nil,
+    proxy_addr:           nil,
+    proxy_port:           nil,
 
     # SSL options
     use_ssl:              false,

data/lib/influxdb/errors.rb

@@ -5,6 +5,7 @@ module InfluxDB # :nodoc:
   Error               = Class.new StandardError
   AuthenticationError = Class.new Error
   ConnectionError     = Class.new Error
+  LineProtocolError   = Class.new Error
   SeriesNotFound      = Class.new Error
   JSONParserError     = Class.new Error
   QueryError          = Class.new Error

data/lib/influxdb/point_value.rb

@@ -46,7 +46,9 @@ module InfluxDB
     end
 
     def escape_values(values)
-      return if values.nil?
+      if values.nil? || values.empty?
+        raise InfluxDB::LineProtocolError, "Cannot create point with empty values".freeze
+      end
 
       values.map do |k, v|
         key = escape(k.to_s, :field_key)

data/lib/influxdb/query/core.rb

@@ -121,9 +121,13 @@ module InfluxDB
       end
 
       def generate_payload(data)
-        data.map do |point|
-          InfluxDB::PointValue.new(point).dump
-        end.join("\n".freeze)
+        data.map { |point| generate_point(point) }.join("\n".freeze)
+      end
+
+      def generate_point(point)
+        InfluxDB::PointValue.new(point).dump
+      rescue InfluxDB::LineProtocolError => e
+        (log :error, "Cannot write data: #{e.inspect}") && nil
       end
 
       def execute(query, db: nil, **options)

data/lib/influxdb/query/series.rb

@@ -1,8 +1,12 @@
 module InfluxDB
   module Query
     module Series # :nodoc:
-      def delete_series(name)
-        execute("DROP SERIES FROM #{name}", db: config.database)
+      def delete_series(name, where: nil, db: config.database)
+        if where
+          execute("DROP SERIES FROM \"#{name}\" WHERE #{where}", db: db)
+        else
+          execute("DROP SERIES FROM \"#{name}\"", db: db)
+        end
       end
 
       def list_series

data/lib/influxdb/version.rb

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

data/spec/influxdb/cases/async_client_spec.rb

@@ -14,8 +14,8 @@ describe InfluxDB::Client do
     it "sends writes to client" do
       post_request = stub_request(:post, stub_url).to_return(status: 204)
 
-      (worker.max_post_points + 100).times do
-        subject.write_point('a', {})
+      (worker.max_post_points + 100).times do |i|
+        subject.write_point('a', values: { i: i })
       end
 
       # The timout code is fragile, and heavily dependent on system load

data/spec/influxdb/cases/query_series_spec.rb

@@ -49,16 +49,32 @@ describe InfluxDB::Client do
   end
 
   describe "#delete_series" do
-    let(:name) { "events" }
-    let(:query) { "DROP SERIES FROM #{name}" }
+    describe "without a where clause" do
+      let(:name) { "events" }
+      let(:query) { "DROP SERIES FROM \"#{name}\"" }
 
-    before do
-      stub_request(:get, "http://influxdb.test:9999/query")
-        .with(query: { u: "username", p: "password", q: query, db: "database" })
+      before do
+        stub_request(:get, "http://influxdb.test:9999/query")
+          .with(query: { u: "username", p: "password", q: query, db: "database" })
+      end
+
+      it "should GET to remove a database" do
+        expect(subject.delete_series(name)).to be_a(Net::HTTPOK)
+      end
     end
 
-    it "should GET to remove a database" do
-      expect(subject.delete_series(name)).to be_a(Net::HTTPOK)
+    describe "with a where clause" do
+      let(:name) { "events" }
+      let(:query) { "DROP SERIES FROM \"#{name}\" WHERE \"tag\"='value'" }
+
+      before do
+        stub_request(:get, "http://influxdb.test:9999/query")
+          .with(query: { u: "username", p: "password", q: query, db: "database" })
+      end
+
+      it "should GET to remove a database" do
+        expect(subject.delete_series(name, where: "\"tag\"='value'")).to be_a(Net::HTTPOK)
+      end
     end
   end
 end

data/spec/influxdb/config_spec.rb

@@ -20,6 +20,8 @@ describe InfluxDB::Config do
     specify { expect(conf).not_to be_udp }
     specify { expect(conf).not_to be_async }
     specify { expect(conf.epoch).to be_falsey }
+    specify { expect(conf.proxy_addr).to be_nil }
+    specify { expect(conf.proxy_port).to be_nil }
   end
 
   context "with no database specified" do
@@ -205,4 +207,21 @@ describe InfluxDB::Config do
       expect(conf).not_to be_async
     end
   end
+
+  context "given explicit proxy information" do
+    let(:args) do
+      [{
+        host:           "host",
+        port:           "port",
+        username:       "username",
+        password:       "password",
+        time_precision: "m",
+        proxy_addr:     "my.proxy.addr",
+        proxy_port:     8080
+      }]
+    end
+
+    specify { expect(conf.proxy_addr).to eq("my.proxy.addr") }
+    specify { expect(conf.proxy_port).to eq(8080) }
+  end
 end

data/spec/influxdb/point_value_spec.rb

@@ -40,6 +40,14 @@ describe InfluxDB::PointValue do
       expected = series.join(",") + " " + fields.join(",")
       expect(point.dump).to eq(expected)
     end
+
+    context 'with empty values' do
+      let(:empty_values_data) { { series: 'test_series', values: {} } }
+
+      it 'should raise an exception' do
+        expect { InfluxDB::PointValue.new(empty_values_data) }.to raise_error(InfluxDB::LineProtocolError)
+      end
+    end
   end
 
   describe 'dump' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxdb
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Todd Persen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-11 00:00:00.000000000 Z
+date: 2020-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -167,8 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Ruby library for InfluxDB.