prometheus-api-client 0.4.2 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8074c0b0a28baf98df9bd1584a8967da123428be
-  data.tar.gz: 19f4184ce0b2417ca1d831f63ad57200173b1e41
+  metadata.gz: 05ac806cc363c0bd274032ab1a07877f09e774f4
+  data.tar.gz: b1612a15ccf17eb234b3abff6e34c7e71217a9ca
 SHA512:
-  metadata.gz: 8feafbc014d92d7d3bbea17b276b101742cf0951010cc7b290445951cc85f1eb69d0922b5ed395e540a3de7234b9a51e09f7ab221ca0fbc095c8dbc94193a94c
-  data.tar.gz: 6aefd696c18b8fd0513095d8c7dec468b122e25cbc30f1a475c2d4c623659b0be8d258283b4b15efc1e484d96b10e29d4d12fa09beb3e27fc0e5d18b7a589dac
+  metadata.gz: b83bcd065a1b5d20a06893192ad165443d114bdc1ce373633f0484a7e688c5a7f9073cc65d800318f47d5d96aeb37a4575acc692d70d19c049c8e1200f22abc8
+  data.tar.gz: 16ac21572fb55cdf744eb3a7d7c83d90e756eae83bb7c0c5b6677fecc74e5301edc8abac774ce57dafcef7c134fb431b1f5c2a93ee922bd4851c6d3b95186cf6

data/README.md

@@ -47,8 +47,8 @@ prometheus = Prometheus::ApiClient.client(url:         'https://example.com:443'
 ###### query
 
 ```ruby
-require 'prometheus/api_client'
 
+# send a low level get request to server
 prometheus.get(
   'query_range',
   query: 'sum(container_cpu_usage_seconds_total' \

data/lib/prometheus/api_client/cadvisor.rb

@@ -36,8 +36,14 @@ module Prometheus
         def initialize(options = {})
           instance = options[:instance]
 
-          @labels = "job=\"kubernetes-cadvisor\",instance=\"#{instance}\"," \
-            'id="/"'
+          # if no instance is given, assume we want data on all nodes
+          @labels = if instance
+                      'job="kubernetes-cadvisor",id="/",' \
+                      "instance=\"#{instance}\""
+                    else
+                      'job="kubernetes-cadvisor",id="/"'
+                    end
+
           super(options)
         end
       end
@@ -48,8 +54,14 @@ module Prometheus
           pod_name = options[:pod_name]
           namespace = options[:namespace] || 'default'
 
-          @labels = "job=\"kubernetes-cadvisor\",namespace=\"#{namespace}\"," \
-            "pod_name=\"#{pod_name}\",container_name=\"POD\""
+          # if no pod_name is given, assume we want data on all pods
+          @labels = if pod_name
+                      'job="kubernetes-cadvisor",container_name="POD",' \
+                      "pod_name=\"#{pod_name}\",namespace=\"#{namespace}\""
+                    else
+                      'job="kubernetes-cadvisor",container_name="POD"'
+                    end
+
           super(options)
         end
       end
@@ -61,8 +73,15 @@ module Prometheus
           pod_name = options[:pod_name]
           namespace = options[:namespace] || 'default'
 
-          @labels = "job=\"kubernetes-cadvisor\",namespace=\"#{namespace}\"," \
-            "pod_name=\"#{pod_name}\",container_name=\"#{container_name}\""
+          # if no container_name is given, assume we want data on all containers
+          @labels = if container_name
+                      'job="kubernetes-cadvisor",' \
+                      "namespace=\"#{namespace}\",pod_name=\"#{pod_name}\"," \
+                      "container_name=\"#{container_name}\""
+                    else
+                      'job="kubernetes-cadvisor",container_name!="POD"'
+                    end
+
           super(options)
         end
       end

data/lib/prometheus/api_client/version.rb

@@ -2,6 +2,6 @@
 
 module Prometheus
   module ApiClient
-    VERSION = '0.4.2'
+    VERSION = '0.5.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-api-client
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.1
 platform: ruby
 authors:
 - Yaacov Zamir
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-10 00:00:00.000000000 Z
+date: 2017-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday