atsd 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9025f64163ec30e20c4a242935de58d36956fdee
-  data.tar.gz: f9d451cb22a9b1c1cd8ee7cbb09d916538019543
+  metadata.gz: 743f931e95108681d4b1a2406db3501c14b78a66
+  data.tar.gz: 19f72e28217eecfa35c64c5dc6abb067467d6f4c
 SHA512:
-  metadata.gz: efd37ea4a310e612b2df8b8417b8ae09fc5990703f8b569f33c1efbdd014d293f324cb9db6181c05eb6d1a092186cb0c3ac73b3e1e11613e0f5fe280dec643ab
-  data.tar.gz: e73b69f0c386d4f073f3df4ce77418bc00f75df5d93d3599e73078ffbb39b05ddd13d5f5f2d050765f96a0de54331b5d7e1ec6e9ad24eb0386c817227f94536f
+  metadata.gz: 6ba9b9e316ee783810bab3ac05f38b46e42aa98d76d73ee923e7d4637762ca988cc0c98c2516dbebc66d67c0c0064819a5f8f5df77b0826029687c59baade927
+  data.tar.gz: 8f9ea0a7a2f5ffd1dfa5c806f335b3ddbd2a80e376c5538189320d83ba1596f6e4f253da80e1f09eaf16462f01d1506896899a1c2f093ed0f0ba29b11e8985ee

data/README.md

@@ -68,8 +68,10 @@ Or install manually:
 To start using the gem you need to create an ATSD instance:
 
 ```ruby
-atsd = ATSD.new :url => '#{API_ENDPOINT}/api/v1', 
-                :basic_auth => '#{LOGIN}:#{PASSWORD}', 
+require 'atsd'
+include ATSD
+atsd = ATSD.new :url => "#{API_ENDPOINT}/api/v1", 
+                :basic_auth => "#{LOGIN}:#{PASSWORD}", 
                 :logger => true
 ```
 
@@ -119,10 +121,10 @@ to CamelCase used in the API. For example, `end_time` property in ruby code beco
 Simple query:
 
 ```ruby
-series = atsd.series
+series_service = atsd.series_service
 # => #<ATSD::SeriesService:0x007f82a4446c08
 
-query = series.query('ubuntu', 'meminfo.memfree')
+query = series_service.query('ubuntu', 'meminfo.memfree')
 # => {:entity=>"ubuntu", :metric=>"meminfo.memfree"}
 
 query.class
@@ -154,7 +156,7 @@ s.entity
 Complex query:
 
 ```ruby
-query.aggregate(types:[ATSD::SeriesQuery::AggregateType::AVG], interval:{count:1, unit:ATSD::SeriesQuery::Interval::HOUR})
+query.aggregate(types:[SeriesQuery::AggregateType::AVG], interval:{count:1, unit:SeriesQuery::Interval::HOUR})
 # => {:entity=>"ubuntu",
 #  :metric=>"meminfo.memfree",
 #  :end_time=>1428303004000,
@@ -169,14 +171,30 @@ query.execute
 #   :data=>[{"t"=>1428300000000, "v"=>82615.05263157895}]}]
 ```
 
+Query with Versions:
+
+```ruby
+query = atsd.series_service.query("sensor-1", "temperature", Time.new(2015, 11, 17, 12, 0, 0), Time.new(2015, 11, 17, 19, 0, 0), {:versioned => true})
+query.execute
+```
+
 Data Insertion:
 
 ```ruby
-s = ATSD::Series.new
+s = Series.new
 s.entity = 'ubuntu'
 s.metric = 'meminfo.memfree'
 s.data = [ {t: 100000000, v: 512} ]
-series.insert(s)
+series_service.insert(s)
+```
+
+Inserting Series with Versions:
+
+```ruby
+sample_1 = Sample.new :t => Time.new(2015, 11, 17, 17, 0, 0), :v => 7, :version => {:status => "normal", :source => "gateway-1"}
+sample_2 = Sample.new :t => Time.new(2015, 11, 17, 18, 0, 0), :v => 17, :version => {:status => "error", :source => "gateway-1"}
+series = Series.new :entity => "sensor-1", :metric => "temperature", :data => [sample_1, sample_2]
+atsd.series_service.insert(series)
 ```
 
 **CSV Insert**
@@ -198,41 +216,41 @@ time, mem.info.memfree, meminfo.memused
 
 Inserting csv data example:
 ```ruby
