sensu-plugins-chrony 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61897a11958c84be26ba2c26c6f6b0adc179069d
-  data.tar.gz: 9adfdeeb69502f704a852237c6629bafc083a1aa
+  metadata.gz: fbee417370232667d4b3b9edf97326b3ee60fd5d
+  data.tar.gz: 9e62f3fd51ea37044e82dd75ff6a7a8928743eed
 SHA512:
-  metadata.gz: 9b3c7b14b75c7fff195b33240384630b2857bb38fe55dbed9e17353e3b3568f177ebba2dcdc50b1ffb7b08e27b377c326d0568f809f0aa14c026e7bd9e3a15a2
-  data.tar.gz: 91321d38af52a4a405b217601c4b92f7d6e212418115f29bb908a677ecf4a9be7207d5d9b4b9e07129769676f9f8ee8405051ff02ddf18bd04faf50ee59cb85f
+  metadata.gz: 7fd93d42abd56f7c88f92c588ada85dcc04d068d5b92edf2bd2479eded00391b2aa48b52a0f4e14c2bf9d15d7e46bd96f3a77d6bd11266359ad824dafe8ee194
+  data.tar.gz: c6397e9073a5d2dd832b22c3b7fb8cb726d498de4f8b8781575584a382fb9d400d06a972caf5ed89725e4a2678f8a389534562be492058764b7ceb36feb2b513

data/bin/metrics-chrony.rb

@@ -34,7 +34,7 @@ class ChronyMetrics < Sensu::Plugin::Metric::CLI::Graphite
          description: 'Metric naming scheme, text to prepend to metric',
          short: '-s SCHEME',
          long: '--scheme SCHEME',
-         default: Socket.gethostname
+         default: "#{Socket.gethostname}.chronystats"
 
   def run
     # #YELLOW
@@ -42,39 +42,34 @@ class ChronyMetrics < Sensu::Plugin::Metric::CLI::Graphite
       config[:scheme] = config[:host]
     end
 
-    chronystats = get_chronystats(config[:host])
+    chronystats = get_chronystats
     critical "Failed to get chronycstats from #{config[:host]}" if chronystats.empty?
     metrics = {
-      chronystats: chronystats
+      config[:scheme] => chronystats
     }
     metrics.each do |name, stats|
       stats.each do |key, value|
-        output([config[:scheme], name, key].join('.'), value)
+        output([name, key].join('.'), value)
       end
     end
     ok
   end
 
-  def get_chronystats(host)
-    key_pattern = Regexp.compile(
-      [
-        "Stratum",
-        "Last offset",
-        "RMS offset",
-        "Frequency",
-        "Residual freq",
-        "Skew",
-        "Root delay",
-        "Root dispersion",
-        "Update interval"
-      ].join('|'))
-    num_val_pattern = /[\-\+]?[\d]+(\.[\d]+)?/
-    pattern = /^(#{key_pattern})\s*:\s*(#{num_val_pattern}).*$/
+  def get_chronystats
+    num_val_pattern = /^[-+]?\d+(\.\d+)?\s/
 
-    `chronyc tracking`.scan(pattern).reduce({}) do |hash, parsed|
-      key, val, fraction = parsed
-      hash[key.downcase.tr(" ", "_")] = fraction ? val.to_f : val.to_i
+    `chronyc tracking`.each_line.reduce({}) do |hash, line|
+      key, val = line.split(/\s*:\s*/)
+      matched = val.match(num_val_pattern) || (next hash)
+      number, fraction = matched.to_a
+      number = fraction ? number.to_f : number.to_i
+      number = - number if /slow/ =~ val # for system time
+      hash[snakecase(key)] = number
       hash
     end
   end
+
+  def snakecase(str)
+    str.downcase.tr(' ', '_').gsub(/[()]/, '')
+  end
 end

data/lib/sensu-plugins-chrony/version.rb

@@ -2,7 +2,7 @@ module SensuPluginsChrony
   module Version
     MAJOR = 0
     MINOR = 0
-    PATCH = 9
+    PATCH = 10
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-chrony
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Matteo Cerutti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-05 00:00:00.000000000 Z
+date: 2016-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin