como_client 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ea2626e48627961305b33ae9492c2d4917358d746989985590a9d1f36662b31
-  data.tar.gz: abf26c663f07c4e1c13ed137c52685ff94c32c4a8a48c14ac68949961c5a1cb7
+  metadata.gz: b863e03423ed22f67e20c70816cf3be07b3a6f952dbe7b70ab48ac57126479ae
+  data.tar.gz: e304d192cb318ae7616a9e013c8efa4d783e9a4ebb7b1f7b49b5f9583651759c
 SHA512:
-  metadata.gz: 99ee9c94a971eea840de26cbdd289f3533b5977dade938a11e5ac9c4263716e7eb68e5cc86ee965776d689e9af995adc46e79032bf9d667c1e5c65496f48cafe
-  data.tar.gz: 54b0afe5ab1e201c06740c2e981bdc02fb04ebb8ef3fecff7063467fe239e0256f5b202003dd85b2a03db8caf0e17bf6d2af639b0ab36103b7f2980862641f3a
+  metadata.gz: 8ff23766c274bcbe335b1a7a7f30c60abd287030972d98d3ca32e911a4af903f8fb14b3f9ec9ded4c0fc75e92ad5756bbf2aaca9b3b6788108258105eeeee07b
+  data.tar.gz: a5a2510903bb8c435a0d9f7f3303b67f5bf4f12e8950abfe0c880bafd1c18349f22f4c07e0812569bf82b7c7cdf57940844ee5c26387dbd55de3f91c4f96aaeb

data/lib/como_client.rb

@@ -44,7 +44,7 @@ module COMOClient
     end
 
     COMOClient::Metrics.register
-    @pushTask = Concurrent::TimerTask.new(execution_interval: 20, timeout_interval: 20){COMOClient::Tasks::PeriodicPush.push}
+    @pushTask = Concurrent::TimerTask.new(execution_interval: @configuration.push_interval, timeout_interval: 20){COMOClient::Tasks::PeriodicPush.push}
     @pushTask.add_observer(COMOClient::Tasks::Observer.new)
     @pushTask.execute
     logger.info("successfully initiated metrics push service!")

data/lib/como_client/metrics/cf.rb

@@ -11,7 +11,7 @@ module COMOClient
 
         prometheus =  Prometheus::Client.registry
 
-        hardwareGauges = Prometheus::Client::Gauge.new( :instance_metrics, docstring: 'instance hardware metrics')
+        hardwareGauges = Prometheus::Client::Gauge.new( :instance_metrics, docstring: 'instance hardware metrics', labels: [:hardware])
         prometheus.register(hardwareGauges)
         logger.info("registered hardware gauges")
 
@@ -25,14 +25,14 @@ module COMOClient
         usw = Usagewatch
         mem = MemInfo.new
         hardwareGauges = prometheus.get(:instance_metrics)
-        hardwareGauges.set({ hardware: 'cpu'}, usw.uw_cpuused)
-        hardwareGauges.set({ hardware: 'avg_load_past_minute'}, usw.uw_load)
-        hardwareGauges.set({ hardware: 'memory_total'}, mem.memtotal)
-        hardwareGauges.set({ hardware: 'memory_free'}, mem.memfree)
-        hardwareGauges.set({ hardware: 'memory_used'}, mem.memused)
-        hardwareGauges.set({ hardware: 'disk_used_perc'}, usw.uw_diskused_perc)
-        hardwareGauges.set({ hardware: 'disk_used_gigabytes'}, usw.uw_diskused)
-        hardwareGauges.set({ hardware: 'uptime_seconds'}, IO.read('/proc/uptime').split[0].to_i)
+        hardwareGauges.set(usw.uw_cpuused, labels: { hardware: 'cpu'})
+        hardwareGauges.set(usw.uw_load, labels: { hardware: 'avg_load_past_minute'})
+        hardwareGauges.set(mem.memtotal, labels: { hardware: 'memory_total'})
+        hardwareGauges.set(mem.memfree, labels: { hardware: 'memory_free'})
+        hardwareGauges.set(mem.memused, labels: { hardware: 'memory_used'})
+        hardwareGauges.set(usw.uw_diskused_perc, labels: { hardware: 'disk_used_perc'})
+        hardwareGauges.set(usw.uw_diskused, labels: { hardware: 'disk_used_gigabytes'})
+        hardwareGauges.set(IO.read('/proc/uptime').split[0].to_i, labels: { hardware: 'uptime_seconds'})
         logger.info("instance gauges")
 
         logger.info("updated CF metrics")

data/lib/como_client/tasks/periodic_push.rb

@@ -11,11 +11,11 @@ module COMOClient
         logger.info("instance: #{COMOClient.configuration.instance_name}")
         COMOClient::Metrics.update
         Prometheus::Client::Push.new(COMOClient.configuration.job_name, #job name
-                                     COMOClient.configuration.instance_name,#instance name
-                                     COMOClient.configuration.pushgateway_url)#pushgateway url
+                                     instance: COMOClient.configuration.instance_name,#instance name
+                                     gateway: COMOClient.configuration.pushgateway_url)#pushgateway url
                                 .add(Prometheus::Client.registry)
         logger.info("successfully pushed metrics")
       end
     end
   end
-end
+end

data/lib/como_client/version.rb

@@ -1,3 +1,3 @@
 module COMOClient
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: como_client
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Disler Colin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-11 00:00:00.000000000 Z
+date: 2020-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec