kapacitor-ruby 1.0.5 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b44ea41ae78d506eb56c16be57c70948724e91f5f07f6d25f1a54ccd84cfc5f7
-  data.tar.gz: 36200bc005660d681749a7106219efeb69447429692df1c202f422eb48ff2e48
+  metadata.gz: bc8385ff59595cd0874e1ebc37cd0dd6ca5cb8015d9214e05ee41d44401d8761
+  data.tar.gz: 2b7bd54a2ae5c1e305e95245ff0b52c305c99ebce1ec4c4aa5a851472586dd62
 SHA512:
-  metadata.gz: 5d84c1cb3ae92d8f59335dcbbd056df4a5fef42454b495e92226b8d762629a2fa88e1c82976f60dd39b275195fd0675680c80a978f85c9353838b879c56bc0f1
-  data.tar.gz: 6eb9cd633c323513e310a059e470ee81e7426ae362fddfaab6ae5930baab2302ca7847709ac3dda15125f90895258191ca8c8805e98339405a4bdfd3080cdb6f
+  metadata.gz: 97cb14918feec5ce8ee40fe59492bfdb92fe50c03543a2690920316105ce8dea56b197ba7f2804ed63f776c122300ee0ba650e69cecacb9ab4f9ad9ba47fefca
+  data.tar.gz: d66623d57ebbf004e47dd1447f7daf4a1a244a21b722f160f8d6636718a507054a0e00975d33231caf805f0b3bfb12604e864da4fa62350660c38342b263bbac

data/lib/kapacitor/client.rb

@@ -66,7 +66,7 @@ module Kapacitor
     # @return [List[String]] List of topics
     #
     def topics()
-      res = api_get(endpoint: "alerts/topics")['topics']
+      res = api_get(endpoint: "alerts/topics")
       return res['topics'].map { |v| v['id'] }
     end
 
@@ -139,7 +139,7 @@ module Kapacitor
       req['type'] = opts[:type] if opts[:type]
       req['dbrps'] = opts[:dbrps] if opts[:dbrps]
       req['script'] = opts[:script] if opts[:script]
-      req['status'] = opts[:status] if opts[:status]
+      req['status'] = 'disabled'
       req['vars'] = opts[:vars] if opts[:vars]
 
       if opts[:type]
@@ -151,6 +151,11 @@ module Kapacitor
       end
 
       api_patch(endpoint: "tasks/#{id}", data: req) unless req.empty?
+
+      if opts[:status] == 'enabled'
+        req['status'] = 'enabled'
+        api_patch(endpoint: "tasks/#{id}", data: req) unless req.empty?
+      end
     end
 
     # Delete a Kapacitor task
@@ -188,20 +193,17 @@ module Kapacitor
     #
     # @param id [String] Handler ID
     # @param topic [String] Topic name
-    # @param actions [Array[Hash]] Handler actions
+    # @param kind [String] Kind of handler
+    # @param match [String] Lambda expression
+    # @param options [Hash] Handler options
     #
-    def define_topic_handler(id:, topic:, actions:)
-      req = {}
-      req['id'] = id
-
-      actions = [actions] unless actions.is_a?(Array)
-      raise ArgumentError, "Kapacitor topic handler requires one or more actions" unless actions.size > 0
-
-      actions.each do |action|
-        raise ArgumentError, "Missing required kind attribute for action #{action}"
-      end
-
-      req['actions'] = actions
+    def define_topic_handler(id:, topic:, kind:, match: nil, options: {})
+      req = {
+        'id': id,
+        'kind': kind
+      }
+      req['match'] = match unless match.nil?
+      req['options'] = options
       api_post(endpoint: "alerts/topics/#{topic}/handlers", data: req)
     end
 
@@ -209,15 +211,17 @@ module Kapacitor
     #
     # @param id [String] Handler ID
     # @param topic [String] Topic name
-    # @param actions [Array[Hash]] Handler actions
+    # @param kind [String] Kind of handler
+    # @param match [String] Lambda expression
+    # @param options [Hash] Handler options
     #
-    def update_topic_handler(id:, topic:, actions:)
-      req = {}
-
-      actions = [actions] unless actions.is_a?(Array)
-      raise ArgumentError, "Kapacitor topic handler requires one or more actions" unless actions.size > 0
-
-      req['actions'] = actions
+    def update_topic_handler(id:, topic:, kind:, match: nil, options: nil)
+      req = {
+        'id': id,
+        'kind': kind
+      }
+      req['match'] = match unless match.nil?
+      req['options'] = options unless options.nil?
       api_put(endpoint: "alerts/topics/#{topic}/handlers/#{id}", data: req) unless req.empty?
     end
 
@@ -250,7 +254,7 @@ private
       begin
         resp = self.http.get([self.url, endpoint].join('/'), query, {'Content-type' => 'application/json', 'Accept' => 'application/json'})
         begin
-          data = JSON.parse(resp.body) unless resp.body.blank?
+          data = JSON.parse(resp.body) unless resp.body.empty?
         rescue JSON::ParserError
           raise Exception, "Failed to decode response message"
         end
@@ -274,7 +278,7 @@ private
       begin
         resp = self.http.post([self.url, endpoint].join('/'), data.to_json, {'Content-Type' => 'application/json', 'Accept' => 'application/json'})
         begin
-          data = JSON.parse(resp.body) unless resp.body.blank?
+          data = JSON.parse(resp.body) unless resp.body.empty?
         rescue JSON::ParserError
           raise Exception, "Failed to decode response message"
         end
@@ -297,7 +301,7 @@ private
       begin
         resp = self.http.delete([self.url, endpoint].join('/'), {'Content-type' => 'application/json', 'Accept' => 'application/json'})
         begin
-          data = JSON.parse(resp.body) unless resp.body.blank?
+          data = JSON.parse(resp.body) unless resp.body.empty?
         rescue JSON::ParserError
           raise Exception, "Failed to decode response message"
         end
@@ -321,7 +325,7 @@ private
       begin
         resp = self.http.patch([self.url, endpoint].join('/'), data.to_json, {'Content-Type' => 'application/json', 'Accept' => 'application/json'})
         begin
-          data = JSON.parse(resp.body) unless resp.body.blank?
+          data = JSON.parse(resp.body) unless resp.body.empty?
         rescue JSON::ParserError
           raise Exception, "Failed to decode response message"
         end
@@ -345,7 +349,7 @@ private
       begin
         resp = self.http.put([self.url, endpoint].join('/'), data.to_json, {'Content-Type' => 'application/json', 'Accept' => 'application/json'})
         begin
-          data = JSON.parse(resp.body) unless resp.body.blank?
+          data = JSON.parse(resp.body) unless resp.body.empty?
         rescue JSON::ParserError
           raise Exception, "Failed to decode response message"
         end

data/lib/kapacitor/version.rb

@@ -3,7 +3,7 @@
 #
 
 module Kapacitor
-  VERSION = "1.0.5"
+  VERSION = "1.0.10"
 
   def self.version
     VERSION

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kapacitor-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.10
 platform: ruby
 authors:
 - Matteo Cerutti
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-27 00:00:00.000000000 Z
+date: 2020-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient