influxdb 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dec07342cd8e538c3ebba57d893117c5dc3d0e35
-  data.tar.gz: a0c35f492f8fabc6b3df66da2725c35a5f67e06f
+  metadata.gz: a15d18aa85145172f0abb3333ef7ffb9641b4ada
+  data.tar.gz: 6146be97a07658dffb26b044d15ddca5adc8e8ac
 SHA512:
-  metadata.gz: 44e86d093b33b08031324467c78b518b49516a6374f9e6a5b0740f86b9d397f0e7ebf013f78aa6284aeee652924cce8576e5176c8f4c22c3212c0c1e9b2a90b1
-  data.tar.gz: 13493de5cfd094646fbf68baf1b15a1fa87ba434ef2d8c988edb21bca9dd5597ab83125582df63f16fa654563610cdea87fb174a0662a2bef6cea51b29c53842
+  metadata.gz: 191c102bd7ad4f5e136763b16ba0efce9b2f6f1002bcea5e317cad36ad20918484c714e277a329890598bd1172469bf117013ed93e2db5ed7742aebbfaa7c8bc
+  data.tar.gz: 7cdbe3eefee7b679dae5c46d1a825cc36195d1bdb05326cf57dd005c1ce3663d57bd34414edaa289424281a726d9df6d25702fea527b4d8711bb6edac9d02151

data/.travis.yml

@@ -1,9 +1,8 @@
 language: ruby
 rvm:
   - 1.8.7
+  - ree
   - 1.9.3
   - 2.0.0
-  - rbx-19mode
-  - rbx-20mode
-  - jruby
   - ruby-head
+  - jruby

data/Gemfile

@@ -2,3 +2,4 @@ source "https://rubygems.org"
 
 gemspec
 
+gem "webmock", :git => "https://github.com/influxdb/webmock.git"

data/README.md

@@ -97,6 +97,16 @@ database = 'site_development'
 influxdb.delete_database(database)
 ```
 
+Delete a database user:
+
+``` ruby
+require 'influxdb'
+
+influxdb = InfluxDB::Client.new
+
+influxdb.delete_database_user(database, username)
+```
+
 Querying:
 
 ``` ruby

data/lib/influxdb.rb

@@ -1,2 +1,6 @@
 require "influxdb/version"
+require "influxdb/logger"
+
+require "influxdb/max_queue"
+require "influxdb/worker"
 require "influxdb/client"

data/lib/influxdb/client.rb

@@ -2,10 +2,13 @@ require 'uri'
 require 'net/http'
 require 'json'
 
-
 module InfluxDB
   class Client
     attr_accessor :host, :port, :username, :password, :database
+    attr_accessor :queue
+
+    include InfluxDB::Logger
+    include InfluxDB::Worker
 
     # Initializes a new Influxdb client
     #
@@ -34,54 +37,95 @@ module InfluxDB
       @username = opts[:username] || "root"
       @password = opts[:password] || "root"
       @database = args.first
+      @http = Net::HTTP.new(@host, @port)
+      @queue = InfluxDB::MaxQueue.new
+      spawn_threads!
     end
 
     def create_database(name)
-      http = Net::HTTP.new(@host, @port)
-      url = "/db?u=#{@username}&p=#{@password}"
+      url = full_url("db")
       data = JSON.generate({:name => name})
 
-      response = http.request(Net::HTTP::Post.new(url), data)
+      headers = {"Content-Type" => "application/json"}
+      response = @http.request(Net::HTTP::Post.new(url, headers), data)
     end
 
     def delete_database(name)
-      http = Net::HTTP.new(@host, @port)
-      url = "/db/#{name}?u=#{@username}&p=#{@password}"
+      url = full_url("db/#{name}")
 
-      response = http.request(Net::HTTP::Delete.new(url))
+      response = @http.request(Net::HTTP::Delete.new(url))
     end
 
     def get_database_list
-      http = Net::HTTP.new(@host, @port)
-      url = "/dbs?u=#{@username}&p=#{@password}"
+      url = full_url("dbs")
 
