atsd 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c1649f0153373e71cac5463d6f58ce980a1fd8f
-  data.tar.gz: 1006d442af096bc3e972a8df391e4a9757b21fb0
+  metadata.gz: 9048a6df918c13c0735a88772e2f6ec0efd03ebd
+  data.tar.gz: 7145ea2cfe5149d9c6e49f168f944158eb71dd46
 SHA512:
-  metadata.gz: 513c38b4a2209ca340fc8c9509eeeddec1cebb4747346272556e5f87c23506a3c02d591e6cb6a373a1ca3261025ec362c6195e0ad37f4182875542a82a7d2f36
-  data.tar.gz: 7d01f2612470b1201be4d8db3c993c0dbe6e6dbf2c1c6e3ac342d28e110956cf6e8770c8b82512e1f349c7c51827852cd6b2806f20bfc336e6dd8ceb51ac54c6
+  metadata.gz: 679adcba7de6756e40f1ed2ab250a537d2173be3b68bd8096cacd64211dbb2db1817c8be612e658326eb994e4ec1ac5eb2c7f81ddc0d18a5160a1f99fd515dd6
+  data.tar.gz: b56edd97517d94ab36e9fcc6e188a6f02f6fa9952f7b6aa0a887d78f0720cc8e47f2afcb23e92ab65ee48d117af096d48bcd5a8826fb07c90c4d1571dd229f71

data/README.md

@@ -26,42 +26,53 @@ Alternatively, you can install atsd gem manually:
 
 ### Data API
 - Series
-    - Query
-    - Insert
-    - CSV Insert
+    - query
+    - insert
+    - csv insert
+    - url query
 - Properties
-    - Query
-    - Insert
-    - Batch
+    - query
+    - insert
+    - url query
+    - type query
+    - delete
+- Messages
+    - insert
+    - query
+    - statistics
 - Alerts 
-    - Query
-    - Update
-    - History Query
+    - query
+    - update
+    - delete
+    - history query
     
 ### Meta API
-- Metrics 
-    - List
-    - Get
-    - Create or replace
-    - Update
-    - Delete
-    - Entities and tags
-- Entities
-    - List
-    - Get
-    - Create or replace
-    - Update
-    - Delete
+- Metric 
+    - get
+    - list
+    - update
+    - create or replace
+    - delete
+    - series    
+- Entity
+    - get
+    - list
+    - update
+    - create or replace
+    - delete
+    - entity groups
+    - metrics
+    - property types
 - Entity Group 
-    - List
-    - Get
-    - Create or replace
-    - Update
-    - Delete
-    - Get entities
-    - Add entities
-    - Set entities
-    - Delete entities
+    - get
+    - list
+    - update
+    - create or replace
+    - delete
+    - get entities
+    - add entities
+    - replace entities
+    - delete entities
 
 ## Usage
 
@@ -102,6 +113,7 @@ The following services are currently implemented:
 
 - series_service, 
 - properties_service, 
+- messages_service, 
 - alerts_service, 
 - metrics_service,
 - entities_service,
@@ -215,7 +227,7 @@ Inserting series using Sample class:
 s = Series.new
 s.entity = 'sensor-1'
 s.metric = 'pressure'
-sample = Sample.new :d => "2015-11-17T17:00:00Z", :value => 7, :version => {:status => "normal", :source => "gateway-1"}
+sample = Sample.new :date => "2015-11-17T17:00:00Z", :value => 7, :version => {:status => "normal", :source => "gateway-1"}
 s.data = [ sample ]
 series_service.insert(s)
 ```
@@ -223,8 +235,8 @@ series_service.insert(s)
 Inserting Series with Versions:
 
 ```ruby
-sample_1 = Sample.new :date => Time.parse("2015-11-17T17:00:00Z"), :value => 7, :version => {:status => "normal", :source => "gateway-1"}
-sample_2 = Sample.new :date => Time.parse("2015-11-17T18:00:00Z"), :value => 17, :version => {:status => "error", :source => "gateway-1"}
+sample_1 = Sample.new :date => "2015-11-17T17:00:00Z", :value => 7, :version => {:status => "normal", :source => "gateway-1"}
+sample_2 = Sample.new :date => "2015-11-17T18:00:00Z", :value => 17, :version => {:status => "error", :source => "gateway-1"}
 series = Series.new :entity => "sensor-1", :metric => "pressure", :data => [sample_1, sample_2]
 atsd.series_service.insert(series)
 ```
@@ -254,7 +266,7 @@ series_service.csv_insert('sensor-1', File.read('/path/to/data.csv'), { :user =>
 Retrieving series values CSV and JSON format:
 
 ```ruby
-series_service.url_query('json','nurswgvml007','cpu_busy', :startDate => 'previous_minute')
+series_service.url_query('json','nurswgvml007','cpu_busy', :startDate => 'previous_minute', :endDate => 'now')
 # => {"series"=>
 #  [{"entity"=>"nurswgvml007",
 #    "metric"=>"cpu_busy",
@@ -262,7 +274,7 @@ series_service.url_query('json','nurswgvml007','cpu_busy', :startDate => 'previo
 #    "type"=>"HISTORY",
 #    "aggregate"=>{"type"=>"DETAIL"},
 #    "data"=>[{"t"=>1464688814000, "v"=>3.03}, {"t"=>1464688830000, "v"=>5}, {"t"=>1464688846000, "v"=>9}, {"t"=>1464688862000, "v"=>4.04}, {"t"=>1464688878000, "v"=>5.05}]}]}
-series_service.url_query('csv','nurswgvml007','cpu_busy', :startDate => 'previous_minute')
+series_service.url_query('csv','nurswgvml007','cpu_busy', :startDate => 'previous_minute', :endDate => 'now')
 => "time,entity,metric,value\r\n1464688862000,nurswgvml007,cpu_busy,4.04\r\n1464688878000,nurswgvml007,cpu_busy,5.05\r\n1464688894000,nurswgvml007,cpu_busy,10.2\r\n1464688910000,nurswgvml007,cpu_busy,45.95\r\n1464688926000,nurswgvml007,cpu_busy,21.36\r\n1464688942000,nurswgvml007,cpu_busy,4.04\r\n"
 ```
 
@@ -275,7 +287,7 @@ properties_service = atsd.properties_service
 property = Property.new :entity => 'sensor-1', :type => 'sensor_type', :tags => {"location":"NUR","site":"building-1"}, :key => {"id": "ch-15"}
 properties_service.insert(property)
 
-properties_service.query('sensor-1', 'sensor_type', :start_date => "2015-11-17T17:00:00Z").execute
+properties_service.query('sensor-1', 'sensor_type', :start_date => '2015-11-17T17:00:00Z', :end_date => '2016-01-17T17:00:00Z').execute
 # => [{:type=>"sensor_type",
 #  :entity=>"sensor-1",
 #  :tags=>{"location"=>"NUR", "site"=>"building-1"},
@@ -283,7 +295,7 @@ properties_service.query('sensor-1', 'sensor_type', :start_date => "2015-11-17T1
 #  :key=>{"id"=>"ch-15"}}]
 
 properties_service.delete(property)
-properties_service.query('sensor-1', 'sensor_type', :start_date => '2015-11-17T17:00:00Z').execute
+properties_service.query('sensor-1', 'sensor_type', :start_date => '2015-11-17T17:00:00Z', :end_date => '2016-01-17T17:00:00Z').execute
 # => []
 
 properties_service.type_query('sensor-1')
@@ -299,6 +311,42 @@ properties_service.url_query('nurswgvml007','network')
 # {"type"=>"network", "entity"=>"nurswgvml007", "key"=>{"id"=>"lo"}, "tags"=>{"network_i/o.read-kb/s"=>"2.7", "network_i/o.write-kb/s"=>"2.7", "network_packets.read/s"=>"6.7", "network_packets.write/s"=>"6.7"}, "timestamp"=>1464680627000}]
 
 
+```
+#### Messages Service
+
+```ruby
+messages_service = atsd.messages_service
+# => #<ATSD::MessagesService:0x000000024156e8
+
+message = Message.new entity: "sensor-1", type: "logger", message: "Processing file"
+messages_service.insert(message)
+
+messages_service.query("sensor-1", :limit => 5, :endDate => "now", :interval => {:count => 5, :unit => "MINUTE"}).execute
+# => [{"entity"=>"sensor-1", "type"=>"logger", "source"=>"default", "severity"=>"NORMAL", "message"=>"Processing file", "date"=>"2016-06-27T14:13:17.580Z"}]
+
+messages_service.stats_query(:entity => "sensor-1", :startDate => "current_day", :endDate => "now")
+#  => [{"entity"=>"sensor-1", "metric"=>"message-count", "tags"=>{}, "type"=>"HISTORY", "aggregate"=>{"type"=>"COUNT", "interval"=>{"count"=>51363229, "unit"=>"MILLISECOND"}}, "data"=>[{"d"=>"2016-06-27T00:00:00.000Z", "v"=>1}]}]
+
+messages_service.stats_query(:entity => "sensor-1", :startDate => "current_day", :endDate => "now", :groupKeys => "type")
+#  => [{"entity"=>"sensor-1", "metric"=>"message-count", "tags"=>{"type"=>"backup"}, "type"=>"HISTORY", "aggregate"=>{"type"=>"COUNT", "interval"=>{"count"=>50071806, "unit"=>"MILLISECOND"}}, "data"=>[{"d"=>"2016-06-27T00:00:00.000Z", "v"=>4}]},
+#  {"entity"=>"sensor-1", "metric"=>"message-count", "tags"=>{"type"=>"logger"}, "type"=>"HISTORY", "aggregate"=>{"type"=>"COUNT", "interval"=>{"count"=>50071806, "unit"=>"MILLISECOND"}}, "data"=>[{"d"=>"2016-06-27T00:00:00.000Z", "v"=>1485}]},
+#  {"entity"=>"sensor-1", "metric"=>"message-count", "tags"=>{"type"=>"security"}, "type"=>"HISTORY", "aggregate"=>{"type"=>"COUNT", "interval"=>{"count"=>50071806, "unit"=>"MILLISECOND"}}, "data"=>[{"d"=>"2016-06-27T00:00:00.000Z", "v"=>272}]}]
+
+messages_service.stats_query(:entity => "sensor-1", :startDate => "current_day", :endDate => "now", "groupKeys" => "type", "aggregate" => {"type" => "COUNT", "period" => {"count" => 12, "unit" => "HOUR"}})
+# => [{"entity"=>"sensor-1", "metric"=>"message-count", "tags"=>{"type"=>"backup"}, "type"=>"HISTORY", "aggregate"=>{"type"=>"COUNT", "period"=>{"count"=>12, "unit"=>"HOUR"}}, "data"=>[{"d"=>"2016-06-27T00:00:00.000Z", "v"=>4}]},
+# {"entity"=>"sensor-1",
+#  "metric"=>"message-count",
+#  "tags"=>{"type"=>"logger"},
+#  "type"=>"HISTORY",
+#  "aggregate"=>{"type"=>"COUNT", "period"=>{"count"=>12, "unit"=>"HOUR"}},
+#  "data"=>[{"d"=>"2016-06-27T00:00:00.000Z", "v"=>1235}, {"d"=>"2016-06-27T12:00:00.000Z", "v"=>253}]},
+# {"entity"=>"sensor-1",
+#  "metric"=>"message-count",
+#  "tags"=>{"type"=>"security"},
+#  "type"=>"HISTORY",
+#  "aggregate"=>{"type"=>"COUNT", "period"=>{"count"=>12, "unit"=>"HOUR"}},
+#  "data"=>[{"d"=>"2016-06-27T00:00:00.000Z", "v"=>232}, {"d"=>"2016-06-27T12:00:00.000Z", "v"=>40}]}]
+
 ```
 
 #### Alerts Service
@@ -307,8 +355,7 @@ properties_service.url_query('nurswgvml007','network')
 alerts_service = atsd.alerts_service
 # => #<ATSD::AlertsService:0x007faf7c0efdc0
 
-alerts_service.query(:entity => "sensor-1", :metrics => ["meminfo.active"], :start_date => "2015-11-17T17:00:00Z").execute
-alerts_service.query.execute
+alerts_service.query(:entity => "sensor-1", :metrics => ["meminfo.active"], :start_date => '2015-11-17T17:00:00Z', :end_date => '2016-01-17T17:00:00Z').execute
 # => [{"entity"=>"sensor-1",
 #  "tags"=>{},
 #  "repeatCount"=>79,
@@ -347,14 +394,16 @@ metrics_service.list(:limit => 10)
 #     :persistent=>true,
 # ...
 
-metrics_service.entity_and_tags('df.disk_size')
-# => [{:entity=>"server-1", :tags=>{"file_system"=>"/dev/sda1", "mount_point"=>"/"}, :last_insert_time=>1428328928000},
-#  {:entity=>"server-1", :tags=>{"file_system"=>"none", "mount_point"=>"/sys/fs/cgroup"}, :last_insert_time=>1428328928000},
-#  {:entity=>"server-1", :tags=>{"file_system"=>"none", "mount_point"=>"/run/lock"}, :last_insert_time=>1428328928000},
-#  {:entity=>"server-1", :tags=>{"file_system"=>"none", "mount_point"=>"/run/shm"}, :last_insert_time=>1428328928000},
-#  {:entity=>"server-2", :tags=>{"file_system"=>"none", "mount_point"=>"/run/user"}, :last_insert_time=>1428328928000},
-#  {:entity=>"server-2", :tags=>{"file_system"=>"udev", "mount_point"=>"/dev"}, :last_insert_time=>1428328928000},
-#  {:entity=>"server-2", :tags=>{"file_system"=>"tmpfs", "mount_point"=>"/run"}, :last_insert_time=>1428328928000}]
+metrics_service.series("disk_used", "entity" => "nurswgvml007")
+# => => [{"metric"=>"disk_used", "entity"=>"nurswgvml007", "tags"=>{"file_system"=>"/dev/mapper/vg_nurswgvml007-lv_root", "mount_point"=>"/"}, "lastInsertDate"=>"2016-06-21T11:47:17.000Z"},
+      {"metric"=>"disk_used", "entity"=>"nurswgvml007", "tags"=>{"file_system"=>"10.102.0.2:/home/store/share", "mount_point"=>"/mnt/share"}, "lastInsertDate"=>"2015-12-25T14:09:49.000Z"},
+      {"metric"=>"disk_used", "entity"=>"nurswgvml007", "tags"=>{"file_system"=>"//u113452.your-backup.de/backup", "mount_point"=>"/mnt/u113452"}, "lastInsertDate"=>"2016-06-21T11:47:17.000Z"}]
+
+
+metrics_service.series("disk_used", "entity" => "nurswgvml007", "tags.mount_point" => "/")
+# => [{"metric"=>"disk_used", "entity"=>"nurswgvml007", 
+    "tags"=>{"file_system"=>"/dev/mapper/vg_nurswgvml007-lv_root", "mount_point"=>"/"}, 
+    "lastInsertDate"=>"2016-06-21T11:36:16.000Z"}]
 
 metric = Metric.new
 # => {}
