jenkins_statsd 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3bba0435e463911efbea5abc1fae0c85aabf7142
-  data.tar.gz: 5387e77c0fafc1eed91eec7d5073d67f368e8a95
+  metadata.gz: cf796a8a056eac63755504806f8366587da4a50a
+  data.tar.gz: 0ed8a656638eee903185cb222bb573b968072685
 SHA512:
-  metadata.gz: 54e82f30945f30dea148cdb3790f80effbf25ea574293bb4911c7a6fbdcbb1e67ff213207fa7ff508dc41218b221b85f8e95171dbddedb2114d69e1bb312791b
-  data.tar.gz: 5343b5028a93830bba8172bf4ec2571307bdfd722ea901cb063445815500a90109fd95fb29e0f2f1279494ecf1f53e049eb5199667bc3d7756e469821784d45b
+  metadata.gz: 309b0a99a68c38283e2564123b029e9bb450f472c3728488d78614ac381e52bc0de15603fd8b3a340db3d32cc4b89f46261cf6f69bb4b61d2cbc5261240e2f96
+  data.tar.gz: 0a57de2b66b701dca9f9ece253072b9264eab5206e2debdd18666f0657dce103b6d21b19d5b91ee16889e60844105c26b3e7d69539daea744768c18cdab78512

data/lib/jenkins_statsd/jenkins_client.rb

@@ -6,11 +6,17 @@ module JenkinsStatsd
     attr_reader :metrics_url
 
     GAUGES_EXCLUDE = [
-      %r(^jenkins\.versions)
+      %r{^jenkins\.versions}
     ]
 
     METERS_EXCLUDE = [
-      %r(^http)
+      %r{^http}
+    ]
+
+    TIMERS_EXCLUDE = [
+      %r{^http},
+      %r{^jenkins\.health},
+      %r{^jenkins\.node}
     ]
 
     def initialize(host, api_token)
@@ -23,6 +29,7 @@ module JenkinsStatsd
       parsed = JSON.parse(response.body)
       metrics[:gauges] = extract_gauges(parsed)
       metrics[:meters] = extract_meters(parsed)
+      metrics[:timers] = extract_timers(parsed)
       metrics
     end
 
@@ -47,11 +54,26 @@ module JenkinsStatsd
 
     def extract_meters(data)
       meters = {}
-      data['meters'].each do |key, value|
+      data['meters'].each do |key, components|
         next if ignore?(key, METERS_EXCLUDE)
-        meters["#{key}.m1_rate"] = value['m1_rate']
+        components.each do |component, value|
+          next if component.match(%r{count|units})
+          meters["#{key}.#{component}"] = value
+        end
       end
       meters
     end
+
+    def extract_timers(data)
+      timers = {}
+      data['timers'].each do |key, components|
+        next if ignore?(key, TIMERS_EXCLUDE)
+        components.each do |component, value|
+          next unless component.match(%r{max|min|mean})
+          timers["#{key}.#{component}"] = value
+        end
+      end
+      timers
+    end
   end
 end

data/lib/jenkins_statsd/version.rb

@@ -1,3 +1,3 @@
 module JenkinsStatsd
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jenkins_statsd
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Matt Chun-Lum