hawkular-client 5.0.0.pre1 → 5.0.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ce43741f3e66c655f0d1c559576dad7296a8e32
-  data.tar.gz: 70e51c3bed465d9ce434b4eef252722c8afff244
+  metadata.gz: 125d32626ed72fe6dab9a3413b025002c3a1dda3
+  data.tar.gz: ae957eb3a34c40d273b1db2c3cb04edeae17639d
 SHA512:
-  metadata.gz: 78e7755e7ecb8ec09c31c59758302a3cf5ce76d302fe7dadfb71f226a91ad81db7b7a33829c6edf7ebdecf7f346b03c31975725e86d424a160b23f70ce15dcab
-  data.tar.gz: 571f341fef1bff183163ecd58027d1e8cfc81b4c94e68cb2f21aaffbf877098c2d5e68728dd3f2b3b93a860255acf8502d2c1da0d7b34dd3859dc1ec1051c3b7
+  metadata.gz: adc002be0c18fa0d666c076ab0d34e36571b7c9b6359f3c970850b74326292ecc661668699aa69b68f9358ffc4e8394ccc88fb36e272a60d931c01e263a6b6f7
+  data.tar.gz: a38704b444dd7b832eb9507acd25b1f398e949d10bf4f8705ed4154cd388ff63d56651f42df4da8c2080d555203446f61c658b3f4e1ec4b164392f7dd68c42f2

data/README.rdoc

@@ -135,7 +135,6 @@ Check each resource API for a detailed description of what methods are available
 Integration tests are recorded and played against cassettes recorded with VCR
 (http://www.relishapp.com/vcr/vcr/docs)
 
-* Edit the endpoint properties in the file +spec/endpoint.yml+ (user, password and host name) if needed
 * From command line run
     rake spec
 * To run the tests against a live server, set +VCR_OFF+ to +1+ as in

data/lib/hawkular/alerts/alerts_api.rb

@@ -182,11 +182,7 @@ module Hawkular::Alerts
     # Obtains action definition/plugin from the server.
     # @param [String] action_plugin Id of the action plugin to fetch. If nil, all the plugins are fetched
     def get_action_definition(action_plugin = nil)
-      if action_plugin.nil?
-        plugins = http_get('plugins')
-      else
-        plugins = [action_plugin]
-      end
+      plugins = action_plugin.nil? ? http_get('plugins') : [action_plugin]
       ret = {}
       plugins.each do |p|
         ret[p] = http_get("/plugins/#{p}")
@@ -232,7 +228,8 @@ module Hawkular::Alerts
     # Obtain the alerts for the Trigger with the passed id
     # @param [String] trigger_id Id of the trigger that has fired the alerts
     # @return [Array<Alert>] List of alerts for the trigger. Can be empty
-    def get_alerts_for_trigger(trigger_id) # TODO: add additional filters
+    def get_alerts_for_trigger(trigger_id)
+      # TODO: add additional filters
       return [] unless trigger_id
 
       url = '/?triggerIds=' + trigger_id
@@ -254,7 +251,7 @@ module Hawkular::Alerts
     # @param [Array] tenants optional list of tenants. The elements of the array can be any object
     #   convertible to a string
     # @return [Array<Alert>] List of alerts in the system. Can be empty
-    def alerts(criteria: {}, tenants:nil)
+    def alerts(criteria: {}, tenants: nil)
       query = generate_query_params(criteria)
       uri = tenants ? '/admin/alerts/' : '/'
       ret = http_get(uri + query, multi_tenants_header(tenants))
@@ -389,7 +386,7 @@ module Hawkular::Alerts
     attr_accessor :auto_resolve, :auto_resolve_alerts, :tags, :type
     attr_accessor :tenant, :description, :group, :severity, :event_type, :event_category, :member_of, :data_id_map
     attr_reader :conditions, :dampenings
-    attr_accessor :enabled, :actions, :firing_match, :auto_resolve_match
+    attr_accessor :enabled, :firing_match, :auto_resolve_match
 
     def initialize(trigger_hash)
       return if trigger_hash.nil?
@@ -427,9 +424,10 @@ module Hawkular::Alerts
         ret = x.to_s.split('_').collect(&:capitalize).join
         ret[0, 1].downcase + ret[1..-1]
       end
-      fields = [:id, :name, :enabled, :severity, :auto_resolve, :auto_resolve_alerts, :event_type, :event_category,
-                :description, :auto_enable, :auto_disable, :context, :type, :tags, :member_of, :data_id_map,
-                :firing_match, :auto_resolve_match]
+      fields = %i[id name enabled severity auto_resolve auto_resolve_alerts
+                  event_type event_category description auto_enable auto_disable
+                  context type tags member_of data_id_map firing_match
+                  auto_resolve_match]
 
       fields.each do |field|
         camelized_field = to_camel.call(field)
@@ -448,6 +446,7 @@ module Hawkular::Alerts
     class Condition
       attr_accessor :condition_id, :type, :operator, :threshold
       attr_accessor :trigger_mode, :data_id, :data2_id, :data2_multiplier
+      attr_accessor :alerter_id, :expression
       attr_reader :condition_set_size, :condition_set_index, :trigger_id
 
       def initialize(cond_hash)
@@ -461,7 +460,8 @@ module Hawkular::Alerts
         @data2_id = cond_hash['data2Id']
         @data2_multiplier = cond_hash['data2Multiplier']
         @trigger_id = cond_hash['triggerId']
-        @interval = cond_hash['interval']
+        @alerter_id = cond_hash['alerterId']
+        @expression = cond_hash['expression']
       end
 
       def to_h
@@ -476,7 +476,8 @@ module Hawkular::Alerts
         cond_hash['data2Id'] = @data2_id
         cond_hash['data2Multiplier'] = @data2_multiplier
         cond_hash['triggerId'] = @trigger_id
-        cond_hash['interval'] = @interval
+        cond_hash['alerterId'] = @alerter_id
+        cond_hash['expression'] = @expression
         cond_hash
       end
     end
@@ -601,8 +602,8 @@ module Hawkular::Alerts
     end
 
     # for some API back compatibility
-    alias_method :ackBy, :ack_by
-    alias_method :resolvedBy, :resolved_by
+    alias ackBy ack_by
+    alias resolvedBy resolved_by
   end
 
   # Representation of one event.

data/lib/hawkular/base_client.rb

@@ -95,7 +95,7 @@ module Hawkular
       opts[:user] = @credentials[:username]
       opts[:password] = @credentials[:password]
       # strip @endpoint in case suburl is absolute
-      suburl = suburl[@entrypoint.length, suburl.length] if suburl.match(/^http/)
+      suburl = suburl[@entrypoint.length, suburl.length] if suburl =~ /^http/
       RestClient::Resource.new(@entrypoint, opts)[suburl]
     end
 
@@ -131,12 +131,12 @@ module Hawkular
     # @param params [Hash] key-values pairs
     # @return [String] complete query string to append to a base url, '' if no valid params
     def generate_query_params(params = {})
-      params = params.select { |_k, v| !(v.nil? || ((v.instance_of? Array) && v.empty?)) }
+      params = params.reject { |_k, v| v.nil? || ((v.instance_of? Array) && v.empty?) }
       return '' if params.empty?
 
       params.inject('?') do |ret, (k, v)|
         ret += '&' unless ret == '?'
-        part = (v.instance_of? Array) ? "#{k}=#{v.join(',')}" : "#{k}=#{v}"
+        part = v.instance_of?(Array) ? "#{k}=#{v.join(',')}" : "#{k}=#{v}"
         ret + hawk_escape(part)
       end
     end

data/lib/hawkular/hawkular_client.rb

@@ -1,14 +1,12 @@
 require 'hawkular/inventory/inventory_api'
-require 'hawkular/metrics/metrics_client'
 require 'hawkular/alerts/alerts_api'
 require 'hawkular/tokens/tokens_api'
 require 'hawkular/operations/operations_api'
+require 'hawkular/prometheus/prometheus_api'
 require 'hawkular/base_client'
 
 module Hawkular
   class Client
-    attr_reader :inventory, :metrics, :alerts, :operations, :tokens, :state
-
     def initialize(hash)
       hash[:credentials] ||= {}
       hash[:options] ||= {}
@@ -18,19 +16,19 @@ module Hawkular
       @state = hash
     end
 
+    def respond_to_missing?(method_name, include_private = false)
+      delegate_client = client_for_method(method_name)
+      return super if delegate_client.nil?
+
+      method = submethod_name_for(method_name)
+      return super unless delegate_client.respond_to?(method)
+
+      true
+    end
+
     def method_missing(name, *args, &block)
-      delegate_client = case name
-                        when /^inventory_/ then inventory
-                        when /^metrics_/ then metrics
-                        when /^alerts_/ then alerts
-                        when /^operations_/ then operations
-                        when /^tokens_/ then tokens
-                        else
-                          fail Hawkular::ArgumentError, "unknown method prefix `#{name}`, allowed prefixes:"\
-      '`inventory_`, `metrics_`,`alerts_`,`operations_`, `tokens_`'
-                        end
-      method = name.to_s.sub(/^[^_]+_/, '')
-      delegate_client.__send__(method, *args, &block)
+      super unless respond_to?(name)
+      client_for_method(name).__send__(submethod_name_for(name), *args, &block)
     end
 
     def inventory
@@ -39,12 +37,6 @@ module Hawkular
                                            @state[:options])
     end
 