@@ -402,6 +451,12 @@ entities_service.list
 # => [{:name=>"atsd", :enabled=>true, :last_insert_time=>1428304482631},
 #  {:name=>"test_entity", :enabled=>true, :last_insert_time=>1000000000},
 #  {:name=>"sensor-1", :enabled=>true, :last_insert_time=>1428304489000}]
+
+entities_service.entity_groups("nurswgvml007")
+# => [{"name"=>"VMware VMs", "tags"=>{}},
+# {"name"=>"java-loggers", "tags"=>{}},
+# {"name"=>"java-virtual-machine", "tags"=>{}},
+# {"name"=>"jetty-web-server", "tags"=>{}},
 ```
 #### Entity Groups Service 
 
@@ -414,12 +469,19 @@ entity_groups_service.list
 # => [{:name=>"group1"}]
 
 entity_groups_service.add_entities('group1', [{name:'entity1'},{name:'entity2'}])
-entity_groups_service.entities(entity_groups_service.get('group1'))
+entity_groups_service.get_entities(entity_groups_service.get('group1'))
 # => [{:name=>"entity1", :enabled=>true}, {:name=>"entity2", :enabled=>true}]
 
-entity_groups_service.delete_all_entities('group1')
-entity_groups_service.entities('group1')
+entity_groups_service.delete_entities('group1', [{name:'entity1'},{name:'entity2'}])
+entity_groups_service.get_entities('group1')
 # => []
+
+entity_groups_service.get_entities("java-loggers", :limit => 3, :timeFormat => "iso")
+# => [{"name"=>"-last-https-test-drive", "enabled"=>true, "lastInsertDate"=>"2016-05-19T11:22:05.710Z"},
+# {"name"=>"12364bc005b2", "enabled"=>true, "lastInsertDate"=>"2016-05-19T22:26:50.432Z"},
+# {"name"=>"1d99e87f5a89", "enabled"=>true, "lastInsertDate"=>"2016-04-18T16:53:51.563Z"}]
+
+
 ```
 
 ### Errors

