influxdb-api 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b75a2d9451bb4769cdeb997320a0f13ab86e2720
-  data.tar.gz: 64a82894fa549ac9e121efa329fd2cf46e102660
+  metadata.gz: 57e3e37757669373a7d4fe649bfb8eb505fc3141
+  data.tar.gz: 9bdf91d6fab7e146290bc6b8bbd71924158de63c
 SHA512:
-  metadata.gz: b941d094565812ef1300f2220fcf3bf4984ab223b3c5f09dc06623d35711afa4d25cf93b3cdd4bc321d43d05b7749180430760dbbd2b8c2baed06bd66042d4eb
-  data.tar.gz: 15e64056ba5e997146f3f31d0a3689ab9cc5b039c9d70298a4e904f1cf3bd32532c82b5d36f00e225ffe5915cc17f6093573e028ec9767bece7013dfc61cc515
+  metadata.gz: db81efe8613a8ed544c3857ce29ae448e94efca422dfbbe90565ecbb6856cd6185c32191e2d872691380324d1ade40b2a2ab59355104e763adceb040fde9a56c
+  data.tar.gz: 77d6bad87f7374fdf7d5f8894972cf0a9aa491f72e4d4941739719d08bc29f10ac2c5154a147c4a3fa5880129008c8ec74744aca466258a2f30bfd62a191a9d2

data/.travis.yml

@@ -4,3 +4,17 @@ rvm:
   - 2.0.0
   - 2.1.1
   - rbx-2
+env:
+  - INFLUXDB_VERSION=0.7.3
+  - INFLUXDB_VERSION=0.8.3
+  - INFLUXDB_VERSION=0.8.8
+  - INFLUXDB_VERSION=latest
+before_install:
+  - wget http://s3.amazonaws.com/influxdb/influxdb_${INFLUXDB_VERSION}_amd64.deb
+  - sudo dpkg -i influxdb_${INFLUXDB_VERSION}_amd64.deb
+  - sudo /etc/init.d/influxdb start
+  - sleep 8
+matrix:
+  allow_failures:
+    - rvm: rbx-2
+    - env: "INFLUXDB_VERSION=latest"

data/README.md

@@ -2,6 +2,8 @@
 
 [![Build Status](https://travis-ci.org/undr/influxdb-api.svg?branch=master)](https://travis-ci.org/undr/influxdb-api) [![Code Climate](https://codeclimate.com/github/undr/influxdb-api/badges/gpa.svg)](https://codeclimate.com/github/undr/influxdb-api) [![Gem Version](https://badge.fury.io/rb/influxdb-api.svg)](http://badge.fury.io/rb/influxdb-api)
 
+It tested on influxdb till 0.8.3.
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/influxdb/Dockerfile.0.7.3

@@ -0,0 +1,8 @@
+FROM debian:jessie
+
+ADD http://s3.amazonaws.com/influxdb/influxdb_0.7.3_amd64.deb /influxdb_0.7.3_amd64.deb
+RUN dpkg -i /influxdb_0.7.3_amd64.deb
+
+EXPOSE 8083 8086
+
+CMD ["/opt/influxdb/current/influxdb", "-config=/opt/influxdb/current/config.toml"]

data/influxdb/Dockerfile.0.8.3

@@ -0,0 +1,8 @@
+FROM debian:jessie
+
+ADD http://s3.amazonaws.com/influxdb/influxdb_0.8.3_amd64.deb /influxdb_0.8.3_amd64.deb
+RUN dpkg -i /influxdb_0.8.3_amd64.deb
+
+EXPOSE 8083 8086
+
+CMD ["/opt/influxdb/current/influxdb", "-config=/opt/influxdb/current/config.toml"]

data/influxdb/Dockerfile.0.8.8

@@ -0,0 +1,8 @@
+FROM debian:jessie
+
+ADD http://s3.amazonaws.com/influxdb/influxdb_0.8.8_amd64.deb /influxdb_0.8.8_amd64.deb
+RUN dpkg -i /influxdb_0.8.8_amd64.deb
+
+EXPOSE 8083 8086
+
+CMD ["/opt/influxdb/current/influxdb", "-config=/opt/influxdb/current/config.toml"]

data/lib/influxdb/api.rb

@@ -13,6 +13,9 @@ require_relative 'api/client'
 
 module Influxdb
   module Api
+    class Error < StandardError;end
+    class UnsupportedFeature < Error;end
+
     extend self
 
     attr_writer :client, :config

data/lib/influxdb/api/client.rb

@@ -18,10 +18,14 @@ module Influxdb
         response = with_retry(path, params) do |connection, url|
           connection.basic_auth(config.user, config.password)
           headers = { 'Content-Type' => 'application/json' }
+          body = body ? convert_to_json(body) : nil
 
-          connection.run_request(method, url, (body ? convert_to_json(body) : nil), headers, &block)
+          logger.debug "=> #{method.upcase} #{url} #{body}" if logger
+          connection.run_request(method, url, body, headers, &block)
         end
 
+        logger.debug "<= [#{response.status}] #{response.body}" if logger
+
         raise_transport_error(response) if response.status.to_i >= 300
 
         json = config.serializer.load(response.body) if response.headers && response.headers["content-type"] =~ /json/

data/lib/influxdb/api/database.rb

@@ -17,11 +17,23 @@ module Influxdb
       end
 
       def continuous_queries
-        @continuous_queries ||= Namespaces::ContinuousQueries.new(client, name)
+        @continuous_queries ||= if client.version > '0.8.3'
+          Namespaces::ContinuousQueries::Sql.new(client, name)
+        else
+          Namespaces::ContinuousQueries::Api.new(client, name)
+        end
       end
 
       def shard_spaces
-        @shard_spaces ||= Namespaces::ShardSpaces.new(client, name)
+        @shard_spaces ||= begin
+          version = client.version
+          raise(
+            UnsupportedFeature,
+            "Shard space's API is supported only after 0.7.3 version. Current is #{version.to_s(:mini)}"
+          ) if version < '0.8.3'
+
+          Namespaces::ShardSpaces.new(client, name)
+        end
       end
     end
   end

data/lib/influxdb/api/namespaces/base.rb

@@ -34,6 +34,13 @@ module Influxdb
 
         protected
 
+        def return_false_if_doesnt_exist(type)
+          yield
+        rescue Influxdb::Api::Client::Errors::BadRequest => e
+          raise e unless e.message =~ /#{type} (.*) doesn\'t exist/
+          false
+        end
+
         def resource_path(*args)
           [path_prefix, self.class._resource_path, path_postfix, args].compact.flatten.join(?/).squeeze(?/)
         end

data/lib/influxdb/api/namespaces/cluster_admins.rb

@@ -8,6 +8,10 @@ module Influxdb
           perform_post(resource_path(name), {}, attributes)
           true
         end
+
+        def delete(*_)
+          return_false_if_doesnt_exist('User'){ super }
+        end
       end
     end
   end

data/lib/influxdb/api/namespaces/continuous_queries.rb

@@ -1,11 +1,35 @@
 module Influxdb
   module Api
     module Namespaces
-      class ContinuousQueries < WithDatabase
-        resource_path '/continuous_queries'
+      module ContinuousQueries
+        class Api < WithDatabase
+          resource_path '/continuous_queries'
 
-        def create(query)
-          super(query: query)
+          def create(query)
+            super(query: query)
+          end
+        end
+
+        class Sql < WithDatabase
+          def create(query)
+            series.execute(query)
+            true
+          end
+
+          def all
+            series.execute('LIST CONTINUOUS QUERIES')['continuous queries']
+          end
+
+          def delete(id)
+            series.execute("DROP CONTINUOUS QUERY #{id}")
+            true
+          end
+
+          private
+
+          def series
+            client.databases(database_name).series
+          end
         end
       end
     end

data/lib/influxdb/api/namespaces/databases.rb

@@ -7,6 +7,10 @@ module Influxdb
         def create(name)
           super(name: name)
         end
+
+        def delete(*_)
+          return_false_if_doesnt_exist('Database'){ super }
+        end
       end
     end
   end

data/lib/influxdb/api/namespaces/series.rb

@@ -35,6 +35,9 @@ module Influxdb
           params = { q: query_string }
           params[:time_precision] = time_precision if time_precision
           perform_get(resource_path, params)
+        rescue Influxdb::Api::Client::Errors::BadRequest => e
+          raise e unless e.message =~ /Couldn\'t look up columns/
+          []
         end
 
         private

data/lib/influxdb/api/namespaces/shards.rb

@@ -4,6 +4,21 @@ module Influxdb
       class Shards < Base
         resource_path '/cluster/shards'
 
+        def create(attributes)
+          attributes['startTime'] = cast_datetime(attributes['startTime']) if attributes['startTime']
+          attributes[:startTime] = cast_datetime(attributes[:startTime]) if attributes[:startTime]
+          attributes['endTime'] = cast_datetime(attributes['endTime']) if attributes['endTime']
+          attributes[:endTime] = cast_datetime(attributes[:endTime]) if attributes[:endTime]
+
+          super(attributes)
+        end
+
+        private
+
+        def cast_datetime(value)
+          value = value.to_i if value && !value.is_a?(Integer)
+          value
+        end
       end
     end
   end

data/lib/influxdb/api/namespaces/users.rb

@@ -6,12 +6,19 @@ module Influxdb
 
         def find(name)
           perform_get(resource_path(name))
+        rescue Influxdb::Api::Client::Errors::BadRequest => e
+          raise e unless e.message =~ /Invalid username/
+          nil
         end
 
         def update(name, attributes)
           perform_post(resource_path(name), {}, attributes)
           true
         end
+
+        def delete(*_)
+          return_false_if_doesnt_exist('User'){ super }
+        end
       end
     end
   end

data/lib/influxdb/api/server_version.rb

@@ -34,8 +34,12 @@ module Influxdb
         [major <=> other_major, minor <=> other_minor, patch <=> other_patch].detect{|c| c != 0 } || 0
       end
 
-      def to_s
-        source
+      def to_s(format = :full)
+        if format == :mini
+          "#{major}.#{minor}.#{patch}"
+        else
+          source
+        end
       end
 
       def inspect

data/lib/influxdb/api/version.rb

@@ -1,5 +1,5 @@
 module Influxdb
   module Api
-    VERSION = '0.0.2'
+    VERSION = '0.0.3'
   end
 end

data/spec/intergrations/cluster_admins_spec.rb

@@ -0,0 +1,75 @@
+require 'spec_helper'
+
+describe 'cluster_admins', integration: true do
+  let(:config){ Influxdb::Api::Configuration.new }
+  let(:client){ Influxdb::Api::Client.new(config) }
+
+  subject{ client.cluster_admins }
+
+  before{ subject.all.each{|u| subject.delete(u['name']) if u['name'] != 'root' } }
+  after{ subject.all.each{|u| subject.delete(u['name']) if u['name'] != 'root' } }
+
+  describe '.all' do
+    it 'returns list of users' do
+      expect(subject.all).to eq([{ 'name' => 'root' }])
+    end
+  end
+
+  describe '.create' do
+    it 'creates cluster admin' do
+      subject.create(name: 'username', password: 'pass')
+      expect(subject.all).to match_array([{ 'name' => 'root' }, { 'name' => 'username' }])
+    end
+
+    context 'when there is user with same name' do
+      it 'raises error' do
+        expect{ subject.create(name: 'root', password: 'pass') }.to raise_error(
+          Influxdb::Api::Client::Errors::BadRequest, '[400] User root already exists'
+        )
+      end
+    end
+  end
+
+  describe '.update' do
+    context 'when user exists' do
+      let(:new_client){ Influxdb::Api::Client.new(new_config) }
+      let(:new_config) do
+        Influxdb::Api::Configuration.new.tap do |c|
+          c.user = 'username'
+          c.password = 'pass1'
+        end
+      end
+
+      before{ subject.create(name: 'username', password: 'pass') }
+
+      it 'updates user attributes' do
+        expect{ subject.update('username', password: 'pass1') }.not_to raise_error
+        expect{ new_client.version }.not_to raise_error
+      end
+    end
+
+    context 'when user does not exist' do
+      it 'raises error' do
+        expect{ subject.update('username', password: 'pass') }.to raise_error(
+          Influxdb::Api::Client::Errors::BadRequest, '[400] Invalid user name username'
+        )
+      end
+    end
+  end
+
+  describe '.delete' do
+    context 'when user does not exist' do
+      it 'returns false' do
+        expect(subject.delete('username')).to be_falsy
+      end
+    end
+
+    context 'when user exists' do
+      before{ subject.create(name: 'username', password: 'pass') }
+
+      it 'removes user and returns true' do
+        expect(subject.delete('username')).to be_truthy
+      end
+    end
+  end
+end

data/spec/intergrations/continuous_queries_spec.rb

@@ -0,0 +1,106 @@
+require 'spec_helper'
+
+describe 'continuous_queries', integration: true do
+  let(:config){ Influxdb::Api::Configuration.new }
+  let(:client){ Influxdb::Api::Client.new(config) }
+  let(:continuous_query1){ 'select MEAN(user) as user_mean from cpu group by time(1m) into cpu.1m.user_mean' }
+  let(:continuous_query2){ 'select MAX(user) as user_max from cpu group by time(1m) into cpu.1m.user_max' }
+  let(:continuous_query1_088){ 'select MEAN(user) as user_mean from "cpu" group by time(1m) into cpu.1m.user_mean' }
+  let(:continuous_query2_088){ 'select MAX(user) as user_max from "cpu" group by time(1m) into cpu.1m.user_max' }
+
+  subject{ client.databases('db_name').continuous_queries }
+
+  before do
+    client.databases.create('db_name')
+    subject.all.each{|q| subject.delete(q['id']) }
+  end
+
+  after{ client.databases.delete('db_name') }
+
+  describe '.all' do
+    context 'when there are no continuous queries' do
+      it 'returns empty array' do
+        expect(subject.all).to eq([])
+      end
+    end
+
+    context 'when there are some continuous queries', version: '<=0.8.3' do
+      before do
+        subject.create(continuous_query1)
+        subject.create(continuous_query2)
+      end
+
+      it 'returns the list of users' do
+        expect(subject.all).to match_array([
+          { 'id' => 1, 'query' => continuous_query1 }, { 'id' => 2, 'query' => continuous_query2 }
+        ])
+      end
+    end
+
+    context 'when there are some continuous queries', version: '>0.8.3' do
+      before do
+        subject.create(continuous_query1)
+        subject.create(continuous_query2)
+      end
+
+      it 'returns the list of users' do
+        expect(subject.all).to match_array([
+          { 'time' => 0, 'id' => 1, 'query' => continuous_query1_088 },
+          { 'time' => 0, 'id' => 2, 'query' => continuous_query2_088 }
+        ])
+      end
+    end
+  end
+
+  describe '.create' do
+    it 'creates a new query', version: '<=0.8.3' do
+      subject.create(continuous_query1)
+      expect(subject.all).to eq([{ 'id' => 1, 'query' => continuous_query1 }])
+    end
+
+    it 'creates a new query', version: '>0.8.3' do
+      subject.create(continuous_query1)
+      expect(subject.all).to eq([{ 'time' => 0, 'id' => 1, 'query' => continuous_query1_088 }])
+    end
+
+    context 'when there is the same query', version: '<=0.8.3' do
+      before{ subject.create(continuous_query1) }
+
+      it 'creates one more' do
+        subject.create(continuous_query1)
+        expect(subject.all).to match_array([
+          { 'id' => 1, 'query' => continuous_query1 }, { 'id' => 2, 'query' => continuous_query1 }
+        ])
+      end
+    end
+
+    context 'when there is the same query', version: '>0.8.3' do
+      before{ subject.create(continuous_query1) }
+
+      it 'creates one more' do
+        subject.create(continuous_query1)
+        expect(subject.all).to match_array([
+          { 'time' => 0, 'id' => 1, 'query' => continuous_query1_088 },
+          { 'time' => 0, 'id' => 2, 'query' => continuous_query1_088 }
+        ])
+      end
+    end
+  end
+
+  describe '.delete' do
+    context 'when query does not exist' do
+      it 'returns true' do
+        expect(subject.delete(1)).to be_truthy
+      end
+    end
+
+    context 'when query exists' do
+      before{ subject.create(continuous_query1) }
+
+      it 'removes db and returns true' do
+        expect(subject.delete(1)).to be_truthy
+        expect(subject.all).to eq([])
+      end
+    end
+  end
+end