-    def metrics
-      @metrics ||= Metrics::Client.new("#{@state[:entrypoint]}/hawkular/metrics",
-                                       @state[:credentials],
-                                       @state[:options])
-    end
-
     def alerts
       @alerts ||= Alerts::Client.new("#{@state[:entrypoint]}/hawkular/alerts",
                                      @state[:credentials],
@@ -64,6 +56,12 @@ module Hawkular
                                     @state[:options])
     end
 
+    def prometheus
+      @prometheus ||= Prometheus::Client.new(@state[:entrypoint],
+                                             @state[:credentials],
+                                             @state[:options])
+    end
+
     private
 
     # this is in a dedicated method, because constructor opens the websocket connection to make the handshake
@@ -72,5 +70,19 @@ module Hawkular
                              credentials: @state[:credentials],
                              options: @state[:options])
     end
+
+    def client_for_method(method_name)
+      case method_name
+      when /^inventory_/ then inventory
+      when /^alerts_/ then alerts
+      when /^operations_/ then operations
+      when /^tokens_/ then tokens
+      when /^prometheus_/ then prometheus
+      end
+    end
+
+    def submethod_name_for(method_name)
+      method_name.to_s.sub(/^[^_]+_/, '')
+    end
   end
 end

data/lib/hawkular/inventory/entities.rb

@@ -1,32 +1,36 @@
 # It contains class definitions that are used by the inventory REST client
 module Hawkular::Inventory
   class Metric
-    # @return [String] Name of the metric
+    # @return [String] Provider Name of the metric
     attr_reader :name
-    # @return [String] Type of the metric
-    attr_reader :type
+    # @return [String] Display Name of the metric
+    attr_reader :display_name
+    # @return [String] Family of the metric (Prometheus family name)
+    attr_reader :family
+    # @return [String] Promql expression for fetching the  time series
+    attr_reader :expression
     # @return [String] Unit of the metric
     attr_reader :unit
+    # @return [Hash<String,String>] Labels of this metric (Prometheus labels)
+    attr_reader :labels
     # @return [Hash<String,String>] Properties of this metric
     attr_reader :properties
 
     def initialize(hash)
-      @name = hash['name']
-      @type = hash['type']
+      @name = hash['displayName']
+      @display_name = hash['displayName']
+      @family = hash['family']
+      @expression = hash['expression']
       @unit = hash['unit']
+      @labels = hash['labels'] || {}
       @properties = hash['properties'] || {}
+      @_hash = hash.dup
     end
 
-    def hawkular_id
-      @properties.fetch('hawkular.metric.id')
-    end
-
-    def hawkular_type
-      @properties.fetch('hawkular.metric.type')
-    end
-
-    def hawkular_type_id
-      @properties.fetch('hawkular.metric.typeId')
+    # Returns a hash representation of the metric type
+    # @return [Hash<String,Object>] hash of the metric type
+    def to_h
+      @_hash.dup
     end
   end
 
@@ -37,7 +41,7 @@ module Hawkular::Inventory
 
     def initialize(op_hash)
       @name = op_hash['name']
-      @params = (op_hash.key? 'parameters') ? op_hash['parameters'] : {}
+      @params = op_hash.key?('parameters') ? op_hash['parameters'] : {}
     end
   end
 
@@ -57,7 +61,7 @@ module Hawkular::Inventory
     end
 
     def ==(other)
-      self.equal?(other) || other.class == self.class && other.id == @id
+      equal?(other) || other.class == self.class && other.id == @id
     end
 
     # Returns a hash representation of the resource type
@@ -82,10 +86,6 @@ module Hawkular::Inventory
     attr_reader :properties
     # @return [Hash<String,String>] Config map of this resource
     attr_reader :config
-    # @return [List<Metric>] Metrics associated to this resource
-    attr_reader :metrics
-    # @return [List<Resource>] List of children (present when the whole tree is loaded, else nil)
-    attr_reader :children
 
     def initialize(hash)
       @id = hash['id']
@@ -117,12 +117,12 @@ module Hawkular::Inventory
       children(recursive).collect(&:metrics).flat_map(&:itself).concat(@metrics)
     end
 
-    def metrics_by_type(type)
-      @metrics.select { |m| m.type == type }
+    def metrics_by_family(family)
+      @metrics.select { |m| m.family == family }
     end
 
     def ==(other)
-      self.equal?(other) || other.class == self.class && other.id == @id
+      equal?(other) || other.class == self.class && other.id == @id
     end
 
     # Returns a hash representation of the resource

data/lib/hawkular/inventory/inventory_api.rb

@@ -39,6 +39,9 @@ module Hawkular::Inventory
     def resource(id)
       hash = http_get(url('/resources/%s', id))
       Resource.new(hash)
+    rescue ::Hawkular::Exception => e
+      return if e.cause.is_a?(::RestClient::NotFound)
+      raise
     end
 
     # Get resource by id with its complete subtree

data/lib/hawkular/metrics/metric_api.rb

@@ -23,7 +23,8 @@ module Hawkular::Metrics
     # @param starts [Integer] optional timestamp (default now - 8h)
     # @param ends [Integer] optional timestamp (default now)
     # @return [Array[Hash]] datapoints
-    def data_by_tags(tags, buckets: nil, bucketDuration:nil, start:nil, ends: nil)
+    def data_by_tags(tags, buckets: nil, bucketDuration: nil, # rubocop:disable Naming/VariableName
+                     start: nil, ends: nil)
       data = {
         tags: tags_param(tags), buckets: buckets, bucketDuration: bucketDuration, start: start, end: ends
       }
@@ -56,7 +57,7 @@ module Hawkular::Metrics
       strings.each { |g| default_timestamp g[:data] }
       data = { gauges: gauges, counters: counters, availabilities: availabilities, strings: strings }
       path = '/metrics/'
-      @legacy_api ? path << 'data' : path << 'raw'
+      path << (@legacy_api ? 'data' : 'raw')
       http_post(path, data)
     end
 
@@ -84,7 +85,7 @@ module Hawkular::Metrics
       path = '/metrics/stats/query'
       metrics = { gauge: gauge_ids, counter: counter_ids, availability: avail_ids }
       data = { metrics: metrics, start: starts, end: ends, bucketDuration: bucket_duration }
-      data['types'] = %w(gauge gauge_rate counter counter_rate availability) if rates
+      data['types'] = %w[gauge gauge_rate counter counter_rate availability] if rates
       http_post(path, data)
     end
 