data/lib/atsd/atsd.rb

@@ -1,6 +1,7 @@
 require 'atsd/client'
 require 'atsd/services/series_service'
 require 'atsd/services/properties_service'
+require 'atsd/services/messages_service'
 require 'atsd/services/alerts_service'
 require 'atsd/services/metrics_service'
 require 'atsd/services/entities_service'
@@ -46,6 +47,7 @@ module ATSD
 
     service :series_service, SeriesService
     service :properties_service, PropertiesService
+    service :messages_service, MessagesService
     service :alerts_service, AlertsService
     service :metrics_service, MetricsService
     service :entities_service, EntitiesService

data/lib/atsd/client.rb

@@ -1,5 +1,6 @@
 require 'atsd/middleware/errors_handler'
 require 'active_support/core_ext/hash/keys'
+require 'uri'
 
 module ATSD
 
@@ -42,6 +43,7 @@ module ATSD
     # @param [Hash, Array<Hash>] queries query or array of queries
     # @return [Array<Hash>] time series
     # @raise [APIError]
+    # @see https://github.com/axibase/atsd-docs/blob/master/api/data/series/query.md for details
     def series_query(queries)
       response = @connection.post 'series/query', Utils.ensure_array(queries)
       response.body
@@ -55,10 +57,10 @@ module ATSD
     # @param [Hash] parameters other query parameters
     # @return [Array<Hash>] time series
     # @raise [APIError]
-    def series_url_query(format, entity, metric, parameters)
-      url = "series/#{format}/#{entity}/#{metric}?"
-      parameters.each { |k, v| url << "&#{k}=#{v}" }
-      response = @connection.get url
+    # @see https://github.com/axibase/atsd-docs/blob/master/api/data/series/url-query.md for details
+    def series_url_query(format, entity, metric, parameters ={})
+      url = "series/#{CGI.escape(format)}/#{CGI.escape(entity)}/#{CGI.escape(metric)}?"
+      response = @connection.get url, parameters
       response.body
     end
 
@@ -67,6 +69,7 @@ module ATSD
     # @param [Hash, Array<Hash>] series series or array of series
     # @return true
     # @raise [APIError]
+    # @see https://github.com/axibase/atsd-docs/blob/master/api/data/series/insert.md for details
     def series_insert(series)
       @connection.post 'series/insert', Utils.ensure_array(series)
       true
@@ -82,9 +85,10 @@ module ATSD
     # @param [Hash] tags tag=value hash
     # @return [true]
     # @raise [APIError]
+    # @see https://github.com/axibase/atsd-docs/blob/master/api/data/series/csv-insert.md for details
     def series_csv_insert(entity, data, tags = {})
       request = @connection.build_request(:post) do |req|
-        req.url("series/csv/#{entity}", tags)
+        req.url("series/csv/#{CGI.escape(entity)}", tags)
         req.headers["Content-Type"] = 'text/csv'
         req.body = data
       end
@@ -93,11 +97,46 @@ module ATSD
       true
     end
 
+    # Query messages
+    #
+    # @param [Hash, Array<Hash>] queries query or array of queries
+    # @return [Array<Hash>] array of messages
+    # @raise [APIError]
+    # @see https://github.com/axibase/atsd-docs/blob/master/api/data/messages/query.md for details
+    def messages_query(queries = nil)
+      response = @connection.post 'messages/query', Utils.ensure_array(queries)
+      response.body
+    end
+
+    # Insert messages
+    #
+    # @param [Hash, Array<Hash>] messages message or array of messages
+    # @return true
+    # @raise [APIError]
+    # @see https://github.com/axibase/atsd-docs/blob/master/api/data/messages/insert.md for details
+    def messages_insert(messages)
+      @connection.post 'messages/insert', Utils.ensure_array(messages)
+      true
+    end
+
+    # Statistics query
+    #
+    # @param [Hash] parameters
+    # @return [Array<Hash>] time series
+    # @raise [APIError]
+    # @see https://github.com/axibase/atsd-docs/blob/master/api/data/messages/stats-query.md for details
+    def messages_stat_query(parameters = {})
+      print parameters
+      response = @connection.post 'messages/stats/query', Utils.ensure_array(parameters)
+      response.body
+    end
+
     # Query properties
     #
     # @param [Hash, Array<Hash>] queries query or array of queries
     # @return [Array<Hash>] array of properties
     # @raise [APIError]
+    # @see https://github.com/axibase/atsd-docs/blob/master/api/data/properties/query.md for details
     def properties_query(queries = nil)
       response = @connection.post 'properties/query', Utils.ensure_array(queries)
       response.body
@@ -109,18 +148,20 @@ module ATSD
     # @param [String] type
     # @return [Array<Hash>] array of properties
     # @raise [APIError]
+    # @see https://github.com/axibase/atsd-docs/blob/master/api/data/properties/url-query.md for details
     def properties_for_entity_and_type(entity, type)
-      response = @connection.get "properties/#{entity}/types/#{type}"
+      response = @connection.get "properties/#{CGI.escape(entity)}/types/#{CGI.escape(type)}"
       response.body
     end
 
     # Returns array of property types for the entity.
     #
-    # @param [String] type
+    # @param [String] entity
     # @return [Array<Hash>] array of properties
     # @raise [APIError]
+    # @see https://github.com/axibase/atsd-docs/blob/master/api/data/properties/type-query.md for details
     def properties_for_entity(entity)
-      response = @connection.get "properties/#{entity}/types"
+      response = @connection.get "properties/#{CGI.escape(entity)}/types"
       response.body
     end
 
@@ -129,6 +170,7 @@ module ATSD
     # @param [Hash, Array<Hash>] properties property or array of properties
     # @return true
     # @raise [APIError]
+    # @see https://github.com/axibase/atsd-docs/blob/master/api/data/properties/insert.md for details
     def properties_insert(properties)
       @connection.post 'properties/insert', Utils.ensure_array(properties)
       true
@@ -139,6 +181,7 @@ module ATSD
     # @param [Hash, Array<Hash>] properties
     # @return true
     # @raise [APIError]
+    # @see https://github.com/axibase/atsd-docs/blob/master/api/data/properties/delete.md for details
     def properties_delete(properties)
       @connection.post 'properties/delete', Utils.ensure_array(properties)
     end
@@ -148,6 +191,7 @@ module ATSD
     # @param [Hash, Array<Hash>] queries query or array of queries
     # @return [Array<Hash>] alerts
     # @raise [APIError]
+    # @see https://github.com/axibase/atsd-docs/blob/master/api/data/alerts/query.md for details
     def alerts_query(queries = nil)
       response = @connection.post 'alerts/query', Utils.ensure_array(queries)
       response.body
@@ -158,6 +202,7 @@ module ATSD
     # @param [Hash, Array<Hash>] actions action or array of actions
     # @return [true]
     # @raise [APIError]
+    # @see https://github.com/axibase/atsd-docs/blob/master/api/data/alerts/update.md for details
     def alerts_update(actions)
       @connection.post 'alerts/update', Utils.ensure_array(actions)
       true
@@ -168,6 +213,7 @@ module ATSD
     # @param [Hash, Array<Hash>] actions action or array of actions
     # @return [true]
     # @raise [APIError]
+    # @see https://github.com/axibase/atsd-docs/blob/master/api/data/alerts/delete.md for details
     def alerts_delete(actions)
       @connection.post 'alerts/delete', Utils.ensure_array(actions)
       true
@@ -178,6 +224,7 @@ module ATSD
     # @param [Hash, Array<Hash>] queries query or array of queries
     # @return [Array<Hash>] history records
     # @raise [APIError]
+    # @see https://github.com/axibase/atsd-docs/blob/master/api/data/alerts/history-query.md for details
     def alerts_history_query(queries = nil)
       response = @connection.post 'alerts/history/query', Utils.ensure_array(queries)
       response.body
@@ -188,6 +235,7 @@ module ATSD
     # @param [Hash] parameters
     # @return [Array<Hash>]
     # @raise [APIError]
+    # @see https://github.com/axibase/atsd-docs/blob/master/api/meta/metric/list.md for details
     def metrics_list(parameters = {})
       response = @connection.get 'metrics', parameters
       response.body
@@ -198,8 +246,9 @@ module ATSD
     # @param [String] metric
     # @return [Hash]
     # @raise [APIError]
+    # @see https://github.com/axibase/atsd-docs/blob/master/api/meta/metric/get.md for details
     def metrics_get(metric)
-      response = @connection.get "metrics/#{metric}"
+      response = @connection.get "metrics/#{CGI.escape(metric)}"
       response.body
     end
 
@@ -213,8 +262,9 @@ module ATSD
     # @param [Hash] body
     # @return [true]
     # @raise [APIError]
+    # @see https://github.com/axibase/atsd-docs/blob/master/api/meta/metric/create-or-replace.md for details
     def metrics_create_or_replace(metric, body)
-      @connection.put "metrics/#{metric}", body
+      @connection.put "metrics/#{CGI.escape(metric)}", body
       true
     end
 
@@ -227,8 +277,9 @@ module ATSD
     # @param [Hash] body
     # @return [true]
     # @raise [APIError]
+    # @see https://github.com/axibase/atsd-docs/blob/master/api/meta/metric/update.md for details
     def metrics_update(metric, body)
-      @connection.patch "metrics/#{metric}", body
+      @connection.patch "metrics/#{CGI.escape(metric)}", body
       true
     end
 
@@ -238,20 +289,22 @@ module ATSD
     # @param [String] metric
     # @return [true]
     # @raise [APIError]
+    # @see https://github.com/axibase/atsd-docs/blob/master/api/meta/metric/delete.md for details
     def metrics_delete(metric)
-      @connection.delete "metrics/#{metric}"
+      @connection.delete "metrics/#{CGI.escape(metric)}"
       true
     end
 
-    # Returns a list of unique series tags for the metric.
-    # The list is based on data stored on disk for the last 24 hours.
+    # Returns a list of series for the metric.
+    # Each series is identified with metric name, entity name, and optional series tags.
     #
     # @param [String] metric
     # @param [Hash] parameters
     # @return [Array]
     # @raise [APIError]
-    def metrics_entity_and_tags(metric, parameters = {})
-      response = @connection.get "metrics/#{metric}/entity-and-tags", parameters
+    # @see https://github.com/axibase/atsd-docs/blob/master/api/meta/metric/series.md for details
+    def metrics_series(metric, parameters = {})
+      response = @connection.get "metrics/#{CGI.escape(metric)}/series", parameters
       response.body
     end
 
