kapacitor-ruby 1.0.3 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 30d665b31a22923dcfe3f323870cd2dbca608f4d
-  data.tar.gz: 2ade7584998c461366148de74ed744e29f111396
+SHA256:
+  metadata.gz: b992f75fe340aaeb410f88845f8b0cf22f404a68f2407920450aeb8f81a749cc
+  data.tar.gz: 0f86926ff9b4354aa26f34cb82dbdcc48678dd9cf89f7b3a7b4161573d0b1265
 SHA512:
-  metadata.gz: 067d28ae1d7d640bbce58ee6304859065057d1d554a7685f08ae2703edd17504d771aac95c8cdf144554fad8060c0e74511591dea6344c67b25191a973110f2a
-  data.tar.gz: ae4153783f39f02933cf12f19e24c390a88bf173a6c363962aea1369ca6b9045441e377cdc84ba977053760b47c564ae1f687852b07a457152868672bbfb07f6
+  metadata.gz: 5766810cf37cf0f73c05085e5dc0e2698f2439a48b065a8c78b0dd1516ea08d5597cfd5ddc8b266f56ee175f0627ac7667f3fa9ac2b515406efb7343862cbc6d
+  data.tar.gz: e2e22bb48e84baf6803fa099364991221fb5f0c1d4746a38811d9fc88e208c98b6ba312eb226f27b5a4f4011580da787bb9885ddca86f43202affd92f77de6b5

data/lib/kapacitor/client.rb

@@ -13,7 +13,7 @@ module Kapacitor
     # @param url [String] Kapacitor REST API's URL (defaults to `http://localhost:9092`)
     # @param version [Integer] API version (defaults to `v1preview`)
     #
-    def initialize(url: 'http://localhost:9092/kapacitor', version: 'v1preview')
+    def initialize(url: 'http://localhost:9092/kapacitor', version: 'v1')
       @http = HTTPClient.new
       @url = [url, version].join('/')
     end
@@ -61,6 +61,15 @@ module Kapacitor
       api_delete(endpoint: "templates/#{id}")
     end
 
+    # Retrieve Kapacitor topic
+    #
+    # @return [List[String]] List of topics
+    #
+    def topics()
+      res = api_get(endpoint: "alerts/topics")
+      return res['topics'].map { |v| v['id'] }
+    end
+
     # Retrieve Kapacitor templates
     #
     # @param offset [Integer] Offset count for paginating through templates
@@ -89,7 +98,7 @@ module Kapacitor
     def define_task(id:, dbrps:, **opts)
       if (opts[:template_id].nil? && opts[:type].nil? && opts[:script].nil?) || (opts[:template_id] && (opts[:type] || opts[:script]))
         raise ArgumentError, "Must specify either a Template ID or a script and type"
-      elsif opts['template_id'].nil? && (opts['type'].nil? || opts['script'].nil?)
+      elsif opts[:template_id].nil? && (opts[:type].nil? || opts[:script].nil?)
         raise ArgumentError, "Must specify both task type and script when not using a Template ID"
       end
 
@@ -130,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]
@@ -142,6 +151,12 @@ module Kapacitor
       end
 
       api_patch(endpoint: "tasks/#{id}", data: req) unless req.empty?
+
+      if opts[:status] == 'enabled'
+        req['status'] = opts[:status] if opts[:status]
+        api_patch(endpoint: "tasks/#{id}", data: req) unless req.empty?
+      end
+
     end
 
     # Delete a Kapacitor task
@@ -179,20 +194,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
 
@@ -200,15 +212,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
 
@@ -240,14 +254,14 @@ private
     def api_get(endpoint:, query: nil)
       begin
         resp = self.http.get([self.url, endpoint].join('/'), query, {'Content-type' => 'application/json', 'Accept' => 'application/json'})
-        if resp.status == 200
-          begin
-            data = JSON.parse(resp.body)
-          rescue JSON::ParserError
-            raise Exception, "Failed to decode response message"
-          end
-        else
-          raise Exception, "Query returned a non successful HTTP code (Status: #{resp.status}, Reason: #{resp.reason})"
+        begin
+          data = JSON.parse(resp.body) unless resp.body.empty?
+        rescue JSON::ParserError
+          raise Exception, "Failed to decode response message"
+        end
+        if resp.status != 200
+          error = data.include?('error') ? data['error'] : data.inspect if data
+          raise Exception, "Query returned a non successful HTTP code (Status: #{resp.status}, Reason: #{resp.reason}#{", Error: #{error}" if error}"
         end
       rescue
         raise Exception, "Failed to execute GET request to Kapacitor REST API (#{$!})"
@@ -264,14 +278,14 @@ private
     def api_post(endpoint:, data:)
       begin
         resp = self.http.post([self.url, endpoint].join('/'), data.to_json, {'Content-Type' => 'application/json', 'Accept' => 'application/json'})