@@ -93,9 +94,11 @@ module Hawkular::Metrics
     def tags
       tags = []
       http_get('/metrics/').map do |g|
+        next if g['tags'].nil?
+
         g['tags'].map do |k, v|
           tags << { k => v }
-        end unless g['tags'].nil?
+        end
       end
       tags.uniq!
     end
@@ -171,7 +174,7 @@ module Hawkular::Metrics
       def push_data(id, data)
         data = [data] unless data.is_a?(Array)
         uri = "/#{@resource}/#{ERB::Util.url_encode(id)}/"
-        @legacy_api ? uri << 'data' : uri << 'raw'
+        uri << (@legacy_api ? 'data' : 'raw')
         @client.default_timestamp data
         @client.http_post(uri, data)
       end
@@ -187,8 +190,8 @@ module Hawkular::Metrics
       # @param order [String] optional Data point sort order, based on timestamp (ASC, DESC)
       # @return [Array[Hash]] datapoints
       # @see #push_data #push_data for datapoint detail
-      def get_data(id, starts: nil, ends: nil, bucketDuration: nil, buckets: nil, percentiles: nil, limit: nil,
-                   order: nil)
+      def get_data(id, starts: nil, ends: nil, bucketDuration: nil, # rubocop:disable Naming/VariableName
+                   buckets: nil, percentiles: nil, limit: nil, order: nil)
         params = { start: starts, end: ends, bucketDuration: bucketDuration, buckets: buckets,
                    percentiles: percentiles, limit: limit, order: order }
         get_data_helper(id, params)
@@ -214,28 +217,32 @@ module Hawkular::Metrics
       # @param buckets [Integer] optional number of buckets
       # @return [Array[Hash]] datapoints
       # @see #push_data #push_data for datapoint detail
-      def get_data_by_tags(tags, starts: nil, ends: nil, bucketDuration: nil, buckets:nil)
+      def get_data_by_tags(tags, starts: nil, ends: nil, bucketDuration: nil, # rubocop:disable Naming/VariableName
+                           buckets: nil)
         params = { tags: @client.tags_param(tags), start: starts,
                    end: ends, bucketDuration: bucketDuration, buckets: buckets }
         path = "/#{@resource}/"
-        @legacy_api ? path << 'data/?' : path << 'stats/?'
+        path << (@legacy_api ? 'data/?' : 'stats/?')
         resp = @client.http_get(path + encode_params(params))
         resp.is_a?(Array) ? resp : [] # API returns no content (empty Hash) instead of empty array
       end
 
       def encode_params(params)
-        URI.encode_www_form(params.select { |_k, v| !v.nil? })
+        URI.encode_www_form(params.reject { |_k, v| v.nil? })
       end
 
       private
 
       def get_data_helper(id, params)
         path = "/#{@resource}/#{ERB::Util.url_encode(id)}/"
-        if @legacy_api
-          path << 'data/?'
-        else
-          (params[:bucketDuration].nil? && params[:buckets].nil?) ? path << 'raw/?' : path << 'stats/?'
-        end
+        path << if @legacy_api
+                  'data/?'
+                elsif params[:bucketDuration].nil? && params[:buckets].nil?
+                  'raw/?'
+                else
+                  'stats/?'
+                end
+
         path << encode_params(params)
         resp = @client.http_get(path)
         resp.is_a?(Array) ? resp : [] # API returns no content (empty Hash) instead of empty array
@@ -329,8 +336,8 @@ module Hawkular::Metrics
       # @param order [String] optional Data point sort order, based on timestamp (ASC, DESC)
       # @return [Array[Hash]] datapoints
       # @see #push_data #push_data for datapoint detail
-      def get_data(id, starts: nil, ends: nil, bucketDuration: nil, buckets: nil, distinct: nil, limit: nil,
-        order: nil)
+      def get_data(id, starts: nil, ends: nil, bucketDuration: nil, # rubocop:disable Naming/VariableName
+                   buckets: nil, distinct: nil, limit: nil, order: nil)
         params = { start: starts, end: ends, bucketDuration: bucketDuration, buckets: buckets,
                    distinct: distinct, limit: limit, order: order }
         get_data_helper(id, params)