-series.csv_insert('ubuntu', File.read('/path/to/data.csv'), { :user => 'beta' })
+series_service.csv_insert('ubuntu', File.read('/path/to/data.csv'), { :user => 'beta' })
 ```
 
 #### Properties Service
 
 ```ruby
-props = atsd.properties
+properties_service = atsd.properties_service
 # => #<ATSD::PropertiesService:0x007f82a456e6f8
 
-property = ATSD::Property.new
+property = Property.new
 property.entity = 'ubuntu'
 property.type = 'system'
 property.key = {"server_name":"server","user_name":"system"}
 property.tags = {"name.1": "value.1"}
-props.insert(property)
+properties_service.insert(property)
 
-props.query('ubuntu', 'system').execute
+properties_service.query('ubuntu', 'system').execute
 # => [{:type=>"system",
 #  :entity=>"ubuntu",
 #  :key=>{"server_name"=>"server", "user_name"=>"system"},
 #  :timestamp=>1428304255068,
 #  :tags=>{"name.1"=>"value.1"}}]
 
-props.delete(property)
-props.query('ubuntu', 'system').execute
+properties_service.delete(property)
+properties_service.query('ubuntu', 'system').execute
 # => []
 ```
 
 #### Alerts Service
 
 ```ruby
-a = atsd.alerts
+alerts_service = atsd.alerts_service
 # => #<ATSD::AlertsService:0x007faf7c0efdc0
 
-a.query.execute
+alerts_service.query.execute
 # => [{:value=>447660.0,
 #     :id=>4,
 #     :text_value=>"447660",
@@ -258,10 +276,10 @@ a.query.execute
 #### Metrics Service
 
 ```ruby
-ms = atsd.metrics
+metrics_service = atsd.metrics_service
 # => #<ATSD::MetricsService:0x007fbb548d9548
 
-ms.list
+metrics_service.list
 # => [{:name=>"activemq_metrics_count",
 #     :enabled=>true,
 #     :data_type=>"FLOAT",
@@ -271,6 +289,7 @@ ms.list
 #     :retention_interval=>0,
 #     :invalid_action=>"NONE",
 #     :last_insert_time=>1428328861848},
+#     :versioned=>true
 #    {:name=>"activemq_properties_count",
 #     :enabled=>true,
 #     :data_type=>"FLOAT",
@@ -278,7 +297,7 @@ ms.list
 #     :persistent=>true,
 # ...
 
-ms.entity_and_tags('df.disk_size')
+metrics_service.entity_and_tags('df.disk_size')
 # => [{:entity=>"ubuntu", :tags=>{"file_system"=>"/dev/sda1", "mount_point"=>"/"}, :last_insert_time=>1428328928000},
 #  {:entity=>"ubuntu",
 #   :tags=>{"file_system"=>"none", "mount_point"=>"/sys/fs/cgroup"},
@@ -288,24 +307,35 @@ ms.entity_and_tags('df.disk_size')
 #  {:entity=>"ubuntu", :tags=>{"file_system"=>"none", "mount_point"=>"/run/user"}, :last_insert_time=>1428328928000},
 #  {:entity=>"ubuntu", :tags=>{"file_system"=>"udev", "mount_point"=>"/dev"}, :last_insert_time=>1428328928000},
 #  {:entity=>"ubuntu", :tags=>{"file_system"=>"tmpfs", "mount_point"=>"/run"}, :last_insert_time=>1428328928000}]
+
+metric = Metric.new
+# => {}
+metric.name = "cpu_count"
+# => "cpu_count"
+metric.versioned = true
+# => true
+metrics_service.create_or_replace(metric)
+metrics_service.get("cpu_count")
+# => {:name=>"cpu_count", :enabled=>true, :data_type=>"FLOAT", :counter=>false, :persistent=>true, :tags=>{}, :time_precision=>"MILLISECONDS", :retention_interval=>0, :invalid_action=>"NONE", :versioned=>true}
+
 ```
 
 #### Entities Service
 
 ```ruby
-ent = atsd.entities
+entities_service = atsd.entities_service
 # => #<ATSD::EntitiesService:0x007f82a45b40b8
 
-ent.list
+entities_service.list
 # => [{:name=>"atsd", :enabled=>true, :last_insert_time=>1428304482631},
 #  {:name=>"mine", :enabled=>true},
 #  {:name=>"test_entity", :enabled=>true, :last_insert_time=>1000000000},
 #  {:name=>"ubuntu", :enabled=>true, :last_insert_time=>1428304489000}]
 
-ent.get('ubuntu')
+entities_service.get('ubuntu')
 # => {:name=>"ubuntu", :enabled=>true, :last_insert_time=>1428304499000, :tags=>{}}
 
-ent.metrics('ubuntu')
+entities_service.metrics('ubuntu')
 # => [{:name=>"df.disk_size",
 #   :enabled=>true,
 #   :data_type=>"FLOAT",
@@ -319,8 +349,8 @@ ent.metrics('ubuntu')
 #   :enabled=>true,
 # ...
 
-ent.delete(ent.get('mine')) # or ent.delete('mine')
-ent.list
+entities_service.delete(entities_service.get('mine')) # or entities_service.delete('mine')
+entities_service.list
 # => [{:name=>"atsd", :enabled=>true, :last_insert_time=>1428304482631},
 #  {:name=>"test_entity", :enabled=>true, :last_insert_time=>1000000000},
 #  {:name=>"ubuntu", :enabled=>true, :last_insert_time=>1428304489000}]
@@ -328,19 +358,19 @@ ent.list
 #### Entity Groups Service 
 
 ```ruby
-eg = atsd.entity_groups
+entity_groups_service = atsd.entity_groups_service
 # => #<ATSD::EntityGroupsService:0x007fb1b2a0d7f8
 
-eg.create_or_replace('group1')
-eg.list
+entity_groups_service.create_or_replace('group1')
+entity_groups_service.list
 # => [{:name=>"group1"}]
 
-eg.add_entities('group1', [{name:'entity1'},{name:'entity2'}])
-eg.entities(eg.get('group1'))
+entity_groups_service.add_entities('group1', [{name:'entity1'},{name:'entity2'}])
+entity_groups_service.entities(entity_groups_service.get('group1'))
 # => [{:name=>"entity1", :enabled=>true}, {:name=>"entity2", :enabled=>true}]
 
-eg.delete_all_entities('group1')
-eg.entities('group1')
+entity_groups_service.delete_all_entities('group1')
+entity_groups_service.entities('group1')
 # => []
 ```
 

data/lib/atsd/atsd.rb

@@ -44,11 +44,11 @@ module ATSD
       end
     end
 
-    service :series, SeriesService
-    service :properties, PropertiesService
-    service :alerts, AlertsService
-    service :metrics, MetricsService
-    service :entities, EntitiesService
-    service :entity_groups, EntityGroupsService
+    service :series_service, SeriesService
+    service :properties_service, PropertiesService
+    service :alerts_service, AlertsService
+    service :metrics_service, MetricsService
+    service :entities_service, EntitiesService
+    service :entity_groups_service, EntityGroupsService
   end
 end

data/lib/atsd/models/base_model.rb

@@ -5,6 +5,8 @@ module ATSD
     include ::Hashie::Extensions::MethodAccess
     include ::Hashie::Extensions::MergeInitializer
     include Utils::UnderscoreKeys
+    include ::Hashie::Extensions::Coercion
+
 
     # Converts model to hash usable for API
     #
@@ -18,6 +20,19 @@ module ATSD
       end
       hash
     end
+
+    # def method_missing(meth, *args, &block)
+    #   action = meth[0, 3]
+    #   field = meth[4..-1]
+    #   case action
+    #     when "get"
+    #       return self.send(field)
+    #     when "set"
+    #       return self[field]=args[0]
+    #     else
+    #       super
+    #   end
+    # end
   end
 end
 

data/lib/atsd/models/entity.rb

@@ -2,6 +2,45 @@ require 'atsd/models/base_model'
 
 module ATSD
   class Entity < BaseModel
+    def set_name(name)
+      self["name"] = name
+    end
+
+    def get_name()
+      self.send("name")
+    end
+
+    def set_enabled(enabled)
+      self["enabled"] = enabled
+    end
+
+    def get_enabled()
+      self.send("enabled")
+    end
+
+    def set_last_insert_time(last_insert_time)
+      self["last_insert_time"] = last_insert_time
+    end
+
+    def get_last_insert_time()
+      self.send("last_insert_time")
+    end
+
+    def set_last_insert_date(last_insert_date)
+      self["last_insert_date"] = last_insert_date
+    end
+
+    def get_last_insert_date()
+      self.send("last_insert_date")
+    end
+
+    def set_tags(tags)
+      self["tags"] = tags
+    end
+
+    def get_tags()
+      self.send("tags")
+    end
   end
 end
 

data/lib/atsd/models/entity_group.rb

@@ -3,6 +3,29 @@ require 'atsd/models/entity'
 
 module ATSD
   class EntityGroup < BaseModel
+    def set_name(name)
+      self["name"] = name
+    end
+
+    def get_name()
+      self.send("name")
+    end
+
+    def set_expression(expression)
+      self["expression"] = expression
+    end
+
+    def get_expression()
+      self.send("expression")
+    end
+
+    def set_tags(tags)
+      self["tags"] = tags
+    end
+
+    def get_tags()
+      self.send("tags")
+    end
   end
 end
 

data/lib/atsd/models/metric.rb

@@ -2,6 +2,214 @@ require 'atsd/models/base_model'
 
 module ATSD
   class Metric < BaseModel
+
+    def set_name(name)
+      self["name"] = name
+    end
+
+    def get_name()
+      self.send("name")
+    end
+
+    def set_label(label)
+      self["label"] = label
+    end
+
+    def get_label()
+      self.send("label")
+    end
+
+    def set_enabled(enabled)
+      self["enabled"] = enabled
+    end
+
+    def get_enabled()
+      self.send("enabled")
+    end
+
+    def set_data_type(data_type)
+      self["data_type"] = data_type
+    end
+
+    def get_data_type()
+      self.send("data_type")
+    end
+
+    def set_time_precision(time_precision)
+      self["time_precision"] = time_precision
+    end
+
+    def get_time_precision()
+      self.send("time_precision")
+    end
+
+    def set_persistent(persistent)
+      self["persistent"] = persistent
+    end
+
+    def get_persistent()
+      self.send("persistent")
+    end
+
+    def set_counter(counter)
+      self["counter"] = counter
+    end
+
+    def get_counter()
+      self.send("counter")
+    end
+
+    def set_filter(filter)
+      self["filter"] = filter
+    end
+
+    def get_filter()
+      self.send("filter")
+    end
+
+    def set_min_value(min_value)
+      self["min_value"] = min_value
+    end
+
+    def get_min_value()
+      self.send("min_value")
+    end
+
+    def set_max_value(max_value)
+      self["max_value"] = max_value
+    end
+
+    def get_max_value()
+      self.send("max_value")
+    end
+
+    def set_invalid_action(invalid_action)
+      self["invalid_action"] = invalid_action
+    end
+
+    def get_invalid_action()
+      self.send("invalid_action")
+    end
+
+    def set_description(description)
+      self["description"] = description
+    end
+
+    def get_description()
+      self.send("description")
+    end
+
+    def set_retention_interval(retention_interval)
+      self["retention_interval"] = retention_interval
+    end
+
+    def get_retention_interval()
+      self.send("retention_interval")
+    end
+
+    def set_last_insert_time(last_insert_time)
+      self["last_insert_time"] = last_insert_time
+    end
+
+    def get_last_insert_time()
+      self.send("last_insert_time")
+    end
+
+    def get_last_insert_date()
+      Time.at(self.send("last_insert_time")/1000)
+    end
+
+    # def set_last_insert_date(last_insert_date)
+    #   self["last_insert_date"] = last_insert_date
+    # end
+
+    def set_versioned(versioned)
+      self["versioned"] = versioned
+    end
+
+    def get_versioned()
+      self.send("versioned")
+    end
+
+    def set_tags(tags)
+      self["tags"] = tags
+    end
+
+    def get_tags()
+      self.send("tags")
+    end
+
+  end
+
+  module DataType
+    SHORT = 'SHORT'
+    INTEGER = 'INTEGER'
+    FLOAT = 'FLOAT'
+    LONG = 'LONG'
+    DOUBLE = 'DOUBLE'
+  end
+
+  module TimePrecision
+    SECONDS = 'SECONDS'
+    MILLISECONDS = 'MILLISECONDS'
+  end
+
+  module InvalidAction
+    NONE = 'NONE'
+    DISCARD = 'DISCARD'
+    TRANSFORM = 'TRANSFORM'
+    RAISE_ERROR = 'RAISE_ERROR'
   end
+
+  # class Enum
+  #   def self.keys
+  #     constants
+  #   end
+  #
+  #   def self.values
+  #     @values ||= constants.map { |const| const_get(const) }
+  #   end
+  # end
+  # class Enum
+  #   def self.keys
+  #     constants
+  #   end
+  #
+  #   def self.values
+  #     @values ||= constants.map { |const| const_get(const) }
+  #   end
+  # end
+  #
+  # class Data_Type < Enum
+  #   SHORT='SHORT'
+  #   INTEGER='INTEGER'
+  #   FLOAT='FLOAT'
+  #   LONG='LONG'
+  #   DOUBLE='DOUBLE'
+  # end
+  #
+  # class Time_Precision < Enum
+  #   SECONDS='SECONDS'
+  #   MILLISECONDS='MILLISECONDS'
+  # end
+  #
+  # class Invalid_Action < Enum
+  #   NONE='NONE'
+  #   DISCARD='DISCARD'
+  #   TRANSFORM='TRANSFORM'
+  #   RAISE_ERROR='RAISE_ERROR'
+  # end
+
 end
 
+
+
+
+
+
+
+
+
+
+
+

data/lib/atsd/models/series.rb

@@ -4,5 +4,59 @@ module ATSD
   # Time Series model
   class Series < BaseModel
   end
+
+  class Sample < BaseModel
+
+    TO_MILLISECONDS_LAMBDA = ->(v) do
+      case v
+        when Time
+          v.to_i * 1_000
+        else
+          v.to_i
+      end
+    end
+
+    coerce_key :t, TO_MILLISECONDS_LAMBDA
+
+    def set_time(time)
+      self["t"] = time
+    end
+
+    def get_time()
+      self.send("t")
+    end
+
+    def get_date()
+      Time.at(self.send("t")/1000)
+    end
+
+    def set_value(value)
+      self["v"] = value
+    end
+
+    def get_value()
+      self.send("v")
+    end
+
+  end
+
+  class Version < BaseModel
+
+    def set_source(source)
+      self["source"] = source
+    end
+
+    def get_source()
+      self.send("source")
+    end
+
+    def set_status(status)
+      self["status"] = status
+    end
+
+    def get_status()
+      self.send("status")
+    end
+  end
 end
 

data/lib/atsd/queries/base_query.rb

@@ -12,6 +12,22 @@ module ATSD
       @client = client
     end
 
+
+    # @!method type(type)
+    #   specifies source for underlying data
+    #   @param [String] type see {Type} for possible values
+    #   @return [self]
+
+    TO_MILLISECONDS_LAMBDA = ->(v) do
+      case v
+        when Time
+          v.to_i * 1_000
+        else
+          v.to_i
+      end
+    end
+
+
     # Build request parameters hash
     # @return [Hash]
     def to_request_hash
@@ -31,6 +47,7 @@ module ATSD
     # @raise [APIError]
     def result
       @result ||= execute
+      @result
     end
 
     protected

data/lib/atsd/queries/series_query.rb

@@ -4,97 +4,20 @@ module ATSD
   # Class for building and executing Series Query
   # @see https://axibase.com/atsd/api/#series:-query
   class SeriesQuery < BaseQuery
-
-    # @!method type(type)
-    #   specifies source for underlying data
-    #   @param [String] type see {Type} for possible values
-    #   @return [self]
-
-    # `type` parameter possible values
-    module Type
-      HISTORY = 'HISTORY' # default
-      FORECAST = 'FORECAST'
-      FORECAST_DEVIATION = 'FORECAST_DEVIATION'
-    end
-
-    # `join.type` parameter possible values
-    module JoinType
-      COUNT = 'COUNT'
-      MIN = 'MIN'
-      MAX = 'MAX'
-      AVG = 'AVG'
-      SUM = 'SUM'
-      PERCENTILE_999 = 'PERCENTILE_999'
-      PERCENTILE_995 = 'PERCENTILE_995'
-      PERCENTILE_99 = 'PERCENTILE_99'
-      PERCENTILE_95 = 'PERCENTILE_95'
-      PERCENTILE_90 = 'PERCENTILE_90'
-      PERCENTILE_75 = 'PERCENTILE_75'
-      PERCENTILE_50 = 'PERCENTILE_50'
-      STANDARD_DEVIATION = 'STANDARD_DEVIATION'
-    end
-
-    # `join.interpolate` parameter possible values
-    module JoinInterpolate
-      STEP = 'STEP' # default
-      NONE = 'NONE'
-      LINEAR = 'LINEAR'
-    end
-
-    # `aggregate.type` parameter possible values
-    module AggregateType
-      DETAIL = 'DETAIL'
-      COUNT = 'COUNT'
-      MIN = 'MIN'
-      MAX = 'MAX'
-      AVG = 'AVG'
-      SUM = 'SUM'
-      PERCENTILE_999 = 'PERCENTILE_999'
-      PERCENTILE_995 = 'PERCENTILE_995'
-      PERCENTILE_99 = 'PERCENTILE_99'
-      PERCENTILE_95 = 'PERCENTILE_95'
-      PERCENTILE_90 = 'PERCENTILE_90'
-      PERCENTILE_75 = 'PERCENTILE_75'
-      PERCENTILE_50 = 'PERCENTILE_50'
-      STANDARD_DEVIATION = 'STANDARD_DEVIATION'
-      FIRST = 'FIRST'
-      LAST = 'LAST'
-      DELTA = 'DELTA'
-      WAVG = 'WAVG'
-      WTAVG = 'WTAVG'
-      THRESHOLD_COUNT = 'THRESHOLD_COUNT'
-      THRESHOLD_DURATION = 'THRESHOLD_DURATION'
-      THRESHOLD_PERCENT = 'THRESHOLD_PERCENT'
-    end
-
-    # `aggregate.interpolate` parameter possible values
-    module AggregateInterpolate
-      STEP = 'STEP'
-      NONE = 'NONE'
-      LINEAR = 'LINEAR'
-    end
-
-    # interval's unit possible values
-    module Interval
-      MILLISECOND = 'MILLISECOND'
-      SECOND = 'SECOND'
-      MINUTE = 'MINUTE'
-      HOUR = 'HOUR'
-      DAY = 'DAY'
-      WEEK = 'WEEK'
-      MONTH = 'MONTH'
-      QUARTER = 'QUARTER'
-      YEAR = 'YEAR'
-    end
-
-    TO_MILLISECONDS_LAMBDA = ->(v) do
-      case v
-        when Time
-          v.to_i * 1_000
-        else
-          v.to_i
-      end
-    end
+    #
+    # # @!method type(type)
+    # #   specifies source for underlying data
+    # #   @param [String] type see {Type} for possible values
+    # #   @return [self]
+    #
+    # TO_MILLISECONDS_LAMBDA = ->(v) do
+    #   case v
+    #     when Time
+    #       v.to_i * 1_000
+    #     else
+    #       v.to_i
+    #   end
+    # end
 
     coerce_key :end_time, TO_MILLISECONDS_LAMBDA
     coerce_key :start_time, TO_MILLISECONDS_LAMBDA
@@ -146,5 +69,83 @@ module ATSD
       results.each { |r| queries_by_id[r.request_id].result << r }
     end
   end
+
+  # `type` parameter possible values
+  module Type
+    HISTORY = 'HISTORY' # default
+    FORECAST = 'FORECAST'
+    FORECAST_DEVIATION = 'FORECAST_DEVIATION'
+  end
+
+  # `join.type` parameter possible values
+  module JoinType
+    COUNT = 'COUNT'
+    MIN = 'MIN'
+    MAX = 'MAX'
+    AVG = 'AVG'
+    SUM = 'SUM'
+    PERCENTILE_999 = 'PERCENTILE_999'
+    PERCENTILE_995 = 'PERCENTILE_995'
+    PERCENTILE_99 = 'PERCENTILE_99'
+    PERCENTILE_95 = 'PERCENTILE_95'
+    PERCENTILE_90 = 'PERCENTILE_90'
+    PERCENTILE_75 = 'PERCENTILE_75'
+    PERCENTILE_50 = 'PERCENTILE_50'
+    STANDARD_DEVIATION = 'STANDARD_DEVIATION'
+  end
+
+  # `join.interpolate` parameter possible values
+  module JoinInterpolate
+    STEP = 'STEP' # default
+    NONE = 'NONE'
+    LINEAR = 'LINEAR'
+  end
+
+  # `aggregate.type` parameter possible values
+  module AggregateType
+    DETAIL = 'DETAIL'
+    COUNT = 'COUNT'
+    MIN = 'MIN'
+    MAX = 'MAX'
+    AVG = 'AVG'
+    SUM = 'SUM'
+    PERCENTILE_999 = 'PERCENTILE_999'
+    PERCENTILE_995 = 'PERCENTILE_995'
+    PERCENTILE_99 = 'PERCENTILE_99'
+    PERCENTILE_95 = 'PERCENTILE_95'
+    PERCENTILE_90 = 'PERCENTILE_90'
+    PERCENTILE_75 = 'PERCENTILE_75'
+    PERCENTILE_50 = 'PERCENTILE_50'
+    STANDARD_DEVIATION = 'STANDARD_DEVIATION'
+    FIRST = 'FIRST'
+    LAST = 'LAST'
+    DELTA = 'DELTA'
+    WAVG = 'WAVG'
+    WTAVG = 'WTAVG'
+    THRESHOLD_COUNT = 'THRESHOLD_COUNT'
+    THRESHOLD_DURATION = 'THRESHOLD_DURATION'
+    THRESHOLD_PERCENT = 'THRESHOLD_PERCENT'
+  end
+
+  # `aggregate.interpolate` parameter possible values
+  module AggregateInterpolate
+    STEP = 'STEP'
+    NONE = 'NONE'
+    LINEAR = 'LINEAR'
+  end
+
+  # interval's unit possible values
+  module Interval
+    MILLISECOND = 'MILLISECOND'
+    SECOND = 'SECOND'
+    MINUTE = 'MINUTE'
+    HOUR = 'HOUR'
+    DAY = 'DAY'
+    WEEK = 'WEEK'
+    MONTH = 'MONTH'
+    QUARTER = 'QUARTER'
+    YEAR = 'YEAR'
+  end
+
 end
 

data/lib/atsd/services/series_service.rb

@@ -10,13 +10,15 @@ module ATSD
     #
     # @param [String, Entity] entity
     # @param [String, Metric] metric
+    # @param [Fixnum] start_time
+    # @param [Fixnum] end_time
     # @param [Hash] options other query parameters
     # @return [SeriesQuery]
-    def query(entity, metric, options = {})
+    def query(entity, metric, start_time, end_time, options = {})
       query = SeriesQuery.new @client
       entity = entity.name if entity.is_a? Entity
       metric = metric.name if metric.is_a? Metric
-      options.merge! entity: entity, metric: metric
+      options.merge! entity: entity, metric: metric, start_time: start_time, end_time: end_time
       options.each { |option, value| query[option] = value }
       query
     end
@@ -28,7 +30,9 @@ module ATSD
     # @raise [APIError]
     def insert(series)
       series = Utils.ensure_array(series).map do |s|
-        s = Series.new(s) if s.is_a? Hash
+        if s.is_a? Hash
+          s = Series.new(s)
+        end
         s.to_request_hash
       end
       @client.series_insert series

data/lib/atsd/version.rb

@@ -1,3 +1,3 @@
 module ATSD
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atsd
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Axibase Corporation
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-04-17 00:00:00.000000000 Z
+date: 2015-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -256,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Axibase Time-Series Database Client for Ruby.