@@ -260,6 +313,7 @@ module ATSD
     # @param [Hash] parameters
     # @return [Array<Hash>]
     # @raise [APIError]
+    # @see https://github.com/axibase/atsd-docs/blob/master/api/meta/entity/list.md for details
     def entities_list(parameters = {})
       response = @connection.get 'entities', parameters
       response.body
@@ -270,8 +324,9 @@ module ATSD
     # @param [String] entity
     # @return [Hash]
     # @raise [APIError]
+    # @see https://github.com/axibase/atsd-docs/blob/master/api/meta/entity/get.md for details
     def entities_get(entity)
-      response = @connection.get "entities/#{entity}"
+      response = @connection.get "entities/#{CGI.escape(entity)}"
       response.body
     end
 
@@ -281,8 +336,9 @@ module ATSD
     # @param [Hash] body
     # @return [true]
     # @raise [APIError]
+    # @see https://github.com/axibase/atsd-docs/blob/master/api/meta/entity/create-or-replace.md for details
     def entities_create_or_replace(entity, body)
-      @connection.put "entities/#{entity}", body
+      @connection.put "entities/#{CGI.escape(entity)}", body
       true
     end
 
@@ -292,8 +348,9 @@ module ATSD
     # @param [Hash] body
     # @return [true]
     # @raise [APIError]
+    # @see https://github.com/axibase/atsd-docs/blob/master/api/meta/entity/update.md for details
     def entities_update(entity, body)
-      @connection.patch "entities/#{entity}", body
+      @connection.patch "entities/#{CGI.escape(entity)}", body
       true
     end
 
@@ -302,19 +359,32 @@ module ATSD
     # @param [String] entity
     # @return [true]
     # @raise [APIError]
+    # @see https://github.com/axibase/atsd-docs/blob/master/api/meta/entity/delete.md for details
     def entities_delete(entity)
-      @connection.delete "entities/#{entity}"
+      @connection.delete "entities/#{CGI.escape(entity)}"
       true
     end
 
+    # Entity groups entity.
+    #
+    # @param [String] entity
+    # @return [Array]
+    # @raise [APIError]
+    # @see https://github.com/axibase/atsd-docs/blob/master/api/meta/entity/entity-groups.md for details
+    def entities_entity_groups(entity, parameters = {})
+      response = @connection.get "entities/#{CGI.escape(entity)}/groups", parameters
+      response.body
+    end
+
     # Property types for entity
     #
     # @param [String] entity
     # @param [Hash] parameters
     # @return [Array]
     # @raise [APIError]
+    # @see https://github.com/axibase/atsd-docs/blob/master/api/meta/entity/property-types.md for details
     def entities_property_types(entity, parameters = {})
-      response = @connection.get "entities/#{entity}/property-types", parameters
+      response = @connection.get "entities/#{CGI.escape(entity)}/property-types", parameters
       response.body
     end
 
@@ -324,8 +394,9 @@ module ATSD
     # @param [Hash] parameters
     # @return [Array]
     # @raise [APIError]
+    # @see https://github.com/axibase/atsd-docs/blob/master/api/meta/entity/metrics.md for details
     def entities_metrics(entity, parameters = {})
-      response = @connection.get "entities/#{entity}/metrics", parameters
+      response = @connection.get "entities/#{CGI.escape(entity)}/metrics", parameters
       response.body
     end
 
@@ -334,6 +405,7 @@ module ATSD
     # @param [Hash] parameters
     # @return [Array]
     # @raise [APIError]
+    # @see https://github.com/axibase/atsd-docs/blob/master/api/meta/entity-group/list.md for details
     def entity_groups_list(parameters = {})
       response = @connection.get 'entity-groups', parameters
       response.body
@@ -344,8 +416,9 @@ module ATSD
     # @param [String] entity_group
     # @return [Hash]
     # @raise [APIError]
+    # @see https://github.com/axibase/atsd-docs/blob/master/api/meta/entity-group/get.md for details
     def entity_groups_get(entity_group)
-      response = @connection.get "entity-groups/#{entity_group}"
+      response = @connection.get "entity-groups/#{CGI.escape(entity_group)}"
       response.body
     end
 
@@ -355,8 +428,9 @@ module ATSD
     # @param [Hash] body
     # @return [true]
     # @raise [APIError]
+    # @see https://github.com/axibase/atsd-docs/blob/master/api/meta/entity-group/create-or-replace.md for details
     def entity_groups_create_or_replace(entity_group, body)
-      @connection.put "entity-groups/#{entity_group}", body
+      @connection.put "entity-groups/#{CGI.escape(entity_group)}", body
       true
     end
 
@@ -366,8 +440,9 @@ module ATSD
     # @param [Hash] body
     # @return [true]
     # @raise [APIError]
+    # @see https://github.com/axibase/atsd-docs/blob/master/api/meta/entity-group/update.md for details
     def entity_groups_update(entity_group, body)
-      @connection.patch "entity-groups/#{entity_group}", body
+      @connection.patch "entity-groups/#{CGI.escape(entity_group)}", body
       true
     end
 
@@ -376,8 +451,9 @@ module ATSD
     # @param [String] entity_group
     # @return [true]
     # @raise [APIError]
+    # @see https://github.com/axibase/atsd-docs/blob/master/api/meta/entity-group/delete.md for details
     def entity_groups_delete(entity_group)
-      @connection.delete "entity-groups/#{entity_group}"
+      @connection.delete "entity-groups/#{CGI.escape(entity_group)}"
       true
     end
 