data/lib/hawkular/metrics/metrics_client.rb

@@ -41,7 +41,7 @@ module Hawkular::Metrics
       version = version_status_hash['Implementation-Version']
       major, minor = version.scan(/\d+/).map(&:to_i)
       fail Hawkular::Exception, fail_version_msg if major.nil? || minor.nil?
-      @legacy_api = (major == 0 && minor < 16)
+      @legacy_api = (major.zero? && minor < 16)
     end
 
     # Construct a new Hawkular Metrics client class.

data/lib/hawkular/operations/operations_api.rb

@@ -95,7 +95,7 @@ module Hawkular::Operations
       if args[:entrypoint]
         uri = URI.parse(args[:entrypoint].to_s)
         args[:host] = "#{uri.host}:#{uri.port}"
-        args[:use_secure_connection] = %w(https wss).include?(uri.scheme) ? true : false
+        args[:use_secure_connection] = %w[https wss].include?(uri.scheme) ? true : false
       end
 
       fail Hawkular::ArgumentError, 'no parameter ":host" or ":entrypoint" given' if args[:host].nil?
@@ -153,7 +153,7 @@ module Hawkular::Operations
     # which the operation is about to run, feedId [String], operationName [String]
     # @param callback [Block] callback that is run after the operation is done
     def invoke_generic_operation(hash, &callback)
-      required = [:resourceId, :feedId, :operationName]
+      required = %i[resourceId feedId operationName]
       check_pre_conditions hash, required, &callback
 
       invoke_operation_helper(hash, &callback)
@@ -168,7 +168,7 @@ module Hawkular::Operations
     # @param callback [Block] callback that is run after the operation is done
     def invoke_specific_operation(operation_payload, operation_name, &callback)
       fail Hawkular::ArgumentError, 'Operation must be specified' if operation_name.nil?
-      required = [:resourceId, :feedId]
+      required = %i[resourceId feedId]
       check_pre_conditions operation_payload, required, &callback
 
       invoke_operation_helper(operation_payload, operation_name, &callback)
@@ -190,7 +190,7 @@ module Hawkular::Operations
     def add_deployment(hash, &callback)
       hash[:enabled] = hash.key?(:enabled) ? hash[:enabled] : true
       hash[:force_deploy] = hash.key?(:force_deploy) ? hash[:force_deploy] : false
-      required = [:resource_id, :feed_id, :destination_file_name, :binary_content]
+      required = %i[resource_id feed_id destination_file_name binary_content]
       check_pre_conditions hash, required, &callback
 
       operation_payload = prepare_payload_hash([:binary_content], hash)
@@ -209,7 +209,7 @@ module Hawkular::Operations
     # @param callback [Block] callback that is run after the operation is done
     def undeploy(hash, &callback)
       hash[:remove_content] = hash.key?(:remove_content) ? hash[:remove_content] : true
-      required = [:resource_id, :feed_id, :deployment_name]
+      required = %i[resource_id feed_id deployment_name]
       check_pre_conditions hash, required, &callback
 
       hash[:destination_file_name] = hash[:deployment_name]
@@ -228,7 +228,7 @@ module Hawkular::Operations
     #
     # @param callback [Block] callback that is run after the operation is done
     def enable_deployment(hash, &callback)
-      required = [:resource_id, :feed_id, :deployment_name]
+      required = %i[resource_id feed_id deployment_name]
       check_pre_conditions hash, required, &callback
 
       hash[:destination_file_name] = hash[:deployment_name]
@@ -247,7 +247,7 @@ module Hawkular::Operations
     #
     # @param callback [Block] callback that is run after the operation is done
     def disable_deployment(hash, &callback)