-      response = http.request(Net::HTTP::Get.new(url))
+      response = @http.request(Net::HTTP::Get.new(url))
       JSON.parse(response.body)
     end
 
+    def create_cluster_admin(username, password)
+      url = full_url("cluster_admins")
+      data = JSON.generate({:name => username, :password => password})
+
+      headers = {"Content-Type" => "application/json"}
+      response = @http.request(Net::HTTP::Post.new(url, headers), data)
+    end
+
+    def update_cluster_admin(username, password)
+      url = full_url("cluster_admins/#{username}")
+      data = JSON.generate({:password => password})
+
+      headers = {"Content-Type" => "application/json"}
+      response = @http.request(Net::HTTP::Post.new(url, headers), data)
+    end
+
+    def delete_cluster_admin(username)
+      url = full_url("cluster_admins/#{username}")
+
+      response = @http.request(Net::HTTP::Delete.new(url))
+    end
+
     def create_database_user(database, username, password)
-      http = Net::HTTP.new(@host, @port)
-      url = "/db/#{database}/users?u=#{@username}&p=#{@password}"
-      data = JSON.generate({:username => username, :password => password})
-      response = http.request(Net::HTTP::Post.new(url), data)
+      url = full_url("db/#{database}/users")
+      data = JSON.generate({:name => username, :password => password})
+
+      headers = {"Content-Type" => "application/json"}
+      response = @http.request(Net::HTTP::Post.new(url, headers), data)
+    end
+
+    def update_database_user(database, username, options = {})
+      url = full_url("db/#{database}/users/#{username}")
+      data = JSON.generate(options)
+
+      headers = {"Content-Type" => "application/json"}
+      @http.request(Net::HTTP::Post.new(url, headers), data)
+    end
+
+    def delete_database_user(database, username)
+      url = full_url("db/#{database}/users/#{username}")
+
+      @http.request(Net::HTTP::Delete.new(url))
     end
 
     def get_database_user_list(database)
-      http = Net::HTTP.new(@host, @port)
-      url = "/db/#{database}/users?u=#{@username}&p=#{@password}"
+      url = full_url("db/#{database}/users")
 
-      response = http.request(Net::HTTP::Get.new(url))
+      response = @http.request(Net::HTTP::Get.new(url))
       JSON.parse(response.body)
     end
 
-    def write_point(name, data)
-      http = Net::HTTP.new(@host, @port)
-      url = "/db/#{@database}/series?u=#{@username}&p=#{@password}"
-      payload = {:name => name, :points => [], :columns => []}
+    def alter_database_privilege(database, username, admin=true)
+      url = full_url("db/#{database}/users/#{username}")
+      data = JSON.generate({:admin => admin})
+
+      headers = {"Content-Type" => "application/json"}
+      @http.request(Net::HTTP::Post.new(url, headers), data)
+    end
 
+    def write_point(name, data, async=false)
       data = data.is_a?(Array) ? data : [data]
-      columns = data.reduce(:merge).keys
-      payload[:columns] = columns
+      columns = data.reduce(:merge).keys.sort {|a,b| a.to_s <=> b.to_s}
+      payload = {:name => name, :points => [], :columns => columns}
 
       data.each do |p|
         point = []
@@ -89,15 +133,21 @@ module InfluxDB
         payload[:points].push point
       end
 
-      data = JSON.generate([payload])
-      response = http.request(Net::HTTP::Post.new(url), data)
+      async ? @queue.push(payload) : _write([payload])
+    end
+
+    def _write(payload)
+      url = full_url("db/#{@database}/series")
+      data = JSON.generate(payload)
+
+      headers = {"Content-Type" => "application/json"}
+      response = @http.request(Net::HTTP::Post.new(url, headers), data)
     end
 
-    def query query
-      http = Net::HTTP.new(@host, @port)
-      url = "/db/#{@database}/series?u=#{@username}&p=#{@password}&q=#{query}"
+    def query(query)
+      url = full_url("db/#{@database}/series", "q=#{query}")
       url = URI.encode url
-      response = http.request(Net::HTTP::Get.new(url))
+      response = @http.request(Net::HTTP::Get.new(url))
       series = JSON.parse(response.body)
 
       if block_given?