-        if resp.status == 200
-          begin
-            data = JSON.parse(resp.body)
-          rescue JSON::ParserError
-            raise Exception, "Failed to decode response message"
-          end
-        else
-          raise Exception, "Query returned a non successful HTTP code (Status: #{resp.status}, Reason: #{resp.reason})"
+        begin
+          data = JSON.parse(resp.body) unless resp.body.empty?
+        rescue JSON::ParserError
+          raise Exception, "Failed to decode response message"
+        end
+        if resp.status != 200
+          error = data.include?('error') ? data['error'] : data.inspect if data
+          raise Exception, "Query returned a non successful HTTP code (Status: #{resp.status}, Reason: #{resp.reason}#{", Error: #{error}" if error}"
         end
       rescue
         raise Exception, "Failed to execute POST request to Kapacitor REST API (#{$!})"
@@ -287,16 +301,14 @@ private
     def api_delete(endpoint:)
       begin
         resp = self.http.delete([self.url, endpoint].join('/'), {'Content-type' => 'application/json', 'Accept' => 'application/json'})
-        if resp.status == 204
-          if resp.body
-            begin
-              data = JSON.parse(resp.body)
-            rescue JSON::ParserError
-              raise Exception, "Failed to decode response message"
-            end
-          end
-        else
-          raise Exception, "Query returned a non successful HTTP code (Status: #{resp.status}, Reason: #{resp.reason})"
+        begin
+          data = JSON.parse(resp.body) unless resp.body.empty?
+        rescue JSON::ParserError
+          raise Exception, "Failed to decode response message"
+        end
+        if resp.status != 204
+          error = data.include?('error') ? data['error'] : data.inspect if data
+          raise Exception, "Query returned a non successful HTTP code (Status: #{resp.status}, Reason: #{resp.reason}#{", Error: #{error}" if error}"
         end
       rescue
         raise Exception, "Failed to execute DELETE request to Kapacitor REST API (#{$!})"
@@ -313,14 +325,14 @@ private
     def api_patch(endpoint:, data:)
       begin
         resp = self.http.patch([self.url, endpoint].join('/'), data.to_json, {'Content-Type' => 'application/json', 'Accept' => 'application/json'})
-        if resp.status == 200
-          begin
-            data = JSON.parse(resp.body)
-          rescue JSON::ParserError
-            raise Exception, "Failed to decode response message"
-          end
-        else
-          raise Exception, "Query returned a non successful HTTP code (Code: #{resp.status}, Reason: #{resp.reason})"
+        begin
+          data = JSON.parse(resp.body) unless resp.body.empty?
+        rescue JSON::ParserError
+          raise Exception, "Failed to decode response message"
+        end
+        if resp.status != 200
+          error = data.include?('error') ? data['error'] : data.inspect if data
+          raise Exception, "Query returned a non successful HTTP code (Status: #{resp.status}, Reason: #{resp.reason}#{", Error: #{error}" if error}"
         end
       rescue
         raise Exception, "Failed to execute PATCH request to Kapacitor REST API (#{$!})"
@@ -337,14 +349,14 @@ private
     def api_put(endpoint:, data:)
       begin
         resp = self.http.put([self.url, endpoint].join('/'), data.to_json, {'Content-Type' => 'application/json', 'Accept' => 'application/json'})
-        if resp.status == 200
-          begin
-            data = JSON.parse(resp.body)
-          rescue JSON::ParserError
-            raise Exception, "Failed to decode response message"
-          end
-        else
-          raise Exception, "Query returned a non successful HTTP code (Status: #{resp.status}, Reason: #{resp.reason})"
+        begin
+          data = JSON.parse(resp.body) unless resp.body.empty?
+        rescue JSON::ParserError
+          raise Exception, "Failed to decode response message"
+        end
+        if resp.status != 200
+          error = data.include?('error') ? data['error'] : data.inspect if data
+          raise Exception, "Query returned a non successful HTTP code (Status: #{resp.status}, Reason: #{resp.reason}#{", Error: #{error}" if error}"
         end
       rescue
         raise Exception, "Failed to execute PUT request to Kapacitor REST API (#{$!})"

data/lib/kapacitor/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kapacitor-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.8
 platform: ruby
 authors:
 - Matteo Cerutti
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-09-04 00:00:00.000000000 Z
+date: 2020-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -52,7 +52,7 @@ homepage: https://github.com/m4ce/kapacitor-ruby
 licenses:
 - Apache 2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -67,9 +67,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
-signing_key: 
+rubygems_version: 3.0.1
+signing_key:
 specification_version: 4
 summary: Ruby client library that allows to interact with the Kapacitor JSON REST
   API