-      required = [:resource_id, :feed_id, :deployment_name]
+      required = %i[resource_id feed_id deployment_name]
       check_pre_conditions hash, required, &callback
 
       hash[:destination_file_name] = hash[:deployment_name]
@@ -266,7 +266,7 @@ module Hawkular::Operations
     #
     # @param callback [Block] callback that is run after the operation is done
     def restart_deployment(hash, &callback)
-      required = [:resource_id, :feed_id, :deployment_name]
+      required = %i[resource_id feed_id deployment_name]
       check_pre_conditions hash, required, &callback
 
       hash[:destination_file_name] = hash[:deployment_name]
@@ -292,8 +292,8 @@ module Hawkular::Operations
     #
     # @param callback [Block] callback that is run after the operation is done
     def add_datasource(hash, &callback)
-      required = [:resourceId, :feedId, :xaDatasource, :datasourceName, :jndiName, :driverName,
-                  :driverClass, :connectionUrl]
+      required = %i[resourceId feedId xaDatasource datasourceName jndiName
+                    driverName driverClass connectionUrl]
       check_pre_conditions hash, required, &callback
 
       invoke_specific_operation(hash, 'AddDatasource', &callback)
@@ -312,8 +312,8 @@ module Hawkular::Operations
     #
     # @param callback [Block] callback that is run after the operation is done
     def add_jdbc_driver(hash, &callback)
-      required = [:resource_id, :feed_id, :driver_jar_name, :driver_name, :module_name,
-                  :driver_class, :binary_content]
+      required = %i[resource_id feed_id driver_jar_name driver_name module_name
+                    driver_class binary_content]
       check_pre_conditions hash, required, &callback
 
       operation_payload = prepare_payload_hash([:binary_content], hash)
@@ -351,7 +351,7 @@ module Hawkular::Operations
     #
     # @param callback [Block] callback that is run after the operation is done
     def update_collection_intervals(hash, &callback)
-      required = [:resourceId, :feedId, :metricTypes, :availTypes]
+      required = %i[resourceId feedId metricTypes availTypes]
       check_pre_conditions hash, required, &callback
       invoke_specific_operation(hash, 'UpdateCollectionIntervals', &callback)
     end
@@ -424,15 +424,18 @@ module Hawkular::Operations
     def self.handle_error(parsed_message, &callback)
       callback.perform(:failure, parsed_message == {} ? 'error' : parsed_message[:data]['errorMessage'])
     end
+    private_class_method :handle_error
 
     def prepare_payload_hash(ignored_params, hash)
       # it filters out ignored params and convert keys from snake_case to camelCase
-      Hash[hash.select { |k, _| !ignored_params.include? k }.map { |k, v| [to_camel_case(k.to_s).to_sym, v] }]
+      Hash[hash.reject { |k, _| ignored_params.include? k }.map { |k, v| [to_camel_case(k.to_s).to_sym, v] }]
     end
 
     def to_camel_case(str)
-      ret = str.split('_').collect(&:capitalize).join
-      ret[0, 1].downcase + ret[1..-1]
+      subs = str.split('_')
+      ret = subs.length > 1 ? subs.collect(&:capitalize).join : subs[0]
+      ret[0] = ret[0].downcase
+      ret
     end
   end
 end

data/lib/hawkular/prometheus/prometheus_api.rb