@@ -113,6 +163,12 @@ module InfluxDB
     end
 
     private
+    def full_url(path, params=nil)
+      "".tap do |url|
+        url << "/#{path}?u=#{@username}&p=#{@password}"
+        url << "&#{params}" unless params.nil?
+      end
+    end
 
     def denormalize_series series
       columns = series['columns']

data/lib/influxdb/config.rb

@@ -0,0 +1,44 @@
+require 'json'
+
+module InfluxDB
+  class Config
+    attr_accessor :path, :config
+
+    # +:path+:: path to the config file
+    # +:config+:: hash representing InfluxDB configuration
+    def initialize(*args)
+      opts = args.last.is_a?(Hash) ? args.last : {}
+      @path   = opts[:path] || '/opt/influxdb/shared/config.json'
+      @config = opts[:config] || default_config
+    end
+
+    def render
+      return JSON.pretty_generate(@config)
+    end
+
+    def valid?(path=@path)
+      begin
+        JSON.parse(File.read(path))
+        return true
+      rescue JSON::ParserError
+        return false
+      end
+    end
+
+    private
+
+    def default_config
+      return {
+        'AdminHttpPort' => 8083,
+        'AdminAssetsDir' => '/opt/influxdb/current/admin',
+        'ApiHttpPort' => 8086,
+        'RaftServerPort' => 8090,
+        'SeedServers' => [],
+        'DataDir' => '/opt/influxdb/shared/data/db',
+        'RaftDir' => '/opt/influxdb/shared/data/raft'
+      }
+    end
+
+  end
+end
+

data/lib/influxdb/logger.rb

@@ -0,0 +1,10 @@
+module InfluxDB
+  module Logger
+    PREFIX = "[InfluxDB] "
+
+    private
+    def log(level, message)
+      STDERR.puts(PREFIX + "(#{level}) #{message}") unless level == :debug
+    end
+  end
+end

data/lib/influxdb/max_queue.rb

@@ -0,0 +1,17 @@
+require "thread"
+
+module InfluxDB
+  class MaxQueue < Queue
+    attr_reader :max
+
+    def initialize(max = 10_000)
+      raise ArgumentError, "queue size must be positive" unless max > 0
+      @max = max
+      super()
+    end
+
+    def push(obj)
+      super if length < @max
+    end
+  end
+end

data/lib/influxdb/version.rb

@@ -1,3 +1,3 @@
 module InfluxDB
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/lib/influxdb/worker.rb

@@ -0,0 +1,59 @@
+require 'thread'
+require "net/http"
+require "uri"
+
+module InfluxDB
+  module Worker
+    attr_accessor :queue
+
+    include InfluxDB::Logger
+
+    MAX_POST_POINTS = 200
+    NUM_WORKER_THREADS = 3
+    SLEEP_INTERVAL = 500
+
+    def current_threads
+      Thread.list.select {|t| t[:influxdb] == self.object_id}
+    end
+
+    def current_thread_count
+      Thread.list.count {|t| t[:influxdb] == self.object_id}
+    end
+
+    def spawn_threads!
+      NUM_WORKER_THREADS.times do |thread_num|
+        log :debug, "Spawning background worker thread #{thread_num}."
+
+        Thread.new do
+          Thread.current[:influxdb] = self.object_id
+
+          at_exit do
+            log :debug, "Thread exiting, flushing queue."
+            check_background_queue(thread_num) until @queue.empty?
+          end
+
+          while true
+            sleep SLEEP_INTERVAL
+            self.check_background_queue(thread_num)
+          end
+        end
+      end
+    end
+
+    def check_background_queue(thread_num = 0)
+      log :debug, "Checking background queue on thread #{thread_num} (#{self.current_thread_count} active)"
+
+      begin
+        data = []
+
+        while data.size < MAX_POST_POINTS && !@queue.empty?
+          p = @queue.pop(true) rescue next;
+          log :debug, "Found data in the queue! (#{p[:n]})"
+          data.push p
+        end
+
+        _write(data)
+      end while @queue.length > MAX_POST_POINTS
+    end
+  end
+end