@@ -387,8 +463,9 @@ module ATSD
     # @param [Hash] parameters
     # @return [Array]
     # @raise [APIError]
+    # @see https://github.com/axibase/atsd-docs/blob/master/api/meta/entity-group/get-entities.md for details
     def entity_groups_get_entities(entity_group, parameters = {})
-      response = @connection.get "entity-groups/#{entity_group}/entities", parameters
+      response = @connection.get "entity-groups/#{CGI.escape(entity_group)}/entities", parameters
       response.body
     end
 
@@ -399,9 +476,11 @@ module ATSD
     # @param [Hash] parameters
     # @return [true]
     # @raise [APIError]
+    # @see https://github.com/axibase/atsd-docs/blob/master/api/meta/entity-group/add-entities.md for details
     def entity_groups_add_entities(entity_group, entities, parameters = {})
-      @connection.patch "entity-groups/#{entity_group}/entities", [
+      @connection.patch "entity-groups/#{CGI.escape(entity_group)}/entities", [
           parameters.merge(:action => 'add',
+                           :createEntities => true,
                            :entities => entities)
       ]
       true
@@ -414,8 +493,9 @@ module ATSD
     # @param [Hash] parameters
     # @return [true]
     # @raise [APIError]
+    # @see https://github.com/axibase/atsd-docs/blob/master/api/meta/entity-group/replace-entities.md for details
     def entity_groups_replace_entities(entity_group, entities, parameters = {})
-      @connection.put "entity-groups/#{entity_group}/entities", entities
+      @connection.put "entity-groups/#{CGI.escape(entity_group)}/entities", entities
       true
     end
 
@@ -425,25 +505,14 @@ module ATSD
     # @param [Array] entities
     # @return [true]
     # @raise [APIError]
+    # @see https://github.com/axibase/atsd-docs/blob/master/api/meta/entity-group/delete-entities.md for details
     def entity_groups_delete_entities(entity_group, entities)
-      @connection.patch "entity-groups/#{entity_group}/entities", [
+      @connection.patch "entity-groups/#{CGI.escape(entity_group)}/entities", [
           {:action => 'delete', :entities => entities}
       ]
       true
     end
 
-    # Delete all entities in entity group.
-    #
-    # @param [String] entity_group
-    # @return [true]
-    # @raise [APIError]
-    def entity_groups_delete_all_entities(entity_group)
-      @connection.patch "entity-groups/#{entity_group}/entities", [
-          {:action => 'delete-all'}
-      ]
-      true
-    end
-
     private
 
     def extract_basic_auth(options)

data/lib/atsd/models/base_model.rb

@@ -23,11 +23,16 @@ module ATSD
 
     # Converts time and value keys as t and v respectively
     # for the rest operates as a superclass method
-    def []=(key,value)
+    def []=(key, value)
       key = :v if key.to_s == 'value'
+      case value
+        when Time
+          value = value.iso8601
+        else
+          value = value
+      end
       super(key, value)
     end
-
   end
 end
 

data/lib/atsd/models/message.rb

@@ -0,0 +1,7 @@
+require 'atsd/models/base_model'
+
+module ATSD
+  class Message < BaseModel
+  end
+end
+

data/lib/atsd/models/metric.rb

@@ -143,6 +143,7 @@ module ATSD
     FLOAT = 'FLOAT'
     LONG = 'LONG'
     DOUBLE = 'DOUBLE'
+    DECIMAL = 'DECIMAL'
   end
 
   module TimePrecision

data/lib/atsd/models/series.rb

@@ -23,19 +23,12 @@ module ATSD
       self.send('v')
     end
 
-    # Converts time and value keys as t and v respectively
+    # Converts date as d
     # for the rest operates as a superclass method
     def []=(key,value)
       if key.to_s == 'date'
         key = :d
-        case value
-          when Time
-            value = value.iso8601
-          else
-            value = value
-        end
       end
-      key = :v if key.to_s == 'value'
       super(key, value)
     end
 

data/lib/atsd/queries/messages_query.rb

@@ -0,0 +1,31 @@
+require 'atsd/queries/base_query'
+
+module ATSD
+  # Class for building and executing Messages Query
+  # @see https://github.com/axibase/atsd-docs/blob/master/api/data/messages/query.md
+  class MessagesQuery < BaseQuery
+    TO_ISO_LAMBDA = ->(v) do
+      case v
+        when Time
+          v.iso8601
+        else
+          v
+      end
+    end
+
+    coerce_key :end_date, TO_ISO_LAMBDA
+    coerce_key :start_date, TO_ISO_LAMBDA
+
+    # @return [Array<Property>]
+    def result
+      super
+    end
+
+    # @return (see #result)
+    def execute
+      result = @client.messages_query to_request_hash
+      @result = result.map { |json| Message.new json }
+    end
+  end
+end
+

data/lib/atsd/services/alerts_service.rb

@@ -16,6 +16,20 @@ module ATSD
       query
     end
 
+    # Change acknowledgement status of the specified alerts.
+    #
+    # @param [Array<Hash, Alert>, Hash, Alert] alerts
+    # @return [self]
+    # @raise [APIError]
+    def update(alerts)
+      alerts = Utils.ensure_array(alerts).map do |alert|
+        { :id => id_for_alert(alert),
+          :acknowledged => acknowledged_for_alert(alert)}
+      end
+      return if alerts.count == 0
+      @client.alerts_update alerts
+    end
+
     # Delete alerts
     #
     # @param [Array<Hash, Alert>, Hash, Alert] alerts
@@ -53,5 +67,16 @@ module ATSD
           alert.id
       end
     end
+
+    def acknowledged_for_alert(alert)
+      case alert
+        when Alert
+          alert.acknowledged
+        when Hash
+          alert[:acknowledged] || alert['acknowledged']
+        else
+          false
+      end
+    end
   end
 end

data/lib/atsd/services/entities_service.rb

@@ -79,6 +79,17 @@ module ATSD
       self
     end
 
+    # Returns an array of Entity Groups to which the entity belongs.
+    # Entity-group tags are included in the reponse.
+    #
+    # @param [Hash, Entity, String] entity entity or name
+    # @return [Array<EntityGroup>]
+    # @raise [APIError]
+    def entity_groups(entity)
+      result = @client.entities_entity_groups(name_for_entity entity)
+      result.map { |json| EntityGroup.new json }
+    end
+
     # Returns an array of property types for the entity.
     #
     # @param [String, Hash, Entity] entity

data/lib/atsd/services/entity_groups_service.rb

@@ -90,7 +90,7 @@ module ATSD
     #   Limit response to first N entities, ordered by name.
     # @return [Array<Entity>]
     # @raise [APIError]
-    def entities(entity_group, parameters = {})
+    def get_entities(entity_group, parameters = {})
       entity_group = name_for_entity_group(entity_group)
       parameters = parameters.camelize_keys
       @client.entity_groups_get_entities(entity_group, parameters).map do |json|
@@ -157,17 +157,6 @@ module ATSD
       self
     end
 
-    # Delete all entities from entity group.
-    #
-    # @param [String, EntityGroup, Hash] entity_group
-    # @return [self]
-    # @raise [APIError]
-    def delete_all_entities(entity_group)
-      entity_group = name_for_entity_group(entity_group)
-      @client.entity_groups_delete_all_entities(entity_group)
-      self
-    end
-
     private
 
     def name_for_entity_group(entity_group)

data/lib/atsd/services/messages_service.rb

@@ -0,0 +1,50 @@
+require 'atsd/services/base_service'
+require 'atsd/queries/messages_query'
+require 'atsd/models/message'
+require 'atsd/models/entity'
+
+module ATSD
+  class MessagesService < BaseService
+    # Create query builder for messages.
+    #
+    # @param [String, Entity] entity
+    # @param [Hash] options other query parameters
+    # @return [MessagesQuery]
+    def query(entity, options = {})
+      query = MessagesQuery.new @client
+      entity = entity.name if entity.is_a? Entity
+      options.merge! entity: entity
+      options.each { |option, value| query[option] = value }
+      query
+    end
+
+    # Insert messages.
+    #
+    # @param [Array<Message, Hash>, Message, Hash] messages
+    # @return [self]
+    # @raise [APIError]
+    def insert(messages)
+      messages = Utils.ensure_array(messages).map do |s|
+        s = Message.new(s) if s.is_a? Hash
+        s.to_request_hash
+      end
+      @client.messages_insert messages
+      self
+    end
+
+    # Retrieve message counters for the specified filters as series.
+    #
+    # @param [Hash] options parameters
+    # @return [self]
+    # @raise [APIError]
+    def stats_query(options)
+      options[:metric] = 'message-count'
+      options = Utils.ensure_array(options).map do |s|
+        s = Message.new(s) if s.is_a? Hash
+        s.to_request_hash
+      end
+      result = @client.messages_stat_query(options)
+      result.map { |json| Series.new json }
+    end
+  end
+end

data/lib/atsd/services/metrics_service.rb

@@ -76,19 +76,16 @@ module ATSD
       self
     end
 
-    # Returns a list of unique series tags for the metric. The list is
-    # based on data stored on disk for the last 24 hours.
+    # Returns a list of series for the metric. Each series
+    # is identified with metric name, entity name and optional
+    # series tags
     #
     # @param [Hash, Metric, String] metric
-    # @param [Hash, Entity, String] entity
-    # @return [Array<Entity>]
+    # @return [Array<Series>]
     # @raise [APIError]
-    def entity_and_tags(metric, entity = nil)
-      metric = name_for_metric(metric)
-      params = {}
-      params[:entity] = name_for_entity(entity) if entity
-      result = @client.metrics_entity_and_tags(metric, params)
-      result.map { |json| Entity.new json }
+    def series(metric, params = {})
+      result = @client.metrics_series(name_for_metric(metric), params)
+      result.map { |json| Series.new json }
     end
 
     private

data/lib/atsd/version.rb

@@ -1,3 +1,3 @@
 module ATSD
-  VERSION = '1.0.8'
+  VERSION = '1.0.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atsd
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Axibase Corporation
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-09 00:00:00.000000000 Z
+date: 2016-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -217,18 +217,21 @@ files:
 - lib/atsd/models/base_model.rb
 - lib/atsd/models/entity.rb
 - lib/atsd/models/entity_group.rb
+- lib/atsd/models/message.rb
 - lib/atsd/models/metric.rb
 - lib/atsd/models/property.rb
 - lib/atsd/models/series.rb
 - lib/atsd/queries/alerts_history_query.rb
 - lib/atsd/queries/alerts_query.rb
 - lib/atsd/queries/base_query.rb
+- lib/atsd/queries/messages_query.rb
 - lib/atsd/queries/properties_query.rb
 - lib/atsd/queries/series_query.rb
 - lib/atsd/services/alerts_service.rb
 - lib/atsd/services/base_service.rb
 - lib/atsd/services/entities_service.rb
 - lib/atsd/services/entity_groups_service.rb
+- lib/atsd/services/messages_service.rb
 - lib/atsd/services/metrics_service.rb
 - lib/atsd/services/properties_service.rb
 - lib/atsd/services/series_service.rb