@@ -0,0 +1,66 @@
+require 'hawkular/base_client'
+require 'hawkular/inventory/entities'
+require 'ostruct'
+
+module Hawkular::Prometheus
+  class Alerter < Hawkular::BaseClient
+    def initialize(entrypoint, credentials = {}, options = {})
+      @entrypoint = normalize_entrypoint_url entrypoint, 'hawkular/alerter'
+      super(@entrypoint, credentials, options)
+    end
+
+    def prometheus_entrypoint
+      rest_client('/prometheus/endpoint').get
+    end
+  end
+
+  # Interface to talk with the Prometheus server used for Middleware Manager
+  # @param entrypoint [String] base url of Hawkular Services
+  class Client < Hawkular::BaseClient
+    attr_reader :entrypoint
+
+    def initialize(entrypoint, credentials = {}, options = {})
+      prometheus_entrypoint = Alerter.new(entrypoint, credentials, options).prometheus_entrypoint
+      @entrypoint = normalize_entrypoint_url prometheus_entrypoint, 'api/v1'
+      super(@entrypoint, credentials, options)
+    end
+
+    def query(metrics: [], time: nil)
+      results = []
+      metrics.each do |metric|
+        query = metric['expression']
+        response = http_get "/query?start=#{time}&query=#{query}"
+        result = response['data']['result'].empty? ? {} : response['data']['result'].first
+        result['metric'] = metric
+        results << result
+      end
+      results
+    end
+
+    def query_range(metrics: [], starts: nil, ends: nil, step: nil)
+      results = []
+      metrics.each do |metric|
+        query = metric['expression']
+        response = http_get "/query_range?start=#{starts}&end=#{ends}&step=#{step}&query=#{query}"
+        result = response['data']['result'].empty? ? {} : response['data']['result'].first
+        result['metric'] = metric
+        results << result
+      end
+      results
+    end
+
+    def up_time(feed_id: nil, starts: nil, ends: nil, step: nil)
+      query = "up{feed_id=\"#{feed_id}\"}"
+      response = http_get "/query_range?start=#{starts}&end=#{ends}&step=#{step}&query=#{query}"
+      if response['data']['result'].empty?
+        []
+      else
+        response['data']['result'].first['values']
+      end
+    end
+
+    def ping
+      http_get '/query?query=up'
+    end
+  end
+end

data/lib/hawkular/version.rb

@@ -4,5 +4,5 @@
 # @see https://github.com/hawkular
 module Hawkular
   # Version of the Hawkular Ruby Gem
-  VERSION = '5.0.0.pre1'.freeze
+  VERSION = '5.0.0.pre2'.freeze
 end

data/lib/hawkularclient.rb

@@ -4,5 +4,6 @@ require 'hawkular/metrics/metrics_client'
 require 'hawkular/alerts/alerts_api'
 require 'hawkular/tokens/tokens_api'
 require 'hawkular/operations/operations_api'
+require 'hawkular/prometheus/prometheus_api'
 require 'hawkular/base_client'
 require 'hawkular/hawkular_client'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hawkular-client
 version: !ruby/object:Gem::Version
-  version: 5.0.0.pre1
+  version: 5.0.0.pre2
 platform: ruby
 authors:
 - Libor Zoubek
@@ -11,22 +11,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-15 00:00:00.000000000 Z
+date: 2020-09-03 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: websocket-client-simple
   requirement: !ruby/object:Gem::Requirement
@@ -42,21 +56,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.3.0
 - !ruby/object:Gem::Dependency
-  name: addressable
+  name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: '4'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4'
 - !ruby/object:Gem::Dependency
-  name: shoulda
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -70,33 +84,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: actionpack
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: 1.6.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: 1.6.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -112,49 +126,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '11'
 - !ruby/object:Gem::Dependency
-  name: simple-websocket-vcr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.0
-- !ruby/object:Gem::Dependency
-  name: yard
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.51.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.51.0
 - !ruby/object:Gem::Dependency
-  name: vcr
+  name: shoulda
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -168,21 +168,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: simple-websocket-vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.34.2
+        version: 0.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.34.2
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -196,21 +196,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -223,7 +223,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: "    A Ruby client for Hawkular\n"
+description: A Ruby client for Hawkular
 email:
 - lzoubek@redhat.com
 - hrupp@redhat.com
@@ -250,6 +250,7 @@ files:
 - lib/hawkular/metrics/tenant_api.rb
 - lib/hawkular/metrics/types.rb
 - lib/hawkular/operations/operations_api.rb
+- lib/hawkular/prometheus/prometheus_api.rb
 - lib/hawkular/tokens/tokens_api.rb
 - lib/hawkular/version.rb
 - lib/hawkularclient.rb
@@ -279,7 +280,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: A Ruby client for Hawkular