data/spec/influxdb/client_spec.rb

@@ -34,7 +34,7 @@ describe InfluxDB::Client do
     it "should POST to create a new database" do
       stub_request(:post, "http://influxdb.test:9999/db").with(
         :query => {:u => "username", :p => "password"},
-        :body => JSON.generate({:name => "foo"})
+        :body => {:name => "foo"}
       )
 
       @influxdb.create_database("foo").should be_a(Net::HTTPOK)
@@ -56,23 +56,87 @@ describe InfluxDB::Client do
       database_list = [{"name" => "foobar"}]
       stub_request(:get, "http://influxdb.test:9999/dbs").with(
         :query => {:u => "username", :p => "password"}
-      ).to_return(:body => JSON.generate(database_list, :status => 200))
+      ).to_return(:body => JSON.generate(database_list), :status => 200)
 
       @influxdb.get_database_list.should == database_list
     end
   end
 
+  describe "#create_cluster_admin" do
+    it "should POST to create a new cluster admin" do
+      stub_request(:post, "http://influxdb.test:9999/cluster_admins").with(
+        :query => {:u => "username", :p => "password"},
+        :body => {:name => "adminadmin", :password => "passpass"}
+      )
+
+      @influxdb.create_cluster_admin("adminadmin", "passpass").should be_a(Net::HTTPOK)
+    end
+  end
+
+  describe "#update_cluster_admin" do
+    it "should POST to update a cluster admin" do
+      stub_request(:post, "http://influxdb.test:9999/cluster_admins/adminadmin").with(
+        :query => {:u => "username", :p => "password"},
+        :body => {:password => "passpass"}
+      )
+
+      @influxdb.update_cluster_admin("adminadmin", "passpass").should be_a(Net::HTTPOK)
+    end
+  end
+
+  describe "#delete_cluster_admin" do
+    it "should DELETE a cluster admin" do
+      stub_request(:delete, "http://influxdb.test:9999/cluster_admins/adminadmin").with(
+        :query => {:u => "username", :p => "password"}
+      )
+
+      @influxdb.delete_cluster_admin("adminadmin").should be_a(Net::HTTPOK)
+    end
+  end
+
   describe "#create_database_user" do
     it "should POST to create a new database user" do
       stub_request(:post, "http://influxdb.test:9999/db/foo/users").with(
         :query => {:u => "username", :p => "password"},
-        :body => JSON.generate({:username => "useruser", :password => "passpass"})
+        :body => {:name => "useruser", :password => "passpass"}
       )
 
       @influxdb.create_database_user("foo", "useruser", "passpass").should be_a(Net::HTTPOK)
     end
   end
 
+  describe "#update_database_user" do
+    it "should POST to update a database user" do
+      stub_request(:post, "http://influxdb.test:9999/db/foo/users/useruser").with(
+        :query => {:u => "username", :p => "password"},
+        :body => {:password => "passpass"}
+      )
+
+      @influxdb.update_database_user("foo", "useruser", :password => "passpass").should be_a(Net::HTTPOK)
+    end
+  end
+
+  describe "#alter_database_privilege" do
+    it "should POST to alter privileges for a user on a database" do
+      stub_request(:post, "http://influxdb.test:9999/db/foo/users/useruser").with(
+        :query => {:u => "username", :p => "password"}
+      )
+
+      @influxdb.alter_database_privilege("foo", "useruser", admin=true).should be_a(Net::HTTPOK)
+      @influxdb.alter_database_privilege("foo", "useruser", admin=false).should be_a(Net::HTTPOK)
+    end
+  end
+
+  describe "#delete_database_user" do
+    it "should DELETE a database user" do
+      stub_request(:delete, "http://influxdb.test:9999/db/foo/users/bar").with(
+        :query => {:u => "username", :p => "password"}
+      )
+
+      @influxdb.delete_database_user("foo", "bar").should be_a(Net::HTTPOK)
+    end
+  end
+
   describe "#get_database_user_list" do
     it "should GET a list of database users" do
       user_list = [{"username"=>"user1"}, {"username"=>"user2"}]
