prometheus-api-client 0.2.10 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7248e7525d856f9fbf407b8e15b6f761e84115af
-  data.tar.gz: a590b35b49f625b63bc572948f2dbd4292b08a8c
+  metadata.gz: f98a4aea6667c830dfe09fb682ab1c02e06930a4
+  data.tar.gz: 2d36c78279cf1e3db674d9dc3db3a179b0525e39
 SHA512:
-  metadata.gz: c7df2b7fd83c373290b1fa2bbe8335dda983f376b4371b90f34d78b12ee68e3c66e81314193ec8e5c93d1ed7da0a8f8072906733d54a42906a501164e222e8ab
-  data.tar.gz: 8153bee7639544c55f133216e295d10f23ad82fca6045bf0686fd76268bd3cc59cac62e02fe69e580b39daf03f782214dd8ecc39edafe5c107dd71e9096a8032
+  metadata.gz: 662fde2340f4e588c5e874d3507958ac51db2975edd97bac9d60243d4fa83d3e82b64c8b3df57eaa72e449404cc525725e58939ac7bf8e406a67faca66004fde
+  data.tar.gz: 718bd0e4be1aaa2fc47f285f51f33d3f75b1b76254800438190cfbeaa5ee29a6fa8f54e4a212efa18758ca78997339e065646ebb417217df18af3fb6bdbffdc4

data/README.md

@@ -25,7 +25,8 @@ prometheus = Prometheus::ApiClient.client
 
 prometheus.get(
   "query_range",
-  :query => "sum(container_cpu_usage_seconds_total{container_name=\"prometheus-hgv4s\",job=\"kubernetes-nodes\"})",
+  :query => "sum(container_cpu_usage_seconds_total" \
+            "{container_name=\"prometheus-hgv4s\",job=\"kubernetes-nodes\"})",
   :start => "2015-07-01T20:10:30.781Z",
   :end   => "2015-07-02T20:10:30.781Z",
   :step  => "120s"
@@ -41,11 +42,13 @@ prometheus = Prometheus::ApiClient.client(url: 'http://example.com:9090')
 
 #### Authentication proxy
 
-If an authentication proxy ( e.g. oauth2 ) is used in a layer above the prometheus REST server, this client can use ssl and authentication headears.
+If an authentication proxy ( e.g. oauth2 ) is used in a layer above the
+prometheus REST server, this client can use ssl and authentication headears.
 
 ```ruby
 # return a client for host https://example.com/api/v1/ using a Bearer token "TopSecret"
-prometheus = Prometheus::ApiClient.client(url: 'https://example.com:443', credentials: {token: 'TopSecret'})
+prometheus = Prometheus::ApiClient.client(url: 'https://example.com:443',
+                                          credentials: {token: 'TopSecret'})
 ```
 
 #### High level calls
@@ -54,13 +57,15 @@ prometheus = Prometheus::ApiClient.client(url: 'https://example.com:443', creden
 
 # send a query request to server
 prometheus.query(
-  :query => "sum(container_cpu_usage_seconds_total{container_name=\"prometheus-hgv4s\",job=\"kubernetes-nodes\"})",
+  :query => "sum(container_cpu_usage_seconds_total" \
+            "{container_name=\"prometheus-hgv4s\",job=\"kubernetes-nodes\"})",
   :time => "2015-07-01T20:10:30.781Z",
 )
 
 # send a query_range request to server
 prometheus.query_range(
-  :query => "sum(container_cpu_usage_seconds_total{container_name=\"prometheus-hgv4s\",job=\"kubernetes-nodes\"})",
+  :query => "sum(container_cpu_usage_seconds_total" \
+            "{container_name=\"prometheus-hgv4s\",job=\"kubernetes-nodes\"})",
   :start => "2015-07-01T20:10:30.781Z",
   :end   => "2015-07-02T20:10:30.781Z",
   :step  => "120s"
@@ -85,6 +90,7 @@ prometheus.query(
   :query => "sum(container_cpu_usage_seconds_total)",
   :time => "2015-07-01T20:10:30.781Z",
 )
+```
 
 ## Tests
 

data/lib/prometheus/api_client.rb

@@ -11,7 +11,7 @@ module Prometheus
     # Create a Prometheus API client:
     #
     # @param [Hash] options
-    # @option options [Hash] :url String base URL.
+    # @option options [String] :url Server base URL.
     # @option options [Hash] :params URI query unencoded key/value pairs.
     # @option options [Hash] :headers Unencoded HTTP header key/value pairs.
     # @option options [Hash] :request Request options.

data/lib/prometheus/api_client/cadvisor.rb

@@ -11,7 +11,7 @@ module Prometheus
       # Create a Prometheus API client:
       #
       # @param [Hash] options
-      # @option options [Hash] :url String base URL.
+      # @option options [String] :url Server base URL.
       # @option options [Hash] :params URI query unencoded key/value pairs.
       # @option options [Hash] :headers Unencoded HTTP header key/value pairs.
       # @option options [Hash] :request Request options.
@@ -20,12 +20,10 @@ module Prometheus
       #
       # A default client is created if options is omitted.
       class Node < Client
-        def initialize(instance:, **options)
-          region = options[:region] || 'infra'
-          zone = options[:zone] || 'default'
+        def initialize(options = {})
+          instance = options[:instance]
 
-          @labels = "job=\"kubernetes-cadvisor\",region=\"#{region}\"," \
-            "zone=\"#{zone}\",instance=\"#{instance}\""
+          @labels = "job=\"kubernetes-cadvisor\",instance=\"#{instance}\""
           super(options)
         end
 
@@ -42,13 +40,11 @@ module Prometheus
 
       # A client with special labels for pod cadvisor metrics
       class Pod < Client
-        def initialize(pod_name:, **options)
+        def initialize(options = {})
+          pod_name = options[:pod_name]
           namespace = options[:namespace] || 'default'
-          region = options[:region] || 'infra'
-          zone = options[:zone] || 'default'
 
-          @labels = "job=\"kubernetes-cadvisor\",region=\"#{region}\"," \
-            "zone=\"#{zone}\",namespace=\"#{namespace}\"," \
+          @labels = "job=\"kubernetes-cadvisor\",namespace=\"#{namespace}\"," \
             "pod_name=\"#{pod_name}\",container_name=\"POD\""
           super(options)
         end
@@ -66,13 +62,12 @@ module Prometheus
 
       # A client with special labels for container cadvisor metrics
       class Container < Client
-        def initialize(container_name:, pod_name:, **options)
+        def initialize(options = {})
+          container_name = args[:container_name]
+          pod_name = args[:pod_name]
           namespace = args[:namespace] || 'default'
-          region = options[:region] || 'infra'
-          zone = options[:zone] || 'default'
 
-          @labels = "job=\"kubernetes-cadvisor\",region=\"#{region}\"," \
-            "zone=\"#{zone}\",namespace=\"#{namespace}\"," \
+          @labels = "job=\"kubernetes-cadvisor\",namespace=\"#{namespace}\"," \
             "pod_name=\"#{pod_name}\",container_name=\"#{container_name}\""
           super(options)
         end

data/lib/prometheus/api_client/client.rb

@@ -24,7 +24,7 @@ module Prometheus
       # Create a Prometheus API client:
       #
       # @param [Hash] options
-      # @option options [Hash] :url String base URL.
+      # @option options [String] :url server base URL.
       # @option options [Hash] :params URI query unencoded key/value pairs.
       # @option options [Hash] :headers Unencoded HTTP header key/value pairs.
       # @option options [Hash] :request Request options.
@@ -32,7 +32,7 @@ module Prometheus
       # @option options [Hash] :proxy Proxy options.
       #
       # A default client is created if options is omitted.
-      def initialize(options)
+      def initialize(options = {})
         options = DEFAULT_ARGS.merge(options)
 
         @client = Faraday.new(

data/lib/prometheus/api_client/version.rb

@@ -2,6 +2,6 @@
 
 module Prometheus
   module ApiClient
-    VERSION = '0.2.10'
+    VERSION = '0.3.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-api-client
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.3.1
 platform: ruby
 authors:
 - Yaacov Zamir