@@ -87,17 +151,16 @@ describe InfluxDB::Client do
   describe "#write_point" do
     it "should POST to add points" do
       body = [{
-        :name => "seriez",
-        :points => [["juan", 87]],
-        :columns => ["name", "age"]
+        "name" => "seriez",
+        "points" => [[87, "juan"]],
+        "columns" => ["age", "name"]
       }]
 
       stub_request(:post, "http://influxdb.test:9999/db/database/series").with(
         :query => {:u => "username", :p => "password"},
-        :body => JSON.generate(body)
+        :body => body
       )
 
-      # data = [{:name => "juan", :age => 87}, {:name => "pablo", :age => 64}]
       data = {:name => "juan", :age => 87}
 
       @influxdb.write_point("seriez", data).should be_a(Net::HTTPOK)
@@ -105,14 +168,14 @@ describe InfluxDB::Client do
 
     it "should POST multiple points" do
       body = [{
-        :name => "seriez",
-        :points => [["juan", 87], ["shahid", 99]],
-        :columns => ["name", "age"]
+        "name" => "seriez",
+        "points" => [[87, "juan"], [99, "shahid"]],
+        "columns" => ["age", "name"]
       }]
 
       stub_request(:post, "http://influxdb.test:9999/db/database/series").with(
         :query => {:u => "username", :p => "password"},
-        :body => JSON.generate(body)
+        :body => body
       )
 
       data = [{:name => "juan", :age => 87}, { :name => "shahid", :age => 99}]
@@ -122,14 +185,14 @@ describe InfluxDB::Client do
 
     it "should POST multiple points with missing columns" do
       body = [{
-        :name => "seriez",
-        :points => [["juan", 87], ["shahid", nil]],
-        :columns => ["name", "age"]
+        "name" => "seriez",
+        "points" => [[87, "juan"], [nil, "shahid"]],
+        "columns" => ["age", "name"]
       }]
 
       stub_request(:post, "http://influxdb.test:9999/db/database/series").with(
         :query => {:u => "username", :p => "password"},
-        :body => JSON.generate(body)
+        :body => body
       )
 
       data = [{:name => "juan", :age => 87}, { :name => "shahid"}]

data/spec/max_queue_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe InfluxDB::MaxQueue do
+  it "should inherit from Queue" do
+    InfluxDB::MaxQueue.new.should be_a(Queue)
+  end
+
+  context "#new" do
+    it "should allow max_depth to be set" do
+      queue = InfluxDB::MaxQueue.new(500)
+      queue.max.should == 500
+    end
+  end
+
+  context "#push" do
+    it "should allow an item to be added if the queue is not full" do
+      queue = InfluxDB::MaxQueue.new(5)
+      queue.size.should be_zero
+      queue.push(1)
+      queue.size.should == 1
+    end
+
+    it "should not allow items to be added if the queue is full" do
+      queue = InfluxDB::MaxQueue.new(5)
+      queue.size.should be_zero
+      5.times { |n| queue.push(n) }
+      queue.size.should == 5
+      queue.push(6)
+      queue.size.should == 5
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxdb
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Todd Persen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-18 00:00:00.000000000 Z
+date: 2013-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -96,9 +96,14 @@ files:
 - influxdb.gemspec
 - lib/influxdb.rb
 - lib/influxdb/client.rb
+- lib/influxdb/config.rb
+- lib/influxdb/logger.rb
+- lib/influxdb/max_queue.rb
 - lib/influxdb/version.rb
+- lib/influxdb/worker.rb
 - spec/influxdb/client_spec.rb
 - spec/influxdb_spec.rb
+- spec/max_queue_spec.rb
 - spec/spec_helper.rb
 homepage: http://influxdb.org
 licenses:
@@ -127,4 +132,5 @@ summary: Ruby library for InfluxDB.
 test_files:
 - spec/influxdb/client_spec.rb
 - spec/influxdb_spec.rb
+- spec/max_queue_spec.rb
 - spec/spec_helper.rb